diff --git a/src/app/shared/components/overlay/task-overlay/task-overlay.component.html b/src/app/shared/components/overlay/task-overlay/task-overlay.component.html index e031e2b..4c0c08c 100644 --- a/src/app/shared/components/overlay/task-overlay/task-overlay.component.html +++ b/src/app/shared/components/overlay/task-overlay/task-overlay.component.html @@ -31,18 +31,18 @@ {{ getTaskData(overlayData)[0].description }}
-

Due date:

+

{{ "addTask.date" | translate }}:

{{ timeConverter(getTaskData(overlayData)[0].date) }}
-

Priority:

+

{{ "addTask.priority" | translate }}:

{{ capitalizeFirstLetter(getTaskData(overlayData)[0].priority) }}
-

Creator:

+

{{ "addTask.creator" | translate }}:

@if (getTaskData(overlayData)[0].assigned.length > 0) {
-

Assigned to:

+

{{ "addTask.assigned" | translate }}:

@for (user of getTaskData(overlayData)[0].assigned; track user) {
} @if (getTaskData(overlayData)[0].subtasksTitle.length > 0) {
-

Subtasks:

+

{{ "addTask.subtask" | translate }}:

@for (subtask of getTaskData(overlayData)[0].subtasksTitle; track subtask; let i = $index) {
}
+ @if(getTaskData(overlayData)[0].creator === + firebaseService.getCurrentUserId()) {
-

Delete

+

{{ "addTask.delete" | translate }}

|
-

Edit

+

{{ "addTask.edit" | translate }}

+ } @else { +
+ {{ "addTask.notice" | translate }} +
+ } diff --git a/src/app/shared/components/overlay/task-overlay/task-overlay.component.scss b/src/app/shared/components/overlay/task-overlay/task-overlay.component.scss index ac47a45..f251af2 100644 --- a/src/app/shared/components/overlay/task-overlay/task-overlay.component.scss +++ b/src/app/shared/components/overlay/task-overlay/task-overlay.component.scss @@ -212,6 +212,13 @@ } } +.notice { + font-size: 16px; + font-weight: 400; + margin-top: 12px; + text-align: center; +} + // BTNS .btns { @@ -269,3 +276,9 @@ } } } + +@media screen and (max-width: 450px) { + .notice { + font-size: 14px; + } +} diff --git a/src/app/shared/components/overlay/task-overlay/task-overlay.component.ts b/src/app/shared/components/overlay/task-overlay/task-overlay.component.ts index 96211d1..f0cceec 100644 --- a/src/app/shared/components/overlay/task-overlay/task-overlay.component.ts +++ b/src/app/shared/components/overlay/task-overlay/task-overlay.component.ts @@ -5,11 +5,12 @@ import { CommonModule } from '@angular/common'; import { OverlayService } from '../../../../services/overlay.service'; import { ActivatedRoute, Router } from '@angular/router'; import { BtnBackComponent } from '../../buttons/btn-back/btn-back.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-task-overlay', standalone: true, - imports: [BtnCloseComponent, CommonModule, BtnBackComponent], + imports: [BtnCloseComponent, CommonModule, BtnBackComponent, TranslateModule], templateUrl: './task-overlay.component.html', styleUrl: './task-overlay.component.scss', }) diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 19216b2..aa230e1 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -110,8 +110,9 @@ "descriptionFormField": "Geben Sie eine Beschreibung ein...", "assigned": "Zugewiesen an", "assignedFormField": "Suche...", - "date": "Fälligkeitsdatum", + "date": "Stichtag", "priority": "Priorität", + "creator": "Ersteller", "urgent": "Dringend", "medium": "Mittel", "low": "Niedrig", @@ -119,6 +120,7 @@ "categorySelection": "Aufgabenkategorie wählen", "subtask": "Unteraufgaben", "subtaskFormField": "Unteraufgabe hinzufügen", + "edit": "Barbeiten", "clear": "Leeren", "delete": "Löschen", "update": "Aktualisieren", @@ -127,7 +129,8 @@ "descriptionError": "Sie müssen eine Beschreibung eingeben! (mind. 10 Buchstaben)", "dateError0": "Sie müssen ein Datum eingeben!", "dateError1": "Das Datum muss in der Zukunft liegen!", - "categoryError": "Sie müssen eine Kategorie auswählen!" + "categoryError": "Sie müssen eine Kategorie auswählen!", + "notice": "Hinweis: Nur der ersteller kann den Task bearbeiten oder löschen." }, "contacts": { "headline": "Kontakte", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 9c045d4..266feec 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -112,6 +112,7 @@ "assignedFormField": "Search...", "date": "Due date", "priority": "Priority", + "creator": "Creator", "urgent": "Urgent", "medium": "Medium", "low": "Low", @@ -119,6 +120,7 @@ "categorySelection": "Select task category", "subtask": "Subtasks", "subtaskFormField": "Add new subtask", + "edit": "Edit", "clear": "Clear", "delete": "Delete", "update": "Update Task", @@ -127,7 +129,8 @@ "descriptionError": "You must enter a description! (min. 10 letters)", "dateError0": "You must enter a date!", "dateError1": "The date must be in the future!", - "categoryError": "You must select a category!" + "categoryError": "You must select a category!", + "notice": "Notice: Only the creator can edit or delete the task." }, "contacts": { "headline": "Contacts",