diff --git a/src/app/Http/Controllers/Api/AlertController.php b/src/app/Http/Controllers/Api/AlertController.php index 67d3439d..3a74ad8a 100644 --- a/src/app/Http/Controllers/Api/AlertController.php +++ b/src/app/Http/Controllers/Api/AlertController.php @@ -20,12 +20,6 @@ class AlertController extends Controller $level = $request->level; $stationtype = $request->stationtype; - // $topic = match($level){ - // 'Warning' => env('FCM_TOPIC_RAINFALL_WARNING'), - // 'Danger' => env('FCM_TOPIC_RAINFALL_DANGER'), - // default => env('FCM_TOPIC_RAINFALL_WARNING') - // }; - $topic = env('FCM_TOPIC_RAINFALL_WARNING'); if($stationtype == 1) diff --git a/src/app/Http/Controllers/RainfallController.php b/src/app/Http/Controllers/RainfallController.php index ff3b6ac4..522e911b 100644 --- a/src/app/Http/Controllers/RainfallController.php +++ b/src/app/Http/Controllers/RainfallController.php @@ -214,22 +214,6 @@ class RainfallController extends Controller ->orderBy('timestamp') ->get(); return response()->json($graphData); - - // $graphData = DB::table('rainfall') - // ->select( - // DB::raw("DATE(timestamp) as date"), - // DB::raw("TO_CHAR(timestamp, 'HH24:MI') AS time_slot"), - // 'currentrf' - // ) - // ->where('stationid', $stationid) - // ->whereBetween('timestamp', [ - // now()->subDays(7)->startOfDay(), - // now()->endOfDay() - // ]) - // ->whereRaw("EXTRACT(MINUTE FROM timestamp) % 5 = 0") // only multiples of 5 minutes - // ->orderBy('timestamp') - // ->get(); - } // Function retrieve data of 6 Hours Rainfall fo Graph Page @@ -293,8 +277,6 @@ class RainfallController extends Controller //Return View Graph Page public function graphPage($stationid,$dates) { - // $station = DB::table('station')->where('stationid',$stationid)->first(); - return view('layout.graph.rainfall',compact('stationid','dates')); } diff --git a/src/app/Http/Controllers/cctvController.php b/src/app/Http/Controllers/cctvController.php index 07a051e7..12be7037 100644 --- a/src/app/Http/Controllers/cctvController.php +++ b/src/app/Http/Controllers/cctvController.php @@ -10,28 +10,12 @@ class cctvController extends Controller // Function Display Station CCTV LINK public function index() { - // $stationdata = DB::select(" - // SELECT s.*, w.* - // FROM station s - // INNER JOIN waterlevel w - // ON s.stationid = w.stationid - // INNER JOIN ( - // SELECT stationid, MAX(datetime) AS latest_datetime - // FROM waterlevel - // GROUP BY stationid - // ) latest ON w.stationid = latest.stationid - // AND w.datetime = latest.latest_datetime - // WHERE s.cctv_link IS NOT NULL - // ORDER BY s.name ASC - // "); - $stationdata = DB::select(" SELECT name,district,cctv_link FROM station WHERE cctv_link IS NOT NULL AND waterlevel = 1 ORDER BY name ASC "); - return view('layout.cctv',compact('stationdata')); } } diff --git a/src/app/Providers/AppServiceProvider.php b/src/app/Providers/AppServiceProvider.php index dfd5bef4..77395768 100644 --- a/src/app/Providers/AppServiceProvider.php +++ b/src/app/Providers/AppServiceProvider.php @@ -20,7 +20,5 @@ class AppServiceProvider extends ServiceProvider */ public function boot(): void { - // URL::forceScheme('https'); - } } diff --git a/src/resources/views/layout/admin/usermgmt.blade.php b/src/resources/views/layout/admin/usermgmt.blade.php index 572e96f9..d9452791 100644 --- a/src/resources/views/layout/admin/usermgmt.blade.php +++ b/src/resources/views/layout/admin/usermgmt.blade.php @@ -59,7 +59,6 @@ No - Username @lang('messages.email') @lang('messages.position') @@ -72,7 +71,6 @@ @foreach ($users as $row) {{$loop->iteration}} - {{$row->name}} {{$row->email}} @php @@ -273,9 +271,6 @@ @endforeach - {{--
  • 1
    • -
  • 2
    • -
  • 3
    • --}} @if ($users->hasMorePages())