Rebase

dvsa · Sep 23, 2024 · 6623db4 · 6623db4
1 parent 460efb4
commit 6623db4
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 26 deletions.
diff --git a/src/app/pages/examiner-records/components/examiner-reports-card/examiner-reports-card.ts b/src/app/pages/examiner-records/components/examiner-reports-card/examiner-reports-card.ts
@@ -32,9 +32,9 @@ export class ExaminerReportsCard {
   @Input()
   labelColour = '#000000';
   @Input()
-  dataLabelBackgroundColour: string = '#000000';
+  dataLabelBackgroundColour = '#000000';
   @Input()
-  dataLabelFontColour: string = '#FFFFFF';
+  dataLabelFontColour = '#FFFFFF';
   @Input()
   chartSubtitle = false;
   @Input()

diff --git a/src/app/pages/examiner-records/examiner-records.page.ts b/src/app/pages/examiner-records/examiner-records.page.ts
@@ -136,14 +136,14 @@ export class ExaminerRecordsPage implements OnInit {
   public testResults: ExaminerRecordModel[];
   subscription: Subscription;
 
-  labelColour: string = this.getColourSchemeDefault('Opposing')
-  strokeColour: string = this.getColourSchemeDefault('Main')
-  dataLabelBackgroundColour: string = this.getColourSchemeDefault('Opposing')
-  averageColour: string = this.getColourSchemeDefault('Opposing')
-  dataLabelFontColour: string = this.getColourSchemeDefault('Main')
+  labelColour: string = this.getColourSchemeDefault('Opposing');
+  strokeColour: string = this.getColourSchemeDefault('Main');
+  dataLabelBackgroundColour: string = this.getColourSchemeDefault('Opposing');
+  averageColour: string = this.getColourSchemeDefault('Opposing');
+  dataLabelFontColour: string = this.getColourSchemeDefault('Main');
 
   darkModeListener: EventListener = null;
-  windowMedia: MediaQueryList = window.matchMedia('(prefers-color-scheme: dark)')
+  windowMedia: MediaQueryList = window.matchMedia('(prefers-color-scheme: dark)');
 
   constructor(
     public store$: Store<StoreModel>,
@@ -616,7 +616,7 @@ export class ExaminerRecordsPage implements OnInit {
       this.subscription.unsubscribe();
     }
     await ScreenOrientation.removeAllListeners();
-    this.windowMedia.removeAllListeners()
+    this.windowMedia.removeAllListeners();
   }
 
   /**

diff --git a/src/app/providers/app-config/__mocks__/environment.mock.ts b/src/app/providers/app-config/__mocks__/environment.mock.ts
@@ -78,7 +78,6 @@ export const localEnvironmentMock: LocalEnvironmentFile = {
     testSubmissionUrl: 'https://www.example.com/api/v1/test-result',
     examinerRecordsUrl: 'https://www.example.com/api/v1/test-result/search-examiner-records',
     autoSendInterval: 900000,
-    examinerRecordsUrl: '',
   },
   user: {
     findUserUrl: 'https://www.example.com/api/v1/users/{staffNumber}',

diff --git a/src/app/providers/schema-validator/__tests__/schema-validator.spec.ts b/src/app/providers/schema-validator/__tests__/schema-validator.spec.ts
@@ -37,13 +37,13 @@ describe('SchemaValidatorProvider', () => {
           tests: {
             testSubmissionUrl: 'test',
             examinerRecordsUrl: 'test',
-          autoSendInterval: 1,
-        },
-        user: { findUserUrl: 'test' },
-        requestTimeout: 1,
-        employeeNameKey: 'test',
-        googleAnalyticsId: 'test',
-      } as RemoteConfig).valid
+            autoSendInterval: 1,
+          },
+          user: { findUserUrl: 'test' },
+          requestTimeout: 1,
+          employeeNameKey: 'test',
+          googleAnalyticsId: 'test',
+        } as RemoteConfig).valid
       ).toEqual(true);
     });
   });

diff --git a/src/components/common/bike-category-type/bike-category-type.ts b/src/components/common/bike-category-type/bike-category-type.ts
@@ -37,8 +37,7 @@ export class BikeCategoryTypeComponent implements OnChanges {
   constructor(
     public bikeCategoryDetailProvider: BikeCategoryDetailProvider,
     public store$: Store<StoreModel>
-  ) {
-  }
+  ) {}
 
   ngOnInit(): void {
     // default to MOD1 if any input other than MOD1 or MOD2 provided
@@ -77,10 +76,9 @@ export class BikeCategoryTypeComponent implements OnChanges {
         //   '(prefers-color-scheme: dark)',
         // ).matches ? 'filter: invert(100%);' : null;
         // Variable to force light mode, replace with above line if dark mode is fully integrated
-        const invertFilter : string = null;
+        const invertFilter: string = null;
 
-        element.innerHTML =
-          `
+        element.innerHTML = `
             <span style=" width: 50px; display: inline-block;">${element.innerHTML}</span>`.concat(`${bike.displayName}<img style="${invertFilter} width: 40px; height: 25px;
                 text-align: right; vertical-align: middle;
                 float: right; margin-right: 15px;" src="${bike.imageUrl}" alt="Bike icon"/>`);

diff --git a/src/components/common/chart/chart.ts b/src/components/common/chart/chart.ts
@@ -61,10 +61,10 @@ export class ChartComponent implements OnInit, OnChanges {
   public averageColour = '#FF0000';
 
   @Input()
-  public dataLabelFontColour: string = '#FFFFFF';
+  public dataLabelFontColour = '#FFFFFF';
 
   @Input()
-  public dataLabelBackgroundColour: string = '#000000';
+  public dataLabelBackgroundColour = '#000000';
 
   public dataValues: ApexAxisChartSeries | ApexNonAxisChartSeries = [];
   public labels: string[] = [];
@@ -217,7 +217,7 @@ export class ChartComponent implements OnInit, OnChanges {
         background: {
           enabled: true,
           foreColor: this.dataLabelFontColour,
-          borderColor: this.dataLabelFontColour
+          borderColor: this.dataLabelFontColour,
         },
         //disables drop shadow on the label
         dropShadow: {
@@ -249,7 +249,7 @@ export class ChartComponent implements OnInit, OnChanges {
       //Applies a border to the chart elements
       stroke: {
         show: true,
-        colors: [this.strokeColour]
+        colors: [this.strokeColour],
       },
       xaxis: {
         //disable the x-axis from darkening when the user clicks on it