From c47af3603f2c53edf384e9dd7f2ae00317c9062d Mon Sep 17 00:00:00 2001 From: Mateja Date: Thu, 26 Nov 2020 23:20:25 +0100 Subject: Added modes to activities. --- app/Http/Controllers/ReservationsController.php | 4 ++-- public/js/activities.js | 1 + resources/views/pages/activities.blade.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ReservationsController.php b/app/Http/Controllers/ReservationsController.php index ae130fc..37e5067 100644 --- a/app/Http/Controllers/ReservationsController.php +++ b/app/Http/Controllers/ReservationsController.php @@ -32,7 +32,7 @@ class ReservationsController extends Controller if ($request->input('call-sign') == 'all') { $activities = Reservation::where('approved', '1') - ->select('operatorCall', 'fromTime', 'toTime', 'specialCall', 'frequencies', 'qso') + ->select('operatorCall', 'fromTime', 'toTime', 'specialCall', 'frequencies', 'modes', 'qso') ->orderBy('fromTime', 'asc') ->get()->toArray(); $data = [ @@ -43,7 +43,7 @@ class ReservationsController extends Controller return response($data); } else { $activities = Reservation::where('approved', '1') - ->select('operatorCall', 'fromTime', 'toTime', 'specialCall', 'frequencies', 'qso') + ->select('operatorCall', 'fromTime', 'toTime', 'specialCall', 'frequencies', 'modes', 'qso') ->where('specialCall', $request->input('call-sign')) ->orderBy('fromTime', 'asc') ->get() diff --git a/public/js/activities.js b/public/js/activities.js index 20b5b11..4d46374 100644 --- a/public/js/activities.js +++ b/public/js/activities.js @@ -33,6 +33,7 @@ function fillTable() { '' + data.data[i].toTime + '' + '' + data.data[i].specialCall + '' + '' + data.data[i].frequencies + '' + + '' + data.data[i].modes + '' + '' + data.data[i].qso + ''; tableData.append(tr); } diff --git a/resources/views/pages/activities.blade.php b/resources/views/pages/activities.blade.php index 1c5c32d..7e7a0ed 100644 --- a/resources/views/pages/activities.blade.php +++ b/resources/views/pages/activities.blade.php @@ -21,7 +21,7 @@
- + -- cgit v1.2.3
OperatorFromToSpecial CallsignFrequenciesQSO
OperatorFromToSpecial CallsignFrequenciesModesQSO