Merge pull request #262 from czqoocavatsim/development

Development
czqoocavatsim · Apr 1, 2024 · ca51782 · ca51782
2 parents 4bc2775 + 5d28d00
commit ca51782
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 39 deletions.
diff --git a/app/Http/Controllers/Training/ApplicationsController.php b/app/Http/Controllers/Training/ApplicationsController.php
@@ -142,8 +142,8 @@ public function applyPost(Request $request)
         $processingUpdate->save();
 
         //Dispatch event
-        Notification::route('mail', CoreSettings::find(1)->emailfirchief)->notify(new NewApplicationStaff($application));
-        Notification::route('mail', CoreSettings::find(1)->emaildepfirchief)->notify(new NewApplicationStaff($application));
+        // Notification::route('mail', CoreSettings::find(1)->emailfirchief)->notify(new NewApplicationStaff($application));
+        // Notification::route('mail', CoreSettings::find(1)->emaildepfirchief)->notify(new NewApplicationStaff($application));
         Notification::route('mail', CoreSettings::find(1)->emailcinstructor)->notify(new NewApplicationStaff($application));
 
         //Redirect to application page
@@ -440,7 +440,7 @@ public function adminAcceptApplication($reference_id, Request $request)
 
         //Status label
         $label = new StudentStatusLabelLink([
-            'student_status_label_id' => StudentStatusLabel::whereName('Not Ready')->first()->id,
+            'student_status_label_id' => StudentStatusLabel::whereName('Awaiting Exam')->first()->id,
             'student_id'              => $student->id,
         ]);
         $label->save();

diff --git a/app/Http/Controllers/Training/InstructingController.php b/app/Http/Controllers/Training/InstructingController.php
@@ -43,7 +43,7 @@ public function board()
         $instructors = Instructor::whereCurrent(true)->get();
 
         //Get all lists
-        $lists = StudentStatusLabel::whereName('Ready For Pick-up')->orWhere('name', 'Not Ready')->orWhere('name', 'Solo Certification')->orWhere('name', 'Ready for Assessment')->orWhere('name', 'Inactive')->get();
+        $lists = StudentStatusLabel::whereName('Ready For Pick-up')->orWhere('name', 'Awaiting Exam')->orWhere('name', 'Solo Certification')->orWhere('name', 'Ready for Assessment')->orWhere('name', 'Inactive')->get();
 
         //Return view
         return view('admin.training.instructing.board', compact('instructors', 'lists'));
@@ -545,11 +545,19 @@ public function assignStatusLabelToStudent(Request $request, $student_id)
         $label = StudentStatusLabel::whereId($request->get('label_id'))->firstOrFail();
 
         //Does user already have this label?
-        if ($l = StudentStatusLabelLink::where('student_id', $student->id)->where('student_status_label_id', $label->id)->first()) {
+        if (StudentStatusLabelLink::where('student_id', $student->id)->where('student_status_label_id', $label->id)->exists()) {
             //Return error
-            return redirect()->back()->with('error', "Label {$label->name} already assigned.");
+            return back()->with('error', "Label {$label->name} already assigned.");
         }
 
+        if ($label->name == 'Ready For Pick-Up'){
+            //Discord notification in instructors channel
+            $discord = new DiscordClient();
+            $discord->sendMessageWithEmbed(intval(config('services.discord.instructors')), 'A new student is available for pick-up by an Instructor', $student->user->fullName('FLC') . ' is available to be picked up by an instructor!');
+        }
+
+
+
         //Create the link
         $link = new StudentStatusLabelLink([
             'student_id'              => $student->id,

diff --git a/app/Http/Controllers/Training/TrainingPortalController.php b/app/Http/Controllers/Training/TrainingPortalController.php
@@ -53,33 +53,6 @@ public function submitAvailabilityPost(Request $request)
         ]);
         $submission->save();
 
-        //If they have the "Not Ready" label, process them as new student submitting availability
-        $student = auth()->user()->studentProfile;
-        foreach ($student->labels as $label) {
-            //Find Not Ready label
-            if (strtolower($label->label()->name) == 'not ready') {
-                //Remove label
-                $label->delete();
-
-                //Find Ready For Pick-Up label
-                $readyForPickUp = StudentStatusLabel::whereName('Ready For Pick-Up')->first();
-
-                //Assign it with link
-                $link = new StudentStatusLabelLink([
-                    'student_id' => $student->id,
-                    'student_status_label_id' => $readyForPickUp->id,
-                ]);
-                $link->save();
-
-                //Discord notification in instructors channel
-                $discord = new DiscordClient();
-                $discord->sendMessageWithEmbed(intval(config('services.discord.instructors')), 'A new student is available for pick-up by an Instructor', $student->user->fullName('FLC') . ' is available to be picked up by an instructor!');
-
-                //Break
-                break;
-            }
-        }
-
         //Return
         return redirect()->route('training.portal.index')->with('success', 'Thank you for submitting your availability, ' . auth()->user()->fullName('F') . '!');
     }

