From 7332303924171df4c7dffec076ca3e52fae125df Mon Sep 17 00:00:00 2001
From: JoshuaMicallefYBSU <joshuamicallef66@gmail.com>
Date: Sun, 1 Dec 2024 20:13:12 +1000
Subject: [PATCH 1/2] Update ProcessRosterInactivity.php

---
 app/Jobs/ProcessRosterInactivity.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Jobs/ProcessRosterInactivity.php b/app/Jobs/ProcessRosterInactivity.php
index 973af8ce..5891ec40 100644
--- a/app/Jobs/ProcessRosterInactivity.php
+++ b/app/Jobs/ProcessRosterInactivity.php
@@ -95,18 +95,18 @@ public function handle()
             }
 
             // 1NOV - 2 Month Activity Check
-            if($roster->certification == "certified" && $roster->active && Carbon::now()->format('d/m') == "01/12" && $roster->currency < 1) {
+            if($roster->certification == "certified" && $roster->active && Carbon::now()->format('d/m') == "01/11" && $roster->currency < 1) {
                 $active_status = 0;
 
                 $first_names[] = $name;
 
                 $first_notice++;
                 
-                // Notification::send($roster->user, new TwoMonthFromRemoval($roster->user, $currency));
+                Notification::send($roster->user, new TwoMonthFromRemoval($roster->user, $currency));
             }
 
             // 1DEC - 1 Month till Removal
-            if($roster->certification == "certified" && Carbon::now()->format('d/m') == "02/12" && $roster->currency < 1){
+            if($roster->certification == "certified" && Carbon::now()->format('d/m') == "01/12" && $roster->currency < 1){
                 $active_status = 0;
 
                 $second_names[] = $name;

From 35dde33f686c63293de1eb48dac0e149ecbf947b Mon Sep 17 00:00:00 2001
From: JoshuaMicallefYBSU <joshuamicallef66@gmail.com>
Date: Sun, 1 Dec 2024 20:14:51 +1000
Subject: [PATCH 2/2] Update ProcessRosterInactivity.php

---
 app/Jobs/ProcessRosterInactivity.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/ProcessRosterInactivity.php b/app/Jobs/ProcessRosterInactivity.php
index 5891ec40..b882495e 100644
--- a/app/Jobs/ProcessRosterInactivity.php
+++ b/app/Jobs/ProcessRosterInactivity.php
@@ -98,7 +98,7 @@ public function handle()
             if($roster->certification == "certified" && $roster->active && Carbon::now()->format('d/m') == "01/11" && $roster->currency < 1) {
                 $active_status = 0;
 
-                $first_names[] = $name;
+                $first_names[] = $name ."(". $roster->currency ." hrs)";
 
                 $first_notice++;
                 
@@ -109,7 +109,7 @@ public function handle()
             if($roster->certification == "certified" && Carbon::now()->format('d/m') == "01/12" && $roster->currency < 1){
                 $active_status = 0;
 
-                $second_names[] = $name;
+                $second_names[] = $name ."(". $roster->currency ." hrs)";
 
                 $second_notice++;
 
@@ -120,7 +120,7 @@ public function handle()
             if($roster->certification == "certified" && Carbon::now()->format('d/m') == "24/12" && $roster->currency < 1){
                 $active_status = 0;
 
-                $third_names[] = $name;
+                $third_names[] = $name ."(". $roster->currency ." hrs)";
 
                 $third_notice++;
 
@@ -132,7 +132,7 @@ public function handle()
 
                 // User to be terminated
                 if($roster->currency < 1){
-                    $termination_names[] = $name;
+                    $termination_names[] = $name ."(". $roster->currency ." hrs)";
 
                     $termination_notice++;
                 }