diff --git a/alfa-client/libs/design-system/src/assets/resubmission-expired.svg b/alfa-client/libs/design-system/src/assets/resubmission-expired.svg new file mode 100644 index 0000000000000000000000000000000000000000..93e09908ceeb111c989d1fbf14afab55149eb133 --- /dev/null +++ b/alfa-client/libs/design-system/src/assets/resubmission-expired.svg @@ -0,0 +1,8 @@ +<svg viewBox="0 0 25 24" xmlns="http://www.w3.org/2000/svg"> + <path + d="M21.491 10.122H14.711L17.451 7.30195C14.721 4.60195 10.301 4.50195 7.57097 7.20195C4.84097 9.91195 4.84097 14.282 7.57097 16.992C10.301 19.702 14.721 19.702 17.451 16.992C18.811 15.652 19.491 14.082 19.491 12.102H21.491C21.491 14.082 20.611 16.652 18.851 18.392C15.341 21.872 9.64097 21.872 6.13097 18.392C2.63097 14.922 2.60097 9.28195 6.11097 5.81195C9.62097 2.34195 15.251 2.34195 18.761 5.81195L21.491 3.00195V10.122Z" /> + <rect x="2.21484" y="5.56445" width="5.95309" height="1.98598" transform="rotate(-45 2.21484 5.56445)" /> + <rect x="4.34375" y="1" width="0.828641" height="3.29385" transform="rotate(45 4.34375 1)" /> + <rect x="11.5" y="7" width="2" height="6" /> + <circle cx="12.5" cy="16" r="1" /> +</svg> \ No newline at end of file diff --git a/alfa-client/libs/ui/src/lib/assets/resubmission_expired.svg b/alfa-client/libs/ui/src/lib/assets/resubmission_expired.svg deleted file mode 100644 index dbeb50ca6be99a07ffbf8210a39954cb0f4d2a84..0000000000000000000000000000000000000000 --- a/alfa-client/libs/ui/src/lib/assets/resubmission_expired.svg +++ /dev/null @@ -1,7 +0,0 @@ -<svg width="25" height="24" viewBox="0 0 25 24" xmlns="http://www.w3.org/2000/svg"> -<path d="M21.491 10.122H14.711L17.451 7.30195C14.721 4.60195 10.301 4.50195 7.57097 7.20195C4.84097 9.91195 4.84097 14.282 7.57097 16.992C10.301 19.702 14.721 19.702 17.451 16.992C18.811 15.652 19.491 14.082 19.491 12.102H21.491C21.491 14.082 20.611 16.652 18.851 18.392C15.341 21.872 9.64097 21.872 6.13097 18.392C2.63097 14.922 2.60097 9.28195 6.11097 5.81195C9.62097 2.34195 15.251 2.34195 18.761 5.81195L21.491 3.00195V10.122Z" /> -<rect x="2.21484" y="5.56445" width="5.95309" height="1.98598" transform="rotate(-45 2.21484 5.56445)" /> -<rect x="4.34375" y="1" width="0.828641" height="3.29385" transform="rotate(45 4.34375 1)" /> -<rect x="11.5" y="7" width="2" height="6" /> -<circle cx="12.5" cy="16" r="1" /> -</svg> diff --git a/alfa-client/libs/ui/src/lib/assets/update.svg b/alfa-client/libs/ui/src/lib/assets/update.svg deleted file mode 100644 index 64c8cf90dc1a17b7183fd9dc03a66effd3273449..0000000000000000000000000000000000000000 --- a/alfa-client/libs/ui/src/lib/assets/update.svg +++ /dev/null @@ -1,4 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="inherit"> - <path - d="M480-120q-75 0-140.5-28.5t-114-77q-48.5-48.5-77-114T120-480q0-75 28.5-140.5t77-114q48.5-48.5 114-77T480-840q82 0 155.5 35T760-706v-94h80v240H600v-80h110q-41-56-101-88t-129-32q-117 0-198.5 81.5T200-480q0 117 81.5 198.5T480-200q105 0 183.5-68T756-440h82q-15 137-117.5 228.5T480-120Zm112-192L440-464v-216h80v184l128 128-56 56Z" /> -</svg> \ No newline at end of file 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 46c0ecd978bf54b8903377af5c0237825d41acdf..ba322fa837113ad747e8cce51a003a33b421a250 100644 --- a/alfa-client/libs/ui/src/lib/icon/icon.model.ts +++ b/alfa-client/libs/ui/src/lib/icon/icon.model.ts @@ -28,7 +28,5 @@ export enum Icons { LOGO = 'logo', MAIL = 'mail', PDF_EXPORT = 'pdf_export', - RESUBMISSION_EXPIRED = 'resubmission_expired', PASTE_FROM_CLIPBOARD = 'paste_from_clipboard', - UPDATE = 'update', } diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.html b/alfa-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.html index b19d4aab4de5d61a8e9152f7a37db521c87b9cc0..c99c65275da7e8d73ccd29e6056302814fd60bd5 100644 --- a/alfa-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.html +++ b/alfa-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.html @@ -23,20 +23,10 @@ unter der Lizenz sind dem Lizenztext zu entnehmen. --> -<div - [ngClass]="{ 'text-error': isOverdue, 'text-text': !isOverdue }" - data-test-class="wiedervorlage-icon" -> - <ng-container *ngIf="isOverdue; else defaultFrist"> - <ozgcloud-svgicon - svgIcon="resubmission_expired" - data-test-class="wiedervorlage-icon-is-overdue" - ></ozgcloud-svgicon> - </ng-container> - <ng-template #defaultFrist> - <ozgcloud-svgicon - svgIcon="update" - data-test-class="wiedervorlage-icon-default" - ></ozgcloud-svgicon> - </ng-template> +<div data-test-class="wiedervorlage-icon"> + @if (isOverdue) { + <ods-icon name="resubmission-expired" data-test-class="wiedervorlage-icon-is-overdue" fill="error" /> + } @else { + <ods-icon name="update" data-test-class="wiedervorlage-icon-default" fill="text" /> + } </div> diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.spec.ts b/alfa-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.spec.ts index 264bdf33d8090b250577e9ba237587b088706a39..53d2efaa86a35b8a283f8bdca046165de2657979 100644 --- a/alfa-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.spec.ts +++ b/alfa-client/libs/vorgang-shared-ui/src/lib/wiedervorlage-icon/wiedervorlage-icon.component.spec.ts @@ -21,12 +21,10 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatIcon } from '@angular/material/icon'; import { getElementFromFixture } from '@alfa-client/test-utils'; -import { OzgcloudIconComponent } from '@alfa-client/ui'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { IconComponent } from '@ods/system'; import { getDataTestClassOf } from 'libs/tech-shared/test/data-test'; -import { OzgcloudSvgIconComponent } from 'libs/ui/src/lib/ui/ozgcloud-svgicon/ozgcloud-svgicon.component'; import { MockComponents } from 'ng-mocks'; import { WiedervorlageIconComponent } from './wiedervorlage-icon.component'; @@ -39,12 +37,8 @@ describe('WiedervorlageIconComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ - WiedervorlageIconComponent, - MatIcon, - MockComponents(OzgcloudIconComponent), - MockComponents(OzgcloudSvgIconComponent), - ], + declarations: [WiedervorlageIconComponent], + imports: [MockComponents(IconComponent)], }).compileComponents(); fixture = TestBed.createComponent(WiedervorlageIconComponent); diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.spec.ts b/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.spec.ts index d7cd88c0faf1e5ca2ec114a6908733f27df88fe8..307477f855ecb48ee4f12aa5903bd817f19071de 100644 --- a/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.spec.ts +++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/vorgang-views-menu.component.spec.ts @@ -56,7 +56,6 @@ describe('VorgangViewsMenuComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [ - WiedervorlageIconComponent, VorgangViewsMenuComponent, HasLinkPipe, HasAnyLinkPipe, @@ -66,6 +65,7 @@ describe('VorgangViewsMenuComponent', () => { MockComponent(OzgcloudIconComponent), MockComponent(OzgcloudSvgIconComponent), MockComponent(PostfachIconComponent), + MockComponent(WiedervorlageIconComponent), ], }).compileComponents();