sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-28 22:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 731: #1942 TK Bearbeitungszeitraum angepasst

Browse Source 
#1942 TK Bearbeitungszeitraum angepasst

Related work items: #1942
This commit is contained in:
Andreas Schickinger
2021-07-01 11:17:58 +00:00
committed by Lorenz Hilpert
parent efadbeedf9
commit 85a90aba48
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/page/task-calendar/src/lib/components/task-info/task-info.component.html
View File

@@ -21,7 +21,7 @@
</div>
<div class="content">
<div [innerHTML]="info.text"></div>
<div class="task-date" *ngIf="showTaskDate">{{ taskDate }}</div>
<div class="task-date" *ngIf="showTaskDate">Zu erledigen {{ taskDate }}</div>
</div>
</div>

4
apps/page/task-calendar/src/lib/components/task-info/task-info.component.ts
View File

@@ -56,6 +56,10 @@ export class TaskInfoComponent implements OnChanges {
if (this.info?.taskDate && this.info?.taskOverdueDate) {
const dateFrom = new Date(this.info?.taskDate);
const dateTo = new Date(this.info?.taskOverdueDate);
if (dateFrom.getHours() === dateTo.getHours() && dateFrom.getMinutes() === dateTo.getMinutes()) {
return `${this.datePipe.transform(dateFrom, 'dd.MM.yy')} bis ${this.datePipe.transform(dateTo, 'dd.MM.yy')}`;
}
return `${this.datePipe.transform(dateFrom, 'dd.MM.yy HH:mm')} Uhr bis ${this.datePipe.transform(dateTo, 'dd.MM.yy HH:mm')} Uhr`;
}
}