Skip to content
Snippets Groups Projects
Commit d32d80bb authored by OZGCloud's avatar OZGCloud
Browse files

Merge pull request 'OZG-2225' (#57) from OZG-2225 into master

parents 62d3c1fb 7751771b
No related branches found
No related tags found
No related merge requests found
Showing
with 78 additions and 21 deletions
...@@ -42,6 +42,7 @@ export class VorgangSearchPreviewListItemE2EComponent { ...@@ -42,6 +42,7 @@ export class VorgangSearchPreviewListItemE2EComponent {
private readonly locatorCreatedAt: string = 'preview-list-item-created-at'; private readonly locatorCreatedAt: string = 'preview-list-item-created-at';
private readonly locatorVorgangName: string = 'preview-list-item-vorgang-name'; private readonly locatorVorgangName: string = 'preview-list-item-vorgang-name';
private readonly locatorVorgangAktenzeichen: string = 'preview-list-item-vorgang-aktenzeichen'; private readonly locatorVorgangAktenzeichen: string = 'preview-list-item-vorgang-aktenzeichen';
private readonly locatorVorgangNummer: string = 'vorgang-nummer';
private readonly rootLocator: string; private readonly rootLocator: string;
...@@ -64,4 +65,8 @@ export class VorgangSearchPreviewListItemE2EComponent { ...@@ -64,4 +65,8 @@ export class VorgangSearchPreviewListItemE2EComponent {
public getVorgangAktenzeichen() { public getVorgangAktenzeichen() {
return this.getRoot().getTestElement(this.locatorVorgangAktenzeichen); return this.getRoot().getTestElement(this.locatorVorgangAktenzeichen);
} }
public getVorgangNummer() {
return this.getRoot().getTestElement(this.locatorVorgangNummer);
}
} }
\ No newline at end of file
...@@ -176,6 +176,10 @@ describe('VorgangList Suche', () => { ...@@ -176,6 +176,10 @@ describe('VorgangList Suche', () => {
it('should show vorgang aktenzeichen', () => { it('should show vorgang aktenzeichen', () => {
exist(previewListItemVorgang.getVorgangAktenzeichen()); exist(previewListItemVorgang.getVorgangAktenzeichen());
}) })
it('should show vorgang nummer', () => {
exist(previewListItemVorgang.getVorgangNummer());
})
}) })
describe('select vorgang in vorganglist preview list', () => { describe('select vorgang in vorganglist preview list', () => {
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
@import "~libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.theme"; @import "~libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.theme";
@import "~libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-in-vorgang.theme"; @import "~libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-in-vorgang.theme";
@import "~libs/user-profile/src/lib/user-profile-search-container/user-profile-search-container.theme"; @import "~libs/user-profile/src/lib/user-profile-search-container/user-profile-search-container.theme";
@import "~libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.theme";
@include mat.core(); @include mat.core();
......
...@@ -10,10 +10,7 @@ ...@@ -10,10 +10,7 @@
<h1 goofy-client-aktenzeichen class="ellipsis" [vorgang]="vorgangWithEingang"></h1> <h1 goofy-client-aktenzeichen class="ellipsis" [vorgang]="vorgangWithEingang"></h1>
</div> </div>
<div class="vorgang-nummer"> <goofy-client-vorgang-nummer class="vorgang-nummer big" [vorgang]="vorgangWithEingang"></goofy-client-vorgang-nummer>
<mat-icon svgIcon="nr"></mat-icon>
<div goofy-client-vorgang-nummer class="ellipsis" [vorgang]="vorgangWithEingang"></div>
</div>
<h2 data-test-id="name" class="name ellipsis">{{ vorgangWithEingang.name }}</h2> <h2 data-test-id="name" class="name ellipsis">{{ vorgangWithEingang.name }}</h2>
......
...@@ -46,8 +46,7 @@ ...@@ -46,8 +46,7 @@
padding: 1rem 1.5rem; padding: 1rem 1.5rem;
} }
h1, h1 {
.vorgang-nummer > div {
margin: 0; margin: 0;
line-height: 1.4; line-height: 1.4;
font-size: 1.5rem; font-size: 1.5rem;
...@@ -98,9 +97,6 @@ mat-icon { ...@@ -98,9 +97,6 @@ mat-icon {
.vorgang-nummer { .vorgang-nummer {
grid-area: vorgang-nummer; grid-area: vorgang-nummer;
margin-left: -2px;
display: flex;
align-items: center;
} }
.name { .name {
......
goofy-client-vorgang-nummer {
div {
display: flex;
align-items: center;
margin: 0;
}
mat-icon {
margin-right: 0.25rem;
height: 1rem;
}
span {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
&.big {
div {
line-height: 1.4;
font-size: 1.5rem;
font-weight: 400;
}
mat-icon {
margin-right: 0.5rem;
height: 1.875rem;
min-height: 1.875rem;
width: 1.875rem;
min-width: 1.875rem;
}
}
}
<div>
<mat-icon svgIcon="nr"></mat-icon>
<span [matTooltip]="vorgang.nummer" data-test-id="vorgang-nummer">{{ vorgang.nummer }}</span> <span [matTooltip]="vorgang.nummer" data-test-id="vorgang-nummer">{{ vorgang.nummer }}</span>
</div>
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 { MatTooltipModule } from '@angular/material/tooltip'; import { MatTooltipModule } from '@angular/material/tooltip';
import { getElementFromFixture } from '@goofy-client/test-utils'; import { getElementFromFixture } from '@goofy-client/test-utils';
import { VorgangResource } from '@goofy-client/vorgang-shared'; import { VorgangResource } from '@goofy-client/vorgang-shared';
...@@ -15,8 +17,14 @@ describe('VorgangNummerComponent', () => { ...@@ -15,8 +17,14 @@ describe('VorgangNummerComponent', () => {
beforeEach(async () => { beforeEach(async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
declarations: [VorgangNummerComponent], declarations: [
imports: [MatTooltipModule], MatIcon,
VorgangNummerComponent
],
imports: [
MatIconTestingModule,
MatTooltipModule,
],
}).compileComponents(); }).compileComponents();
}); });
......
...@@ -2,9 +2,8 @@ import { Component, Input } from '@angular/core'; ...@@ -2,9 +2,8 @@ import { Component, Input } from '@angular/core';
import { Vorgang } from '@goofy-client/vorgang-shared'; import { Vorgang } from '@goofy-client/vorgang-shared';
@Component({ @Component({
selector: '[goofy-client-vorgang-nummer]', selector: 'goofy-client-vorgang-nummer',
templateUrl: './vorgang-nummer.component.html', templateUrl: './vorgang-nummer.component.html'
styleUrls: ['./vorgang-nummer.component.scss']
}) })
export class VorgangNummerComponent { export class VorgangNummerComponent {
......
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
<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> </div>
<div class="line"> <div class="line">
<div data-test-id="preview-list-item-vorgang-aktenzeichen"> <div class="aktenzeichen" data-test-id="preview-list-item-vorgang-aktenzeichen">
<mat-icon svgIcon="az"></mat-icon> <mat-icon svgIcon="az"></mat-icon>
<span goofy-client-aktenzeichen [vorgang]="vorgang"></span> <span goofy-client-aktenzeichen [vorgang]="vorgang"></span>
</div> </div>
<goofy-client-vorgang-nummer [vorgang]="vorgang"></goofy-client-vorgang-nummer>
</div> </div>
\ No newline at end of file
...@@ -2,3 +2,14 @@ a { ...@@ -2,3 +2,14 @@ a {
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
} }
.line {
> * {
width: 49%;
}
}
.aktenzeichen {
display: flex;
align-items: center;
}
\ No newline at end of file
...@@ -7,6 +7,7 @@ import { FormatToPrettyDatePipe } from '@goofy-client/tech-shared'; ...@@ -7,6 +7,7 @@ import { FormatToPrettyDatePipe } from '@goofy-client/tech-shared';
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';
import { AktenzeichenComponent } from '../../../aktenzeichen/aktenzeichen.component'; import { AktenzeichenComponent } from '../../../aktenzeichen/aktenzeichen.component';
import { VorgangNummerComponent } from '../../../vorgang-nummer/vorgang-nummer.component';
import { VorgangSearchAutocompleteOptionsContentComponent } from './vorgang-search-autocomplete-options-content.component'; import { VorgangSearchAutocompleteOptionsContentComponent } from './vorgang-search-autocomplete-options-content.component';
registerLocaleData(localeDe); registerLocaleData(localeDe);
...@@ -21,7 +22,8 @@ describe('VorgangSearchAutocompleteOptionsComponent', () => { ...@@ -21,7 +22,8 @@ describe('VorgangSearchAutocompleteOptionsComponent', () => {
VorgangSearchAutocompleteOptionsContentComponent, VorgangSearchAutocompleteOptionsContentComponent,
FormatToPrettyDatePipe, FormatToPrettyDatePipe,
MatIcon, MatIcon,
MockComponent(AktenzeichenComponent) MockComponent(AktenzeichenComponent),
MockComponent(VorgangNummerComponent),
], ],
imports: [ imports: [
MatIconTestingModule MatIconTestingModule
......
...@@ -30,10 +30,7 @@ ...@@ -30,10 +30,7 @@
<div class="ellipsis">{{ vorgang.name }}</div> <div class="ellipsis">{{ vorgang.name }}</div>
</div> </div>
<div class="vorgang-nummer"> <goofy-client-vorgang-nummer class="vorgang-nummer" [vorgang]="vorgang"></goofy-client-vorgang-nummer>
<mat-icon svgIcon="nr"></mat-icon>
<span class="ellipsis" goofy-client-vorgang-nummer [vorgang]="vorgang"></span>
</div>
<goofy-client-vorgang-next-frist-button *ngIf="vorgang | hasLink: vorgangLinkRel.WIEDERVORLAGEN" [vorgang]="vorgang" <goofy-client-vorgang-next-frist-button *ngIf="vorgang | hasLink: vorgangLinkRel.WIEDERVORLAGEN" [vorgang]="vorgang"
class="wiedervorlagen"></goofy-client-vorgang-next-frist-button> class="wiedervorlagen"></goofy-client-vorgang-next-frist-button>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment