diff options
| author | Mateja <mail@matejamaric.com> | 2020-11-26 23:20:25 +0100 |
|---|---|---|
| committer | Mateja <mail@matejamaric.com> | 2020-11-26 23:20:25 +0100 |
| commit | c47af3603f2c53edf384e9dd7f2ae00317c9062d (patch) | |
| tree | c2f51cff78106bfac93a177788cfc0ac1b6fa9b4 | |
| parent | 69c5d739142daba181fbe30cecc58b0c66bb087b (diff) | |
| download | yota-laravel-c47af3603f2c53edf384e9dd7f2ae00317c9062d.tar.gz yota-laravel-c47af3603f2c53edf384e9dd7f2ae00317c9062d.zip | |
Added modes to activities.
| -rw-r--r-- | app/Http/Controllers/ReservationsController.php | 4 | ||||
| -rw-r--r-- | public/js/activities.js | 1 | ||||
| -rw-r--r-- | 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() { '<td>' + data.data[i].toTime + '</td>' + '<td>' + data.data[i].specialCall + '</td>' + '<td>' + data.data[i].frequencies + '</td>' + + '<td>' + data.data[i].modes + '</td>' + '<td>' + data.data[i].qso + '</td></tr>'; 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 @@ <div class="table-responsive mt-2"> <table id="ajax-table" class="table table-striped table-bordered" style="white-space:nowrap;"> <thead class="thead-dark"> - <tr><th>Operator</th><th>From</th><th>To</th><th>Special Callsign</th><th>Frequencies</th><th>QSO</th></tr> + <tr><th>Operator</th><th>From</th><th>To</th><th>Special Callsign</th><th>Frequencies</th><th>Modes</th><th>QSO</th></tr> </thead> <tbody> </tbody> |