Skip to content

Commit

Permalink
Merge pull request #202 from Heigvd/dev
Browse files Browse the repository at this point in the history 
Phase 5 - last fixes
  • Loading branch information
@SandraMonnier
SandraMonnier authored Aug 26, 2024
2 parents a46050c + 25f4c62 commit f0cf4ff
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 23 deletions.
6 changes: 3 additions & 3 deletions gameModel/files/translations/mainSim-actions-tasks.tsv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ healing-pma-green-desc Green patients care Soins des patients verts
send-radio-title Sends radio message Envoyer message radio
send-radio-desc Sends a radio message Envoyer un message radio
send-radio-feedback A radio message was sent Un message radio a été envoyé
define-pcFront-title Define forward command post Placer le poste de commandement au front (PC front)
define-pcFront-desc Choose a position for the forward command post's location Choisir l'emplacement du poste de commandement au front
define-pcFront-feedback Forward command post is defined Le poste de commandement au front (PC front) est défini
define-pcFront-title Position your ambulance Positionner votre ambulance
define-pcFront-desc Choose a position for your ambulance. This location will be the forward command post. Choisir un emplacement pour votre ambulance. Ce lieu sera le poste de commandement au front.
define-pcFront-feedback Forward command post is defined Le poste de commandement au front est défini
move-actor-title Move to another location Se déplacer
move-actor-desc You move to another location (to be chosen on the map) Aller à
move-actor-feedback Moving En déplacement
Expand Down
7 changes: 4 additions & 3 deletions gameModel/files/translations/mainSim-resources.tsv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ minutes minute(s) minute(s)
emergencyAmbulance Emergency ambulance Ambulance urgence
intermediateAmbulance Intermediate ambulance Ambulance intermédiaire
transferAmbulance Transfer ambulance Ambulance de transfert
helicopter Helicopter Hélicoptère
ambulance Ambulance Ambulance
smur SMUR SMUR
helicopter Helicopter Hélicoptère
acs-mcs ACS / MCS ACS / MCS
pma PMA PMA
pica PICA PICA
pcs PC San PC SAN
acs-mcs ACS/MCS ACS/MCS
pc-san PC San PC SAN
pca-separate-road Separate entry/exit: Entrée/sortie séparées:
pca-true Yes Oui
pca-false No Non
Expand Down
13 changes: 7 additions & 6 deletions gameModel/gamemodel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"comments" : null,
"createdById" : null,
"createdByName" : null,
"createdTime" : 1724239497781,
"createdTime" : 1724667865870,
"description" : null,
"items" : [ {
"@class" : "ListDescriptor",
Expand Down Expand Up @@ -4053,9 +4053,9 @@
"define-pc-desc" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"choose a position for the medical command post\"},\"FR\":{\"status\":\"\",\"translation\":\"choisir l'emplacement du poste de commandement sanitaire\",\"lang\":\"FR\"}},\"version\":0}",
"define-pc-feedback" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"the medical command post is now ready\"},\"FR\":{\"status\":\"\",\"translation\":\"le poste de commandement sanitaire (PC SAN) est maintenant prêt\",\"lang\":\"FR\"}},\"version\":0}",
"define-pc-title" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"positioning the medical command post\"},\"FR\":{\"status\":\"\",\"translation\":\"placer le poste de commandement sanitaire (PC SAN)\",\"lang\":\"FR\"}},\"version\":0}",
"define-pcfront-desc" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"choose a position for the forward command post's location\"},\"FR\":{\"status\":\"\",\"translation\":\"choisir l'emplacement du poste de commandement au front\",\"lang\":\"FR\"}},\"version\":0}",
"define-pcfront-feedback" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"forward command post is defined\"},\"FR\":{\"status\":\"\",\"translation\":\"le poste de commandement au front (PC front) est défini\",\"lang\":\"FR\"}},\"version\":0}",
"define-pcfront-title" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"define forward command post\"},\"FR\":{\"status\":\"\",\"translation\":\"placer le poste de commandement au front (PC front)\",\"lang\":\"FR\"}},\"version\":0}",
"define-pcfront-desc" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"choose a position for your ambulance. This location will be the forward command post.\"},\"FR\":{\"status\":\"\",\"translation\":\"choisir un emplacement pour votre ambulance. Ce lieu sera le poste de commandement au front.\",\"lang\":\"FR\"}},\"version\":0}",
"define-pcfront-feedback" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"forward command post is defined\"},\"FR\":{\"status\":\"\",\"translation\":\"le poste de commandement au front est défini\",\"lang\":\"FR\"}},\"version\":0}",
"define-pcfront-title" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"position your ambulance\"},\"FR\":{\"status\":\"\",\"translation\":\"positionner votre ambulance\",\"lang\":\"FR\"}},\"version\":0}",
"define-pma-desc" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"choose a position for the medical post location\"},\"FR\":{\"status\":\"\",\"translation\":\"choisir l'emplacement du poste médical avancé\",\"lang\":\"FR\"}},\"version\":0}",
"define-pma-feedback" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"the medical post location can now be prepared\"},\"FR\":{\"status\":\"\",\"translation\":\"le poste médical avancé (PMA) est prêt à être installé\",\"lang\":\"FR\"}},\"version\":0}",
"define-pma-title" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"positioning the advanced medical post location\"},\"FR\":{\"status\":\"\",\"translation\":\"placer le poste médical avancé (PMA)\",\"lang\":\"FR\"}},\"version\":0}",
Expand Down Expand Up @@ -4202,7 +4202,8 @@
},
"name" : "mainSim-resources",
"properties" : {
"acs-mcs" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"aCS/MCS\"},\"FR\":{\"status\":\"\",\"translation\":\"aCS/MCS\",\"lang\":\"FR\"}},\"version\":0}",
"acs-mcs" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"aCS / MCS\"},\"FR\":{\"status\":\"\",\"translation\":\"aCS / MCS\",\"lang\":\"FR\"}},\"version\":0}",
"ambulance" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"ambulance\"},\"FR\":{\"status\":\"\",\"translation\":\"ambulance\",\"lang\":\"FR\"}},\"version\":0}",
"ambulancier" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"ambulance man\"},\"FR\":{\"status\":\"\",\"translation\":\"ambulancier\",\"lang\":\"FR\"}},\"version\":0}",
"ambulancier-short" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"ambul. man\"},\"FR\":{\"status\":\"\",\"translation\":\"ambul.\",\"lang\":\"FR\"}},\"version\":0}",
"arrival-in" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"arrival in\"},\"FR\":{\"status\":\"\",\"translation\":\"arrivée dans\",\"lang\":\"FR\"}},\"version\":0}",
Expand All @@ -4219,6 +4220,7 @@
"medecinsenior" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"senior doctor\"},\"FR\":{\"status\":\"\",\"translation\":\"médecin senior\",\"lang\":\"FR\"}},\"version\":0}",
"medecinsenior-short" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"senior doc.\"},\"FR\":{\"status\":\"\",\"translation\":\"méd. senior\",\"lang\":\"FR\"}},\"version\":0}",
"minutes" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"minute(s)\"},\"FR\":{\"status\":\"\",\"translation\":\"minute(s)\",\"lang\":\"FR\"}},\"version\":0}",
"pc-san" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"pC San\"},\"FR\":{\"status\":\"\",\"translation\":\"pC SAN\",\"lang\":\"FR\"}},\"version\":0}",
"pca-capacity" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"capacity:\"},\"FR\":{\"status\":\"\",\"translation\":\"capacité:\",\"lang\":\"FR\"}},\"version\":0}",
"pca-false" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"no\"},\"FR\":{\"status\":\"\",\"translation\":\"non\",\"lang\":\"FR\"}},\"version\":0}",
"pca-heat" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"heated:\"},\"FR\":{\"status\":\"\",\"translation\":\"chauffé:\",\"lang\":\"FR\"}},\"version\":0}",
Expand All @@ -4228,7 +4230,6 @@
"pca-separate-road" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"separate entry/exit:\"},\"FR\":{\"status\":\"\",\"translation\":\"entrée/sortie séparées:\",\"lang\":\"FR\"}},\"version\":0}",
"pca-true" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"yes\"},\"FR\":{\"status\":\"\",\"translation\":\"oui\",\"lang\":\"FR\"}},\"version\":0}",
"pca-water" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"access to water:\"},\"FR\":{\"status\":\"\",\"translation\":\"accès à l'eau:\",\"lang\":\"FR\"}},\"version\":0}",
"pcs" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"pC San\"},\"FR\":{\"status\":\"\",\"translation\":\"pC SAN\",\"lang\":\"FR\"}},\"version\":0}",
"pica" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"pICA\"},\"FR\":{\"status\":\"\",\"translation\":\"pICA\",\"lang\":\"FR\"}},\"version\":0}",
"pma" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"pMA\"},\"FR\":{\"status\":\"\",\"translation\":\"pMA\",\"lang\":\"FR\"}},\"version\":0}",
"resources" : "{\"@class\":\"TranslatableContent\",\"translations\":{\"EN\":{\"@class\":\"Translation\",\"lang\":\"EN\",\"status\":\"\",\"translation\":\"resources\"},\"FR\":{\"status\":\"\",\"translation\":\"ressources\",\"lang\":\"FR\"}},\"version\":0}",
Expand Down
2 changes: 1 addition & 1 deletion gameModel/libs/ClientScript/game/common/localEvents/localEventBase.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ export class AutoSendACSMCSLocalEvent extends ResourceRequestResolutionLocalEven
SMUR: 0,
PMA: 0,
PICA: 0,
'PC San': 0,
'PC-San': 0,
Helicopter: 0,
},
};
Expand Down
4 changes: 2 additions & 2 deletions gameModel/libs/ClientScript/game/common/resources/emergencyDepartment.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ export function loadEmergencyResourceContainers(): ResourceContainerConfig[] {
});

const pcSanitaire: ResourceContainerDefinitionId = addContainerDefinition(
'PC San',
'pcs',
'PC-San',
'pc-san',
{},
[],
[SimFlag.PCS_ARRIVED]
Expand Down
4 changes: 2 additions & 2 deletions gameModel/libs/ClientScript/game/common/resources/resourceContainer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ export const ResourceContainerTypeArray = [
'SMUR',
'PMA',
'PICA',
'PC San',
'PC-San',
'Helicopter',
] as const;

export type ResourceContainerType = typeof ResourceContainerTypeArray[number];

export const UniqueResourceTypeMap: Record<ResourceContainerType, boolean> = {
'ACS-MCS': true,
'PC San': true,
'PC-San': true,
PICA: true,
PMA: true,
Ambulance: false,
Expand Down
17 changes: 13 additions & 4 deletions gameModel/libs/ClientScript/gameMap/styling/layerStyles.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,22 @@ function getPolygonStyle(feature: any): LayerStyleObject {
},
};

// If we're currently performing a selection
// If we're currently performing a selection - for the selected one
if (
!(name === Context.interfaceState.state.selectedMapObjectId) &&
name === Context.interfaceState.state.selectedMapObjectId &&
Context.mapState.state.mapSelect
) {
stroke.color = '#3CA3CC';
fill.color = '#3CA3CC';
}

// If we're currently performing a selection - for the other choices
if (
name !== Context.interfaceState.state.selectedMapObjectId &&
Context.mapState.state.mapSelect
) {
stroke.color = '#7f868a80';
fill.color = '#7f868a80';
stroke.color = '#3CA3CC80';
fill.color = '#3CA3CC80';
}

return { fill, stroke, text };
Expand Down
4 changes: 2 additions & 2 deletions gameModel/pages/42.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@
"style" : { },
"text" : {
"@class" : "Script",
"content" : "// TODO transalations\nContext.item.type;",
"content" : "import { getTranslation } from \"./tools/translation\";\ngetTranslation(\"mainSim-resources\", Context.item.type);",
"language" : "TypeScript"
}
},
Expand Down Expand Up @@ -643,7 +643,7 @@
"style" : { },
"text" : {
"@class" : "Script",
"content" : "// TODO transalations\nContext.item.type;",
"content" : "import { getTranslation } from \"./tools/translation\";\ngetTranslation(\"mainSim-resources\", Context.item.type);",
"language" : "TypeScript"
}
},
Expand Down

0 comments on commit f0cf4ff

Please sign in to comment.