diff --git a/matsen-tool/src/app/_components/linked-label/linked-label.component.html b/matsen-tool/src/app/_components/linked-label/linked-label.component.html index 37573db..059bbf1 100644 --- a/matsen-tool/src/app/_components/linked-label/linked-label.component.html +++ b/matsen-tool/src/app/_components/linked-label/linked-label.component.html @@ -1,13 +1,17 @@ - {{partner.name}} + {{ partner.name }} - {{product.name}} + {{ product.name }} - {{contact.firstName}} {{contact.lastName}} + {{ contact.firstName }} {{ contact.lastName }} - {{user.firstName}} {{user.lastName}} + {{ user.firstName }} {{ user.lastName }} diff --git a/matsen-tool/src/app/_views/documents/document-list/document-list.component.html b/matsen-tool/src/app/_views/documents/document-list/document-list.component.html index 9609998..5f2e5f6 100644 --- a/matsen-tool/src/app/_views/documents/document-list/document-list.component.html +++ b/matsen-tool/src/app/_views/documents/document-list/document-list.component.html @@ -58,7 +58,7 @@ sortActionDescription="{{ 'overview.sort' | translate }}: {{ 'overview.uploaded' | translate }}"> {{ 'overview.uploaded' | translate }} - {{ element.createdAt | date:'dd.MM.YYYY HH:mm' }} + {{ element.createdAt | date:'dd.MM.YYYY - HH:mm':'GMT+0000' }} Uhr diff --git a/matsen-tool/src/app/_views/posts/post-list/post-list.component.html b/matsen-tool/src/app/_views/posts/post-list/post-list.component.html index 18946dc..f323d49 100644 --- a/matsen-tool/src/app/_views/posts/post-list/post-list.component.html +++ b/matsen-tool/src/app/_views/posts/post-list/post-list.component.html @@ -4,14 +4,15 @@
- {{ post.createdAt | date:'dd.MM.YYYY':'GMT+0000' }} + {{ post.createdAt | date:'dd.MM.YYYY - HH:mm':'GMT+0000' }} + Uhr

@@ -21,7 +22,8 @@

-

{{ post.owner?.fullName }}

+

{{ post.owner?.fullName }}

{{ post.headline }}

@@ -30,12 +32,14 @@ data-type="user-tool" data-action="edit" (click)="openModalEditPost(post)">
- {{ 'basic.hide-comments' | translate }} + *ngIf="post.id && commentsVisibility.get(post.id)">{{ 'basic.hide-comments' | translate }} {{ 'basic.show-comments' | translate }} ({{post.numComments}}) + *ngIf="post.id && !commentsVisibility.get(post.id)">{{ 'basic.show-comments' | translate }} + ({{ post.numComments }}) {{ 'basic.comment-it' | translate }} @@ -47,14 +51,16 @@
-

{{ comment.createdAt | date:'dd.MM.YYYY' }}

{{ comment.owner?.fullName }}

+

{{ comment.createdAt | date:'dd.MM.YYYY - HH:mm':'GMT+0000' }} Uhr

- +
diff --git a/matsen-tool/src/app/_views/sales/sale-list/sale-list.component.html b/matsen-tool/src/app/_views/sales/sale-list/sale-list.component.html index 182bbd9..9c3ce72 100644 --- a/matsen-tool/src/app/_views/sales/sale-list/sale-list.component.html +++ b/matsen-tool/src/app/_views/sales/sale-list/sale-list.component.html @@ -75,7 +75,7 @@ {{ 'overview.createdAt' | translate }} - {{ element.createdAt | date:'dd.MM.YYYY HH:mm' }} + {{ element.createdAt | date:'dd.MM.YYYY - HH:mm':'GMT+0000' }} Uhr diff --git a/matsen-tool/src/app/_views/tasks/task-list/task-list.component.html b/matsen-tool/src/app/_views/tasks/task-list/task-list.component.html index caec5d4..74cd7eb 100644 --- a/matsen-tool/src/app/_views/tasks/task-list/task-list.component.html +++ b/matsen-tool/src/app/_views/tasks/task-list/task-list.component.html @@ -1,20 +1,25 @@
- +
-
Kompaktansicht
+
Kompaktansicht +
- {{ task.dueAt | date:'dd.MM.YYYY':'GMT+0000' }} + {{ task.dueAt | date:'dd.MM.YYYY - HH:mm':'GMT+0000' }} + Uhr

@@ -32,16 +37,19 @@

{{ task.headline }}

-

+

- {{ 'basic.hide-comments' | translate }} {{ 'basic.show-comments' | translate }} ({{task.numTaskNotes}}) + *ngIf="task.id && !taskNotesVisibility.get(task.id)">{{ 'basic.show-comments' | translate }} + ({{ task.numTaskNotes }}) {{ 'basic.comment-it' | translate }} @@ -52,7 +60,7 @@
- {{ task.dueAt | date:'dd.MM.YYYY':'GMT+0000' }} + {{ task.dueAt | date:'dd.MM.YYYY - HH:mm':'GMT+0000' }} Uhr

@@ -70,12 +78,14 @@
- {{ 'basic.hide-comments' | translate }} + *ngIf="task.id && taskNotesVisibility.get(task.id)">{{ 'basic.hide-comments' | translate }} {{ 'basic.show-comments' | translate }} ({{task.numTaskNotes}}) + *ngIf="task.id && !taskNotesVisibility.get(task.id)">{{ 'basic.show-comments' | translate }} + ({{ task.numTaskNotes }}) {{ 'basic.comment-it' | translate }} @@ -87,14 +97,15 @@
-

{{ taskNote.createdAt | date:'dd.MM.YYYY' }}

{{ taskNote.owner?.firstName }} {{ taskNote.owner?.lastName }}

+

{{ taskNote.createdAt | date:'dd.MM.YYYY - HH:mm':'GMT+0000' }} Uhr

+ data-type="user-tool" data-action="edit" + (click)="openModalEditTaskNote(taskNote)">