Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create transfer framework #911

Merged
merged 28 commits into from
May 4, 2023
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
da2dae0
Add Events
benn02 Apr 24, 2023
c0b2166
Add new activities
benn02 Apr 24, 2023
77377f5
Add Behavior
benn02 Apr 25, 2023
82ff1f9
Remove old Activity and adjust old behaviors
benn02 Apr 26, 2023
3093e0f
Merge branch 'dev' into feature/891-create-transfer-framework
benn02 Apr 26, 2023
5d08ba4
Add UI
benn02 Apr 26, 2023
5f6462e
Add UI
benn02 May 2, 2023
15a6c03
Add transfer to hospital
benn02 May 2, 2023
e79f312
Merge branch 'dev' into feature/891-create-transfer-framework
benn02 May 2, 2023
4c36283
Add Changelog
benn02 May 2, 2023
8252943
Merge branch 'dev' into feature/891-create-transfer-framework
benn02 May 2, 2023
1330ad4
Add Migration
benn02 May 2, 2023
c36c377
Merge branch 'feature/891-create-transfer-framework' of https://githu…
benn02 May 2, 2023
362f89d
Respond to Feedback (not complete)
benn02 May 2, 2023
e1e4847
Respond to Feedback 2
benn02 May 3, 2023
c628ba9
Respond to Feedback (final (last version(i love versioning w/o git in…
benn02 May 3, 2023
cfc94a8
Respond to feedback
benn02 May 3, 2023
11bf79c
Add occupation
benn02 May 3, 2023
e8ec869
Add ResourceRequiredEvent to request behavior
benn02 May 3, 2023
d129ca5
Add min 0
benn02 May 3, 2023
9dc4f24
Add and delete Events from array
benn02 May 3, 2023
4659be2
use ,1 in splice
benn02 May 3, 2023
b8768f1
Improve migration
benn02 May 3, 2023
6d7d661
clean up migration
benn02 May 3, 2023
96f5f22
more clean up
benn02 May 3, 2023
711af43
Update Submodule+striped tables
benn02 May 3, 2023
57e6b43
Fix for failing migration
benn02 May 3, 2023
4001ade
Merge branch 'dev' into feature/891-create-transfer-framework
benn02 May 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ and this project does **not** adhere to [Semantic Versioning](https://semver.org
- 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
lukasrad02 marked this conversation as resolved.
Show resolved Hide resolved

### Changed

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type {
Mutable,
} from 'digital-fuesim-manv-shared';
import {
TransferBehaviorState,
cloneDeepMutable,
MapPosition,
SimulatedRegion,
Expand Down Expand Up @@ -76,6 +77,7 @@ const stereotypes: SimulatedRegion[] = [
AutomaticallyDistributeVehiclesBehaviorState.create(),
AnswerRequestsBehaviorState.create(),
ReportBehaviorState.create(),
TransferBehaviorState.create(),
],
inEvents: [],
position,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import { RequestVehiclesComponent } from './tabs/behavior-tab/behaviors/request-
import { SimulatedRegionOverviewPatientInteractionBarComponent } from './tabs/patients-tab/simulated-region-overview-patient-interaction-bar/simulated-region-overview-patient-interaction-bar.component';
import { SimulatedRegionOverviewVehiclesTabComponent } from './tabs/vehicles-tab/simulated-region-overview-vehicles-tab.component';
import { SimulatedRegionOverviewPatientsTableComponent } from './patients-table/simulated-region-overview-patients-table.component';
import { SimulatedRegionOverviewBehaviorTransferVehiclesComponent } from './tabs/behavior-tab/behaviors/transfer-vehicles/simulated-region-overview-behavior-transfer-vehicles.component';

@NgModule({
declarations: [
Expand Down Expand Up @@ -87,6 +88,7 @@ import { SimulatedRegionOverviewPatientsTableComponent } from './patients-table/
SimulatedRegionOverviewPatientInteractionBarComponent,
SimulatedRegionOverviewVehiclesTabComponent,
SimulatedRegionOverviewPatientsTableComponent,
SimulatedRegionOverviewBehaviorTransferVehiclesComponent,
],
imports: [
FormsModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class RequestVehiclesComponent implements OnChanges {
`[Simuliert] ${simulatedRegion.name}`,
])
.filter(([id, _name]) => id !== this.simulatedRegionId)
.sort(([id1, name1], [id2, name2]) =>
.sort(([_id1, name1], [_id2, name2]) =>
name1 === name2 ? 0 : name1! < name2! ? -1 : 1
);
options.unshift(['trainees', 'Die Trainierenden']);
Expand Down
Loading