perbaikan input dms tps

app/Http/Controllers/Admin/LoginController.php

@@ -41,6 +41,6 @@ public function logout(Request $request)
         $request->session()->invalidate();
         $request->session()->regenerateToken();
 
-        return redirect()->route('admin.login');
+        return redirect()->route('user.index');
     }
 }

app/Http/Controllers/Admin/TpsController.php

@@ -30,10 +30,48 @@ public function create()
         return view('admin.tps.create', compact('title', 'kategori'));
     }
 
+    private function convertToDecimal($coordinate)
+    {
+        // decimal langsung
+        if (is_numeric($coordinate)) {
+            return (float) $coordinate;
+        }
+
+        $coordinate = html_entity_decode($coordinate);
+        $coordinate = strtoupper(trim($coordinate));
+
+        // ganti simbol jadi seragam
+        $coordinate = str_replace(
+            ['°', "'", '"'],
+            [' ', ' ', ' '],
+            $coordinate
+        );
+
+        // ambil arah
+        preg_match('/([NSEW])/', $coordinate, $dirMatch);
+        if (!$dirMatch) return null;
+
+        $direction = $dirMatch[1];
+
+        // ambil angka
+        preg_match_all('/\d+(\.\d+)?/', $coordinate, $numbers);
+        if (count($numbers[0]) < 3) return null;
+
+        [$deg, $min, $sec] = array_map('floatval', $numbers[0]);
+
+        $decimal = $deg + ($min / 60) + ($sec / 3600);
+
+        if (in_array($direction, ['S', 'W'])) {
+            $decimal *= -1;
+        }
+
+        return $decimal;
+    }
+
     public function store(Request $request)
     {
         $request->validate([
-            'kategori_tps_id' => 'required|exists:kategori_tps,id',
+            'kategori_tps_id' => 'required|exists:kategori_tps,id_kategori_tps',
             'nama_tps' => 'required|string|max:255',
             'alamat_tps' => 'required|string|max:255',
             'status_tps' => 'required',
@@ -44,13 +82,19 @@ public function store(Request $request)
             'foto_tps' => 'nullable|image|mimes:jpg,jpeg,png|max:2048',
         ]);
 
-        // Upload foto
+        // 🔥 KONVERSI KOORDINAT
-        if ($request->hasFile('foto_tps')) {
+        $latitude  = $this->convertToDecimal($request->latitude);
-            $foto = $request->file('foto_tps')->store('foto-tps', 'public');
+        $longitude = $this->convertToDecimal($request->longitude);
-        } else {
+
-            $foto = null;
+        if ($latitude === null || $longitude === null) {
+            return back()->withErrors(['Koordinat tidak valid'])->withInput();
         }
 
+        // Upload foto
+        $foto = $request->hasFile('foto_tps')
+            ? $request->file('foto_tps')->store('foto-tps', 'public')
+            : null;
+
         LokasiTps::create([
             'kategori_tps_id' => $request->kategori_tps_id,
             'nama_tps' => $request->nama_tps,
@@ -58,8 +102,8 @@ public function store(Request $request)
             'status_tps' => $request->status_tps,
             'tahun_pembuatan' => $request->tahun_pembuatan,
             'kapasitas_tps' => $request->kapasitas_tps,
-            'latitude' => $request->latitude,
+            'latitude' => $latitude,
-            'longitude' => $request->longitude,
+            'longitude' => $longitude,
             'foto_tps' => $foto,
         ]);
 
@@ -67,6 +111,7 @@ public function store(Request $request)
             ->with('success', 'Data TPS berhasil ditambahkan');
     }
 
+
     public function edit($id)
     {
         $title = 'Edit TPS';
@@ -80,6 +125,7 @@ public function update(Request $request, $id)
     {
         $tps = LokasiTps::findOrFail($id);
 
+        // VALIDASI
         $request->validate([
             'kategori_tps_id' => 'required|exists:kategori_tps,id',
             'nama_tps' => 'required|string|max:255',
@@ -92,16 +138,31 @@ public function update(Request $request, $id)
             'foto_tps' => 'nullable|image|mimes:jpg,jpeg,png|max:2048',
         ]);
 
-        // Jika upload foto baru
+        // 🔥 KONVERSI KOORDINAT (DMS / DECIMAL)
+        $latitude  = $this->convertToDecimal($request->latitude);
+        $longitude = $this->convertToDecimal($request->longitude);
+
+        // Jika koordinat tidak valid
+        if ($latitude === null || $longitude === null) {
+            return back()
+                ->withErrors(['Koordinat tidak valid. Gunakan format Decimal atau DMS.'])
+                ->withInput();
+        }
+
+        // 📸 UPLOAD FOTO JIKA ADA
         if ($request->hasFile('foto_tps')) {
+
+            // Hapus foto lama
             if ($tps->foto_tps) {
                 Storage::disk('public')->delete($tps->foto_tps);
             }
+
             $foto = $request->file('foto_tps')->store('foto-tps', 'public');
         } else {
             $foto = $tps->foto_tps;
         }
 
+        // 💾 UPDATE DATA
         $tps->update([
             'kategori_tps_id' => $request->kategori_tps_id,
             'nama_tps' => $request->nama_tps,
@@ -109,8 +170,8 @@ public function update(Request $request, $id)
             'status_tps' => $request->status_tps,
             'tahun_pembuatan' => $request->tahun_pembuatan,
             'kapasitas_tps' => $request->kapasitas_tps,
-            'latitude' => $request->latitude,
+            'latitude' => $latitude,
-            'longitude' => $request->longitude,
+            'longitude' => $longitude,
             'foto_tps' => $foto,
         ]);
 

app/Models/LokasiTps.php

@@ -11,6 +11,9 @@ class LokasiTps extends Model
 
     protected $table = 'lokasi_tps';
     protected $primaryKey = 'id_tps';
+    protected $keyType = 'int';
+    public $incrementing = true;
+    public $timestamps = false;
 
     protected $fillable = [
         'kategori_tps_id',

resources/views/admin/login.blade.php

@@ -27,8 +27,9 @@
                     <div class="col-lg-4 mx-auto">
                         <div class="auth-form-light text-left py-5 px-4 px-sm-5">
                             <div class="brand-logo">
-                                <img src="{{ asset('assets/admin/images/logo.svg') }}" alt="logo">
+                                <h3 class="brand-text">SIG TPS</h3>
                             </div>
+
                             <h4>Halo Admin!</h4>
                             <h6 class="font-weight-light">Silakan masuk untuk melanjutkan.</h6>
                             <form class="pt-3" method="POST" action="{{ route('admin.login.process') }}">

resources/views/admin/tps/create.blade.php

@@ -9,6 +9,17 @@
                         <h4 class="card-title">Tambah Data TPS</h4>
                         <p class="card-description">Form tambah data TPS</p>
 
+                        @if ($errors->any())
+                            <div class="alert alert-danger">
+                                <ul>
+                                    @foreach ($errors->all() as $error)
+                                        <li>{{ $error }}</li>
+                                    @endforeach
+                                </ul>
+                            </div>
+                        @endif
+
+
                         <form action="{{ route('admin.tps.store') }}" method="POST" enctype="multipart/form-data">
                             @csrf
 
@@ -30,7 +41,7 @@
                                 <select name="kategori_tps_id" class="form-control" required>
                                     <option value="">Pilih Kategori</option>
                                     @foreach ($kategori as $item)
-                                        <option value="{{ $item->id }}">
+                                        <option value="{{ $item->id_kategori_tps }}">
                                             {{ $item->nama_kategori }}
                                         </option>
                                     @endforeach
@@ -56,22 +67,21 @@
                                 <label>Status</label>
                                 <select name="status_tps" class="form-control" required>
                                     <option value="Aktif">Aktif</option>
-                                    <option value="Non-Aktif">Non-Aktif</option>
+                                    <option value="Non-Aktif">Tidak Aktif</option>
                                     <option value="Pembangunan">Pembangunan</option>
                                 </select>
                             </div>
 
-                            <!-- LATITUDE -->
                             <div class="form-group">
                                 <label>Latitude</label>
-                                <input type="text" name="latitude" class="form-control" placeholder="Latitude" required>
+                                <input type="text" name="latitude" class="form-control"
+                                    placeholder="Contoh: -7.588125 atau 7°35'17.25&quot;S" required>
                             </div>
 
-                            <!-- LONGITUDE -->
                             <div class="form-group">
                                 <label>Longitude</label>
-                                <input type="text" name="longitude" class="form-control" placeholder="Longitude"
+                                <input type="text" name="longitude" class="form-control"
-                                    required>
+                                    placeholder="Contoh: 111.916936 atau 111°55'0.97&quot;E" required>
                             </div>
 
                             <!-- FOTO -->