material template + material and personnel having own thresholds

shared/src/data/default-state/material-templates.ts

@@ -0,0 +1,22 @@
+import { CanCaterFor } from '../../models/utils';
+import { MaterialTemplate } from '../../models/material-template';
+import type { MaterialType } from '../../models/utils/material-type';
+
+const defaultMaterialTemplate = MaterialTemplate.create(
+    'default',
+    {
+        url: '/assets/material.svg',
+        height: 40,
+        aspectRatio: 1,
+    },
+    CanCaterFor.create(2, 2, 2, 'or'),
+    0.5,
+    5,
+    false
+);
+
+export const materialTemplateMap: {
+    [key in MaterialType]: MaterialTemplate;
+} = {
+    default: defaultMaterialTemplate,
+};

shared/src/data/default-state/personnel-templates.ts

@@ -10,6 +10,8 @@ const sanPersonnelTemplate = PersonnelTemplate.create(
         aspectRatio: 1,
     },
     CanCaterFor.create(0, 0, 5, 'or'),
+    0.5,
+    5,
     false
 );
 
@@ -21,6 +23,8 @@ const rettSanPersonnelTemplate = PersonnelTemplate.create(
         aspectRatio: 1,
     },
     CanCaterFor.create(1, 2, 0, 'and'),
+    0.5,
+    5,
     false
 );
 
@@ -32,6 +36,8 @@ const notSanPersonnelTemplate = PersonnelTemplate.create(
         aspectRatio: 1,
     },
     CanCaterFor.create(2, 1, 0, 'and'),
+    0.5,
+    5,
     false
 );
 
@@ -44,6 +50,8 @@ const notarztPersonnelTemplate = PersonnelTemplate.create(
     },
     // TODO: give notarzt aura
     CanCaterFor.create(2, 2, 2, 'and'),
+    20,
+    0,
     true
 );
 
@@ -55,6 +63,8 @@ const gfPersonnelTemplate = PersonnelTemplate.create(
         aspectRatio: 1,
     },
     CanCaterFor.create(0, 0, 0, 'or'),
+    0,
+    0,
     false
 );
 

shared/src/data/default-state/vehicle-templates.ts

