Commit 6929b02f by Alfiro Pratama

fix value data

parent 77d0b2ef
...@@ -66,7 +66,7 @@ class KelompokController extends Controller ...@@ -66,7 +66,7 @@ class KelompokController extends Controller
$kelompok = Kelompok::query()->find(decrypt($kel['id'])); $kelompok = Kelompok::query()->find(decrypt($kel['id']));
$kelompok->status = 2; $kelompok->status = '2';
$kelompok->save(); $kelompok->save();
Alert::success('Berhasil disimpan'); Alert::success('Berhasil disimpan');
...@@ -80,7 +80,7 @@ class KelompokController extends Controller ...@@ -80,7 +80,7 @@ class KelompokController extends Controller
$kelompok = Kelompok::query()->find(decrypt($kel['id'])); $kelompok = Kelompok::query()->find(decrypt($kel['id']));
$kelompok->status = 1; $kelompok->status = '1';
$kelompok->save(); $kelompok->save();
Alert::success('Berhasil disimpan'); Alert::success('Berhasil disimpan');
...@@ -96,7 +96,7 @@ class KelompokController extends Controller ...@@ -96,7 +96,7 @@ class KelompokController extends Controller
$no = 1; $no = 1;
$anggota= 0; $anggota= 0;
foreach ($kelompok_detil as $key => $value) { foreach ($kelompok_detil as $key => $value) {
if($value->status_ketua == 1) if($value->status_ketua == '1')
$keterangan = "Ketua"; $keterangan = "Ketua";
else else
{ {
......
...@@ -69,7 +69,7 @@ class ProposalController extends Controller ...@@ -69,7 +69,7 @@ class ProposalController extends Controller
$proposal = Proposal::query()->find(decrypt($proId['id'])); $proposal = Proposal::query()->find(decrypt($proId['id']));
$proposal->status = 1; $proposal->status = '1';
$proposal->date_approval = now(); $proposal->date_approval = now();
$proposal->save(); $proposal->save();
......
...@@ -125,7 +125,7 @@ class AnggotaController extends Controller ...@@ -125,7 +125,7 @@ class AnggotaController extends Controller
{ {
$anggota = KelompokDetail::find($anggotum); $anggota = KelompokDetail::find($anggotum);
if ($anggota && $anggota->status_ketua != 1) { if ($anggota && $anggota->status_ketua != '1') {
$anggota->delete(); $anggota->delete();
return redirect()->back()->with('success', 'Anggota berhasil dihapus.'); return redirect()->back()->with('success', 'Anggota berhasil dihapus.');
......
...@@ -202,8 +202,8 @@ class KelompokController extends Controller ...@@ -202,8 +202,8 @@ class KelompokController extends Controller
$kelompok = Kelompok::query()->find($kel['kelompok_id']); $kelompok = Kelompok::query()->find($kel['kelompok_id']);
$kelompok->status = 1; $kelompok->status = '1';
$kelompok->kirim = 1; $kelompok->kirim = '1';
$kelompok->save(); $kelompok->save();
Alert::success('Berhasil disimpan'); Alert::success('Berhasil disimpan');
......
...@@ -147,7 +147,7 @@ class KelompokController extends Controller ...@@ -147,7 +147,7 @@ class KelompokController extends Controller
$no = 1; $no = 1;
$anggota= 0; $anggota= 0;
foreach ($kelompok_detil as $key => $value) { foreach ($kelompok_detil as $key => $value) {
if($value->status_ketua == 1) if($value->status_ketua == '1')
$keterangan = "Ketua"; $keterangan = "Ketua";
else else
{ {
...@@ -201,7 +201,7 @@ class KelompokController extends Controller ...@@ -201,7 +201,7 @@ class KelompokController extends Controller
public function update(Request $request, $id) public function update(Request $request, $id)
{ {
} }
public function updateKetua(Request $request) public function updateKetua(Request $request)
...@@ -210,11 +210,11 @@ class KelompokController extends Controller ...@@ -210,11 +210,11 @@ class KelompokController extends Controller
try { try {
foreach($request->kelompok_detil_id as $key => $kelompok_detil_id) { foreach($request->kelompok_detil_id as $key => $kelompok_detil_id) {
$status_ketua = $request->keterangan[$key]; $status_ketua = $request->keterangan[$key];
KelompokDetail::where('kelompok_detil_id', $kelompok_detil_id) KelompokDetail::where('kelompok_detil_id', $kelompok_detil_id)
->update(['status_ketua' => $status_ketua]); ->update(['status_ketua' => $status_ketua]);
} }
DB::commit(); DB::commit();
return response()->json(['success' => true, 'message' => 'Data berhasil disimpan.']); return response()->json(['success' => true, 'message' => 'Data berhasil disimpan.']);
} catch (\Exception $e) { } catch (\Exception $e) {
......
...@@ -302,7 +302,7 @@ class ProposalController extends Controller ...@@ -302,7 +302,7 @@ class ProposalController extends Controller
$data = ''; $data = '';
$no = 1; $no = 1;
foreach ($kelompok_detil as $key => $value) { foreach ($kelompok_detil as $key => $value) {
if($value->status_ketua == 1) if($value->status_ketua == '1')
$keterangan = "Ketua"; $keterangan = "Ketua";
else else
$keterangan = "Anggota ".$no-1; $keterangan = "Anggota ".$no-1;
......
...@@ -307,9 +307,9 @@ class DaftarSeleksiController extends Controller ...@@ -307,9 +307,9 @@ class DaftarSeleksiController extends Controller
} }
$nilai = URL::to("reviewer/seleksi-internal/".Crypt::encrypt($proposal_id)."/edit"); $nilai = URL::to("reviewer/seleksi-internal/".Crypt::encrypt($proposal_id)."/edit");
if($status_administrasi != 0) if($status_administrasi != '0')
{ {
if($status_nilai == 1) if($status_nilai == '1')
{ {
if($urut == '1') if($urut == '1')
$aksi = '<h4>'.$nilai_1.'</h4>'; $aksi = '<h4>'.$nilai_1.'</h4>';
......
...@@ -41,9 +41,9 @@ class NilaiSeleksiInternal ...@@ -41,9 +41,9 @@ class NilaiSeleksiInternal
return $next($request); return $next($request);
} }
if($status_administrasi != 0) if($status_administrasi != '0')
{ {
if($status_nilai != 1) if($status_nilai != '1')
{ {
if($status_administrasi != '2') if($status_administrasi != '2')
return $next($request); return $next($request);
......
...@@ -42,7 +42,7 @@ class Kelompok extends Model ...@@ -42,7 +42,7 @@ class Kelompok extends Model
public function rKetua() public function rKetua()
{ {
return $this->hasOne(KelompokDetail::class, 'kelompok_id', 'kelompok_id') return $this->hasOne(KelompokDetail::class, 'kelompok_id', 'kelompok_id')
->whereRaw("TRIM(status_ketua) = '1'"); ->where('status_ketua', '1');
} }
public function rBiodata() public function rBiodata()
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<td>{{ $item->nidn_dosen }}</td> <td>{{ $item->nidn_dosen }}</td>
<td> <td>
@if(!is_null($item->kirim)) @if(!is_null($item->kirim))
@if($item->status == 0) @if($item->status == '0')
<span class="badge bg-danger">Menunggu Persetujuan Dosen</span> <span class="badge bg-danger">Menunggu Persetujuan Dosen</span>
@else @else
<span class="badge bg-success">Sudah Disetujui Dosen</span> <span class="badge bg-success">Sudah Disetujui Dosen</span>
...@@ -92,12 +92,12 @@ ...@@ -92,12 +92,12 @@
{{-- <button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->kelompok_id }}" href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->kelompok_id)) }}" class="btn btn-info btn-sm"><i class="far fa-eye"></i> Lihat</button> --}} {{-- <button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->kelompok_id }}" href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->kelompok_id)) }}" class="btn btn-info btn-sm"><i class="far fa-eye"></i> Lihat</button> --}}
<a data-toggle="tooltip" data-id="{{ $item->kelompok_id }}" data-original-title="Lihat" class="btn btn-info btn-sm lihatDet"><i class="far fa-eye"></i> Lihat</a> <a data-toggle="tooltip" data-id="{{ $item->kelompok_id }}" data-original-title="Lihat" class="btn btn-info btn-sm lihatDet"><i class="far fa-eye"></i> Lihat</a>
@if($item->status == 0) @if($item->status == '0')
<a onclick="setuju('{{ encrypt($item->kelompok_id) }}', 'row-{{ $token }}')" class="btn btn-success btn-sm"><i class="fas fa-check"></i> Setuju</a> <a onclick="setuju('{{ encrypt($item->kelompok_id) }}', 'row-{{ $token }}')" class="btn btn-success btn-sm"><i class="fas fa-check"></i> Setuju</a>
<a onclick="tolak('{{ encrypt($item->kelompok_id) }}', 'row-{{ $token }}')" class="btn btn-danger btn-sm"><i class="fas fa-times"></i> Tolak</a> <a onclick="tolak('{{ encrypt($item->kelompok_id) }}', 'row-{{ $token }}')" class="btn btn-danger btn-sm"><i class="fas fa-times"></i> Tolak</a>
@endif @endif
@if((auth()->user()->id == $item->created_user) && ($item->status == 0)) @if((auth()->user()->id == $item->created_user) && ($item->status == '0'))
<a href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->kelompok_id)) }}" class="btn btn-warning btn-sm">Edit</a> <a href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->kelompok_id)) }}" class="btn btn-warning btn-sm">Edit</a>
<a onclick="hapus('{{ encrypt($item->kelompok_id) }}', 'row-{{ $token }}')" class="btn btn-danger btn-sm">Hapus</a> <a onclick="hapus('{{ encrypt($item->kelompok_id) }}', 'row-{{ $token }}')" class="btn btn-danger btn-sm">Hapus</a>
@endif @endif
......
...@@ -85,9 +85,9 @@ ...@@ -85,9 +85,9 @@
@endif @endif
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">
@if(is_null($item->rDaftarPro->status_final) || $item->rDaftarPro->status_final == 0) @if(is_null($item->rDaftarPro->status_final) || $item->rDaftarPro->status_final == '0')
<span class="badge bg-info">Menunggu Reviewer</span> <span class="badge bg-info">Menunggu Reviewer</span>
@elseif($item->rDaftarPro->status_final == 1) @elseif($item->rDaftarPro->status_final == '1')
<span class="badge bg-success">Lolos Seleksi Internal</span> <span class="badge bg-success">Lolos Seleksi Internal</span>
@else @else
<span class="badge bg-danger">Tidak Lolos Seleksi Internal</span> <span class="badge bg-danger">Tidak Lolos Seleksi Internal</span>
......
...@@ -87,14 +87,14 @@ ...@@ -87,14 +87,14 @@
<td>{{ $item->fakultas }}</td> <td>{{ $item->fakultas }}</td>
<td>{{ $item->prodi }}</td> <td>{{ $item->prodi }}</td>
<td> <td>
@if($item->status_ketua == 1) @if($item->status_ketua == '1')
Ketua Ketua
@else @else
Anggota {{ $loop->iteration-1 }} Anggota {{ $loop->iteration-1 }}
@endif @endif
</td> </td>
<td> <td>
@if($item->status_ketua != 1) @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" onsubmit="return confirm('Yakin ingin menghapus anggota ini?');"> --}}
<form action="{{ route('mahasiswa.anggota.destroy', $item->kelompok_detil_id) }}" method="POST" class="delete-form"> <form action="{{ route('mahasiswa.anggota.destroy', $item->kelompok_detil_id) }}" method="POST" class="delete-form">
@csrf @csrf
......
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
<td>{{ $item->nidn_dosen }}</td> <td>{{ $item->nidn_dosen }}</td>
<td> <td>
@if(!is_null($item->kirim)) @if(!is_null($item->kirim))
@if($item->status == 0) @if($item->status == '0')
<span class="badge bg-warning">Menunggu Persetujuan Dosen</span> <span class="badge bg-warning">Menunggu Persetujuan Dosen</span>
@elseif($item->status == 2) @elseif($item->status == '2')
<span class="badge bg-danger">Di Tolak Dosen</span> <span class="badge bg-danger">Di Tolak Dosen</span>
@else @else
<span class="badge bg-success">Sudah Disetujui Dosen</span> <span class="badge bg-success">Sudah Disetujui Dosen</span>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<td> <td>
<button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->kelompok_id }}" href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->kelompok_id)) }}" class="btn btn-info btn-sm">Lihat</button> <button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->kelompok_id }}" href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->kelompok_id)) }}" class="btn btn-info btn-sm">Lihat</button>
@if((auth()->user()->id == $item->created_user) && ($item->status == 0)) @if((auth()->user()->id == $item->created_user) && ($item->status == '0'))
<a href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->kelompok_id)) }}" class="btn btn-warning btn-sm">Edit</a> <a href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->kelompok_id)) }}" class="btn btn-warning btn-sm">Edit</a>
<a onclick="hapus('{{ encrypt($item->kelompok_id) }}', 'row-{{ $token }}')" class="btn btn-danger btn-sm">Hapus</a> <a onclick="hapus('{{ encrypt($item->kelompok_id) }}', 'row-{{ $token }}')" class="btn btn-danger btn-sm">Hapus</a>
@endif @endif
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
<td>{{ $value->fakultas }}</td> <td>{{ $value->fakultas }}</td>
<td>{{ $value->prodi }}</td> <td>{{ $value->prodi }}</td>
<td> <td>
@if($value->status_ketua == 1) @if($value->status_ketua == '1')
Ketua Ketua
@else @else
Anggota {{ $loop->iteration-1 }} Anggota {{ $loop->iteration-1 }}
......
...@@ -128,9 +128,9 @@ ...@@ -128,9 +128,9 @@
@else @else
<span class="badge bg-success">Tidak Lolos Seleksi Internal</span> <span class="badge bg-success">Tidak Lolos Seleksi Internal</span>
@endif --}} @endif --}}
@if(is_null($item->rProposal->status) || $item->rProposal->status == 0) @if(is_null($item->rProposal->status) || $item->rProposal->status == '0')
<span class="badge bg-info">Menunggu Reviewer</span> <span class="badge bg-info">Menunggu Reviewer</span>
@elseif($item->rProposal->status == 1) @elseif($item->rProposal->status == '1')
<span class="badge bg-success">Lolos Seleksi Internal</span> <span class="badge bg-success">Lolos Seleksi Internal</span>
@else @else
<span class="badge bg-danger">Tidak Lolos Seleksi Internal</span> <span class="badge bg-danger">Tidak Lolos Seleksi Internal</span>
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<td align="center"> <td align="center">
<button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->id }}" class="btn btn-success btn-sm form-control mb-2"><i class="fas fa-search"></i> Hasil Penilaian</button> <button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->id }}" class="btn btn-success btn-sm form-control mb-2"><i class="fas fa-search"></i> Hasil Penilaian</button>
<a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->id.'__proposal__II')) }}" type="button" class="btn btn-danger btn-sm waves-effect waves-light form-control" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Revisi Proposal"><i class="fas fa-file-upload"></i> Revisi</a> <a href="{{ URL::to('mahasiswa/monev-revisi/'.encrypt($item->id.'__proposal__II')) }}" type="button" class="btn btn-danger btn-sm waves-effect waves-light form-control" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Revisi Proposal"><i class="fas fa-file-upload"></i> Revisi</a>
<div id="{{ 'lihat'.$item->id }}" class="modal fade" tabindex="-1" role="dialog" <div id="{{ 'lihat'.$item->id }}" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="lihatLabel" aria-hidden="true"> aria-labelledby="lihatLabel" aria-hidden="true">
<div class="modal-dialog modal-xl"> <div class="modal-dialog modal-xl">
...@@ -140,9 +140,9 @@ ...@@ -140,9 +140,9 @@
@else @else
<span class="badge bg-success">Tidak Lolos Seleksi Internal</span> <span class="badge bg-success">Tidak Lolos Seleksi Internal</span>
@endif --}} @endif --}}
@if(is_null($item->rProposal->status) || $item->rProposal->status == 0) @if(is_null($item->rProposal->status) || $item->rProposal->status == '0')
<span class="badge bg-info">Menunggu Reviewer</span> <span class="badge bg-info">Menunggu Reviewer</span>
@elseif($item->rProposal->status == 1) @elseif($item->rProposal->status == '1')
<span class="badge bg-success">Lolos Seleksi Internal</span> <span class="badge bg-success">Lolos Seleksi Internal</span>
@else @else
<span class="badge bg-danger">Tidak Lolos Seleksi Internal</span> <span class="badge bg-danger">Tidak Lolos Seleksi Internal</span>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<td colspan="2"> <td colspan="2">
<h4 class="card-title mb-4">Reviewer 1</h4> <h4 class="card-title mb-4">Reviewer 1</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2</h4> <h4 class="card-title mb-4">Reviewer 2</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p>
</td> </td>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
</div> </div>
</div> </div>
</div> </div>
</td> </td>
</tr> </tr>
@endforeach @endforeach
......
...@@ -86,9 +86,9 @@ ...@@ -86,9 +86,9 @@
@endif @endif
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">
@if(is_null($item->rDaftarPro->status_final) || $item->rDaftarPro->status_final == 0) @if(is_null($item->rDaftarPro->status_final) || $item->rDaftarPro->status_final == '0')
<span class="badge bg-info">Menunggu Reviewer</span> <span class="badge bg-info">Menunggu Reviewer</span>
@elseif($item->rDaftarPro->status_final == 1) @elseif($item->rDaftarPro->status_final == '1')
<span class="badge bg-success">Lolos Seleksi Internal</span> <span class="badge bg-success">Lolos Seleksi Internal</span>
@else @else
<span class="badge bg-danger">Tidak Lolos Seleksi Internal</span> <span class="badge bg-danger">Tidak Lolos Seleksi Internal</span>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
$bgColor = "background-color: #FFFF00"; $bgColor = "background-color: #FFFF00";
} }
@endphp --}} @endphp --}}
@if ($proposal['status'] == 2) @if ($proposal['status'] == '2')
<tr> <tr>
<td rowspan="{{ count($proposal['kelompok']) }}" style="background-color: red; vertical-align: top; text-align: right; border: 1px solid black;">{{ $no++ }}</td> <td rowspan="{{ count($proposal['kelompok']) }}" style="background-color: red; vertical-align: top; text-align: right; border: 1px solid black;">{{ $no++ }}</td>
<td rowspan="{{ count($proposal['kelompok']) }}" style="background-color: red; vertical-align: top; text-align: center; border: 1px solid black;">{{ $proposal['kode'] }}</td> <td rowspan="{{ count($proposal['kelompok']) }}" style="background-color: red; vertical-align: top; text-align: center; border: 1px solid black;">{{ $proposal['kode'] }}</td>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</tr> </tr>
@endif @endif
@endforeach @endforeach
@elseif ($proposal['status'] == 0) @elseif ($proposal['status'] == '0')
<tr> <tr>
<td rowspan="{{ count($proposal['kelompok']) }}" style="background-color: yellow; vertical-align: top; text-align: right; border: 1px solid black;">{{ $no++ }}</td> <td rowspan="{{ count($proposal['kelompok']) }}" style="background-color: yellow; vertical-align: top; text-align: right; border: 1px solid black;">{{ $no++ }}</td>
<td rowspan="{{ count($proposal['kelompok']) }}" style="background-color: yellow; vertical-align: top; text-align: center; border: 1px solid black;">{{ $proposal['kode'] }}</td> <td rowspan="{{ count($proposal['kelompok']) }}" style="background-color: yellow; vertical-align: top; text-align: center; border: 1px solid black;">{{ $proposal['kode'] }}</td>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
@endforeach @endforeach
@endif @endif
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
{{-- </body> {{-- </body>
</html> --}} </html> --}}
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