From 15a8e9f98bf7f0f2d0683b0437af2d3605a715e7 Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Tue, 16 Dec 2025 17:25:19 +0100 Subject: [PATCH] no message --- be/app/Mail/MasterTaskEdited.php | 4 +++- be/app/Mail/MasterTaskReopened.php | 4 +++- be/app/Mail/MasterTaskTrackedTimeReachingPricQouteTime.php | 4 +++- be/app/Mail/NewTask.php | 6 +++++- be/app/Mail/SubTaskDeleted.php | 5 ++++- be/app/Mail/SubTaskEdited.php | 5 ++++- be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php | 6 ++++-- be/app/Mail/TimeBlockFinished.php | 5 ++++- 8 files changed, 30 insertions(+), 9 deletions(-) diff --git a/be/app/Mail/MasterTaskEdited.php b/be/app/Mail/MasterTaskEdited.php index e249342..1e810e8 100644 --- a/be/app/Mail/MasterTaskEdited.php +++ b/be/app/Mail/MasterTaskEdited.php @@ -39,8 +39,10 @@ class MasterTaskEdited extends Mailable */ public function envelope() { + $projectCode = $this->mastertask->project?->code ?? 'N/A'; + return new Envelope( - subject: 'Bol editovaný Task ' . $this->mastertask->project->code . ' - ' . $this->mastertask->title, + subject: 'Bol editovaný Task ' . $projectCode . ' - ' . $this->mastertask->title, ); } diff --git a/be/app/Mail/MasterTaskReopened.php b/be/app/Mail/MasterTaskReopened.php index df27b09..522e037 100644 --- a/be/app/Mail/MasterTaskReopened.php +++ b/be/app/Mail/MasterTaskReopened.php @@ -37,8 +37,10 @@ class MasterTaskReopened extends Mailable */ public function envelope() { + $projectCode = $this->mastertask->project?->code ?? 'N/A'; + return new Envelope( - subject: 'Bol znovuotvorený Master Task ' . $this->mastertask->project->code . ' - ' . $this->mastertask->title, + subject: 'Bol znovuotvorený Master Task ' . $projectCode . ' - ' . $this->mastertask->title, ); } diff --git a/be/app/Mail/MasterTaskTrackedTimeReachingPricQouteTime.php b/be/app/Mail/MasterTaskTrackedTimeReachingPricQouteTime.php index eaa590d..89d51fe 100644 --- a/be/app/Mail/MasterTaskTrackedTimeReachingPricQouteTime.php +++ b/be/app/Mail/MasterTaskTrackedTimeReachingPricQouteTime.php @@ -36,8 +36,10 @@ class MasterTaskTrackedTimeReachingPricQouteTime extends Mailable */ public function envelope() { + $projectCode = $this->mastertask->project?->code ?? 'N/A'; + return new Envelope( - subject: 'Master Task ' . $this->mastertask->project->code . ' - ' . $this->mastertask->title . ' ma natrackovaných viac ako 80% odhadovaných hodín', + subject: 'Master Task ' . $projectCode . ' - ' . $this->mastertask->title . ' ma natrackovaných viac ako 80% odhadovaných hodín', ); } diff --git a/be/app/Mail/NewTask.php b/be/app/Mail/NewTask.php index 4a5c00a..49956ff 100644 --- a/be/app/Mail/NewTask.php +++ b/be/app/Mail/NewTask.php @@ -42,11 +42,15 @@ class NewTask extends Mailable */ public function envelope() { + $project = $this->subtask->mastertask?->project; + $projectCode = $project?->code ?? 'N/A'; + $projectName = $project?->name ?? ''; + return new Envelope( replyTo: [ new Address($this->creator->email, ($this->creator) ? $this->creator->firstname . ' ' . $this->creator->lastname : ''), ], - subject: $this->subtask->mastertask->project->code . ' ' . $this->subtask->mastertask->project->name . ' - vytvorený Sub Task', + subject: $projectCode . ' ' . $projectName . ' - vytvorený Sub Task', ); } diff --git a/be/app/Mail/SubTaskDeleted.php b/be/app/Mail/SubTaskDeleted.php index c485e44..c476ddc 100644 --- a/be/app/Mail/SubTaskDeleted.php +++ b/be/app/Mail/SubTaskDeleted.php @@ -37,8 +37,11 @@ class SubTaskDeleted extends Mailable */ public function envelope() { + $projectCode = $this->subtask->mastertask?->project?->code ?? 'N/A'; + $title = $this->subtask->title ?: $this->subtask->mastertask?->title ?? ''; + return new Envelope( - subject: 'Bol vymazaný Sub Task ' . $this->subtask->mastertask->project->code . ' - ' . ($this->subtask->title) ?: $this->subtask->mastertask->title, + subject: 'Bol vymazaný Sub Task ' . $projectCode . ' - ' . $title, ); } diff --git a/be/app/Mail/SubTaskEdited.php b/be/app/Mail/SubTaskEdited.php index fd2a36a..fceb568 100644 --- a/be/app/Mail/SubTaskEdited.php +++ b/be/app/Mail/SubTaskEdited.php @@ -39,8 +39,11 @@ class SubTaskEdited extends Mailable */ public function envelope() { + $projectCode = $this->subtask->mastertask?->project?->code ?? 'N/A'; + $title = $this->subtask->title ?: $this->subtask->mastertask?->title ?? ''; + return new Envelope( - subject: 'Bol editovaný Sub Task ' . $this->subtask->mastertask->project->code . ' - ' . ($this->subtask->title) ?: $this->subtask->mastertask->title, + subject: 'Bol editovaný Sub Task ' . $projectCode . ' - ' . $title, ); } diff --git a/be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php b/be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php index 3b5f08c..7e84b44 100644 --- a/be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php +++ b/be/app/Mail/SubTaskFinishedWithHigherTrackedTime.php @@ -33,9 +33,11 @@ class SubTaskFinishedWithHigherTrackedTime extends Mailable */ public function envelope() { + $projectCode = $this->subtask->mastertask?->project?->code ?? 'N/A'; + $title = $this->subtask->title ?: $this->subtask->mastertask?->title ?? ''; + return new Envelope( -// 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ý' + subject: 'Čas pre Task ' . $projectCode . ' - ' . $title . ' bol prekročený' ); } diff --git a/be/app/Mail/TimeBlockFinished.php b/be/app/Mail/TimeBlockFinished.php index f393080..43e2ef8 100644 --- a/be/app/Mail/TimeBlockFinished.php +++ b/be/app/Mail/TimeBlockFinished.php @@ -33,8 +33,11 @@ class TimeBlockFinished extends Mailable */ public function envelope() { + $projectCode = $this->subtask->mastertask?->project?->code ?? 'N/A'; + $title = $this->subtask->title ?: $this->subtask->mastertask?->title ?? ''; + return new Envelope( - subject: 'Naplánovaný čas pre Task ' . $this->subtask->mastertask->project->code . ' - ' . ($this->subtask->title) ?: $this->subtask->mastertask->title . ' bol ukončený' + subject: 'Naplánovaný čas pre Task ' . $projectCode . ' - ' . $title . ' bol ukončený' ); }