diff --git a/app/Jobs/ProcessRosterInactivity.php b/app/Jobs/ProcessRosterInactivity.php
@@ -56,7 +56,7 @@ public function handle()
                 }
             }
 
-            if ($rosterMember->active && $rosterMember->currency < 0.25) {
+            if ($rosterMember->active && $rosterMember->currency < 3) {
                 $rosterMember->active = false;
                 $rosterMember->save();
             }

diff --git a/database/seeds/StudentStatusLabelsSeeder.php b/database/seeds/StudentStatusLabelsSeeder.php
@@ -13,10 +13,10 @@ class StudentStatusLabelsSeeder extends Seeder
     public function run()
     {
         $notReady = new StudentStatusLabel([
-            'name'        => 'Not Ready',
+            'name'        => 'Awaiting Exam',
             'colour'      => 'grey',
             'fa_icon'     => 'far fa-pause-circle',
-            'description' => 'Student yet to submit timings for sessions.',
+            'description' => 'Student yet to complete entry exam.',
             'restricted'  => false,
         ]);
         $notReady->save();

diff --git a/resources/views/my/index.blade.php b/resources/views/my/index.blade.php
@@ -359,7 +359,7 @@ class="list-group-item list-group-item-action p-4 z-depth-1 shadow-none mb-3">
                         <h3 class="font-weight-bold blue-text mt-3 pb-2">Activity</h3>
                         @php
                             $currency = $user->rosterProfile->currency;
-                            $class = $currency < 0.1 ? 'red' : 'green';
+                            $class = $currency < 3 ? 'red' : 'green';
                         @endphp
 
                         <h3>
@@ -368,6 +368,8 @@ class='badge rounded {{ $class }} text-white p-2 shadow-none'>
                                 {{ $currency }} hours recorded
                             </span>
                         </h3>
+
+                        <p class="mt-4">You require 3 hours of activity every quarter, unless you were certified within the current activity cycle.</p>
                     @else
                         <h3>
                             <span style='font-weight: 400' class='badge rounded p-2 red text-white shadow-none'>

diff --git a/resources/views/training/portal/index.blade.php b/resources/views/training/portal/index.blade.php
@@ -66,7 +66,7 @@
                 Completed!
             </div>
         </div>
-        @if ($studentProfile->hasLabel("Not Ready"))
+        @if ($studentProfile->hasLabel("Awaiting Exam"))
             <script>
                 $('#studentProgressBar').css('width', '0%')
             </script>

diff --git a/resources/views/training/portal/progress.blade.php b/resources/views/training/portal/progress.blade.php
@@ -31,7 +31,7 @@
             Completed!
         </div>
     </div>
-    @if ($studentProfile->hasLabel("Not Ready"))
+    @if ($studentProfile->hasLabel("Awaiting Exam"))
         <script>
             $('#studentProgressBar').css('width', '0%')
         </script>