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

Merge branch 'master' of git.ozg-sh.de:mgm/goofy

parents 40844cf0 91f5a695
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 44 additions and 8 deletions
goofy-client/apps/goofy-e2e/src/integration/vorgang-list-wiedervorlage/vorgang-list-wiedervorlagen.e2e-spec.ts
+ 3
− 1
View file @ 3597169f
......@@ -49,6 +49,8 @@ describe('VorgangList Wiedervorlagen Next Frist', () => {
mouseEnter(vorgang.getWiedervorlageNextFrist());
exist(vorgang.getWiedervorlageNextFrist());
vorgang.getWiedervorlageNextFrist().trigger('mouseleave'); // fix for next test
})
it('should show next frist in the past and list', () => {
......
goofy-client/apps/goofy/src/silent-refresh.html
+ 6
− 1
View file @ 3597169f
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8"/>
<title>silent refresh</title>
</head>
<body>
<script>
(window.opener || window.parent).postMessage(location.hash || ('#' + location.search), location.origin);
......
goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-body/antragsteller/antragsteller.component.html
+ 5
− 1
View file @ 3597169f
<table>
<table aria-label="Antragstellerdaten">
<tr>
<th scope="col">Formularfeld</th>
<th scope="col">Formulareingabe</th>
</tr>
<tr>
<td class="key">Anrede</td>
<td class="value">{{ antragsteller.anrede }}</td>
......
goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-body/eingang-header/eingang-header.component.html
+ 5
− 1
View file @ 3597169f
<table>
<table aria-label="Eingangsdaten">
<tr>
<th scope="col">Formularfeld</th>
<th scope="col">Formulareingabe</th>
</tr>
<tr>
<td class="key">Erstellungsdatum</td>
<td class="value">{{ eingangHeader.createdAt }}</td>
......
goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-body/form-data-table/form-data-table.component.html
+ 5
− 1
View file @ 3597169f
<table>
<table aria-label="Formulardaten">
<tr>
<th scope="col">Formularfeld</th>
<th scope="col">Formulareingabe</th>
</tr>
<tr *ngFor="let row of formData | keyvalue: objectToBottom">
<td colspan="2" *ngIf="isObject(row.value); else keyValueEntry">
......
goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-body/form-data-table/form-data-table.component.scss
+ 4
− 0
View file @ 3597169f
......@@ -18,3 +18,7 @@ td {
.value {
word-break: break-word;
}
th {
display: none;
}
goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-next-frist-button/vorgang-next-frist-button.component.scss
+ 1
− 1
View file @ 3597169f
......@@ -13,5 +13,5 @@ button {
}
.red:not(.erledigt) {
color: mat-color($warnPalette);
color: mat-color($warnPalette, darker);
}
goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.component.html
+ 6
− 1
View file @ 3597169f
<div *ngIf="wiedervorlagenStateResource$ | async as wiedervorlagenStateResource" class="foreground">
<table>
<table aria-label="Wiedervorlagenliste">
<tr>
<th scope="col">Wiedervorlage</th>
<th scope="col"><span>Status</span></th>
<th scope="col">Frist</th>
</tr>
<tr *ngFor="let wiedervorlageResource of wiedervorlagenStateResource.resource">
<td class="name" data-test-class="betreff">{{ wiedervorlageResource.betreff }}</td>
<td>
......
goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.component.scss
+ 9
− 1
View file @ 3597169f
......@@ -36,11 +36,19 @@
width: 72px;
}
td {
td,
th {
margin: 0;
padding: 4px;
}
th {
text-align: left;
span {
display: none;
}
}
table {
border-collapse: collapse;
border-spacing: 0;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit