Skip to content

S
simpmw
Commit b592db66 by Alfiro Pratama
Options

Re-approve Kelompok mhs, Filter data kelompok view dosen

parent 502b8df9
Showing with 155 additions and 37 deletions
app/Http/Controllers/Dosen/KelompokController.php
...@@ -32,7 +32,11 @@ class KelompokController extends Controller ...@@ -32,7 +32,11 @@ class KelompokController extends Controller
$year = !is_null($request->year) ? $request->year : now()->year; $year = !is_null($request->year) ? $request->year : now()->year;
$kelompok = Kelompok::with(['rAnggota']) $kelompok = Kelompok::with(['rAnggota'])
->where('nidn_dosen', $bio->noidentitas) // ->where('nidn_dosen', $bio->noidentitas)
->when($bio->noidentitas !== null, function ($query) use ($bio) {
return $query->where('nidn_dosen', $bio->noidentitas);
})
->whereRaw('LOWER(nama_dosen) = ?', [strtolower($bio->name)])
->where('kirim', '1') ->where('kirim', '1')
->whereYear('created_at', $year) ->whereYear('created_at', $year)
->orderBy('kode') ->orderBy('kode')
......
app/Http/Controllers/Mahasiswa/AnggotaController.php
...@@ -121,8 +121,16 @@ class AnggotaController extends Controller ...@@ -121,8 +121,16 @@ class AnggotaController extends Controller
* @param int $id * @param int $id
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function destroy($id) public function destroy($anggotum)
{ {
// $anggota = KelompokDetail::find($anggotum);
if ($anggota && $anggota->status_ketua != 1) {
$anggota->delete();
return redirect()->back()->with('success', 'Anggota berhasil dihapus.');
} else {
return redirect()->back()->with('error', 'Tidak dapat menghapus ketua atau anggota tidak ditemukan.');
}
} }
} }
app/Http/Controllers/Operator/KelompokController.php
...@@ -97,17 +97,17 @@ class KelompokController extends Controller ...@@ -97,17 +97,17 @@ class KelompokController extends Controller
if($status == '1') if($status == '1')
{ {
$keterangan = '<span class="badge bg-success">Disetujui</span>'; $keterangan = '<span class="badge bg-success">Disetujui</span>';
$aksi = ''; $aksi = '<a class="btn btn-warning btn-sm waves-effect waves-light aksi" role="button" data-ket="Kelompok yang sudah disetujui dan dibatalkan statusnya, dapat mengubah anggota kelompok serta harus melakukan verifikasi mandiri kembali." data-id="'.Crypt::encrypt($kelompok_id.'#0').'"><i class="fas fa-undo"></i></a>';
} }
elseif($status == '2') elseif($status == '2')
{ {
$keterangan = '<span class="badge bg-danger">Ditolak</span>'; $keterangan = '<span class="badge bg-danger">Ditolak</span>';
$aksi = '<a class="btn btn-warning btn-sm waves-effect waves-light aksi" role="button" data-ket="Kelompok yang di dibatalkan status tolak akan menunggu di verifikasi kembali oleh dosen pembimbing." data-id="'.Crypt::encrypt($kelompok_id.'#0').'"><i class="fas fa-undo"></i></a>'; $aksi = '<a class="btn btn-warning btn-sm waves-effect waves-light aksi" role="button" data-ket="Kelompok yang dibatalkan status tolak akan menunggu di verifikasi kembali oleh dosen pembimbing." data-id="'.Crypt::encrypt($kelompok_id.'#0').'"><i class="fas fa-undo"></i></a>';
} }
else else
{ {
$keterangan = '<span class="badge bg-warning">Menunngu Persetujuan</span>'; $keterangan = '<span class="badge bg-warning">Menunngu Persetujuan</span>';
$aksi = '<a class="btn btn-success btn-sm waves-effect waves-light aksi" role="button" data-ket="Kelompok yang di setujui akan di teruskan untuk upload proposal" data-id="'.Crypt::encrypt($kelompok_id.'#1').'"><i class="fas fa-check"></i></a> <a class="btn btn-danger btn-sm waves-effect waves-light aksi" role="button" data-ket="Kelompok yang tidak di setujui tidak bisa untuk upload proposal" data-id="'.Crypt::encrypt($kelompok_id.'#2').'"><i class="fas fa-times"></i></a>'; $aksi = '<a class="btn btn-success btn-sm waves-effect waves-light aksi" role="button" data-ket="Kelompok yang disetujui akan diteruskan untuk upload proposal" data-id="'.Crypt::encrypt($kelompok_id.'#1').'"><i class="fas fa-check"></i></a> <a class="btn btn-danger btn-sm waves-effect waves-light aksi" role="button" data-ket="Kelompok yang tidak di setujui tidak bisa untuk upload proposal" data-id="'.Crypt::encrypt($kelompok_id.'#2').'"><i class="fas fa-times"></i></a>';
} }
$aksi .= ' <a class="btn btn-primary btn-sm waves-effect waves-light viewdetails" role="button" data-id="'.Crypt::encrypt($kelompok_id).'"><i class="fas fa-eye"></i></a>'; $aksi .= ' <a class="btn btn-primary btn-sm waves-effect waves-light viewdetails" role="button" data-id="'.Crypt::encrypt($kelompok_id).'"><i class="fas fa-eye"></i></a>';
......
resources/views/backend/mahasiswa/kelompok/create.blade.php
...@@ -81,8 +81,25 @@ ...@@ -81,8 +81,25 @@
// scrolling can be used // scrolling can be used
params.page = params.page || 1; params.page = params.page || 1;
// return {
// results: data.items,
// pagination: {
// more: (params.page * 30) < data.total_count
// }
// };
// },
const modifiedItems = data.items.map(item => {
return { return {
results: data.items, id: item.id,
text: item.full_name,
full_name: item.full_name,
description: item.description,
disabled: item.disabled || false,
};
});
return {
results: modifiedItems,
pagination: { pagination: {
more: (params.page * 30) < data.total_count more: (params.page * 30) < data.total_count
} }
...@@ -106,13 +123,13 @@ ...@@ -106,13 +123,13 @@
"<div class='select2-result-repository clearfix'>" + "<div class='select2-result-repository clearfix'>" +
"<div class='select2-result-repository__meta'>" + "<div class='select2-result-repository__meta'>" +
"<div class='select2-result-repository__title'></div>" + "<div class='select2-result-repository__title'></div>" +
"<div class='select2-result-repository__description'></div>" + "<div class='select2-result-repository__description text-muted'></div>" +
"</div>" + "</div>" +
"</div>" "</div>"
); );
$container.find(".select2-result-repository__title").text(repo.full_name); $container.find(".select2-result-repository__title").text(repo.full_name);
$container.find(".select2-result-repository__description").text(repo.description); $container.find(".select2-result-repository__description").html(repo.description);
return $container; return $container;
} }
......
resources/views/backend/mahasiswa/kelompok/createkel.blade.php
...@@ -55,9 +55,14 @@ ...@@ -55,9 +55,14 @@
<div class="col-10"> <div class="col-10">
<h4 class="card-title">Anggota Kelompok</h4> <h4 class="card-title">Anggota Kelompok</h4>
</div> </div>
{{-- <div class="col-2">
<a href="{{ URL::to('mahasiswa/anggota/create') }}" class="btn btn-info btn-sm">Tambah Anggota</a>
</div> --}}
@if($kelompok->rAnggota->count() < 5)
<div class="col-2"> <div class="col-2">
<a href="{{ URL::to('mahasiswa/anggota/create') }}" class="btn btn-info btn-sm">Tambah Anggota</a> <a href="{{ URL::to('mahasiswa/anggota/create') }}" class="btn btn-info btn-sm">Tambah Anggota</a>
</div> </div>
@endif
</div> </div>
<br/> <br/>
<div class="table-responsive"> <div class="table-responsive">
...@@ -70,7 +75,7 @@ ...@@ -70,7 +75,7 @@
<td>Fakultas</td> <td>Fakultas</td>
<td>Program Studi</td> <td>Program Studi</td>
<td>Keterangan</td> <td>Keterangan</td>
<td></td> <td>#</td>
</tr> </tr>
<thead> <thead>
<tbody> <tbody>
...@@ -88,7 +93,16 @@ ...@@ -88,7 +93,16 @@
Anggota {{ $loop->iteration-1 }} Anggota {{ $loop->iteration-1 }}
@endif @endif
</td> </td>
<td></td> <td>
@if($item->status_ketua != 1)
{{-- <form action="{{ route('mahasiswa.anggota.destroy', $item->kelompok_detil_id) }}" method="POST" onsubmit="return confirm('Yakin ingin menghapus anggota ini?');"> --}}
<form action="{{ route('mahasiswa.anggota.destroy', $item->kelompok_detil_id) }}" method="POST" class="delete-form">
@csrf
@method('DELETE')
<button type="submit" class="btn btn-danger btn-sm" id="deleteButton"><i class="fas fa-trash-alt"></i></button>
</form>
@endif
</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
...@@ -110,7 +124,7 @@ ...@@ -110,7 +124,7 @@
<strong>Informasi!</strong> Anggota kelompok minimal 3 dan maksimal 5 </strong> <strong>Informasi!</strong> Anggota kelompok minimal 3 dan maksimal 5 </strong>
</div> </div>
<div class="mb-0"> <div class="mb-0">
@if($kelompok->rAnggota->count() >= 3) @if($kelompok->rAnggota->count() >= 3 && $kelompok->rAnggota->count() <= 5)
<button type="submit" class="btn btn-primary waves-effect waves-light me-1 btnSimpanKelompok" id="btnSimpanKelompok"> Submit </button> <button type="submit" class="btn btn-primary waves-effect waves-light me-1 btnSimpanKelompok" id="btnSimpanKelompok"> Submit </button>
@endif @endif
<a href="{{ URL::to('mahasiswa/kelompok') }}" type="reset" class="btn btn-secondary waves-effect"> Kembali </a> <a href="{{ URL::to('mahasiswa/kelompok') }}" type="reset" class="btn btn-secondary waves-effect"> Kembali </a>
...@@ -133,4 +147,29 @@ ...@@ -133,4 +147,29 @@
$("#addKelompok").submit(); $("#addKelompok").submit();
}); });
</script> </script>
<script>
// Menambahkan SweetAlert untuk konfirmasi penghapusan
document.querySelectorAll('.delete-form').forEach((form) => {
form.addEventListener('submit', function (e) {
e.preventDefault(); // Mencegah form untuk submit langsung
Swal.fire({
title: 'Yakin ingin menghapus anggota ini?',
text: "Data ini tidak bisa dikembalikan lagi!",
icon: 'warning',
showCancelButton: true,
confirmButtonText: 'Ya, hapus!',
cancelButtonText: 'Batal',
reverseButtons: true,
confirmButtonColor: '#d33',
cancelButtonColor: '#28a745'
}).then((result) => {
if (result.isConfirmed) {
// Jika user memilih "Ya", form akan disubmit
form.submit();
}
});
});
});
</script>
@endsection @endsection
resources/views/backend/operator/kelompok/index.blade.php
...@@ -186,6 +186,51 @@ ...@@ -186,6 +186,51 @@
} }
}); });
// $('#example').on('click','.aksi',function(){
// var kelId = $(this).attr('data-id');
// var ket = $(this).attr('data-ket');
// if(kelId != null || kelId != ''){
// Swal.fire({
// title: "Apakah Anda Yakin?",
// text: ket,
// icon: "warning",
// showCancelButton: !0,
// confirmButtonText: "Ya!",
// cancelButtonText: "Tidak, Kembali!",
// confirmButtonClass: "btn btn-success mt-2",
// cancelButtonClass: "btn btn-danger ms-2 mt-2",
// buttonsStyling: !1,
// allowOutsideClick: !1,
// showLoaderOnConfirm: true
// }).then((result) => {
// if (result.value){
// $.ajax({
// url:'{{url("/operator/proses-kelompok")}}',
// type:'POST',
// data:{
// "_token": "{{ csrf_token() }}",
// "kelompokId": kelId
// },
// dataType: "JSON",
// })
// .done(function(response){
// swal.fire(response.status, response.message, response.status).then(function(){
// oTable.ajax.reload();
// });
// })
// .fail(function(){
// swal.fire('Oops...', 'Something went wrong with ajax !', 'error');
// });
// }
// else
// {
// swal.fire('Batal!', 'Data batal diproses.', 'error');
// }
// })
// }
// });
$('#example').on('click','.aksi',function(){ $('#example').on('click','.aksi',function(){
var kelId = $(this).attr('data-id'); var kelId = $(this).attr('data-id');
var ket = $(this).attr('data-ket'); var ket = $(this).attr('data-ket');
...@@ -195,39 +240,44 @@ ...@@ -195,39 +240,44 @@
title: "Apakah Anda Yakin?", title: "Apakah Anda Yakin?",
text: ket, text: ket,
icon: "warning", icon: "warning",
showCancelButton: !0, showCancelButton: true,
confirmButtonText: "Ya!", confirmButtonText: "Ya!",
cancelButtonText: "Tidak, Kembali!", cancelButtonText: "Tidak, Kembali!",
confirmButtonClass: "btn btn-success mt-2", confirmButtonColor: "#d33", // Merah
cancelButtonClass: "btn btn-danger ms-2 mt-2", cancelButtonColor: "#3085d6", // Biru
buttonsStyling: !1, showLoaderOnConfirm: true,
allowOutsideClick: !1, allowOutsideClick: false,
showLoaderOnConfirm: true preConfirm: () => {
}).then((result) => { return $.ajax({
if (result.value){ url: '{{ url("/operator/proses-kelompok") }}',
$.ajax({ type: 'POST',
url:'{{url("/operator/proses-kelompok")}}', data: {
type:'POST',
data:{
"_token": "{{ csrf_token() }}", "_token": "{{ csrf_token() }}",
"kelompokId": kelId "kelompokId": kelId
}, },
dataType: "JSON", dataType: "json"
}) }).then(response => {
.done(function(response){ return response;
swal.fire(response.status, response.message, response.status).then(function(){ }).catch(error => {
oTable.ajax.reload(); Swal.showValidationMessage(
}); `Request gagal: ${error.statusText}`
}) );
.fail(function(){
swal.fire('Oops...', 'Something went wrong with ajax !', 'error');
}); });
} }
else }).then((result) => {
{ if (result.isConfirmed) {
swal.fire('Batal!', 'Data batal diproses.', 'error'); Swal.fire({
title: 'Berhasil!',
text: result.value.message,
icon: result.value.status,
confirmButtonText: 'OK'
}).then(() => {
oTable.ajax.reload();
});
} else if (result.dismiss === Swal.DismissReason.cancel) {
Swal.fire('Dibatalkan', 'Tidak jadi memproses data.', 'info');
} }
}) });
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment