Merge pull request #953 from hpi-sam/release/v0.5.1

Release v0.5.1
hpi-sam · May 9, 2023 · 356b9a8 · 356b9a8
2 parents 70aba92 + 1e8b940
commit 356b9a8
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project does **not** adhere to [Semantic Versioning](https://semver.org
 
 ## [Unreleased]
 
+## [0.5.1] - 2023-05-09
+
+### Fixed
+
+-   Queries for the current number of patients and the current treatment progress won't be answered by the treat patients behavior if there is no leader of the requested simulated region.
+-   The frontend for the treat patients behavior hides the "assigned personnel" column not only in the `unknown` but also the `noTreatment` phase.
+-   The diff link in the changelog for v0.4.0 now refers to the correct tags.
+
 ## [0.5.0] - 2023-05-08
 
 ### Added
@@ -28,7 +36,7 @@ and this project does **not** adhere to [Semantic Versioning](https://semver.org
     -   A list of patients that are in the vehicle is shown and the patients tab opens for details when clicking a patient.
     -   Vehicles can be deleted or moved to the map.
     -   Trainers can see the current occupation of a vehicle and cancel it.
--   Simulated regions are prefixed with "\[Simuliert\]" in the request target selection for the requests behavior.
+-   Simulated regions are prefixed with "\[Simuliert]" in the request target selection for the requests behavior.
 -   The patient, whose popup is open, is now highlighted.
 -   There is now a behavior that transfers patients. It has configurable load times and delay between transfers.
     -   Its user interface can be used to transfer specific patients in specific vehicles.
@@ -193,9 +201,10 @@ and this project does **not** adhere to [Semantic Versioning](https://semver.org
 
 ### Initial unstable release of Digitale FüSim MANV
 
-[Unreleased]: https://github.com/hpi-sam/digital-fuesim-manv/compare/v0.5.0...HEAD
+[Unreleased]: https://github.com/hpi-sam/digital-fuesim-manv/compare/v0.5.1...HEAD
+[0.5.1]: https://github.com/hpi-sam/digital-fuesim-manv/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/hpi-sam/digital-fuesim-manv/compare/v0.4.0...v0.5.0
-[0.4.0]: https://github.com/hpi-sam/digital-fuesim-manv/compare/v0.3.0...0.4.0
+[0.4.0]: https://github.com/hpi-sam/digital-fuesim-manv/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/hpi-sam/digital-fuesim-manv/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/hpi-sam/digital-fuesim-manv/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/hpi-sam/digital-fuesim-manv/compare/v0.1.0...v0.2.0

diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "digital-fuesim-manv-backend",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "type": "module",
     "scripts": {
         "start:once:linux-macos": "NODE_ENV=production node --experimental-specifier-resolution=node dist/src/index.js",

diff --git a/benchmark/package-lock.json b/benchmark/package-lock.json
diff --git a/benchmark/package.json b/benchmark/package.json
@@ -1,6 +1,6 @@
 {
     "name": "digital-fuesim-manv-benchmark",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "type": "module",
     "scripts": {
         "lint": "eslint --max-warnings 0 --ignore-path .gitignore \"./**/*.{ts,js,yml,html}\"",

diff --git a/docs/swagger.yml b/docs/swagger.yml
@@ -2,7 +2,7 @@ openapi: 3.0.3
 info:
     title: Digital Fuesim MANV HTTP API
     description: HTTP API of the digital-fuesim-manv project
-    version: 0.5.0
+    version: 0.5.1
 paths:
     /api/health:
         get:

diff --git a/frontend/cypress.config.ts b/frontend/cypress.config.ts
@@ -8,5 +8,6 @@ export default defineConfig({
     e2e: {
         baseUrl: 'http://127.0.0.1:4200',
         video: false,
+        responseTimeout: 60000,
     },
 });
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "digital-fuesim-manv-frontend",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "type": "module",
     "scripts": {
         "cy:open": "cypress open",

diff --git a/...behaviors/treat-patients/simulated-region-overview-behavior-treat-patients.component.html b/...behaviors/treat-patients/simulated-region-overview-behavior-treat-patients.component.html
@@ -86,7 +86,11 @@ <h6 class="text-center">Sichtungs<wbr />kategorie</h6>
             <h6 class="text-center">Verlauf</h6>
         </div>
         <div
-            *ngIf="treatPatientsBehaviorState.treatmentProgress !== 'unknown'"
+            *ngIf="
+                treatPatientsBehaviorState.treatmentProgress !==
+                    'noTreatment' &&
+                treatPatientsBehaviorState.treatmentProgress !== 'unknown'
+            "
             class="col-sm justify-content-center"
         >
             <h6 class="text-center">Zugeteiltes Personal</h6>
@@ -102,6 +106,8 @@ <h6 class="text-center">Zugeteiltes Personal</h6>
             <app-simulated-region-overview-behavior-treat-patients-patient-details
                 [patientId]="patientId"
                 [cateringsActive]="
+                    treatPatientsBehaviorState.treatmentProgress !==
+                        'noTreatment' &&
                     treatPatientsBehaviorState.treatmentProgress !== 'unknown'
                 "
                 (click)="selectPatientService.selectPatient(patientId)"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "digital-fuesim-manv",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "type": "module",
     "scripts": {
         "build": "cd shared && npm run build && cd .. && concurrently \"cd frontend && npm run build\" \"cd backend && npm run build\"",

diff --git a/shared/package-lock.json b/shared/package-lock.json
diff --git a/shared/package.json b/shared/package.json
@@ -1,6 +1,6 @@
 {
     "name": "digital-fuesim-manv-shared",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "type": "module",
     "main": "./dist/index.js",
     "esnext": "./dist/index.js",

diff --git a/shared/src/simulation/behaviors/report.ts b/shared/src/simulation/behaviors/report.ts
@@ -69,6 +69,12 @@ export const reportBehavior: SimulationBehavior<ReportBehaviorState> = {
             case 'treatmentProgressChangedEvent': {
                 if (!behaviorState.reportTreatmentProgressChanges) return;
 
+                if (event.newProgress === 'noTreatment') {
+                    // No treatment indicates that there is no leader
+                    // Therefore, the radiogram can't be sent
+                    return;
+                }
+
                 const radiogram = cloneDeepMutable(
                     TreatmentStatusRadiogram.create(
                         nextUUID(draftState),

diff --git a/shared/src/simulation/behaviors/treat-patients.ts b/shared/src/simulation/behaviors/treat-patients.ts
@@ -193,6 +193,12 @@ export const treatPatientsBehavior: SimulationBehavior<TreatPatientsBehaviorStat
                     break;
                 }
                 case 'collectInformationEvent': {
+                    if (behaviorState.treatmentProgress === 'noTreatment') {
+                        // noTreatment indicated that there is no leader
+                        // Therefore, queries should not be answered
+                        return;
+                    }
+
                     const collectInformationEvent = event;
 
                     const radiogram = getActivityById(
@@ -206,6 +212,7 @@ export const treatPatientsBehavior: SimulationBehavior<TreatPatientsBehaviorStat
                         // This behavior answerers this query because the treating personnel has the knowledge of how many patients are in a given category
                         case 'patientCount': {
                             if (behaviorState.treatmentProgress === 'unknown') {
+                                // The patients haven't been counted yet
                                 return;
                             }