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

Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app

Browse Source
This commit is contained in:
Matej Glasnák committed 2023-04-17 17:35:44 +02:00
2 parents 43e57b407e 7d45d19174
commit 7b37e076eb
4 files changed
+14 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

be/app/Console/Kernel.php
+8 -1
View File
@@ -15,7 +15,14 @@ class Kernel extends ConsoleKernel
*/
protected function schedule(Schedule $schedule)
{
// $schedule->command('inspire')->hourly();
if (env('APP_ENV') === 'stage' && env('LXC') === 1) {
// $schedule->command('karat:sync-timesheets')->everyFiveMinutes();
$schedule->command('intranet:sync-vacations')->twiceDaily();
$schedule->command('karat:sync-users')->daily();
$schedule->command('karat:sync-clients')->hourly();
$schedule->command('karat:sync-projects')->hourly();
}
}
/**
be/app/Listeners/SendEditedMasterTaskNotification.php
+2 -4
View File
@@ -50,8 +50,7 @@ class SendEditedMasterTaskNotification implements ShouldQueue
// znovuotvorenie tasku
if ($key == 'is_finished' && $diff == 0) {
foreach ( $event->mastertask->subtasks as $subtask ) {
// Mail::to( $subtask->user->email )->send( new \App\Mail\MasterTaskEdited( $event->mastertask, $difference ) );
Mail::to( 'feher@studiotem.com' )->send( new \App\Mail\MasterTaskReopened( $event->mastertask ) );
Mail::to( $subtask->user->email )->send( new \App\Mail\MasterTaskEdited( $event->mastertask, $difference ) );
return;
}
@@ -71,8 +70,7 @@ class SendEditedMasterTaskNotification implements ShouldQueue
// send notification to all users
foreach ( $event->mastertask->subtasks as $subtask ) {
// Mail::to( $subtask->user->email )->send( new \App\Mail\MasterTaskEdited( $event->mastertask, $difference ) );
Mail::to( 'feher@studiotem.com' )->send( new \App\Mail\MasterTaskEdited( $event->mastertask, $difference ) );
Mail::to( $subtask->user->email )->send( new \App\Mail\MasterTaskEdited( $event->mastertask, $difference ) );
}
be/app/Listeners/SendEditedSubTaskNotification.php
+3 -6
View File
@@ -59,10 +59,9 @@ class SendEditedSubTaskNotification implements ShouldQueue
// ukoncenie sub tasku - Pokiaľ je sub task ukončený s vyšším počtom vykázaných hodín ako bol pôvodne zadaný, posiela sa e-mailová notifikácia o tejto skutočnosti zadávateľovi master tasku (soft warning).
if ($key == 'is_finished' && $diff == 1 && $event->subtask->tracked_time > $event->subtask->estimated_time) {
// $creatorEmail = User::find($event->subtask->created_by)->email;
$creatorEmail = User::find($event->subtask->created_by)->email;
// Mail::to( $creatorEmail )->send( new \App\Mail\SubTaskFinishedWithHigherTrackedTime( $event->subtask ) );
Mail::to( 'feher@studiotem.com' )->send( new \App\Mail\SubTaskFinishedWithHigherTrackedTime( $event->subtask ) );
Mail::to( $creatorEmail )->send( new \App\Mail\SubTaskFinishedWithHigherTrackedTime( $event->subtask ) );
}
@@ -73,8 +72,6 @@ class SendEditedSubTaskNotification implements ShouldQueue
return;
}
// Mail::to( $subtask->user->email )->send( new \App\Mail\SubTaskEdited( $event->subtask, $difference ) );
Mail::to( 'feher@studiotem.com' )->send( new \App\Mail\SubTaskEdited( $event->subtask, $difference ) );
Mail::to( $event->subtask->user->email )->send( new \App\Mail\SubTaskEdited( $event->subtask, $difference ) );
}
}
be/app/Listeners/SendNewSubTaskEmailNotification.php
+1 -2
View File
@@ -29,7 +29,6 @@ class SendNewSubTaskEmailNotification implements ShouldQueue
*/
public function handle(SubTaskCreated $event)
{
// Mail::to( $event->subtask->user->email )->send( new NewTask( $event->subtask ) );
Mail::to( 'feher@studiotem.com' )->send( new NewTask( $event->subtask ) );
Mail::to( $event->subtask->user->email )->send( new NewTask( $event->subtask ) );
}
}