diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 8e4a4f97..1d4be280 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -46,7 +46,7 @@ protected function schedule(Schedule $schedule) $schedule->job(new ProcessRosterInactivity())->daily(); // Monthly Statistics Breakdown - $schedule->job(new ProcessMonthlyBreakdown())->monthlyOn(1, '00:40'); + $schedule->job(new ProcessMonthlyBreakdown())->monthlyOn(1, '00:01'); //Solo cert expiry warning // $schedule->job(new ProcessSoloCertExpiryWarnings())->daily(); @@ -58,10 +58,10 @@ protected function schedule(Schedule $schedule) $schedule->job(new ProcessSessionReminders())->daily(); // Check Training Threads Status (Once per week) - $schedule->job(new DiscordTrainingWeeklyUpdates())->weeklyOn(6, '6:00'); + $schedule->job(new DiscordTrainingWeeklyUpdates())->weeklyOn(6, '00:01'); // Check If Account is Linked - $schedule->job(new DiscordAccountCheck)->weeklyOn(5, '0:30'); + $schedule->job(new DiscordAccountCheck)->weeklyOn(5, '0:01'); //CRONS FOR INACTIVITY EMAILS 2 weeks // $schedule->call(function () { diff --git a/app/Jobs/DiscordTrainingWeeklyUpdates.php b/app/Jobs/DiscordTrainingWeeklyUpdates.php index 4ef689dc..56ac5461 100644 --- a/app/Jobs/DiscordTrainingWeeklyUpdates.php +++ b/app/Jobs/DiscordTrainingWeeklyUpdates.php @@ -128,7 +128,7 @@ public function handle() $avail_message++; // // SendEmbed to ask student to send availability - $discord->sendEmbedInTrainingThread($cid, "Please Provide Availability", 'Hello, <@'.$student->discord_user_id.'> + $discord->sendEmbedInTrainingThread($cid, "Please Provide Availability", 'Hello, <@'.$student->user->discord_user_id.'> As we head into the Weekend, we ask you please provide your availability for next week. Please ensure to tag the `@Instructor` role with all times you are available. Please provide these times in Zulu Format. diff --git a/app/Jobs/ProcessMonthlyBreakdown.php b/app/Jobs/ProcessMonthlyBreakdown.php index bd35af11..cbac49e7 100644 --- a/app/Jobs/ProcessMonthlyBreakdown.php +++ b/app/Jobs/ProcessMonthlyBreakdown.php @@ -52,9 +52,9 @@ public function handle() $message .= "\n**__Top 3 Controllers__**\n"; foreach($top_3 as $t) { if($t->user->discord_user_id === null){ - $message .= "- " . $t->user->fullName('FLC') . " - ".$t->monthly_hours."\n"; + $message .= "- " . $t->user->fullName('FLC') . " - ".$t->monthly_hours." hours\n"; } else { - $message .= "- <@" . $t->user->discord_user_id . "> - ".$t->monthly_hours."\n"; + $message .= "- <@" . $t->user->discord_user_id . "> - ".$t->monthly_hours." hours\n"; } } diff --git a/app/Jobs/ProcessRosterInactivity.php b/app/Jobs/ProcessRosterInactivity.php index 77401d40..20280a1b 100644 --- a/app/Jobs/ProcessRosterInactivity.php +++ b/app/Jobs/ProcessRosterInactivity.php @@ -63,9 +63,11 @@ public function handle() // Go through each session to get some information foreach($sessions as $s){ - if($s->duration > 0.49){ - $currency += $s->duration; - } + // if($s->duration > 0.49){ + // $currency += $s->duration; + // } + + $currency += $s->duration; } diff --git a/app/Jobs/ProcessSessionLogging.php b/app/Jobs/ProcessSessionLogging.php index d4a1c4f9..158eb695 100644 --- a/app/Jobs/ProcessSessionLogging.php +++ b/app/Jobs/ProcessSessionLogging.php @@ -170,8 +170,8 @@ public function handle() // Controller is either Certified or In Training if (($rosterMember->certification == 'certified' || $rosterMember->certification == 'training')) { - // Only add hours if more than 30mins - if($currency > 0.49){ + // Only add hours if more than 30mins (Disabled to 01mins until policy update) + if($currency > 0.00){ $rosterMember->currency += $currency; $rosterMember->monthly_hours += $monthly_hours; $rosterMember->save(); diff --git a/resources/views/admin/training/instructing/students/student.blade.php b/resources/views/admin/training/instructing/students/student.blade.php index f202877f..89f7a42e 100644 --- a/resources/views/admin/training/instructing/students/student.blade.php +++ b/resources/views/admin/training/instructing/students/student.blade.php @@ -196,7 +196,7 @@