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

Merge branch 'master' into OZG-6129-zufi-searchbar

parents 74eb72d1 4281bb2c
Branches
Tags
No related merge requests found
Showing
with 112 additions and 44 deletions
...@@ -111,6 +111,7 @@ describe('PostfachMail', () => { ...@@ -111,6 +111,7 @@ describe('PostfachMail', () => {
}; };
const vorgangWithoutPostfach: VorgangE2E = createVorgangWithoutPostfachId(); const vorgangWithoutPostfach: VorgangE2E = createVorgangWithoutPostfachId();
function createVorgangWithoutPostfachId(): VorgangE2E { function createVorgangWithoutPostfachId(): VorgangE2E {
return { return {
...buildVorgang(objectIds[2], 'VorgangWithoutPostfachId'), ...buildVorgang(objectIds[2], 'VorgangWithoutPostfachId'),
...@@ -523,8 +524,8 @@ describe('PostfachMail', () => { ...@@ -523,8 +524,8 @@ describe('PostfachMail', () => {
exist(postfachMailPage.getSubnavigation().getBackButton()); exist(postfachMailPage.getSubnavigation().getBackButton());
}); });
it('should show breadcrumb', () => { it('should show Nachrichten heading', () => {
contains(postfachMailPage.getBreadcrump(), vorgangWithReply.aktenzeichen); contains(postfachMailPage.getHeading(), postfachMailPage.getHeadingText());
}); });
}); });
......
...@@ -92,7 +92,7 @@ describe('PostfachNachrichten filtered by organisationseinheit', () => { ...@@ -92,7 +92,7 @@ describe('PostfachNachrichten filtered by organisationseinheit', () => {
visitUrl(authorizedUrl); visitUrl(authorizedUrl);
waitForSpinnerToDisappear(); waitForSpinnerToDisappear();
exist(postfachMailPage.getBreadcrump()); exist(postfachMailPage.getHeading());
}); });
it('should not open postfachNachrichten page', () => { it('should not open postfachNachrichten page', () => {
...@@ -100,7 +100,7 @@ describe('PostfachNachrichten filtered by organisationseinheit', () => { ...@@ -100,7 +100,7 @@ describe('PostfachNachrichten filtered by organisationseinheit', () => {
visitUrl(forbiddenUrl); visitUrl(forbiddenUrl);
waitForSpinnerToDisappear(); waitForSpinnerToDisappear();
notExist(postfachMailPage.getBreadcrump()); notExist(postfachMailPage.getHeading());
}); });
it('should show snackbar', () => { it('should show snackbar', () => {
...@@ -125,7 +125,7 @@ describe('PostfachNachrichten filtered by organisationseinheit', () => { ...@@ -125,7 +125,7 @@ describe('PostfachNachrichten filtered by organisationseinheit', () => {
visitUrl(authorizedUrl); visitUrl(authorizedUrl);
waitForSpinnerToDisappear(); waitForSpinnerToDisappear();
exist(postfachMailPage.getBreadcrump()); exist(postfachMailPage.getHeading());
}); });
it('should not open postfachNachrichten page', () => { it('should not open postfachNachrichten page', () => {
...@@ -133,7 +133,7 @@ describe('PostfachNachrichten filtered by organisationseinheit', () => { ...@@ -133,7 +133,7 @@ describe('PostfachNachrichten filtered by organisationseinheit', () => {
visitUrl(forbiddenUrl); visitUrl(forbiddenUrl);
waitForSpinnerToDisappear(); waitForSpinnerToDisappear();
notExist(postfachMailPage.getBreadcrump()); notExist(postfachMailPage.getHeading());
}); });
it('should show snackbar', () => { it('should show snackbar', () => {
......
...@@ -141,7 +141,7 @@ describe('VorgangList Wiedervorlagen Next Frist', () => { ...@@ -141,7 +141,7 @@ describe('VorgangList Wiedervorlagen Next Frist', () => {
vorgangWithWiedervorlageInFuture.name, vorgangWithWiedervorlageInFuture.name,
); );
notContainClass(vorgang.getWiedervorlageNextFrist(), 'red'); notContainClass(vorgang.getWiedervorlageNextFrist(), 'text-error');
exist(vorgang.getWiedervorlageNextFrist()); exist(vorgang.getWiedervorlageNextFrist());
}); });
...@@ -150,7 +150,7 @@ describe('VorgangList Wiedervorlagen Next Frist', () => { ...@@ -150,7 +150,7 @@ describe('VorgangList Wiedervorlagen Next Frist', () => {
vorgangWithWiedervorlageInThePast.name, vorgangWithWiedervorlageInThePast.name,
); );
containClass(vorgang.getWiedervorlageNextFrist(), 'red'); containClass(vorgang.getWiedervorlageNextFrist(), 'text-error');
exist(vorgang.getWiedervorlageNextFrist()); exist(vorgang.getWiedervorlageNextFrist());
}); });
}); });
......
...@@ -33,7 +33,7 @@ import { WiedervorlageInVorgangE2EComponent } from '../../../components/wiedervo ...@@ -33,7 +33,7 @@ import { WiedervorlageInVorgangE2EComponent } from '../../../components/wiedervo
import { WiedervorlageE2EComponent } from '../../../components/wiedervorlage/wiedervorlage-page.e2e.component'; import { WiedervorlageE2EComponent } from '../../../components/wiedervorlage/wiedervorlage-page.e2e.component';
import { WiedervorlageSubnavigationE2EComponent } from '../../../components/wiedervorlage/wiedervorlage-subnavigation'; import { WiedervorlageSubnavigationE2EComponent } from '../../../components/wiedervorlage/wiedervorlage-subnavigation';
import { WiedervorlagenInVorgangE2EComponent } from '../../../components/wiedervorlage/wiedervorlagen-in-vorgang.e2e.component'; import { WiedervorlagenInVorgangE2EComponent } from '../../../components/wiedervorlage/wiedervorlagen-in-vorgang.e2e.component';
import { VorgangE2E } from '../../../model/vorgang'; import { ClientAttributeNameE2E, VorgangE2E } from '../../../model/vorgang';
import { WiedervorlageE2E } from '../../../model/wiedervorlage'; import { WiedervorlageE2E } from '../../../model/wiedervorlage';
import { import {
MainPage, MainPage,
...@@ -51,12 +51,20 @@ import { ...@@ -51,12 +51,20 @@ import {
notExist, notExist,
} from '../../../support/cypress.util'; } from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util'; import { loginAsSabine } from '../../../support/user-util';
import { createVorgang, initVorgang, objectIds } from '../../../support/vorgang-util'; import {
createAlfaClientAttributes,
createNextWiedervorlageFristClientAttribute,
createVorgang,
initVorgang,
objectIds,
} from '../../../support/vorgang-util';
import { import {
createWiedervorlageAttachedItem, createWiedervorlageAttachedItem,
createWiedervorlageItem, createWiedervorlageItem,
} from '../../../support/wiedervorlage-util'; } from '../../../support/wiedervorlage-util';
const wiedervorlageItemFixture: WiedervorlageE2E = require('../../../fixtures/wiedervorlage/wiedervorlage.json');
describe('Wiedervorlage erledigen/wiedereroeffnen', () => { describe('Wiedervorlage erledigen/wiedereroeffnen', () => {
const mainPage: MainPage = new MainPage(); const mainPage: MainPage = new MainPage();
...@@ -76,7 +84,13 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => { ...@@ -76,7 +84,13 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => {
const wiedervorlageContainer: WiedervorlageE2EComponent = const wiedervorlageContainer: WiedervorlageE2EComponent =
wiedervorlagePage.getWiedervorlageContainer(); wiedervorlagePage.getWiedervorlageContainer();
const vorgang: VorgangE2E = createVorgang(); const vorgang: VorgangE2E = {
...createVorgang(),
clientAttributes: createAlfaClientAttributes(
ClientAttributeNameE2E.NEXT_WIEDERVORLAGE_FRIST,
createNextWiedervorlageFristClientAttribute(wiedervorlageItemFixture.frist),
),
};
const wiedervorlageZumErledigen: WiedervorlageE2E = { const wiedervorlageZumErledigen: WiedervorlageE2E = {
...createWiedervorlageItem('WiedervorlageZumErledigen'), ...createWiedervorlageItem('WiedervorlageZumErledigen'),
...@@ -144,8 +158,6 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => { ...@@ -144,8 +158,6 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => {
waitforSpinnerToAppear(); waitforSpinnerToAppear();
waitForSpinnerToDisappear(); waitForSpinnerToDisappear();
wait(1000, 'Wait for async BE to complete');
containClass(wiedervorlageContainer.getStatusDot(), 'erledigt'); containClass(wiedervorlageContainer.getStatusDot(), 'erledigt');
contains( contains(
snackBar.getMessage(), snackBar.getMessage(),
...@@ -187,8 +199,6 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => { ...@@ -187,8 +199,6 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => {
waitforSpinnerToAppear(); waitforSpinnerToAppear();
waitForSpinnerToDisappear(); waitForSpinnerToDisappear();
wait(1000, 'Wait for async BE to complete');
notContainClass(wiedervorlageContainer.getStatusDot(), 'erledigt'); notContainClass(wiedervorlageContainer.getStatusDot(), 'erledigt');
contains( contains(
snackBar.getMessage(), snackBar.getMessage(),
...@@ -219,7 +229,6 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => { ...@@ -219,7 +229,6 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => {
const locatorIconDefault: string = 'wiedervorlage-icon-default'; const locatorIconDefault: string = 'wiedervorlage-icon-default';
it('back to vorgang list', () => { it('back to vorgang list', () => {
wait(3000, 'Wait for async BE to complete');
vorgangPage.getSubnavigation().getBackButton().click(); vorgangPage.getSubnavigation().getBackButton().click();
waitForSpinnerToDisappear(); waitForSpinnerToDisappear();
}); });
...@@ -240,8 +249,6 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => { ...@@ -240,8 +249,6 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => {
subnavigation.erledigen(); subnavigation.erledigen();
waitForSpinnerToDisappear(); waitForSpinnerToDisappear();
wait(3000, 'Wait for async BE to complete');
subnavigation.navigateBack(); subnavigation.navigateBack();
waitForSpinnerToDisappear(); waitForSpinnerToDisappear();
}); });
......
...@@ -26,10 +26,11 @@ import { PostfachMailSubnavigation } from '../components/postfach/postfach-mail- ...@@ -26,10 +26,11 @@ import { PostfachMailSubnavigation } from '../components/postfach/postfach-mail-
import { PostfachMailListItem } from '../components/postfach/postfach-mail.e2e.component'; import { PostfachMailListItem } from '../components/postfach/postfach-mail.e2e.component';
export class PostfachMailPage { export class PostfachMailPage {
private readonly breadcrump: string = 'postfach-breadcrump';
private readonly root: string = 'postfach-mail-list'; private readonly root: string = 'postfach-mail-list';
private readonly downloadButton: string = 'postfach-pdf-export-button'; private readonly downloadButton: string = 'postfach-pdf-export-button';
private readonly mailText: string = 'postfach-outgoing-nachricht'; private readonly mailText: string = 'postfach-outgoing-nachricht';
private readonly heading: string = 'postfach-mail-heading';
private readonly headingText: string = 'Nachrichten zum Vorgang';
private readonly subnavigation: PostfachMailSubnavigation = new PostfachMailSubnavigation(); private readonly subnavigation: PostfachMailSubnavigation = new PostfachMailSubnavigation();
...@@ -41,8 +42,12 @@ export class PostfachMailPage { ...@@ -41,8 +42,12 @@ export class PostfachMailPage {
return this.subnavigation; return this.subnavigation;
} }
getBreadcrump() { getHeading() {
return cy.getTestElement(this.breadcrump); return cy.getTestElement(this.heading);
}
getHeadingText() {
return this.headingText;
} }
getListItem(subject: string): PostfachMailListItem { getListItem(subject: string): PostfachMailListItem {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<alfa-header-container [apiRootStateResource]="apiRoot"></alfa-header-container> <alfa-header-container [apiRootStateResource]="apiRoot"></alfa-header-container>
<div class="relative ml-4 mt-16 flex flex-grow items-start justify-between"> <div class="relative ml-4 mt-16 flex flex-grow items-start justify-between">
<main class="mat-app-background"><router-outlet></router-outlet></main> <div class="mat-app-background relative grow"><router-outlet></router-outlet></div>
<section class="mat-app-background right-nav"> <section class="mat-app-background right-nav">
<alfa-build-info <alfa-build-info
......
...@@ -41,13 +41,6 @@ ...@@ -41,13 +41,6 @@
border-left: 1rem solid $background; border-left: 1rem solid $background;
} }
main {
position: relative;
flex-grow: 1;
max-width: calc(100vw - 2.25rem);
background-color: #fff;
}
.right-nav { .right-nav {
flex-shrink: 0; flex-shrink: 0;
position: sticky; position: sticky;
......
...@@ -75,6 +75,6 @@ $alfaDarkTheme: mat.define-dark-theme( ...@@ -75,6 +75,6 @@ $alfaDarkTheme: mat.define-dark-theme(
) )
); );
$default-font-size: 16px; $default-font-size: 1rem;
$iconHeight: 24px; $iconHeight: 24px;
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
// TODO Wofür ist der box-shadow? // TODO Wofür ist der box-shadow?
// box-shadow: inset 0 -1px 0 0 rgba(0, 0, 0, 0.08), inset 1px 0 0 rgba(0, 0, 0, 0.08), inset -1px 0 0 rgba(0, 0, 0, 0.08); // box-shadow: inset 0 -1px 0 0 rgba(0, 0, 0, 0.08), inset 1px 0 0 rgba(0, 0, 0, 0.08), inset -1px 0 0 rgba(0, 0, 0, 0.08);
position: relative; position: relative;
display: block; display: flex;
min-height: calc(100vh - $header-height - $navigation-height); min-height: calc(100vh - $header-height - $navigation-height);
background-color: #fff; background-color: #fff;
} }
......
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
@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';
@import 'libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.theme'; @import 'libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.theme';
@import 'libs/ui/src/lib/ui/button-toggle/button-toogle.theme'; @import 'libs/ui/src/lib/ui/button-toggle/button-toogle.theme';
@import 'libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-filter-menu-container/vorgang-filter-menu/_vorgang-filter-item.theme.scss'; @import 'libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-filter-menu-container/vorgang-filter-menu/_vorgang-filter-item.theme.scss';
...@@ -83,3 +82,27 @@ body.dark { ...@@ -83,3 +82,27 @@ body.dark {
@include mat.all-component-colors($alfaDarkTheme); @include mat.all-component-colors($alfaDarkTheme);
@include custom-components-theme($alfaDarkTheme); @include custom-components-theme($alfaDarkTheme);
} }
body {
--mdc-filled-text-field-label-text-size: 1rem;
--mdc-form-field-label-text-size: 12rem;
}
// Material Datepicker font-sizes
.mat-datepicker-content {
.mat-button, .mat-fab, .mat-icon-button, .mat-mini-fab, .mat-raised-button,th,td {
font-size: 1rem
}
}
.mdc-text-field__input {
font-size: 1rem !important;
}
.mat-calendar-table-header th {
font-size: 0.875rem !important;
}
.mdc-button__label {
font-size: 0.875rem !important;
}
\ No newline at end of file
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
.mat-mdc-option { .mat-mdc-option {
border-top: 1px solid rgba(0, 0, 0, 0.08); border-top: 1px solid rgba(0, 0, 0, 0.08);
font-size: 14px; font-size: 0.875rem;
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
margin-bottom: 0 !important; margin-bottom: 0 !important;
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
$color-config: mat.get-color-config($theme); $color-config: mat.get-color-config($theme);
$primary-palette: map.get($color-config, 'primary'); $primary-palette: map.get($color-config, 'primary');
h1 { h1.mat-mdc-dialog-title {
color: mat.get-color-from-palette($primary-palette) !important; color: mat.get-color-from-palette($primary-palette) !important;
font-size: 24px !important; font-size: 1.5rem !important;
font-weight: normal !important; font-weight: normal !important;
} }
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
margin-bottom: 0; margin-bottom: 0;
font-weight: 500; font-weight: 500;
margin-left: 16px; margin-left: 16px;
font-size: 16px; font-size: 1rem;
} }
.mat-expansion-panel-body { .mat-expansion-panel-body {
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
h3 { h3 {
color: inherit; color: inherit;
font-size: 14px !important; font-size: 0.875rem !important;
font-weight: 500 !important; font-weight: 500 !important;
margin-left: 0; margin-left: 0;
} }
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
background-color: inherit; background-color: inherit;
box-shadow: none; box-shadow: none;
border-radius: 0; border-radius: 0;
font-size: 14px; font-size: 0.875rem;
} }
:host-context(.dark) .mat-expansion-panel { :host-context(.dark) .mat-expansion-panel {
......
...@@ -19,5 +19,6 @@ alfa-help-menu { ...@@ -19,5 +19,6 @@ alfa-help-menu {
height: 40px; height: 40px;
width: auto; width: auto;
padding: 0.5rem; padding: 0.5rem;
font-size: 0.875rem;
} }
} }
...@@ -35,3 +35,6 @@ ...@@ -35,3 +35,6 @@
margin-right: 0 !important; margin-right: 0 !important;
} }
} }
.mat-mdc-tab .mdc-tab__text-label {
font-size: 0.875rem;
}
\ No newline at end of file
.mat-tooltip { .mat-tooltip {
font-size: 12px !important; font-size: 0.75rem !important;
padding-top: 2px !important; padding-top: 2px !important;
padding-bottom: 2px !important; padding-bottom: 2px !important;
margin-top: 2px !important; margin-top: 2px !important;
......
...@@ -25,5 +25,5 @@ ...@@ -25,5 +25,5 @@
position: relative; position: relative;
max-width: 100%; max-width: 100%;
padding: 4px 0; padding: 4px 0;
font-size: 14px; font-size: 0.875rem;
} }
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
} }
.size { .size {
font-size: 12px; font-size: 0.75rem;
flex-shrink: 0; flex-shrink: 0;
margin-right: 4px; margin-right: 4px;
......
...@@ -27,8 +27,12 @@ ...@@ -27,8 +27,12 @@
*ngIf="binaryFileListStateResource.resource" *ngIf="binaryFileListStateResource.resource"
[stateResource]="binaryFileListStateResource" [stateResource]="binaryFileListStateResource"
> >
<ods-attachment-wrapper [title]="title" data-test-id="file-list"> <ods-attachment-wrapper data-test-id="file-list">
<ods-attachment-header [title]="title"> <ods-attachment-header
[title]="title"
*ngIf="title || archiveDownloadUri"
data-test-id="file-list-header"
>
<alfa-download-archive-file-button-container <alfa-download-archive-file-button-container
*ngIf="archiveDownloadUri" *ngIf="archiveDownloadUri"
data-test-class="download-archive-file-button" data-test-class="download-archive-file-button"
......
...@@ -37,7 +37,7 @@ import { ...@@ -37,7 +37,7 @@ import {
createBinaryFileListResource, createBinaryFileListResource,
createBinaryFileResource, createBinaryFileResource,
} from 'libs/binary-file-shared/test/binary-file'; } from 'libs/binary-file-shared/test/binary-file';
import { getDataTestClassOf } from 'libs/tech-shared/test/data-test'; import { getDataTestClassOf, getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
import { BinaryFile2ContainerComponent } from '../binary-file2-container/binary-file2-container.component'; import { BinaryFile2ContainerComponent } from '../binary-file2-container/binary-file2-container.component';
import { DownloadArchiveFileButtonContainerComponent } from '../download-archive-file-button-container/download-archive-file-button-container.component'; import { DownloadArchiveFileButtonContainerComponent } from '../download-archive-file-button-container/download-archive-file-button-container.component';
...@@ -48,6 +48,7 @@ describe('VerticalBinaryFileListComponent', () => { ...@@ -48,6 +48,7 @@ describe('VerticalBinaryFileListComponent', () => {
let fixture: ComponentFixture<VerticalBinaryFileListComponent>; let fixture: ComponentFixture<VerticalBinaryFileListComponent>;
const downloadArchiveFileButton: string = getDataTestClassOf('download-archive-file-button'); const downloadArchiveFileButton: string = getDataTestClassOf('download-archive-file-button');
const fileListHeader: string = getDataTestIdOf('file-list-header');
const binaryFile: BinaryFileResource = createBinaryFileResource(); const binaryFile: BinaryFileResource = createBinaryFileResource();
...@@ -109,7 +110,37 @@ describe('VerticalBinaryFileListComponent', () => { ...@@ -109,7 +110,37 @@ describe('VerticalBinaryFileListComponent', () => {
}); });
}); });
describe('attachment header', () => {
it('should show header if there is title', () => {
component.title = 'Title';
fixture.detectChanges();
existsAsHtmlElement(fixture, fileListHeader);
});
it('should show header if there is uri', () => {
component.archiveDownloadUri = faker.internet.url();
fixture.detectChanges();
existsAsHtmlElement(fixture, fileListHeader);
});
it('should not show header if there is no uri or title', () => {
component.title = '';
fixture.detectChanges();
notExistsAsHtmlElement(fixture, fileListHeader);
});
});
describe('download archive button', () => { describe('download archive button', () => {
beforeEach(() => {
component.title = 'Test title';
});
const downloadUri: ResourceUri = faker.internet.url(); const downloadUri: ResourceUri = faker.internet.url();
it('should be visible if uri exists', () => { it('should be visible if uri exists', () => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment