fixing tests and prettier

hpi-sam · May 29, 2022 · b921aff · b921aff
1 parent 4b398a0
commit b921aff
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,5 +8,5 @@
  "onStartup": ["all-tests"]
  },
  "editor.formatOnSave": true,
- "editor.defaultFormatter": "esbenp.prettier-vscode",
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
 }
diff --git a/.../exercises/exercise/shared/exercise-map/shared/patient-popup/patient-popup.component.html b/.../exercises/exercise/shared/exercise-map/shared/patient-popup/patient-popup.component.html
@@ -29,9 +29,7 @@ <h5 class="popover-header">
  <td>
  <select
  [ngModel]="patientStatus$ | async"
- (ngModelChange)="
- setPretriageCategory($event)
- "
+ (ngModelChange)="setPretriageCategory($event)"
  >
  <option [value]="'black'">EX</option>
  <option [value]="'blue'">SK IV</option>

diff --git a/shared/src/models/patient.ts b/shared/src/models/patient.ts
@@ -140,7 +140,8 @@ export class Patient {
  static readonly msUntilRealStatus: number = 120_000;
 
  static getVisibleStatus(patient: Patient, pretriageEnabled: boolean) {
- return !pretriageEnabled || patient.treatmentTime >= this.msUntilRealStatus
+ return !pretriageEnabled ||
+ patient.treatmentTime >= this.msUntilRealStatus
  ? patient.realStatus
  : patient.pretriageStatus;
  }

diff --git a/shared/src/store/action-reducers/utils/calculate-treatments.spec.ts b/shared/src/store/action-reducers/utils/calculate-treatments.spec.ts
@@ -55,12 +55,12 @@ function assertCatering(
 }
 
 function generatePatient(
- visibleStatus: PatientStatus,
+ pretriageStatus: PatientStatus,
  realStatus: PatientStatus,
  position?: Position
 ): Mutable<Patient> {
  const patient = generateDummyPatient() as Mutable<Patient>;
- patient.visibleStatus = visibleStatus;
+ patient.pretriageStatus = pretriageStatus;
  patient.realStatus = realStatus;
  if (position) {
  patient.position = { ...position };

diff --git a/shared/src/store/action-reducers/utils/calculate-treatments.ts b/shared/src/store/action-reducers/utils/calculate-treatments.ts
@@ -1,5 +1,5 @@
 import { groupBy } from 'lodash-es';
-import type { Material, Personnel} from '../../../models';
+import type { Material, Personnel } from '../../../models';
 import { Patient } from '../../../models';
 import type { PatientStatus } from '../../../models/utils';
 import type { ExerciseState } from '../../../state';
@@ -30,10 +30,13 @@ function caterFor(
  catering: Mutable<Material> | Mutable<Personnel>,
  catersFor: Mutable<CatersFor>,
  patient: Mutable<Patient>,
- pretriageEnabled: boolean,
+ pretriageEnabled: boolean
 ) {
  // Treat not pretriaged patients as yellow.
- const status = Patient.getVisibleStatus(patient, pretriageEnabled) === 'white' ? 'yellow' : Patient.getVisibleStatus(patient, pretriageEnabled);
+ const status =
+ Patient.getVisibleStatus(patient, pretriageEnabled) === 'white'
+ ? 'yellow'
+ : Patient.getVisibleStatus(patient, pretriageEnabled);
  if (
  (status === 'red' && catering.canCaterFor.red <= catersFor.red) ||
  (status === 'yellow' &&
@@ -150,7 +153,9 @@ function calculateCatering(
  > = groupBy(
  distances,
  ({ patient }) =>
- Patient.getVisibleStatus(patient, pretriageEnabled) === 'white' ? 'yellow' : Patient.getVisibleStatus(patient, pretriageEnabled) // Treat untriaged patients as yellow
+ Patient.getVisibleStatus(patient, pretriageEnabled) === 'white'
+ ? 'yellow'
+ : Patient.getVisibleStatus(patient, pretriageEnabled) // Treat untriaged patients as yellow
  );
 
  const redPatients =

diff --git a/shared/src/utils/exercise-configuration.ts b/shared/src/utils/exercise-configuration.ts
@@ -1,6 +1,6 @@
-import { getCreate } from "../models/utils";
+import { getCreate } from '../models/utils';
 
-export class ExerciseConfiguration{
+export class ExerciseConfiguration {
  public readonly pretriageEnabled: boolean = true;
 
  static readonly create = getCreate(this);