Date: Fri, 5 Aug 2022 13:26:09 +0200
Subject: [PATCH 11/19] fix: reiterate eventname AB#14708
---
.../src/app/components/chat/chat.component.html | 6 ++++--
interfaces/IBF-dashboard/src/assets/i18n/en.json | 6 +++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html
index acf1f409e..38c7cb5f2 100644
--- a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html
+++ b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html
@@ -161,12 +161,13 @@
[isTriggered]="true"
>
no active trigger for typhoon {{ eventName }} any more, as can be seen in the map, which always reflects the latest forecast. However, you can still see here the EAP-actions that relate to the event that started on {{ startDate }} and ended on {{ endDate }}. These actions stay visible here for 7 days after the end-date."
},
"active-event": {
- "overview": "There are {{ nrTriggeredAreas }} {{ adminAreaLabelPlural }} exposed. They are listed below in order of {{ actionIndicator}}.",
+ "overview": "There are {{ nrTriggeredAreas }} {{ adminAreaLabelPlural }} exposed for typhoon {{ eventName }}. They are listed below in order of {{ actionIndicator}}.",
"instruction": "The triggered areas are highlighted in the map with a red outline. Please select the area on the map to monitor, select and send the pre-planned anticipatory actions executed in each area and eventually close the event.",
"place-name": "{{ adminAreaLabel }}: {{ placeName }}",
"exposed": "Houses affected:",
@@ -199,12 +199,12 @@
}
},
"stopped-event": {
- "overview": "The following {{ nrStoppedAreas }} {{adminAreaLabelPlural}} were manually stopped and listed below in order of {{ actionIndicator }}.",
+ "overview": "The following {{ nrStoppedAreas }} {{adminAreaLabelPlural}} were manually stopped for typhoon {{ eventName }} and listed below in order of {{ actionIndicator }}.",
"instruction": "To see when this was done and by whom, click on the area in the map.",
"area": "The floods trigger warning for {{ placeCodeName }} activated on {{ startDate }} was manually stopped by {{ displayName }} on {{ stoppedDate }}."
},
"event-switcher": {
- "current-event-message": "The map is currently showing this event.",
+ "current-event-message": "The portal is currently showing this event.",
"switch-event-button-prefix": "Show "
}
},
From 6f05e90c8b560c7925865c4aa16df86eed95a542 Mon Sep 17 00:00:00 2001
From: jannisvisser
Date: Fri, 5 Aug 2022 13:33:16 +0200
Subject: [PATCH 12/19] fix: change from-name email AB#14709
---
.../API-service/src/api/notification/notification.service.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/API-service/src/api/notification/notification.service.ts b/services/API-service/src/api/notification/notification.service.ts
index a76b8d503..0fbe81762 100644
--- a/services/API-service/src/api/notification/notification.service.ts
+++ b/services/API-service/src/api/notification/notification.service.ts
@@ -33,7 +33,7 @@ export class NotificationService {
private placeholderToday = '(TODAY)';
private fromEmail = process.env.SUPPORT_EMAIL_ADDRESS;
- private fromEmailName = 'IBF system';
+ private fromEmailName = 'IBF portal';
private mailchimp = new Mailchimp(process.env.MC_API);
From dde92a6e72dfa34f2b4659f68abb8961cfc17141 Mon Sep 17 00:00:00 2001
From: jannisvisser
Date: Fri, 5 Aug 2022 15:58:27 +0200
Subject: [PATCH 13/19] fix: adjust speech bubbles in multi-event AB#14710
---
.../app/components/chat/chat.component.html | 2 ++
.../src/app/components/chat/chat.component.ts | 1 +
.../dialogue-turn.component.html | 4 +++-
.../dialogue-turn.component.scss | 21 ++++++++++++++++++-
.../dialogue-turn/dialogue-turn.component.ts | 6 ++++++
5 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html
index 38c7cb5f2..c14d80fd2 100644
--- a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html
+++ b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html
@@ -45,6 +45,8 @@
diff --git a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
index 3e082f4b7..4d1905455 100644
--- a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
+++ b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
@@ -159,6 +159,7 @@ export class ChatComponent implements OnInit, OnDestroy {
private onEventStateChange = (eventState: EventState) => {
this.eventState = eventState;
+ this.eventState.events.sort((a, b) => (a.startDate > b.startDate ? 1 : -1));
};
private onTimelineStateChange = (timelineState: TimelineState) => {
diff --git a/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.html b/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.html
index 3d3cd7f1c..f1d0638ce 100644
--- a/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.html
+++ b/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.html
@@ -9,7 +9,9 @@
'is-spoken': animate && isSpoken,
'is-warn': isWarn,
'is-stopped': isStopped,
- 'is-triggered': isTriggered
+ 'is-triggered': isTriggered,
+ 'is-not-triggered': isNotTriggered,
+ 'is-selected': isSelected
}"
>
diff --git a/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.scss b/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.scss
index 68f461225..ffd6b4f39 100644
--- a/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.scss
+++ b/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.scss
@@ -156,10 +156,29 @@
}
}
+.dialogue-turn.is-not-triggered {
+ .dialogue-turn--content {
+ ion-card {
+ background-color: var(--ion-color-ibf-no-alert-tertiary) !important;
+ color: var(--ion-color-ibf-black) !important;
+ }
+ }
+}
+
.dialogue-turn.is-triggered {
.dialogue-turn--content {
ion-card {
- border: var(--ion-color-ibf-outline-red) solid 2px;
+ background-color: var(--ion-color-ibf-trigger-alert-tertiary) !important;
+ color: var(--ion-color-ibf-trigger-alert-tertiary-contrast) !important;
+ border: var(--ion-color-ibf-outline-red) solid 1px;
+ }
+ }
+
+ &.is-selected {
+ .dialogue-turn--content {
+ ion-card {
+ border: var(--ion-color-ibf-outline-red) solid 2px;
+ }
}
}
}
diff --git a/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.ts b/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.ts
index 578eaf2ca..f9ad339f3 100644
--- a/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.ts
+++ b/interfaces/IBF-dashboard/src/app/components/dialogue-turn/dialogue-turn.component.ts
@@ -33,6 +33,12 @@ export class DialogueTurnComponent implements OnInit {
@Input()
isTriggered = false;
+ @Input()
+ isNotTriggered = false;
+
+ @Input()
+ isSelected = true;
+
isSelf: boolean;
isSystem: boolean;
From 47c19ebf29e45b955922cd27e5d1155d0f229d5e Mon Sep 17 00:00:00 2001
From: jannisvisser
Date: Fri, 5 Aug 2022 16:06:30 +0200
Subject: [PATCH 14/19] test
---
.../IBF-dashboard/src/app/components/chat/chat.component.ts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
index 4d1905455..fd75525d9 100644
--- a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
+++ b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
@@ -159,7 +159,9 @@ export class ChatComponent implements OnInit, OnDestroy {
private onEventStateChange = (eventState: EventState) => {
this.eventState = eventState;
- this.eventState.events.sort((a, b) => (a.startDate > b.startDate ? 1 : -1));
+ this.eventState?.events?.sort((a, b) =>
+ a.startDate > b.startDate ? 1 : -1,
+ );
};
private onTimelineStateChange = (timelineState: TimelineState) => {
From 5d671b13e0e001c28687fa29cfa5cd1aee3195c6 Mon Sep 17 00:00:00 2001
From: arsforza
Date: Mon, 8 Aug 2022 09:34:23 +0200
Subject: [PATCH 15/19] refactor: update UGA drought mock data AB#14570
---
.../UGA/drought/upload-alert_threshold-1.json | 4 +-
.../UGA/drought/upload-alert_threshold-2.json | 8 +-
.../UGA/drought/upload-alert_threshold-3.json | 16 +--
.../UGA/drought/upload-alert_threshold-4.json | 120 +++++++++---------
.../UGA/drought/upload-cattle_exposed-1.json | 4 +-
.../UGA/drought/upload-cattle_exposed-2.json | 10 +-
.../UGA/drought/upload-cattle_exposed-3.json | 16 +--
.../UGA/drought/upload-cattle_exposed-4.json | 120 +++++++++---------
.../drought/upload-population_affected-1.json | 4 +-
.../drought/upload-population_affected-2.json | 10 +-
.../drought/upload-population_affected-3.json | 16 +--
.../drought/upload-population_affected-4.json | 120 +++++++++---------
.../upload-small_ruminants_exposed-1.json | 4 +-
.../upload-small_ruminants_exposed-2.json | 10 +-
.../upload-small_ruminants_exposed-3.json | 16 +--
.../upload-small_ruminants_exposed-4.json | 120 +++++++++---------
16 files changed, 299 insertions(+), 299 deletions(-)
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-1.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-1.json
index d952eb0ba..74b0073d1 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-1.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-1.json
@@ -5,11 +5,11 @@
},
{
"placeCode": "UG2",
- "amount": 1.0
+ "amount": 0.0
},
{
"placeCode": "UG3",
- "amount": 0.0
+ "amount": 1.0
},
{
"placeCode": "UG4",
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-2.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-2.json
index e3ad7ae59..eb8f87472 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-2.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-2.json
@@ -1,6 +1,6 @@
[
{
- "amount": 1,
+ "amount": 0,
"placeCode": "21UGA003001"
},
{
@@ -28,7 +28,7 @@
"placeCode": "21UGA003004"
},
{
- "amount": 1,
+ "amount": 0,
"placeCode": "21UGA003003"
},
{
@@ -68,7 +68,7 @@
"placeCode": "21UGA004003"
},
{
- "amount": 0,
+ "amount": 1,
"placeCode": "21UGA008003"
},
{
@@ -292,7 +292,7 @@
"placeCode": "21UGA004002"
},
{
- "amount": 0,
+ "amount": 1,
"placeCode": "21UGA008004"
},
{
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-3.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-3.json
index 47364f9a0..f23a13533 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-3.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-3.json
@@ -57,7 +57,7 @@
},
{
"placeCode": "UG202801",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG100601",
@@ -161,7 +161,7 @@
},
{
"placeCode": "UG203601",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG411502",
@@ -201,7 +201,7 @@
},
{
"placeCode": "UG307601",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG410701",
@@ -261,7 +261,7 @@
},
{
"placeCode": "UG203701",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG308901",
@@ -273,7 +273,7 @@
},
{
"placeCode": "UG202802",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG204101",
@@ -305,7 +305,7 @@
},
{
"placeCode": "UG308001",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG204501",
@@ -333,7 +333,7 @@
},
{
"placeCode": "UG307501",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG203901",
@@ -505,7 +505,7 @@
},
{
"placeCode": "UG308002",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG306401",
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-4.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-4.json
index 6e4a1a803..67a5d08b0 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-4.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-alert_threshold-4.json
@@ -33,7 +33,7 @@
},
{
"placeCode": "UG30800201",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG20350101",
@@ -657,11 +657,11 @@
},
{
"placeCode": "UG20280102",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG20360101",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG41240101",
@@ -789,7 +789,7 @@
},
{
"placeCode": "UG20280101",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG20540102",
@@ -1249,7 +1249,7 @@
},
{
"placeCode": "UG20360106",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG10120112",
@@ -1293,7 +1293,7 @@
},
{
"placeCode": "UG20360107",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG10020103",
@@ -1325,7 +1325,7 @@
},
{
"placeCode": "UG20360104",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG20400302",
@@ -1333,7 +1333,7 @@
},
{
"placeCode": "UG20370102",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG20520108",
@@ -1369,7 +1369,7 @@
},
{
"placeCode": "UG20360102",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG20480102",
@@ -1377,7 +1377,7 @@
},
{
"placeCode": "UG20360105",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG10220101",
@@ -1385,7 +1385,7 @@
},
{
"placeCode": "UG20370101",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG41240104",
@@ -1429,7 +1429,7 @@
},
{
"placeCode": "UG20360103",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG41060102",
@@ -1713,7 +1713,7 @@
},
{
"placeCode": "UG30750102",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG20450205",
@@ -1829,7 +1829,7 @@
},
{
"placeCode": "UG20280201",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG20510105",
@@ -1841,7 +1841,7 @@
},
{
"placeCode": "UG30750103",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG20350207",
@@ -1873,7 +1873,7 @@
},
{
"placeCode": "UG30750101",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG20410104",
@@ -1885,7 +1885,7 @@
},
{
"placeCode": "UG20280202",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG41110105",
@@ -1909,7 +1909,7 @@
},
{
"placeCode": "UG20360108",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG30900101",
@@ -2081,7 +2081,7 @@
},
{
"placeCode": "UG30800101",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG41290302",
@@ -2117,7 +2117,7 @@
},
{
"placeCode": "UG20360109",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG41290103",
@@ -2209,7 +2209,7 @@
},
{
"placeCode": "UG20280104",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG10160101",
@@ -2229,11 +2229,11 @@
},
{
"placeCode": "UG20370103",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG20280103",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG41030105",
@@ -2241,7 +2241,7 @@
},
{
"placeCode": "UG30750104",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG10230101",
@@ -2289,7 +2289,7 @@
},
{
"placeCode": "UG30750105",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG10070103",
@@ -2297,7 +2297,7 @@
},
{
"placeCode": "UG20280204",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG30730108",
@@ -2341,7 +2341,7 @@
},
{
"placeCode": "UG30750106",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG41130108",
@@ -2413,7 +2413,7 @@
},
{
"placeCode": "UG20370104",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG10060102",
@@ -2425,7 +2425,7 @@
},
{
"placeCode": "UG20280203",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG20340113",
@@ -2605,7 +2605,7 @@
},
{
"placeCode": "UG20370105",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG41140105",
@@ -2617,7 +2617,7 @@
},
{
"placeCode": "UG30760115",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG10130105",
@@ -2637,7 +2637,7 @@
},
{
"placeCode": "UG30750108",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG41090205",
@@ -2701,7 +2701,7 @@
},
{
"placeCode": "UG30760114",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG20450206",
@@ -2769,7 +2769,7 @@
},
{
"placeCode": "UG30750107",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG10080102",
@@ -2869,7 +2869,7 @@
},
{
"placeCode": "UG20280205",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG41310104",
@@ -2965,7 +2965,7 @@
},
{
"placeCode": "UG30760116",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG10100203",
@@ -3337,7 +3337,7 @@
},
{
"placeCode": "UG30800102",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG30990108",
@@ -3633,7 +3633,7 @@
},
{
"placeCode": "UG30750111",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG20350209",
@@ -3733,7 +3733,7 @@
},
{
"placeCode": "UG30750112",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG10140205",
@@ -3765,7 +3765,7 @@
},
{
"placeCode": "UG30760118",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG30880102",
@@ -3857,11 +3857,11 @@
},
{
"placeCode": "UG30750109",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG30750110",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG30780105",
@@ -3877,7 +3877,7 @@
},
{
"placeCode": "UG20280105",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG30640106",
@@ -3885,7 +3885,7 @@
},
{
"placeCode": "UG30760117",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG30890102",
@@ -4301,7 +4301,7 @@
},
{
"placeCode": "UG20280206",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG41300106",
@@ -4365,7 +4365,7 @@
},
{
"placeCode": "UG20280106",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG10210404",
@@ -4377,7 +4377,7 @@
},
{
"placeCode": "UG20360110",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG30990110",
@@ -4545,7 +4545,7 @@
},
{
"placeCode": "UG20280107",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG20540122",
@@ -4717,7 +4717,7 @@
},
{
"placeCode": "UG30760119",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG10100205",
@@ -4737,7 +4737,7 @@
},
{
"placeCode": "UG30800202",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG41010106",
@@ -4757,7 +4757,7 @@
},
{
"placeCode": "UG30800103",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG20520114",
@@ -4781,7 +4781,7 @@
},
{
"placeCode": "UG20360112",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG41030109",
@@ -4825,7 +4825,7 @@
},
{
"placeCode": "UG20360111",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG10260503",
@@ -5317,7 +5317,7 @@
},
{
"placeCode": "UG30800104",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG30770108",
@@ -5417,7 +5417,7 @@
},
{
"placeCode": "UG20370106",
- "amount": 1
+ "amount": 0
},
{
"placeCode": "UG30840109",
@@ -5577,11 +5577,11 @@
},
{
"placeCode": "UG30760120",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG30750113",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG30980104",
@@ -5673,7 +5673,7 @@
},
{
"placeCode": "UG30800105",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG41260108",
@@ -5845,7 +5845,7 @@
},
{
"placeCode": "UG30800203",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG41330302",
@@ -6025,7 +6025,7 @@
},
{
"placeCode": "UG30800204",
- "amount": 0
+ "amount": 1
},
{
"placeCode": "UG10140208",
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-1.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-1.json
index 361750600..a792aa464 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-1.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-1.json
@@ -5,11 +5,11 @@
},
{
"placeCode": "UG2",
- "amount": 1613.3923
+ "amount": 0.0
},
{
"placeCode": "UG3",
- "amount": 0.0
+ "amount": 1613.3923
},
{
"placeCode": "UG4",
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-2.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-2.json
index 2c3655019..735f84d54 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-2.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-2.json
@@ -1,6 +1,6 @@
[
{
- "amount": 131.6869659423828,
+ "amount": 0,
"placeCode": "21UGA003001"
},
{
@@ -28,7 +28,7 @@
"placeCode": "21UGA003004"
},
{
- "amount": 1481.705322265625,
+ "amount": 0,
"placeCode": "21UGA003003"
},
{
@@ -68,7 +68,7 @@
"placeCode": "21UGA004003"
},
{
- "amount": 0,
+ "amount": 131.6869659423828,
"placeCode": "21UGA008003"
},
{
@@ -292,7 +292,7 @@
"placeCode": "21UGA004002"
},
{
- "amount": 0,
+ "amount": 1481.705322265625,
"placeCode": "21UGA008004"
},
{
@@ -511,4 +511,4 @@
"amount": 0,
"placeCode": "21UGA015003"
}
-]
\ No newline at end of file
+]
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-3.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-3.json
index 46074253a..90634f276 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-3.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-3.json
@@ -57,7 +57,7 @@
},
{
"placeCode": "UG202801",
- "amount": 10
+ "amount": 0
},
{
"placeCode": "UG100601",
@@ -161,7 +161,7 @@
},
{
"placeCode": "UG203601",
- "amount": 10
+ "amount": 0
},
{
"placeCode": "UG411502",
@@ -201,7 +201,7 @@
},
{
"placeCode": "UG307601",
- "amount": 0
+ "amount": 17
},
{
"placeCode": "UG410701",
@@ -261,7 +261,7 @@
},
{
"placeCode": "UG203701",
- "amount": 10
+ "amount": 0
},
{
"placeCode": "UG308901",
@@ -273,7 +273,7 @@
},
{
"placeCode": "UG202802",
- "amount": 10
+ "amount": 0
},
{
"placeCode": "UG204101",
@@ -305,7 +305,7 @@
},
{
"placeCode": "UG308001",
- "amount": 0
+ "amount": 7
},
{
"placeCode": "UG204501",
@@ -333,7 +333,7 @@
},
{
"placeCode": "UG307501",
- "amount": 0
+ "amount": 13
},
{
"placeCode": "UG203901",
@@ -505,7 +505,7 @@
},
{
"placeCode": "UG308002",
- "amount": 0
+ "amount": 3
},
{
"placeCode": "UG306401",
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-4.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-4.json
index e1e4ed39f..3c9f7688c 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-4.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-cattle_exposed-4.json
@@ -33,7 +33,7 @@
},
{
"placeCode": "UG30800201",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20350101",
@@ -657,11 +657,11 @@
},
{
"placeCode": "UG20280102",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20360101",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41240101",
@@ -789,7 +789,7 @@
},
{
"placeCode": "UG20280101",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20540102",
@@ -1249,7 +1249,7 @@
},
{
"placeCode": "UG20360106",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10120112",
@@ -1293,7 +1293,7 @@
},
{
"placeCode": "UG20360107",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10020103",
@@ -1325,7 +1325,7 @@
},
{
"placeCode": "UG20360104",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20400302",
@@ -1333,7 +1333,7 @@
},
{
"placeCode": "UG20370102",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20520108",
@@ -1369,7 +1369,7 @@
},
{
"placeCode": "UG20360102",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20480102",
@@ -1377,7 +1377,7 @@
},
{
"placeCode": "UG20360105",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10220101",
@@ -1385,7 +1385,7 @@
},
{
"placeCode": "UG20370101",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41240104",
@@ -1429,7 +1429,7 @@
},
{
"placeCode": "UG20360103",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41060102",
@@ -1713,7 +1713,7 @@
},
{
"placeCode": "UG30750102",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20450205",
@@ -1829,7 +1829,7 @@
},
{
"placeCode": "UG20280201",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20510105",
@@ -1841,7 +1841,7 @@
},
{
"placeCode": "UG30750103",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20350207",
@@ -1873,7 +1873,7 @@
},
{
"placeCode": "UG30750101",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20410104",
@@ -1885,7 +1885,7 @@
},
{
"placeCode": "UG20280202",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41110105",
@@ -1909,7 +1909,7 @@
},
{
"placeCode": "UG20360108",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30900101",
@@ -2081,7 +2081,7 @@
},
{
"placeCode": "UG30800101",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41290302",
@@ -2117,7 +2117,7 @@
},
{
"placeCode": "UG20360109",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41290103",
@@ -2209,7 +2209,7 @@
},
{
"placeCode": "UG20280104",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10160101",
@@ -2229,11 +2229,11 @@
},
{
"placeCode": "UG20370103",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20280103",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41030105",
@@ -2241,7 +2241,7 @@
},
{
"placeCode": "UG30750104",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10230101",
@@ -2289,7 +2289,7 @@
},
{
"placeCode": "UG30750105",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10070103",
@@ -2297,7 +2297,7 @@
},
{
"placeCode": "UG20280204",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30730108",
@@ -2341,7 +2341,7 @@
},
{
"placeCode": "UG30750106",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41130108",
@@ -2413,7 +2413,7 @@
},
{
"placeCode": "UG20370104",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10060102",
@@ -2425,7 +2425,7 @@
},
{
"placeCode": "UG20280203",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20340113",
@@ -2605,7 +2605,7 @@
},
{
"placeCode": "UG20370105",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41140105",
@@ -2617,7 +2617,7 @@
},
{
"placeCode": "UG30760115",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10130105",
@@ -2637,7 +2637,7 @@
},
{
"placeCode": "UG30750108",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41090205",
@@ -2701,7 +2701,7 @@
},
{
"placeCode": "UG30760114",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20450206",
@@ -2769,7 +2769,7 @@
},
{
"placeCode": "UG30750107",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10080102",
@@ -2869,7 +2869,7 @@
},
{
"placeCode": "UG20280205",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41310104",
@@ -2965,7 +2965,7 @@
},
{
"placeCode": "UG30760116",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10100203",
@@ -3337,7 +3337,7 @@
},
{
"placeCode": "UG30800102",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30990108",
@@ -3633,7 +3633,7 @@
},
{
"placeCode": "UG30750111",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20350209",
@@ -3733,7 +3733,7 @@
},
{
"placeCode": "UG30750112",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10140205",
@@ -3765,7 +3765,7 @@
},
{
"placeCode": "UG30760118",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30880102",
@@ -3857,11 +3857,11 @@
},
{
"placeCode": "UG30750109",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30750110",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30780105",
@@ -3877,7 +3877,7 @@
},
{
"placeCode": "UG20280105",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30640106",
@@ -3885,7 +3885,7 @@
},
{
"placeCode": "UG30760117",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30890102",
@@ -4301,7 +4301,7 @@
},
{
"placeCode": "UG20280206",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41300106",
@@ -4365,7 +4365,7 @@
},
{
"placeCode": "UG20280106",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10210404",
@@ -4377,7 +4377,7 @@
},
{
"placeCode": "UG20360110",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30990110",
@@ -4545,7 +4545,7 @@
},
{
"placeCode": "UG20280107",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20540122",
@@ -4717,7 +4717,7 @@
},
{
"placeCode": "UG30760119",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10100205",
@@ -4737,7 +4737,7 @@
},
{
"placeCode": "UG30800202",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41010106",
@@ -4757,7 +4757,7 @@
},
{
"placeCode": "UG30800103",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20520114",
@@ -4781,7 +4781,7 @@
},
{
"placeCode": "UG20360112",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41030109",
@@ -4825,7 +4825,7 @@
},
{
"placeCode": "UG20360111",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10260503",
@@ -5317,7 +5317,7 @@
},
{
"placeCode": "UG30800104",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30770108",
@@ -5417,7 +5417,7 @@
},
{
"placeCode": "UG20370106",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30840109",
@@ -5577,11 +5577,11 @@
},
{
"placeCode": "UG30760120",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30750113",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30980104",
@@ -5673,7 +5673,7 @@
},
{
"placeCode": "UG30800105",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41260108",
@@ -5845,7 +5845,7 @@
},
{
"placeCode": "UG30800203",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41330302",
@@ -6025,7 +6025,7 @@
},
{
"placeCode": "UG30800204",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10140208",
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-1.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-1.json
index 361750600..a792aa464 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-1.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-1.json
@@ -5,11 +5,11 @@
},
{
"placeCode": "UG2",
- "amount": 1613.3923
+ "amount": 0.0
},
{
"placeCode": "UG3",
- "amount": 0.0
+ "amount": 1613.3923
},
{
"placeCode": "UG4",
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-2.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-2.json
index 2c3655019..735f84d54 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-2.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-2.json
@@ -1,6 +1,6 @@
[
{
- "amount": 131.6869659423828,
+ "amount": 0,
"placeCode": "21UGA003001"
},
{
@@ -28,7 +28,7 @@
"placeCode": "21UGA003004"
},
{
- "amount": 1481.705322265625,
+ "amount": 0,
"placeCode": "21UGA003003"
},
{
@@ -68,7 +68,7 @@
"placeCode": "21UGA004003"
},
{
- "amount": 0,
+ "amount": 131.6869659423828,
"placeCode": "21UGA008003"
},
{
@@ -292,7 +292,7 @@
"placeCode": "21UGA004002"
},
{
- "amount": 0,
+ "amount": 1481.705322265625,
"placeCode": "21UGA008004"
},
{
@@ -511,4 +511,4 @@
"amount": 0,
"placeCode": "21UGA015003"
}
-]
\ No newline at end of file
+]
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-3.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-3.json
index 46074253a..90634f276 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-3.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-3.json
@@ -57,7 +57,7 @@
},
{
"placeCode": "UG202801",
- "amount": 10
+ "amount": 0
},
{
"placeCode": "UG100601",
@@ -161,7 +161,7 @@
},
{
"placeCode": "UG203601",
- "amount": 10
+ "amount": 0
},
{
"placeCode": "UG411502",
@@ -201,7 +201,7 @@
},
{
"placeCode": "UG307601",
- "amount": 0
+ "amount": 17
},
{
"placeCode": "UG410701",
@@ -261,7 +261,7 @@
},
{
"placeCode": "UG203701",
- "amount": 10
+ "amount": 0
},
{
"placeCode": "UG308901",
@@ -273,7 +273,7 @@
},
{
"placeCode": "UG202802",
- "amount": 10
+ "amount": 0
},
{
"placeCode": "UG204101",
@@ -305,7 +305,7 @@
},
{
"placeCode": "UG308001",
- "amount": 0
+ "amount": 7
},
{
"placeCode": "UG204501",
@@ -333,7 +333,7 @@
},
{
"placeCode": "UG307501",
- "amount": 0
+ "amount": 13
},
{
"placeCode": "UG203901",
@@ -505,7 +505,7 @@
},
{
"placeCode": "UG308002",
- "amount": 0
+ "amount": 3
},
{
"placeCode": "UG306401",
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-4.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-4.json
index e1e4ed39f..3c9f7688c 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-4.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-population_affected-4.json
@@ -33,7 +33,7 @@
},
{
"placeCode": "UG30800201",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20350101",
@@ -657,11 +657,11 @@
},
{
"placeCode": "UG20280102",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20360101",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41240101",
@@ -789,7 +789,7 @@
},
{
"placeCode": "UG20280101",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20540102",
@@ -1249,7 +1249,7 @@
},
{
"placeCode": "UG20360106",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10120112",
@@ -1293,7 +1293,7 @@
},
{
"placeCode": "UG20360107",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10020103",
@@ -1325,7 +1325,7 @@
},
{
"placeCode": "UG20360104",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20400302",
@@ -1333,7 +1333,7 @@
},
{
"placeCode": "UG20370102",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20520108",
@@ -1369,7 +1369,7 @@
},
{
"placeCode": "UG20360102",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20480102",
@@ -1377,7 +1377,7 @@
},
{
"placeCode": "UG20360105",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10220101",
@@ -1385,7 +1385,7 @@
},
{
"placeCode": "UG20370101",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41240104",
@@ -1429,7 +1429,7 @@
},
{
"placeCode": "UG20360103",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41060102",
@@ -1713,7 +1713,7 @@
},
{
"placeCode": "UG30750102",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20450205",
@@ -1829,7 +1829,7 @@
},
{
"placeCode": "UG20280201",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20510105",
@@ -1841,7 +1841,7 @@
},
{
"placeCode": "UG30750103",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20350207",
@@ -1873,7 +1873,7 @@
},
{
"placeCode": "UG30750101",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20410104",
@@ -1885,7 +1885,7 @@
},
{
"placeCode": "UG20280202",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41110105",
@@ -1909,7 +1909,7 @@
},
{
"placeCode": "UG20360108",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30900101",
@@ -2081,7 +2081,7 @@
},
{
"placeCode": "UG30800101",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41290302",
@@ -2117,7 +2117,7 @@
},
{
"placeCode": "UG20360109",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41290103",
@@ -2209,7 +2209,7 @@
},
{
"placeCode": "UG20280104",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10160101",
@@ -2229,11 +2229,11 @@
},
{
"placeCode": "UG20370103",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20280103",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41030105",
@@ -2241,7 +2241,7 @@
},
{
"placeCode": "UG30750104",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10230101",
@@ -2289,7 +2289,7 @@
},
{
"placeCode": "UG30750105",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10070103",
@@ -2297,7 +2297,7 @@
},
{
"placeCode": "UG20280204",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30730108",
@@ -2341,7 +2341,7 @@
},
{
"placeCode": "UG30750106",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41130108",
@@ -2413,7 +2413,7 @@
},
{
"placeCode": "UG20370104",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10060102",
@@ -2425,7 +2425,7 @@
},
{
"placeCode": "UG20280203",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20340113",
@@ -2605,7 +2605,7 @@
},
{
"placeCode": "UG20370105",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41140105",
@@ -2617,7 +2617,7 @@
},
{
"placeCode": "UG30760115",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10130105",
@@ -2637,7 +2637,7 @@
},
{
"placeCode": "UG30750108",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41090205",
@@ -2701,7 +2701,7 @@
},
{
"placeCode": "UG30760114",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20450206",
@@ -2769,7 +2769,7 @@
},
{
"placeCode": "UG30750107",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10080102",
@@ -2869,7 +2869,7 @@
},
{
"placeCode": "UG20280205",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41310104",
@@ -2965,7 +2965,7 @@
},
{
"placeCode": "UG30760116",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10100203",
@@ -3337,7 +3337,7 @@
},
{
"placeCode": "UG30800102",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30990108",
@@ -3633,7 +3633,7 @@
},
{
"placeCode": "UG30750111",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20350209",
@@ -3733,7 +3733,7 @@
},
{
"placeCode": "UG30750112",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10140205",
@@ -3765,7 +3765,7 @@
},
{
"placeCode": "UG30760118",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30880102",
@@ -3857,11 +3857,11 @@
},
{
"placeCode": "UG30750109",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30750110",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30780105",
@@ -3877,7 +3877,7 @@
},
{
"placeCode": "UG20280105",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30640106",
@@ -3885,7 +3885,7 @@
},
{
"placeCode": "UG30760117",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30890102",
@@ -4301,7 +4301,7 @@
},
{
"placeCode": "UG20280206",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41300106",
@@ -4365,7 +4365,7 @@
},
{
"placeCode": "UG20280106",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10210404",
@@ -4377,7 +4377,7 @@
},
{
"placeCode": "UG20360110",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30990110",
@@ -4545,7 +4545,7 @@
},
{
"placeCode": "UG20280107",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20540122",
@@ -4717,7 +4717,7 @@
},
{
"placeCode": "UG30760119",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10100205",
@@ -4737,7 +4737,7 @@
},
{
"placeCode": "UG30800202",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41010106",
@@ -4757,7 +4757,7 @@
},
{
"placeCode": "UG30800103",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20520114",
@@ -4781,7 +4781,7 @@
},
{
"placeCode": "UG20360112",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41030109",
@@ -4825,7 +4825,7 @@
},
{
"placeCode": "UG20360111",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10260503",
@@ -5317,7 +5317,7 @@
},
{
"placeCode": "UG30800104",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30770108",
@@ -5417,7 +5417,7 @@
},
{
"placeCode": "UG20370106",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30840109",
@@ -5577,11 +5577,11 @@
},
{
"placeCode": "UG30760120",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30750113",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30980104",
@@ -5673,7 +5673,7 @@
},
{
"placeCode": "UG30800105",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41260108",
@@ -5845,7 +5845,7 @@
},
{
"placeCode": "UG30800203",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41330302",
@@ -6025,7 +6025,7 @@
},
{
"placeCode": "UG30800204",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10140208",
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-1.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-1.json
index 361750600..a792aa464 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-1.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-1.json
@@ -5,11 +5,11 @@
},
{
"placeCode": "UG2",
- "amount": 1613.3923
+ "amount": 0.0
},
{
"placeCode": "UG3",
- "amount": 0.0
+ "amount": 1613.3923
},
{
"placeCode": "UG4",
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-2.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-2.json
index 2c3655019..735f84d54 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-2.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-2.json
@@ -1,6 +1,6 @@
[
{
- "amount": 131.6869659423828,
+ "amount": 0,
"placeCode": "21UGA003001"
},
{
@@ -28,7 +28,7 @@
"placeCode": "21UGA003004"
},
{
- "amount": 1481.705322265625,
+ "amount": 0,
"placeCode": "21UGA003003"
},
{
@@ -68,7 +68,7 @@
"placeCode": "21UGA004003"
},
{
- "amount": 0,
+ "amount": 131.6869659423828,
"placeCode": "21UGA008003"
},
{
@@ -292,7 +292,7 @@
"placeCode": "21UGA004002"
},
{
- "amount": 0,
+ "amount": 1481.705322265625,
"placeCode": "21UGA008004"
},
{
@@ -511,4 +511,4 @@
"amount": 0,
"placeCode": "21UGA015003"
}
-]
\ No newline at end of file
+]
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-3.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-3.json
index 46074253a..90634f276 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-3.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-3.json
@@ -57,7 +57,7 @@
},
{
"placeCode": "UG202801",
- "amount": 10
+ "amount": 0
},
{
"placeCode": "UG100601",
@@ -161,7 +161,7 @@
},
{
"placeCode": "UG203601",
- "amount": 10
+ "amount": 0
},
{
"placeCode": "UG411502",
@@ -201,7 +201,7 @@
},
{
"placeCode": "UG307601",
- "amount": 0
+ "amount": 17
},
{
"placeCode": "UG410701",
@@ -261,7 +261,7 @@
},
{
"placeCode": "UG203701",
- "amount": 10
+ "amount": 0
},
{
"placeCode": "UG308901",
@@ -273,7 +273,7 @@
},
{
"placeCode": "UG202802",
- "amount": 10
+ "amount": 0
},
{
"placeCode": "UG204101",
@@ -305,7 +305,7 @@
},
{
"placeCode": "UG308001",
- "amount": 0
+ "amount": 7
},
{
"placeCode": "UG204501",
@@ -333,7 +333,7 @@
},
{
"placeCode": "UG307501",
- "amount": 0
+ "amount": 13
},
{
"placeCode": "UG203901",
@@ -505,7 +505,7 @@
},
{
"placeCode": "UG308002",
- "amount": 0
+ "amount": 3
},
{
"placeCode": "UG306401",
diff --git a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-4.json b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-4.json
index e1e4ed39f..3c9f7688c 100644
--- a/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-4.json
+++ b/services/API-service/src/api/admin-area-dynamic-data/dto/example/UGA/drought/upload-small_ruminants_exposed-4.json
@@ -33,7 +33,7 @@
},
{
"placeCode": "UG30800201",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20350101",
@@ -657,11 +657,11 @@
},
{
"placeCode": "UG20280102",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20360101",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41240101",
@@ -789,7 +789,7 @@
},
{
"placeCode": "UG20280101",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20540102",
@@ -1249,7 +1249,7 @@
},
{
"placeCode": "UG20360106",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10120112",
@@ -1293,7 +1293,7 @@
},
{
"placeCode": "UG20360107",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10020103",
@@ -1325,7 +1325,7 @@
},
{
"placeCode": "UG20360104",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20400302",
@@ -1333,7 +1333,7 @@
},
{
"placeCode": "UG20370102",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20520108",
@@ -1369,7 +1369,7 @@
},
{
"placeCode": "UG20360102",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20480102",
@@ -1377,7 +1377,7 @@
},
{
"placeCode": "UG20360105",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10220101",
@@ -1385,7 +1385,7 @@
},
{
"placeCode": "UG20370101",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41240104",
@@ -1429,7 +1429,7 @@
},
{
"placeCode": "UG20360103",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41060102",
@@ -1713,7 +1713,7 @@
},
{
"placeCode": "UG30750102",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20450205",
@@ -1829,7 +1829,7 @@
},
{
"placeCode": "UG20280201",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20510105",
@@ -1841,7 +1841,7 @@
},
{
"placeCode": "UG30750103",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20350207",
@@ -1873,7 +1873,7 @@
},
{
"placeCode": "UG30750101",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20410104",
@@ -1885,7 +1885,7 @@
},
{
"placeCode": "UG20280202",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41110105",
@@ -1909,7 +1909,7 @@
},
{
"placeCode": "UG20360108",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30900101",
@@ -2081,7 +2081,7 @@
},
{
"placeCode": "UG30800101",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41290302",
@@ -2117,7 +2117,7 @@
},
{
"placeCode": "UG20360109",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41290103",
@@ -2209,7 +2209,7 @@
},
{
"placeCode": "UG20280104",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10160101",
@@ -2229,11 +2229,11 @@
},
{
"placeCode": "UG20370103",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20280103",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41030105",
@@ -2241,7 +2241,7 @@
},
{
"placeCode": "UG30750104",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10230101",
@@ -2289,7 +2289,7 @@
},
{
"placeCode": "UG30750105",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10070103",
@@ -2297,7 +2297,7 @@
},
{
"placeCode": "UG20280204",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30730108",
@@ -2341,7 +2341,7 @@
},
{
"placeCode": "UG30750106",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41130108",
@@ -2413,7 +2413,7 @@
},
{
"placeCode": "UG20370104",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10060102",
@@ -2425,7 +2425,7 @@
},
{
"placeCode": "UG20280203",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20340113",
@@ -2605,7 +2605,7 @@
},
{
"placeCode": "UG20370105",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41140105",
@@ -2617,7 +2617,7 @@
},
{
"placeCode": "UG30760115",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10130105",
@@ -2637,7 +2637,7 @@
},
{
"placeCode": "UG30750108",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41090205",
@@ -2701,7 +2701,7 @@
},
{
"placeCode": "UG30760114",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20450206",
@@ -2769,7 +2769,7 @@
},
{
"placeCode": "UG30750107",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10080102",
@@ -2869,7 +2869,7 @@
},
{
"placeCode": "UG20280205",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41310104",
@@ -2965,7 +2965,7 @@
},
{
"placeCode": "UG30760116",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10100203",
@@ -3337,7 +3337,7 @@
},
{
"placeCode": "UG30800102",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30990108",
@@ -3633,7 +3633,7 @@
},
{
"placeCode": "UG30750111",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20350209",
@@ -3733,7 +3733,7 @@
},
{
"placeCode": "UG30750112",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10140205",
@@ -3765,7 +3765,7 @@
},
{
"placeCode": "UG30760118",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30880102",
@@ -3857,11 +3857,11 @@
},
{
"placeCode": "UG30750109",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30750110",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30780105",
@@ -3877,7 +3877,7 @@
},
{
"placeCode": "UG20280105",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30640106",
@@ -3885,7 +3885,7 @@
},
{
"placeCode": "UG30760117",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30890102",
@@ -4301,7 +4301,7 @@
},
{
"placeCode": "UG20280206",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41300106",
@@ -4365,7 +4365,7 @@
},
{
"placeCode": "UG20280106",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10210404",
@@ -4377,7 +4377,7 @@
},
{
"placeCode": "UG20360110",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30990110",
@@ -4545,7 +4545,7 @@
},
{
"placeCode": "UG20280107",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG20540122",
@@ -4717,7 +4717,7 @@
},
{
"placeCode": "UG30760119",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10100205",
@@ -4737,7 +4737,7 @@
},
{
"placeCode": "UG30800202",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41010106",
@@ -4757,7 +4757,7 @@
},
{
"placeCode": "UG30800103",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG20520114",
@@ -4781,7 +4781,7 @@
},
{
"placeCode": "UG20360112",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG41030109",
@@ -4825,7 +4825,7 @@
},
{
"placeCode": "UG20360111",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG10260503",
@@ -5317,7 +5317,7 @@
},
{
"placeCode": "UG30800104",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30770108",
@@ -5417,7 +5417,7 @@
},
{
"placeCode": "UG20370106",
- "amount": 5
+ "amount": 0
},
{
"placeCode": "UG30840109",
@@ -5577,11 +5577,11 @@
},
{
"placeCode": "UG30760120",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30750113",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG30980104",
@@ -5673,7 +5673,7 @@
},
{
"placeCode": "UG30800105",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41260108",
@@ -5845,7 +5845,7 @@
},
{
"placeCode": "UG30800203",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG41330302",
@@ -6025,7 +6025,7 @@
},
{
"placeCode": "UG30800204",
- "amount": 0
+ "amount": 5
},
{
"placeCode": "UG10140208",
From 2e7b5e211fa0d5708454141430d46812150da718 Mon Sep 17 00:00:00 2001
From: jannisvisser
Date: Mon, 8 Aug 2022 09:53:36 +0200
Subject: [PATCH 16/19] fix: missing date attribute in mock endpoint call
AB#14721
---
.../backend-mock-scenario.component.ts | 1 -
interfaces/IBF-dashboard/src/app/services/api.service.ts | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/interfaces/IBF-dashboard/src/app/mocks/backend-mock-scenario-component/backend-mock-scenario.component.ts b/interfaces/IBF-dashboard/src/app/mocks/backend-mock-scenario-component/backend-mock-scenario.component.ts
index 005051583..85343dfb4 100644
--- a/interfaces/IBF-dashboard/src/app/mocks/backend-mock-scenario-component/backend-mock-scenario.component.ts
+++ b/interfaces/IBF-dashboard/src/app/mocks/backend-mock-scenario-component/backend-mock-scenario.component.ts
@@ -175,7 +175,6 @@ export class BackendMockScenarioComponent implements OnInit, OnDestroy {
triggered,
removeEvents,
this.disasterType,
- 1,
)
.subscribe({
next: () => this.processMockSuccess(secret, oldEvent, alert),
diff --git a/interfaces/IBF-dashboard/src/app/services/api.service.ts b/interfaces/IBF-dashboard/src/app/services/api.service.ts
index 64a8b32c6..66e30f276 100644
--- a/interfaces/IBF-dashboard/src/app/services/api.service.ts
+++ b/interfaces/IBF-dashboard/src/app/services/api.service.ts
@@ -348,17 +348,16 @@ export class ApiService {
triggered: boolean,
removeEvents: boolean,
disasterType: DisasterType,
- eventNr: number,
) {
return this.post(
'scripts/mock-dynamic-data',
{
secret,
countryCodeISO3: country.countryCodeISO3,
+ disasterType: disasterType.disasterType,
triggered,
removeEvents,
- disasterType: disasterType.disasterType,
- eventNr,
+ date: new Date(),
},
false,
);
From 4678483663c939a851a67ef35a036b7230b56299 Mon Sep 17 00:00:00 2001
From: jannisvisser
Date: Mon, 8 Aug 2022 13:26:45 +0200
Subject: [PATCH 17/19] fix: improve sorting of events in chat-section AB#14710
---
.../src/app/components/chat/chat.component.ts | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
index fd75525d9..d7d3a2787 100644
--- a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
+++ b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
@@ -160,7 +160,12 @@ export class ChatComponent implements OnInit, OnDestroy {
private onEventStateChange = (eventState: EventState) => {
this.eventState = eventState;
this.eventState?.events?.sort((a, b) =>
- a.startDate > b.startDate ? 1 : -1,
+ Number(a.firstLeadTime?.split('-')[0]) >
+ Number(b.firstLeadTime?.split('-')[0])
+ ? 1
+ : a.startDate > b.startDate
+ ? 1
+ : -1,
);
};
From 8d7e50ddf87f186ebb1f5c8ae947065888522177 Mon Sep 17 00:00:00 2001
From: jannisvisser
Date: Mon, 8 Aug 2022 13:37:45 +0200
Subject: [PATCH 18/19] fix: only execute api-call if parameters match AB#14744
---
.../IBF-dashboard/src/app/services/eap-actions.service.ts | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/interfaces/IBF-dashboard/src/app/services/eap-actions.service.ts b/interfaces/IBF-dashboard/src/app/services/eap-actions.service.ts
index 6e59c68aa..73927d85d 100644
--- a/interfaces/IBF-dashboard/src/app/services/eap-actions.service.ts
+++ b/interfaces/IBF-dashboard/src/app/services/eap-actions.service.ts
@@ -98,7 +98,11 @@ export class EapActionsService {
this.disasterTypeSettings.adminLevels.includes(this.adminLevel) &&
this.disasterTypeSettings.activeLeadTimes.includes(
this.timelineState?.activeLeadTime,
- )
+ ) &&
+ // if eventName (=typhoon) then event's leadtime must correspond with timeline's leadtime
+ (!this.eventState.event?.eventName ||
+ this.eventState.event?.firstLeadTime ===
+ this.timelineState.activeLeadTime)
) {
this.apiService
.getTriggeredAreas(
From fc2b15fa1fac8114609e370eaa62012cf0dd305d Mon Sep 17 00:00:00 2001
From: Conventional Changelog Action
Date: Mon, 8 Aug 2022 11:57:41 +0000
Subject: [PATCH 19/19] chore(release): v0.173.1 [skip ci]
---
CHANGELOG.md | 24 ++++++++++++++----------
package.json | 2 +-
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index da06aa255..a7dd0fa7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [0.173.1](https://github.com/rodekruis/IBF-system/compare/v0.173.0...v0.173.1) (2022-08-08)
+
+
+### Bug Fixes
+
+* adjust speech bubbles in multi-event AB[#14710](https://github.com/rodekruis/IBF-system/issues/14710) ([dde92a6](https://github.com/rodekruis/IBF-system/commit/dde92a6e72dfa34f2b4659f68abb8961cfc17141))
+* change from-name email AB[#14709](https://github.com/rodekruis/IBF-system/issues/14709) ([6f05e90](https://github.com/rodekruis/IBF-system/commit/6f05e90c8b560c7925865c4aa16df86eed95a542))
+* improve sorting of events in chat-section AB[#14710](https://github.com/rodekruis/IBF-system/issues/14710) ([4678483](https://github.com/rodekruis/IBF-system/commit/4678483663c939a851a67ef35a036b7230b56299))
+* missing date attribute in mock endpoint call AB[#14721](https://github.com/rodekruis/IBF-system/issues/14721) ([2e7b5e2](https://github.com/rodekruis/IBF-system/commit/2e7b5e211fa0d5708454141430d46812150da718))
+* only execute api-call if parameters match AB[#14744](https://github.com/rodekruis/IBF-system/issues/14744) ([8d7e50d](https://github.com/rodekruis/IBF-system/commit/8d7e50ddf87f186ebb1f5c8ae947065888522177))
+* reiterate eventname AB[#14708](https://github.com/rodekruis/IBF-system/issues/14708) ([15ab37f](https://github.com/rodekruis/IBF-system/commit/15ab37f80b557839a58e7802c714aa4db7305dae))
+
+
+
# [0.173.0](https://github.com/rodekruis/IBF-system/compare/v0.172.1...v0.173.0) (2022-08-05)
@@ -118,13 +132,3 @@
-## [0.167.2](https://github.com/rodekruis/IBF-system/compare/v0.167.1...v0.167.2) (2022-07-08)
-
-
-### Bug Fixes
-
-* correct PHL floods eapLink AB[#14421](https://github.com/rodekruis/IBF-system/issues/14421) ([956d8ee](https://github.com/rodekruis/IBF-system/commit/956d8eec08488d2792466d55d3853742bf03227f))
-* correct PHL trigger statement AB[#14421](https://github.com/rodekruis/IBF-system/issues/14421) ([ee65ccb](https://github.com/rodekruis/IBF-system/commit/ee65ccba83bb6221abed002b734ebfdf39e59d66))
-
-
-
diff --git a/package.json b/package.json
index c3beaf40a..6a2127190 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "IBF-system",
- "version": "0.173.0",
+ "version": "0.173.1",
"private": true,
"scripts": {
"demo": "npx npm-run-all --print-label --parallel start open",