mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
no message
This commit is contained in:
1 parent
5b230a2842
commit
4b02fdf4bf
4 files changed
+30
-20
No files matched your search
@@ -8,6 +8,9 @@ use Illuminate\Support\Facades\Mail;
|
||||
|
||||
class SendEditedMasterTaskNotification implements ShouldQueue
|
||||
{
|
||||
public $timeout = 120;
|
||||
public $tries = 3;
|
||||
|
||||
/**
|
||||
* Create the event listener.
|
||||
*
|
||||
@@ -22,6 +25,7 @@ class SendEditedMasterTaskNotification implements ShouldQueue
|
||||
* Handle the event.
|
||||
*
|
||||
* @param object $event
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function handle(MasterTaskEdited $event)
|
||||
@@ -42,15 +46,16 @@ class SendEditedMasterTaskNotification implements ShouldQueue
|
||||
// get the difference between $mastertask and $originalMastertask
|
||||
$modelDiff = array_diff_assoc($editedMasterTaskArray, $originalMasterTaskArray);
|
||||
|
||||
foreach ( $modelDiff as $key => $diff ) {
|
||||
foreach ($modelDiff as $key => $diff) {
|
||||
if (in_array($key, ['status', 'tracked_time', 'estimated_time', 'team_id'])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// 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 ) );
|
||||
foreach ($event->mastertask->subtasks as $subtask) {
|
||||
Mail::to($subtask->user->email)->send(new \App\Mail\MasterTaskEdited($event->mastertask,
|
||||
$difference));
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -69,11 +74,8 @@ 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 ) );
|
||||
foreach ($event->mastertask->subtasks as $subtask) {
|
||||
Mail::to($subtask->user->email)->send(new \App\Mail\MasterTaskEdited($event->mastertask, $difference));
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -5,11 +5,13 @@ namespace App\Listeners;
|
||||
use App\Events\SubTaskEdited;
|
||||
use App\Models\User;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Queue\InteractsWithQueue;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
|
||||
class SendEditedSubTaskNotification implements ShouldQueue
|
||||
{
|
||||
public $timeout = 120;
|
||||
public $tries = 3;
|
||||
|
||||
/**
|
||||
* Create the event listener.
|
||||
*
|
||||
@@ -24,6 +26,7 @@ class SendEditedSubTaskNotification implements ShouldQueue
|
||||
* Handle the event.
|
||||
*
|
||||
* @param object $event
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function handle(SubTaskEdited $event)
|
||||
@@ -52,7 +55,7 @@ class SendEditedSubTaskNotification implements ShouldQueue
|
||||
// get the difference between $subtask and $originalSubtask
|
||||
$modelDiff = array_diff_assoc($editedSubTaskArray, $originalSubTaskArray);
|
||||
|
||||
foreach ( $modelDiff as $key => $diff ) {
|
||||
foreach ($modelDiff as $key => $diff) {
|
||||
if (in_array($key, ['status', 'tracked_time'])) {
|
||||
continue;
|
||||
}
|
||||
@@ -62,7 +65,7 @@ class SendEditedSubTaskNotification implements ShouldQueue
|
||||
$creator = User::find($event->subtask->created_by);
|
||||
|
||||
if ($creator) {
|
||||
Mail::to( $creator->email )->send( new \App\Mail\SubTaskFinishedWithHigherTrackedTime( $event->subtask ) );
|
||||
Mail::to($creator->email)->send(new \App\Mail\SubTaskFinishedWithHigherTrackedTime($event->subtask));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,14 +76,12 @@ class SendEditedSubTaskNotification implements ShouldQueue
|
||||
} else {
|
||||
$difference[$key] = $diff;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if (empty($difference)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Mail::to( $event->subtask->user->email )->send( new \App\Mail\SubTaskEdited( $event->subtask, $difference ) );
|
||||
Mail::to($event->subtask->user->email)->send(new \App\Mail\SubTaskEdited($event->subtask, $difference));
|
||||
}
|
||||
}
|
||||
@@ -5,11 +5,13 @@ namespace App\Listeners;
|
||||
use App\Events\TimeBlockFinished;
|
||||
use App\Models\User;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Queue\InteractsWithQueue;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
|
||||
class SendFinishedTimeBlockNotification implements ShouldQueue
|
||||
{
|
||||
public $timeout = 120;
|
||||
public $tries = 3;
|
||||
|
||||
/**
|
||||
* Create the event listener.
|
||||
*
|
||||
@@ -24,6 +26,7 @@ class SendFinishedTimeBlockNotification implements ShouldQueue
|
||||
* Handle the event.
|
||||
*
|
||||
* @param object $event
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function handle(TimeBlockFinished $event)
|
||||
@@ -31,8 +34,10 @@ class SendFinishedTimeBlockNotification implements ShouldQueue
|
||||
$receiver = User::find($event->timeblock->subtask->created_by);
|
||||
|
||||
// pripad ked bol user soft deletnuty
|
||||
if (!$receiver ) return;
|
||||
if ( ! $receiver) {
|
||||
return;
|
||||
}
|
||||
|
||||
Mail::to( $receiver->email )->send( new \App\Mail\TimeBlockFinished( $event->timeblock->subtask ) );
|
||||
Mail::to($receiver->email)->send(new \App\Mail\TimeBlockFinished($event->timeblock->subtask));
|
||||
}
|
||||
}
|
||||
@@ -4,13 +4,14 @@ namespace App\Listeners;
|
||||
|
||||
use App\Events\SubTaskCreated;
|
||||
use App\Mail\NewTask;
|
||||
use App\Mail\PasswordReset;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Queue\InteractsWithQueue;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
|
||||
class SendNewSubTaskEmailNotification implements ShouldQueue
|
||||
{
|
||||
public $timeout = 120;
|
||||
public $tries = 3;
|
||||
|
||||
/**
|
||||
* Create the event listener.
|
||||
*
|
||||
@@ -25,10 +26,11 @@ class SendNewSubTaskEmailNotification implements ShouldQueue
|
||||
* Handle the event.
|
||||
*
|
||||
* @param \App\Events\SubTaskCreated $event
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function handle(SubTaskCreated $event)
|
||||
{
|
||||
Mail::to( $event->subtask->user->email )->send( new NewTask( $event->subtask ) );
|
||||
Mail::to($event->subtask->user->email)->send(new NewTask($event->subtask));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user