Merge pull request #995 from hpi-sam/release/v0.6.0

Release v0.6.0
hpi-sam · May 17, 2023 · 991abf7 · 991abf7
2 parents 356b9a8 + 8010c35
commit 991abf7
Show file tree

Hide file tree

Showing 150 changed files with 5,212 additions and 354 deletions.
diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml
@@ -34,7 +34,7 @@ jobs:
             - name: Update changelog
               uses: thomaseizinger/keep-a-changelog-new-release@v1
               with:
-                  tag: ${{ github.event.inputs.versionName }}
+                  tag: v${{ github.event.inputs.versionName }}
             - name: Format changelog
               run: npm run prettier
             - name: Commit updated version and changelog

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -238,13 +238,8 @@ jobs:
                   working-directory: frontend
                   browser: ${{ matrix.browser }}
                   wait-on: 'http://127.0.0.1:4200/, http://127.0.0.1:3201/api/health'
+                  wait-on-timeout: 90
                   command-prefix: '--' # So cypress is using our node version: https://github.com/cypress-io/github-action/issues/489#issuecomment-1021379037
-            # - name: Archive cypress videos
-            #   if: always()
-            #   uses: actions/upload-artifact@v3
-            #   with:
-            #       name: cypress-videos-${{ matrix.browser }}
-            #       path: frontend/cypress/videos
             - name: Archive cypress screenshots
               if: always()
               uses: actions/upload-artifact@v3
@@ -328,19 +323,16 @@ jobs:
             contents: write
         steps:
             - uses: actions/checkout@v3
-            - name: Initialize mandatory git config
-              run: |
-                  git config user.name "GitHub Actions"
-                  git config user.email [email protected]
             - uses: ./.github/actions/extract-version
             - name: Extract release notes
               id: extract_release_notes
               uses: ffurrer2/extract-release-notes@v1
