kelompok by periode

app/Http/Controllers/Dosen/KelompokController.php

@@ -34,7 +34,9 @@ class KelompokController extends Controller
         $kelompok = Kelompok::with(['rAnggota'])
                     ->where('nidn_dosen', $bio->noidentitas)
                     ->where('kirim', '1')
-                    ->whereYear('created_at', $year)
+                    ->whereHas('rPeriode', function ($query) use ($year) {
+                        $query->where('nama', $year);
+                    })
                     ->orderBy('kode')
                     ->get();
 

app/Http/Controllers/Mahasiswa/KelompokController.php

@@ -37,7 +37,9 @@ class KelompokController extends Controller
                     ->whereHas('rAnggota', function ($query) use($nim){
                         $query->where('nim', $nim);
                     })
-                    ->whereYear('created_at', $year)
+                    ->whereHas('rPeriode', function ($query) use ($year) {
+                        $query->where('nama', $year);
+                    })
                     ->orderBy('kode')
                     ->get();
 
@@ -220,6 +222,22 @@ class KelompokController extends Controller
         return redirect()->route('mahasiswa.kelompok.index');
     }
 
+    public function hapusanggota(Request $request)
+    {
+        $kel = $request->except('_token');
+
+        $get = explode('_', decrypt($kel['id']));
+        $dataid = $get[0];
+        $kelId = $get[1];
+
+        $kelompok = KelompokDetail::query()->find($dataid);
+
+        $kelompok->delete();
+
+        return redirect()->route('mahasiswa.kelompok.createnew',  ['id' => encrypt($kelId)])->with('success', 'Berhasil dihapus');
+    }
+
+
     // public function cetak_kelompok(Request $request)
     // {
     //     $fakultas = $request->fakultas;