From df1725479a4ddcbdda3f241c09adb6ee1af7437e Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Fri, 25 Apr 2025 10:46:49 +0200
Subject: [PATCH] OZG-8129 replace done icon
---
alfa-client/libs/ui/src/lib/assets/done.svg | 3 ---
alfa-client/libs/ui/src/lib/icon/icon.model.ts | 1 -
.../wiedervorlage-status.component.html | 11 ++++-------
.../wiedervorlage-status.component.scss | 12 ------------
.../wiedervorlage-status.component.spec.ts | 5 +++--
5 files changed, 7 insertions(+), 25 deletions(-)
delete mode 100644 alfa-client/libs/ui/src/lib/assets/done.svg
diff --git a/alfa-client/libs/ui/src/lib/assets/done.svg b/alfa-client/libs/ui/src/lib/assets/done.svg
deleted file mode 100644
index 6fd1e43b40..0000000000
--- a/alfa-client/libs/ui/src/lib/assets/done.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.16245 13.5002L2.88745 9.2252L3.9562 8.15645L7.16245 11.3627L14.0437 4.48145L15.1125 5.5502L7.16245 13.5002Z" fill="#2D65BA"/>
-</svg>
diff --git a/alfa-client/libs/ui/src/lib/icon/icon.model.ts b/alfa-client/libs/ui/src/lib/icon/icon.model.ts
index 6629ec4360..46c0ecd978 100644
--- a/alfa-client/libs/ui/src/lib/icon/icon.model.ts
+++ b/alfa-client/libs/ui/src/lib/icon/icon.model.ts
@@ -23,7 +23,6 @@
*/
export enum Icons {
DELETE_FINALLY = 'delete_finally',
- DONE = 'done',
EDIT = 'edit',
INCOMING = 'incoming',
LOGO = 'logo',
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.html b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.html
index 56565d7fb7..c1eca6004c 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.html
@@ -28,15 +28,12 @@
class="dot"
[style.width]="diameter + 'px'"
[style.height]="diameter + 'px'"
- [ngClass]="[
- wiedervorlageResource.frist | toTrafficLight,
- wiedervorlageResource.done ? 'erledigt' : ''
- ]"
+ [ngClass]="[wiedervorlageResource.frist | toTrafficLight, wiedervorlageResource.done ? 'erledigt' : '']"
data-test-class="dot"
>
- <mat-icon class="done" *ngIf="wiedervorlageResource.done" data-test-class="done-icon"
- >done</mat-icon
- >
+ @if (wiedervorlageResource.done) {
+ <ods-icon name="check" class="absolute -left-0.5 top-1/2 -translate-y-1/2" fill="bewilligt" data-test-class="done-icon" />
+ }
</div>
</ng-container>
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.scss b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.scss
index 70237e8791..90fa12aa5f 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.scss
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.scss
@@ -39,14 +39,6 @@
display: flex;
position: relative;
- .mat-icon {
- position: absolute;
- left: -2px;
- top: 50%;
- transform: translateY(-50%);
- font-size: 20px;
- }
-
&.red:not(.erledigt) {
background-color: mat.m2-get-color-from-palette($warnPalette);
border-color: mat.m2-get-color-from-palette($warnPalette, darker);
@@ -61,7 +53,3 @@
.content {
margin-left: 4px;
}
-
-.done {
- color: green;
-}
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.spec.ts
index 86383128c2..1eb2bcd839 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.spec.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-status/wiedervorlage-status.component.spec.ts
@@ -23,8 +23,9 @@
*/
import { ToTrafficLightPipe } from '@alfa-client/tech-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatIcon } from '@angular/material/icon';
+import { IconComponent } from '@ods/system';
import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage';
+import { MockComponent } from 'ng-mocks';
import { WiedervorlageStatusComponent } from './wiedervorlage-status.component';
const doneIcon: string = '[data-test-class="done-icon"]';
@@ -36,7 +37,7 @@ describe('WiedervorlageStatusComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [WiedervorlageStatusComponent],
- imports: [MatIcon, ToTrafficLightPipe],
+ imports: [MockComponent(IconComponent), ToTrafficLightPipe],
}).compileComponents();
});
--
GitLab