Merge pull request #943 from hpi-sam/release/v0.5.0

Release v0.5.0

.github/workflows/pipeline.yml

@@ -86,9 +86,9 @@ jobs:
             postgres:
                 image: postgres:14
                 env:
-                    POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
-                    POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
-                    POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
+                    POSTGRES_DB: ${{ vars.POSTGRES_DB }}
+                    POSTGRES_PASSWORD: ${{ vars.POSTGRES_PASSWORD }}
+                    POSTGRES_USER: ${{ vars.POSTGRES_USER }}
                 ports:
                     - 5432:5432
                 # Set health checks to wait until postgres has started
@@ -108,9 +108,9 @@ jobs:
             - name: Create .env
               run: >
                   cat ./.env.example
-                  | sed -e "s/^DFM_DB_USER=.*$/DFM_DB_USER=${{ secrets.POSTGRES_USER }}/"
-                  | sed -e "s/^#DFM_DB_PASSWORD=.*$/DFM_DB_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}/"
-                  | sed -e "s/^DFM_DB_NAME=.*$/DFM_DB_NAME=${{ secrets.POSTGRES_DB }}/"
+                  | sed -e "s/^DFM_DB_USER=.*$/DFM_DB_USER=${{ vars.POSTGRES_USER }}/"
+                  | sed -e "s/^#DFM_DB_PASSWORD=.*$/DFM_DB_PASSWORD=${{ vars.POSTGRES_PASSWORD }}/"
+                  | sed -e "s/^DFM_DB_NAME=.*$/DFM_DB_NAME=${{ vars.POSTGRES_DB }}/"
                   | sed -e "s/^DFM_DB_HOST=.*$/DFM_DB_HOST=127.0.0.1/" > ./.env
             - name: Run migrations
               run: cd backend && npm run migration:run && cd ..
@@ -143,9 +143,9 @@ jobs:
             postgres:
                 image: postgres:14
                 env:
-                    POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
-                    POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
-                    POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
+                    POSTGRES_DB: ${{ vars.POSTGRES_DB }}
+                    POSTGRES_PASSWORD: ${{ vars.POSTGRES_PASSWORD }}
+                    POSTGRES_USER: ${{ vars.POSTGRES_USER }}
                 ports:
                     - 5432:5432
                 # Set health checks to wait until postgres has started
@@ -165,9 +165,9 @@ jobs:
             - name: Create .env
               run: >
                   cat ./.env.example
-                  | sed -e "s/^DFM_DB_USER=.*$/DFM_DB_USER=${{ secrets.POSTGRES_USER }}/"
-                  | sed -e "s/^#DFM_DB_PASSWORD=.*$/DFM_DB_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}/"
-                  | sed -e "s/^DFM_DB_NAME=.*$/DFM_DB_NAME=${{ secrets.POSTGRES_DB }}/"
+                  | sed -e "s/^DFM_DB_USER=.*$/DFM_DB_USER=${{ vars.POSTGRES_USER }}/"
+                  | sed -e "s/^#DFM_DB_PASSWORD=.*$/DFM_DB_PASSWORD=${{ vars.POSTGRES_PASSWORD }}/"
+                  | sed -e "s/^DFM_DB_NAME=.*$/DFM_DB_NAME=${{ vars.POSTGRES_DB }}/"
                   | sed -e "s/^DFM_DB_HOST=.*$/DFM_DB_HOST=127.0.0.1/" > ./.env
             - name: Run migrations
               run: cd backend && npm run migration:run && cd ..
@@ -188,9 +188,9 @@ jobs:
             postgres:
                 image: postgres:14
                 env:
-                    POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
-                    POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
-                    POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
+                    POSTGRES_DB: ${{ vars.POSTGRES_DB }}
+                    POSTGRES_PASSWORD: ${{ vars.POSTGRES_PASSWORD }}
+                    POSTGRES_USER: ${{ vars.POSTGRES_USER }}
                 ports:
                     - 5432:5432
                 # Set health checks to wait until postgres has started
@@ -225,9 +225,9 @@ jobs:
             - name: Create .env
               run: >
                   cat ./.env.example
-                  | sed -e "s/^DFM_DB_USER=.*$/DFM_DB_USER=${{ secrets.POSTGRES_USER }}/"
-                  | sed -e "s/^#DFM_DB_PASSWORD=.*$/DFM_DB_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}/"
-                  | sed -e "s/^DFM_DB_NAME=.*$/DFM_DB_NAME=${{ secrets.POSTGRES_DB }}/"
+                  | sed -e "s/^DFM_DB_USER=.*$/DFM_DB_USER=${{ vars.POSTGRES_USER }}/"
+                  | sed -e "s/^#DFM_DB_PASSWORD=.*$/DFM_DB_PASSWORD=${{ vars.POSTGRES_PASSWORD }}/"
+                  | sed -e "s/^DFM_DB_NAME=.*$/DFM_DB_NAME=${{ vars.POSTGRES_DB }}/"
                   | sed -e "s/^DFM_DB_HOST=.*$/DFM_DB_HOST=127.0.0.1/" > ./.env
             - name: Run migrations
               run: cd backend && npm run migration:run && cd ..