-            - name: Create Release
-              run: >
-                  gh release create "v${{ env.VERSION_NAME }}"
-                  --title "v${{ env.VERSION_NAME }}"
-                  --notes "${{ steps.extract_release_notes.outputs.release_notes }}"
-                  --target "main"
+            - name: Create release
+              uses: softprops/action-gh-release@v1
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  tag_name: v${{ env.VERSION_NAME }}
+                  name: v${{ env.VERSION_NAME }}
+                  target_commitish: main
+                  body: ${{ steps.extract_release_notes.outputs.release_notes }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,35 @@ and this project does **not** adhere to [Semantic Versioning](https://semver.org
 
 ## [Unreleased]
 
+## [0.6.0] - 2023-05-17
+
+### Added
+
+-   Added a new favicon.
+-   2 new events related to patient transport have been added to the simulation.
+-   Selected material, personnel and vehicles are now highlighted on the map.
+    -   When material or personnel is selected, the corresponding vehicle is highlighted as well.
+    -   When a vehicle is selected, the corresponding material and personnel are highlighted as well.
+-   A generic catch-all hospital is present in every exercise and cannot be deleted.
+-   The reports behavior can generate reports on the counts of transferred patients per triage category.
+    -   These reports either cover a single region or all that are managed by the same transport management.
+-   The reports behavior can generate event-based reports when the last patient of a triage category has been transferred to a hospital.
+-   A new transfer to hospital behavior uses arriving vehicles that are reserved for transport by an occupation and transfer the most urgent patient to a hospital.
+-   A new simulated region preset for transport management is available in the frontend.
+-   A new manage patient transfer to hospitals behavior is responsible for distributing vehicles to multiple simulated regions to transfer patients to hospitals.
+
+### Changed
+
+-   Add behaviors button now opens towards the top.
+-   Simulated regions can now send patients to any hospital. The hospitals tab was removed.
+-   The default order of behaviors is now vaguely chronological.
+-   Resource request radiograms now store whether they have been accepted or denied. This is also displayed in the frontend.
+
+### Fixed
+
+-   Removed the id property of events.
+-   Dissolved a livelock in treatment assignment.
+
 ## [0.5.1] - 2023-05-09
 
 ### Fixed
@@ -201,7 +230,8 @@ 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.1...HEAD
+[Unreleased]: https://github.com/hpi-sam/digital-fuesim-manv/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/hpi-sam/digital-fuesim-manv/compare/v0.5.1...v0.6.0
 [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...v0.4.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.1",
+    "version": "0.6.0",
     "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.1",
+    "version": "0.6.0",
     "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.1
+    version: 0.6.0
 paths:
     /api/health:
         get:

diff --git a/frontend/cypress.config.ts b/frontend/cypress.config.ts
@@ -8,6 +8,5 @@ export default defineConfig({
     e2e: {
         baseUrl: 'http://127.0.0.1:4200',
         video: false,
-        responseTimeout: 60000,
     },
 });
diff --git a/frontend/cypress/e2e/exercise.cy.ts b/frontend/cypress/e2e/exercise.cy.ts
@@ -341,8 +341,12 @@ describe('A trainer on the exercise page', () => {
 
         cy.log('add a hospital').get('[data-cy="hospitalAddButton"]').click();
         cy.get('@trainerSocketPerformedActions')
-            .lastElement()
+            .firstElement()
             .should('have.property', 'type', '[Hospital] Add hospital');
+        cy.get('@trainerSocketPerformedActions')
+            .firstElement()
+            .its('hospital')
+            .as('createdHospital');
 
         cy.getState()
             .its('exerciseState')
@@ -351,7 +355,7 @@ describe('A trainer on the exercise page', () => {
 
         cy.log('update a hospitals transport time')
             .get('[data-cy="hospitalUpdateTransportTimeInput"]')
-            .first()
+            .last()
             .clear()
             .type('30');
 
@@ -367,7 +371,7 @@ describe('A trainer on the exercise page', () => {
             .its('exerciseState')
             .its('hospitals')
             .itsValues()
-            .firstElement()
+            .lastElement()
             .should('have.property', 'transportDuration', 1800000);
 
         cy.get('[data-cy=hospitalClosePopupButton]').click({ force: true });
@@ -377,7 +381,7 @@ describe('A trainer on the exercise page', () => {
         cy.get('[data-cy=transferPointPopupHospitalNav]').click();
         cy.get('[data-cy=transferPointPopupAddHospitalButton]').click();
         cy.get('[data-cy=transferPointPopupAddHospitalDropdownButton]')
-            .first()
+            .last()
             .click({ force: true });
 
         cy.get('@trainerSocketPerformedActions')
@@ -392,7 +396,7 @@ describe('A trainer on the exercise page', () => {
             .its('exerciseState')
             .its('transferPoints')
             .itsValues()
-            .firstElement()
+            .lastElement()
             .its('reachableHospitals')
             .should('not.be.empty');
 
@@ -416,7 +420,7 @@ describe('A trainer on the exercise page', () => {
             .its('exerciseState')
             .its('hospitals')
             .itsValues()
-            .firstElement()
+            .lastElement()
             .its('patientIds')
             .should('not.be.empty');
 
@@ -437,7 +441,7 @@ describe('A trainer on the exercise page', () => {
             .its('exerciseState')
             .its('transferPoints')
             .itsValues()
-            .firstElement()
+            .lastElement()
             .its('reachableHospitals')
             .should('be.empty');
 
@@ -451,7 +455,12 @@ describe('A trainer on the exercise page', () => {
             .lastElement()
             .should('have.property', 'type', '[Hospital] Remove hospital');
 
-        cy.getState().its('exerciseState').its('hospitals').should('be.empty');
+        cy.get('@createdHospital').then((hospital: any) => {
+            cy.getState()
+                .its('exerciseState')
+                .its('hospitals')
+                .should('not.have.keys', hospital.id);
+        });
     });
 
     it('can manage transfer points (within simulated regions) and transfer vehicles', () => {

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.1",
+    "version": "0.6.0",
     "type": "module",
     "scripts": {
         "cy:open": "cypress open",

diff --git a/frontend/src/app/pages/exercises/exercise/shared/editor-panel/templates/simulated-region.ts b/frontend/src/app/pages/exercises/exercise/shared/editor-panel/templates/simulated-region.ts
@@ -5,6 +5,8 @@ import type {
     Mutable,
 } from 'digital-fuesim-manv-shared';
 import {
+    TransferToHospitalBehaviorState,
+    ManagePatientTransportToHospitalBehaviorState,
     TransferBehaviorState,
     cloneDeepMutable,
     MapPosition,
@@ -37,12 +39,18 @@ const stereotypes: SimulatedRegion[] = [
     {
         type: 'simulatedRegion',
         id: '',
-        name: 'Einsatzabschnitt ???',
-        borderColor: '#cccc00',
+        name: 'Patientenablage ???',
+        borderColor: '#cc0000',
         activities: {},
         behaviors: [
             AssignLeaderBehaviorState.create(),
             ReportBehaviorState.create(),
+            UnloadArrivingVehiclesBehaviorState.create(),
+            TreatPatientsBehaviorState.create(),
+            ProvidePersonnelBehaviorState.create(),
+            RequestBehaviorState.create(),
+            TransferBehaviorState.create(),
+            TransferToHospitalBehaviorState.create(),
         ],
         inEvents: [],
         position,
@@ -51,16 +59,15 @@ const stereotypes: SimulatedRegion[] = [
     {
         type: 'simulatedRegion',
         id: '',
-        name: 'Patientenablage ???',
-        borderColor: '#cc0000',
+        name: 'Bereitstellungsraum ???',
+        borderColor: '#00cc00',
         activities: {},
         behaviors: [
             AssignLeaderBehaviorState.create(),
-            TreatPatientsBehaviorState.create(),
-            UnloadArrivingVehiclesBehaviorState.create(),
-            ProvidePersonnelBehaviorState.create(),
-            RequestBehaviorState.create(),
             ReportBehaviorState.create(),
+            TransferBehaviorState.create(),
+            AnswerRequestsBehaviorState.create(),
+            AutomaticallyDistributeVehiclesBehaviorState.create(),
         ],
         inEvents: [],
         position,
@@ -69,15 +76,27 @@ const stereotypes: SimulatedRegion[] = [
     {
         type: 'simulatedRegion',
         id: '',
-        name: 'Bereitstellungsraum ???',
-        borderColor: '#00cc00',
+        name: 'Transportorganisation ???',
+        borderColor: '#0000cc',
+        activities: {},
+        behaviors: [
+            AssignLeaderBehaviorState.create(),
+            ReportBehaviorState.create(),
+            ManagePatientTransportToHospitalBehaviorState.create(),
+        ],
+        inEvents: [],
+        position,
+        size,
+    },
+    {
+        type: 'simulatedRegion',
+        id: '',
+        name: 'Einsatzabschnitt ???',
+        borderColor: '#cccc00',
         activities: {},
         behaviors: [
             AssignLeaderBehaviorState.create(),
-            AutomaticallyDistributeVehiclesBehaviorState.create(),
-            AnswerRequestsBehaviorState.create(),
             ReportBehaviorState.create(),
-            TransferBehaviorState.create(),
         ],
         inEvents: [],
         position,

diff --git a/...ges/exercises/exercise/shared/exercise-map/feature-managers/map-images-feature-manager.ts b/...ges/exercises/exercise/shared/exercise-map/feature-managers/map-images-feature-manager.ts
@@ -80,6 +80,9 @@ export class MapImageFeatureManager extends MoveableFeatureManager<MapImage> {
                 MapImagePopupComponent,
                 feature,
                 [feature.getId() as UUID],
+                [],
+                [],
+                [],
                 {
                     mapImageId: feature.getId() as UUID,
                 }