From 0c09435b16916da3ef08d89fa644e7c91a00cd6f Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 22 Feb 2024 19:17:08 +0100
Subject: [PATCH] =?UTF-8?q?OZG-4994=20OZG-5078=20add=20navi=20element=20wi?=
=?UTF-8?q?th=20number=20of=20Vorg=C3=A4nge=20with=20unread=20messages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../vorgang-shared/src/lib/+state/vorgang.reducer.ts | 1 +
.../libs/vorgang-shared/src/lib/vorgang.model.ts | 2 ++
alfa-client/libs/vorgang-shared/test/vorgang.ts | 1 +
.../vorgang-views-menu.component.html | 10 +++++++++-
.../vorgang-views-menu.component.scss | 3 ++-
5 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/alfa-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.ts b/alfa-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.ts
index 94216faa5f..c7a5be544e 100644
--- a/alfa-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.ts
+++ b/alfa-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.ts
@@ -143,6 +143,7 @@ function createEmptyVorgangStatistic(): VorgangStatistic {
},
wiedervorlagen: null,
existsWiedervorlageOverdue: false,
+ ungeleseneNachrichten: 0,
};
}
diff --git a/alfa-client/libs/vorgang-shared/src/lib/vorgang.model.ts b/alfa-client/libs/vorgang-shared/src/lib/vorgang.model.ts
index 41b412c983..c18d952fce 100644
--- a/alfa-client/libs/vorgang-shared/src/lib/vorgang.model.ts
+++ b/alfa-client/libs/vorgang-shared/src/lib/vorgang.model.ts
@@ -109,6 +109,7 @@ export interface VorgangStatistic {
byStatus: ByStatus;
wiedervorlagen: number;
existsWiedervorlageOverdue: boolean;
+ ungeleseneNachrichten: number;
}
export interface ByStatus {
@@ -163,6 +164,7 @@ export enum VorgangView {
WIEDERVORLAGEN,
SEARCH,
ZU_LOESCHEN,
+ UNGELESENE_NACHRICHTEN,
}
export interface StatusCommandMap {
diff --git a/alfa-client/libs/vorgang-shared/test/vorgang.ts b/alfa-client/libs/vorgang-shared/test/vorgang.ts
index 743c5e6533..8bddc8cc50 100644
--- a/alfa-client/libs/vorgang-shared/test/vorgang.ts
+++ b/alfa-client/libs/vorgang-shared/test/vorgang.ts
@@ -145,6 +145,7 @@ export function createVorgangStatistic(): VorgangStatistic {
byStatus: createByStatus(),
wiedervorlagen: faker.datatype.number(),
existsWiedervorlageOverdue: false,
+ ungeleseneNachrichten: faker.datatype.number(),
};
}
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.html b/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.html
index c7d9d6fc88..c5f2b64b85 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.html
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.html
@@ -130,6 +130,15 @@
>
<div class="dot zu-loeschen"></div>
</alfa-vorgang-view-item-container>
+ <alfa-vorgang-view-item-container
+ data-test-id="vorgang-ungelesene-nachrichten-view"
+ label="Ungelesen"
+ [view]="vorgangView.UNGELESENE_NACHRICHTEN"
+ [count]="statistic.ungeleseneNachrichten"
+ class="top-border"
+ >
+ <ozgcloud-postfach-icon [showBadge]="true"></ozgcloud-postfach-icon>
+ </alfa-vorgang-view-item-container>
<alfa-vorgang-view-item-container
*ngIf="
apiRootResource
@@ -142,7 +151,6 @@
label="Wiedervorlagen"
[view]="vorgangView.WIEDERVORLAGEN"
[count]="statistic.wiedervorlagen"
- class="top-border"
>
<alfa-wiedervorlage-icon
[isOverdue]="statistic.existsWiedervorlageOverdue"
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.scss b/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.scss
index 4b089df917..e6328b2c2a 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.scss
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.scss
@@ -70,6 +70,7 @@ body.dark :host {
}
}
-ozgcloud-icon {
+ozgcloud-icon,
+ozgcloud-postfach-icon {
margin-right: 6px;
}
--
GitLab