Merge pull request #280 from czqoocavatsim/JoshuaNeedsCoffee

Joshua needs coffee
czqoocavatsim · Aug 15, 2024 · cff9b51 · cff9b51
2 parents cf7914b + 124a65e
commit cff9b51
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/app/Http/Controllers/DiscordTestController.php b/app/Http/Controllers/DiscordTestController.php
@@ -12,7 +12,7 @@ public function ThreadTest()
     {
         //New Applicant in Instructor Channel
         $discord = new DiscordClient();
-        $discord->createTrainingThread('1273181022699130902', 'Joshua Micallef 1342084', '<@200426385863344129>');
+        $discord->createTrainingThread('1273228164255977492', 'Joshua Micallef 1342084', '<@200426385863344129>');
     }
 
     public function EditTagTest()

diff --git a/resources/views/admin/training/instructing/students/student.blade.php b/resources/views/admin/training/instructing/students/student.blade.php
@@ -200,7 +200,7 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-light" data-dismiss="modal">Dismiss</button>
-                    <a href="{{route('training.admin.instructing.students.certify', $student->user->id)}}" role="button" class="btn btn-success">Certify Controller</a>
+                    <a disabled href="{{route('training.admin.instructing.students.certify', $student->user->id)}}" role="button" class="btn btn-success">Certify Controller</a>
                 </div>
                 </form>
             </div>

diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
@@ -72,6 +72,7 @@ class="jarallax-img">
                             <li>
                                 <div class="white-text d-flex flex-row justify-content-between align-items-center">
                                     <h4 class="font-weight-bold m-0">{{ $controller->callsign }}</h4>
+                                    <div class="my-1">{{$controller->session_start->diff(\Carbon\Carbon::now())->format('%h:%I')}} Online</div>
                                     <div style="font-size: 1.1em;">
                                         @if (auth()->check() && ($rosterMember = $controller->rosterMember))
                                             <img src="{{ $rosterMember->user->avatar() }}"

diff --git a/routes/web.php b/routes/web.php
@@ -75,7 +75,7 @@
 
 // Discord shortcut
 Route::get('/discord', [DiscordController::class, 'joinShortcut']);
-Route::get('/discord/function-test', [DiscordTestController::class, 'sendEmbed']);
+Route::get('/discord/function-test', [DiscordTestController::class, 'ThreadTest']);
 
 // Public news articles
 Route::get('/news/{id}', [NewsController::class, 'viewArticlePublic'])->name('news.articlepublic')->where('id', '[0-9]+');