Skip to content
Snippets Groups Projects
Commit da935ad8 authored by Alexander Reifschneider's avatar Alexander Reifschneider
Browse files

OZG-8129 replace incoming icon

parent 851a6322
No related branches found
No related tags found
1 merge request!131OZG-8129 replace mat icons
Showing
with 13 additions and 28 deletions
<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd"
stroke-linejoin="round" stroke-miterlimit="2">
<path
d="M11.34 3.024c-.908.094-1.475.209-2.18.442-2.47.816-4.49 2.706-5.496 5.142a5.018 5.018 0 0 0-.144.37c0 .012.466.022 1.035.022H5.59l.23-.41c.126-.225.339-.563.472-.75.313-.437 1.111-1.235 1.548-1.548a7.224 7.224 0 0 1 3.252-1.293c.578-.073 1.814-.03 2.328.08 2.902.621 5.129 2.966 5.558 5.851.081.549.081 1.591 0 2.14-.335 2.255-1.817 4.269-3.878 5.271-1.146.558-2.417.805-3.612.703-1.792-.153-3.349-.882-4.549-2.129a6.97 6.97 0 0 1-1.234-1.705L5.599 15h-1.04c-.571 0-1.039.01-1.039.022 0 .013.065.179.144.37A9.037 9.037 0 0 0 12.014 21c3.404 0 6.571-1.984 8.066-5.054A8.971 8.971 0 0 0 18.415 5.7a9.054 9.054 0 0 0-5.095-2.599c-.408-.061-1.658-.11-1.98-.077m.14 5.996V11H3v2h8.48v1.98c0 1.089.014 1.98.03 1.98.017 0 1.146-1.116 2.51-2.48L16.5 12l-2.48-2.48c-1.364-1.364-2.493-2.48-2.51-2.48-.016 0-.03.891-.03 1.98" />
</svg>
\ No newline at end of file
<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2"><path d="M11.5 13v4l5-5-5-5v4H3v2h8.5z"/><path d="M3.517 8.988C4.758 5.5 8.089 3 12 3c4.967 0 9 4.033 9 9s-4.033 9-9 9c-3.92 0-7.258-2.512-8.491-6.012h2.088A7.069 7.069 0 0012 19.065 7.069 7.069 0 0019.065 12 7.069 7.069 0 0012 4.935a7.067 7.067 0 00-6.391 4.053H3.517z"/></svg>
\ No newline at end of file
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
export enum Icons { export enum Icons {
DELETE_FINALLY = 'delete_finally', DELETE_FINALLY = 'delete_finally',
EDIT = 'edit', EDIT = 'edit',
INCOMING = 'incoming',
LOGO = 'logo', LOGO = 'logo',
MAIL = 'mail', MAIL = 'mail',
PDF_EXPORT = 'pdf_export', PDF_EXPORT = 'pdf_export',
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen * Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
import { MatIconRegistry } from '@angular/material/icon';
import { IconService } from './icon.service';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils'; import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { MatIconRegistry } from '@angular/material/icon';
import { Icons } from './icon.model'; import { Icons } from './icon.model';
import { IconService } from './icon.service';
describe('IconService', () => { describe('IconService', () => {
let service: IconService; let service: IconService;
...@@ -59,13 +59,5 @@ describe('IconService', () => { ...@@ -59,13 +59,5 @@ describe('IconService', () => {
expect(domSanitizer.bypassSecurityTrustResourceUrl).toHaveBeenCalled(); expect(domSanitizer.bypassSecurityTrustResourceUrl).toHaveBeenCalled();
expect(domSanitizer.bypassSecurityTrustResourceUrl).toHaveBeenCalledTimes(iconsObjectLength); expect(domSanitizer.bypassSecurityTrustResourceUrl).toHaveBeenCalledTimes(iconsObjectLength);
}); });
it('should call domSanitizer for `incoming` icon', () => {
service.registerIcons();
expect(domSanitizer.bypassSecurityTrustResourceUrl).toHaveBeenCalledWith(
iconBasePath + 'incoming.svg',
);
});
}); });
}); });
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="line name-date"> <div class="line name-date">
<span class="name" data-test-id="preview-list-item-vorgang-name">{{ vorgang.name }}</span> <span class="name" data-test-id="preview-list-item-vorgang-name">{{ vorgang.name }}</span>
<div class="date"> <div class="date">
<mat-icon svgIcon="incoming"></mat-icon> <ods-icon name="incoming" fill="text" />
<span data-test-id="preview-list-item-created-at">{{ vorgang.createdAt | formatToPrettyDate }}</span> <span data-test-id="preview-list-item-created-at">{{ vorgang.createdAt | formatToPrettyDate }}</span>
</div> </div>
</div> </div>
......
...@@ -25,8 +25,6 @@ import { FormatToPrettyDatePipe } from '@alfa-client/tech-shared'; ...@@ -25,8 +25,6 @@ import { FormatToPrettyDatePipe } from '@alfa-client/tech-shared';
import { registerLocaleData } from '@angular/common'; import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de'; import localeDe from '@angular/common/locales/de';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIcon } from '@angular/material/icon';
import { MatIconTestingModule } from '@angular/material/icon/testing';
import { IconComponent } from '@ods/system'; import { IconComponent } from '@ods/system';
import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang'; import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
...@@ -45,12 +43,10 @@ describe('VorgangSearchAutocompleteOptionsComponent', () => { ...@@ -45,12 +43,10 @@ describe('VorgangSearchAutocompleteOptionsComponent', () => {
declarations: [ declarations: [
VorgangSearchAutocompleteOptionsContentComponent, VorgangSearchAutocompleteOptionsContentComponent,
FormatToPrettyDatePipe, FormatToPrettyDatePipe,
MockComponent(IconComponent),
MatIcon,
MockComponent(AktenzeichenComponent), MockComponent(AktenzeichenComponent),
MockComponent(VorgangNummerComponent), MockComponent(VorgangNummerComponent),
], ],
imports: [MatIconTestingModule], imports: [MockComponent(IconComponent)],
}).compileComponents(); }).compileComponents();
}); });
......
...@@ -24,6 +24,6 @@ ...@@ -24,6 +24,6 @@
--> -->
<div tooltip="Eingang: {{ vorgang.createdAt | formatDateWithTimePipe }}"> <div tooltip="Eingang: {{ vorgang.createdAt | formatDateWithTimePipe }}">
<mat-icon svgIcon="incoming"></mat-icon> <ods-icon name="incoming" fill="text" [class]="'mr-1.5'" />
<span data-test-id="created-at">{{ vorgang.createdAt | formatDateWithoutYearWithTime }}</span> <span data-test-id="created-at">{{ vorgang.createdAt | formatDateWithoutYearWithTime }}</span>
</div> </div>
...@@ -26,7 +26,3 @@ div { ...@@ -26,7 +26,3 @@ div {
align-items: center; align-items: center;
white-space: nowrap; white-space: nowrap;
} }
mat-icon {
margin-right: 6px;
}
...@@ -31,12 +31,10 @@ import { VorgangResource } from '@alfa-client/vorgang-shared'; ...@@ -31,12 +31,10 @@ import { VorgangResource } from '@alfa-client/vorgang-shared';
import { registerLocaleData } from '@angular/common'; import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de'; import localeDe from '@angular/common/locales/de';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIcon } from '@angular/material/icon'; import { IconComponent, TooltipDirective } from '@ods/system';
import { MatIconTestingModule } from '@angular/material/icon/testing';
import { TooltipDirective } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang'; import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockDirective } from 'ng-mocks'; import { MockComponent, MockDirective } from 'ng-mocks';
import { VorgangCreatedAtComponent } from './vorgang-created-at.component'; import { VorgangCreatedAtComponent } from './vorgang-created-at.component';
registerLocaleData(localeDe); registerLocaleData(localeDe);
...@@ -56,7 +54,7 @@ describe('VorgangCreatedAtComponent', () => { ...@@ -56,7 +54,7 @@ describe('VorgangCreatedAtComponent', () => {
VorgangCreatedAtComponent, VorgangCreatedAtComponent,
MockDirective(TooltipDirective), MockDirective(TooltipDirective),
], ],
imports: [MatIcon, MatIconTestingModule], imports: [MockComponent(IconComponent)],
}).compileComponents(); }).compileComponents();
fixture = TestBed.createComponent(VorgangCreatedAtComponent); fixture = TestBed.createComponent(VorgangCreatedAtComponent);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment