Skip to content

Commit

Permalink
CSCEXAM-000 Formatting and lint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
lupari committed Feb 8, 2024
1 parent 1a4ce97 commit 6394135
Show file tree
Hide file tree
Showing 7 changed files with 226 additions and 227 deletions.
40 changes: 17 additions & 23 deletions ui/src/app/examination/examination.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
<xm-examination-header [exam]="exam" (timedOut)="timedOut()" [isPreview]="isPreview"> </xm-examination-header>
}
<div class="row ms-3">
<!-- RIGHT COLUMN -->
<div class="col-md-4 col-xs-4 pe-4 order-2">
<!-- TOOLBAR -->
@if (exam) {
<xm-examination-toolbar
[exam]="exam"
[activeSection]="activeSection"
[isPreview]="isPreview"
(pageSelected)="selectNewPage($event)"
[isCollaborative]="isCollaborative"
>
</xm-examination-toolbar>
}
</div>
<!-- RIGHT COLUMN -->
<div class="col-md-4 col-xs-4 pe-4 order-2">
<!-- TOOLBAR -->
@if (exam) {
<xm-examination-toolbar
[exam]="exam"
[activeSection]="activeSection"
[isPreview]="isPreview"
(pageSelected)="selectNewPage($event)"
[isCollaborative]="isCollaborative"
>
</xm-examination-toolbar>
}
</div>
<!-- LEFT COLUMN -->
<div class="col-md-8 col-xs-8 order-1">
<!-- EXAM AREA -->
Expand Down Expand Up @@ -47,15 +47,9 @@
>
</xm-examination-navigation>
}
<a
class="skip"
id="skip-button"
[href]="getSkipLinkPath('#examination-section')"
>
{{ 'i18n_skip_to_content' | translate }}
</a>
<a class="skip" id="skip-button" [href]="getSkipLinkPath('#examination-section')">
{{ 'i18n_skip_to_content' | translate }}
</a>
</div>


</div>
</div>
24 changes: 12 additions & 12 deletions ui/src/app/examination/examination.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ import { AnswerInstructionsComponent } from './instructions/answer-instructions.
import { ExaminationNavigationComponent } from './navigation/examination-navigation.component';
import { ExaminationToolbarComponent } from './navigation/examination-toolbar.component';
import { ExaminationSectionComponent } from './section/examination-section.component';
import {TranslateModule} from "@ngx-translate/core";
import { TranslateModule } from '@ngx-translate/core';

@Component({
selector: 'xm-examination',
templateUrl: './examination.component.html',
standalone: true,
imports: [
ExaminationHeaderComponent,
ExaminationSectionComponent,
AnswerInstructionsComponent,
ExaminationNavigationComponent,
ExaminationToolbarComponent,
TranslateModule,
],
imports: [
ExaminationHeaderComponent,
ExaminationSectionComponent,
AnswerInstructionsComponent,
ExaminationNavigationComponent,
ExaminationToolbarComponent,
TranslateModule,
],
})
export class ExaminationComponent implements OnInit, OnDestroy {
isCollaborative = false;
Expand Down Expand Up @@ -103,9 +103,9 @@ export class ExaminationComponent implements OnInit, OnDestroy {
)
.subscribe();

getSkipLinkPath = (skipTarget: string) => {
return window.location.toString().includes(skipTarget) ? window.location : window.location + skipTarget;
};
getSkipLinkPath = (skipTarget: string) => {
return window.location.toString().includes(skipTarget) ? window.location : window.location + skipTarget;
};

private logout = (msg: string, canFail: boolean) =>
this.Examination.logout(msg, this.exam.hash, this.exam.implementation === 'CLIENT_AUTH', canFail);
Expand Down
Loading

0 comments on commit 6394135

Please sign in to comment.