@@ -37,14 +37,7 @@ const rtwVehicleTemplate = VehicleTemplate.create(
     rtwImage,
     2,
     ['notSan', 'rettSan'],
-    [
-        {
-            logicalOperator: 'and',
-            green: 0,
-            yellow: 0,
-            red: 2,
-        },
-    ]
+    ['default']
 );
 
 const ktwVehicleTemplate = VehicleTemplate.create(
@@ -53,14 +46,7 @@ const ktwVehicleTemplate = VehicleTemplate.create(
     ktwImage,
     2,
     ['san', 'rettSan'],
-    [
-        {
-            logicalOperator: 'and',
-            green: 0,
-            yellow: 0,
-            red: 2,
-        },
-    ]
+    ['default']
 );
 
 const gwSanVehicleTemplate = VehicleTemplate.create(
@@ -70,54 +56,14 @@ const gwSanVehicleTemplate = VehicleTemplate.create(
     0,
     ['gf', 'rettSan', 'rettSan', 'san', 'san', 'notarzt'],
     [
-        {
-            logicalOperator: 'and',
-            green: 0,
-            yellow: 0,
-            red: 2,
-        },
-        {
-            logicalOperator: 'and',
-            green: 0,
-            yellow: 0,
-            red: 2,
-        },
-        {
-            logicalOperator: 'and',
-            green: 0,
-            yellow: 0,
-            red: 2,
-        },
-        {
-            logicalOperator: 'and',
-            green: 0,
-            yellow: 0,
-            red: 2,
-        },
-        {
-            logicalOperator: 'and',
-            green: 0,
-            yellow: 0,
-            red: 2,
-        },
-        {
-            logicalOperator: 'and',
-            green: 0,
-            yellow: 0,
-            red: 2,
-        },
-        {
-            logicalOperator: 'and',
-            green: 0,
-            yellow: 0,
-            red: 2,
-        },
-        {
-            logicalOperator: 'and',
-            green: 0,
-            yellow: 0,
-            red: 2,
-        },
+        'default',
+        'default',
+        'default',
+        'default',
+        'default',
+        'default',
+        'default',
+        'default',
     ]
 );
 
@@ -127,14 +73,7 @@ const nefVehicleTemplate = VehicleTemplate.create(
     nefImage,
     0,
     ['notarzt', 'notSan'],
-    [
-        {
-            logicalOperator: 'and',
-            green: 0,
-            yellow: 0,
-            red: 2,
-        },
-    ]
+    ['default']
 );
 
 const rthVehicleTemplate = VehicleTemplate.create(
@@ -143,14 +82,7 @@ const rthVehicleTemplate = VehicleTemplate.create(
     rthImage,
     1,
     ['notarzt', 'notSan'],
-    [
-        {
-            logicalOperator: 'and',
-            green: 0,
-            yellow: 0,
-            red: 2,
-        },
-    ]
+    ['default']
 );
 
 export const defaultVehicleTemplates: readonly VehicleTemplate[] = [

shared/src/models/material-template.ts

@@ -0,0 +1,55 @@
+import { Type } from 'class-transformer';
+import {
+    IsBoolean,
+    IsNumber,
+    IsString,
+    Min,
+    ValidateNested,
+} from 'class-validator';
+import { CanCaterFor, ImageProperties, getCreate } from './utils';
+import { MaterialType } from './utils/material-type';
+
+export class MaterialTemplate {
+    @IsString()
+    public readonly materialType: MaterialType;
+
+    @ValidateNested()
+    @Type(() => CanCaterFor)
+    public readonly canCaterFor: CanCaterFor;
+
+    @IsNumber()
+    @Min(0)
+    public readonly specificThreshold: number;
+
+    @IsNumber()
+    @Min(0)
+    public readonly generalThreshold: number;
+
+    @IsBoolean()
+    public readonly auraMode: boolean;
+
+    @ValidateNested()
+    @Type(() => ImageProperties)
+    public readonly image: ImageProperties;
+
+    /**
+     * @deprecated Use {@link create} instead
+     */
+    constructor(
+        materialType: MaterialType,
+        image: ImageProperties,
+        canCaterFor: CanCaterFor,
+        specificThreshold: number,
+        generalThreshold: number,
+        auraMode: boolean
+    ) {
+        this.materialType = materialType;
+        this.image = image;
+        this.canCaterFor = canCaterFor;
+        this.specificThreshold = specificThreshold;
+        this.generalThreshold = generalThreshold;
+        this.auraMode = auraMode;
+    }
+
+    static readonly create = getCreate(this);
+}

shared/src/models/material.ts

@@ -2,13 +2,17 @@ import { Type } from 'class-transformer';
 import {
     IsBoolean,
     IsDefined,
+    IsNumber,
     IsOptional,
     IsString,
     IsUUID,
+    Min,
     ValidateNested,
 } from 'class-validator';
+import { materialTemplateMap } from '../data/default-state/material-templates';
 import { uuid, UUID, UUIDSet, uuidValidationOptions } from '../utils';
 import { CanCaterFor, getCreate, ImageProperties, Position } from './utils';
+import type { MaterialType } from './utils/material-type';
 
 export class Material {
     @IsUUID(4, uuidValidationOptions)
@@ -28,6 +32,14 @@ export class Material {
     @Type(() => CanCaterFor)
     public readonly canCaterFor: CanCaterFor;
 
+    @IsNumber()
+    @Min(0)
+    public readonly specificThreshold: number;
+
+    @IsNumber()
+    @Min(0)
+    public readonly generalThreshold: number;
+
     @IsBoolean()
     public readonly auraMode: boolean;
 
@@ -41,29 +53,30 @@ export class Material {
 
     @ValidateNested()
     @Type(() => ImageProperties)
-    public readonly image: ImageProperties = {
-        url: './assets/material.svg',
-        height: 40,
-        aspectRatio: 1,
-    };
+    public readonly image: ImageProperties;
 
     /**
      * @deprecated Use {@link create} instead
      */
     constructor(
         vehicleId: UUID,
         vehicleName: string,
-        canCaterFor: CanCaterFor,
+        materialType: MaterialType,
         assignedPatientIds: UUIDSet,
         position?: Position,
         auraMode: boolean = false
     ) {
         this.vehicleId = vehicleId;
         this.vehicleName = vehicleName;
-        this.canCaterFor = canCaterFor;
         this.assignedPatientIds = assignedPatientIds;
         this.position = position;
         this.auraMode = auraMode;
+        this.image = materialTemplateMap[materialType]?.image;
+        this.canCaterFor = materialTemplateMap[materialType]?.canCaterFor;
+        this.generalThreshold =
+            materialTemplateMap[materialType]?.generalThreshold;
+        this.specificThreshold =
+            materialTemplateMap[materialType]?.specificThreshold;
     }
 
     static readonly create = getCreate(this);

shared/src/models/personnel-template.ts

@@ -1,5 +1,11 @@
 import { Type } from 'class-transformer';
-import { IsBoolean, IsString, ValidateNested } from 'class-validator';
+import {
+    IsBoolean,
+    IsNumber,
+    IsString,
+    Min,
+    ValidateNested,
+} from 'class-validator';
 import {
     CanCaterFor,
     ImageProperties,
@@ -15,6 +21,14 @@ export class PersonnelTemplate {
     @Type(() => CanCaterFor)
     public readonly canCaterFor: CanCaterFor;
 
+    @IsNumber()
+    @Min(0)
+    public readonly specificThreshold: number;
+
+    @IsNumber()
+    @Min(0)
+    public readonly generalThreshold: number;
+
     @IsBoolean()
     public readonly auraMode: boolean;
 
@@ -29,11 +43,15 @@ export class PersonnelTemplate {
         personnelType: PersonnelType,
         image: ImageProperties,
         canCaterFor: CanCaterFor,
+        specificThreshold: number,
+        generalThreshold: number,
         auraMode: boolean
     ) {
         this.personnelType = personnelType;
         this.image = image;
         this.canCaterFor = canCaterFor;
+        this.specificThreshold = specificThreshold;
+        this.generalThreshold = generalThreshold;
         this.auraMode = auraMode;
     }