CHANGELOG.md

@@ -7,6 +7,48 @@ and this project does **not** adhere to [Semantic Versioning](https://semver.org
 
 ## [Unreleased]
 
+## [0.5.0] - 2023-05-08
+
+### Added
+
+-   There are now events for the removal of patients, vehicles, material, and personnel from simulated regions.
+    -   When personnel, material, or patients are removed, the treatments get reassigned.
+    -   When the leader is removed, a new one gets selected.
+-   The trainer editor now offers pre-configured templates for different kinds of simulated regions.
+    -   These templates come with different border colors.
+-   Simulated regions display their names on the map.
+-   There is now a button in the patients tab of a simulated region that removes the patient from the simulated region and places the patient on the map next to the simulated region (on the right hand side).
+-   Simulated regions and viewports display their names on the map.
+-   Vehicles now have a property to indicate their current occupation.
+-   The emergency operations center ("Leitstelle") now has an option to select a different destination for a specified amount of vehicles.
+-   Treatment progress falls back to no treatment when a leader is missing in the region.
+-   All vehicles in a simulated region can be managed with the new vehicles tab.
+    -   All operations from the vehicle popup (change name, load, unload) are available.
+    -   There is a detailed list of the personnel that belongs to the vehicle.
+    -   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.
+-   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.
+    -   Its user interface displays what vehicles are being loaded and what vehicles are waiting for transfer.
+-   Exercises can be started and paused trough a new button in the simulated regions modal, so the modal does not have to be closed to access the button in the toolbar.
+-   Changes of the treatment progress can now be reported automatically.
+-   The waiting times for vehicles that are getting loaded or are waiting for transfer are shown.
+-   There are now buttons in the patients and vehicles tabs that create and lead to a transfer behavior that is pre filled with the patient or vehicle.
+
+### Changed
+
+-   Loading or unloading a vehicle from its popup does not close the popup automatically.
+-   Patient treatment sorts the patients by their UUID before triaging or assigning treatments in simulated regions. This way, the order of triage does not depend on the order the patients have been added.
+-   The load all into vehicle button in the vehicle popup is now visible to trainers only.
+
+### Fixed
+
+-   For Tragetrupp vehicles, the load and unload buttons are now properly disabled.
+-   The patient status display now updates the pregnancy indicator properly.
+
 ## [0.4.1] - 2023-04-20
 
 ### Fixed
@@ -151,7 +193,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.4.0...HEAD
+[Unreleased]: https://github.com/hpi-sam/digital-fuesim-manv/compare/v0.5.0...HEAD
+[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.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

backend/package.json

@@ -1,6 +1,6 @@
 {
     "name": "digital-fuesim-manv-backend",
-    "version": "0.4.1",
+    "version": "0.5.0",
     "type": "module",
     "scripts": {
         "start:once:linux-macos": "NODE_ENV=production node --experimental-specifier-resolution=node dist/src/index.js",
@@ -44,7 +44,7 @@
         "express": "^4.18.2",
         "lodash-es": "4.17.21",
         "pg": "^8.8.0",
-        "socket.io": "^4.5.4",
+        "socket.io": "^4.6.1",
         "supertest": "^6.3.3",
         "typeorm": "^0.3.11"
     },

backend/tsconfig.json

@@ -6,6 +6,7 @@
         "rootDir": ".",
         "types": ["jest", "node"],
         "baseUrl": "./src",
+        "sourceMap": true, // For debugging
         "emitDecoratorMetadata": true // For typeorm - See https://github.com/typeorm/typeorm/issues/2897
     },
     "references": [],

benchmark/package.json

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

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.4.1
+    version: 0.5.0
 paths:
     /api/health:
         get:

frontend/cypress/e2e/exercise.cy.ts

@@ -259,25 +259,9 @@ describe('A trainer on the exercise page', () => {
             .should(
                 'have.property',
                 'type',
-                '[Emergency Operation Center] Add Log Entry'
+                '[Emergency Operation Center] Send Alarm Group'
             );
 
-        cy.get('@trainerSocketPerformedActions')
-            .atPosition(-2)
-            .should('have.property', 'type', '[Transfer] Add to transfer');
-
-        cy.get('@trainerSocketPerformedActions')
-            .atPosition(-3)
-            .should('have.property', 'type', '[Vehicle] Add vehicle');
-
-        cy.get('@trainerSocketPerformedActions')
-            .atPosition(-4)
-            .should('have.property', 'type', '[Transfer] Add to transfer');
-
-        cy.get('@trainerSocketPerformedActions')
-            .atPosition(-5)
-            .should('have.property', 'type', '[Vehicle] Add vehicle');
-
         cy.get('[data-cy=closeEmergencyOperationsCenterPopupButton]').click({
             force: true,
         });