From ea9aaa9a63f5a22c63d6748ed18bfc1502ada6e0 Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Wed, 26 Jul 2023 15:04:55 +0200 Subject: [PATCH] no message --- be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php | 3 ++- be/app/Mail/TimeBlockFinished.php | 2 +- .../sub_task_finished_with_higher_tracked_time.blade.php | 6 +++--- .../views/emails/task/time_block_finished.blade.php | 5 ++++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php b/be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php index 02f1a06..3b5f08c 100644 --- a/be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php +++ b/be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php @@ -34,7 +34,8 @@ class SubTaskFinishedWithHigherTrackedTime extends Mailable public function envelope() { return new Envelope( - subject: 'Sub Task Finished With Higher Tracked Time Than Estimated' +// subject: 'Sub Task Finished With Higher Tracked Time Than Estimated' + subject: 'Čas pre Task ' . $this->subtask->mastertask->project->code . ' - ' . ($this->subtask->title) ?: $this->subtask->mastertask->title . ' bol prekročený' ); } diff --git a/be/app/Mail/TimeBlockFinished.php b/be/app/Mail/TimeBlockFinished.php index 7aff3b0..f393080 100644 --- a/be/app/Mail/TimeBlockFinished.php +++ b/be/app/Mail/TimeBlockFinished.php @@ -34,7 +34,7 @@ class TimeBlockFinished extends Mailable public function envelope() { return new Envelope( - subject: 'Time block for subtask was finished' + subject: 'Naplánovaný čas pre Task ' . $this->subtask->mastertask->project->code . ' - ' . ($this->subtask->title) ?: $this->subtask->mastertask->title . ' bol ukončený' ); } diff --git a/be/resources/views/emails/task/sub_task_finished_with_higher_tracked_time.blade.php b/be/resources/views/emails/task/sub_task_finished_with_higher_tracked_time.blade.php index 9ea7625..7e9c388 100644 --- a/be/resources/views/emails/task/sub_task_finished_with_higher_tracked_time.blade.php +++ b/be/resources/views/emails/task/sub_task_finished_with_higher_tracked_time.blade.php @@ -1,3 +1,3 @@ -Sub Task {{$subtask->mastertask->title}} finished with higher tracker time than estimated.

-Estimated: {{$subtask->estimated_time}}
-Tracked: {{$subtask->tracked_time}}
+Názov Tasku: {{($subtask->title) ?: $subtask->mastertask->title}}
+Odhadovaný čas: {{$subtask->estimated_time}}
+Odpracovaný čas: {{$subtask->tracked_time}}
diff --git a/be/resources/views/emails/task/time_block_finished.blade.php b/be/resources/views/emails/task/time_block_finished.blade.php index f4790c0..e5c911a 100644 --- a/be/resources/views/emails/task/time_block_finished.blade.php +++ b/be/resources/views/emails/task/time_block_finished.blade.php @@ -1 +1,4 @@ -Timeblock for Sub Task {{$subtask->mastertask->title}} was finished. +Job number: {{$subtask->mastertask->project->code}}
+Názov Tasku: {{($subtask->title) ?: $subtask->mastertask->title}}
+Deadline do: {{($subtask->deadline) ?: $subtask->mastertask->deadline}}
+Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/tasks?subtask=' . $subtask->id) }}