JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 14:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'production' of https://bitbucket.org/studiotem/jandl-taskmanager-app into production

Browse Source
This commit is contained in:
romankko2 committed 2023-09-27 16:31:04 +02:00
2 parents e6cd6a9278 7aa0b5fafd
commit b4775e84bf
4 files changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/.env
+1 -1
View File
@@ -1 +1 @@
VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/api/ VUE_APP_WAXIOS_URL=https://tm.jandl.sk/api/
be/app/Listeners/SendEditedSubTaskNotification.php
+1 -1
View File
@@ -67,7 +67,7 @@ class SendEditedSubTaskNotification implements ShouldQueue
} }
// aby nechodilo "Updated by: 63" // aby nechodilo "Updated by: 63"
if ($key == 'updated_by' && $diff == 1) { if ($key == 'updated_by') {
$user = User::find($diff); $user = User::find($diff);
$difference[$key] = ($user) ? $user->firstname . ' ' . $user->lastname : ''; $difference[$key] = ($user) ? $user->firstname . ' ' . $user->lastname : '';
} else { } else {
be/app/Mail/NewTask.php
+1 -1
View File
@@ -46,7 +46,7 @@ class NewTask extends Mailable
replyTo: [ replyTo: [
new Address($this->creator->email, ($this->creator) ? $this->creator->firstname . ' ' . $this->creator->lastname : ''), new Address($this->creator->email, ($this->creator) ? $this->creator->firstname . ' ' . $this->creator->lastname : ''),
], ],
subject: $this->subtask->mastertask->project->code . ' ' . $this->subtask->mastertask->project->code . ' - vytvorený Sub Task', subject: $this->subtask->mastertask->project->code . ' ' . $this->subtask->mastertask->project->name . ' - vytvorený Sub Task',
); );
} }
be/resources/views/emails/task/sub_task_created.blade.php
+2 -1
View File
@@ -1,12 +1,13 @@
Task založil: {{($creator) ? $creator->firstname . ' ' . $creator->lastname : ''}} <br> Task založil: {{($creator) ? $creator->firstname . ' ' . $creator->lastname : ''}} <br>
Job number: {{$subtask->mastertask->project->code}} <br> Job number: {{$subtask->mastertask->project->code}} <br>
Názov Tasku: {{($subtask->title) ?: $subtask->mastertask->title}} <br> Názov Tasku: {{($subtask->title) ?: $subtask->mastertask->title}} <br>
Deadline do: {{($subtask->deadline) ?: $subtask->mastertask->deadline}} <br> Deadline do: {{($subtask->deadline) ?: $subtask->mastertask->deadline}} <br> <br>
Ľudia v Master Tasku: <br> Ľudia v Master Tasku: <br>
@foreach($usersInMasterTask as $key => $user) @foreach($usersInMasterTask as $key => $user)
{{ $user->firstname }} {{ $user->lastname }} <br> {{ $user->firstname }} {{ $user->lastname }} <br>
@endforeach @endforeach
<br>
Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/tasks?subtask=' . $subtask->id) }} <br><br> Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/tasks?subtask=' . $subtask->id) }} <br><br>
Popis: {!!($subtask->description) ?: $subtask->mastertask->description !!} <br> Popis: {!!($subtask->description) ?: $subtask->mastertask->description !!} <br>