Skip to content
Snippets Groups Projects
Commit 89512544 authored by Rahmat Santosa's avatar Rahmat Santosa
Browse files

add commit rifo

parent 11c6e4ff
Branches master
No related merge requests found
Pipeline #8075 failed with stage
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/ManajerController.php
+ 18
− 0
View file @ 89512544
......@@ -54,6 +54,24 @@ class ManajerController extends Controller
$mahasiswa = $user->isMahasiswa();
if ($mahasiswa) {
// Error handling for invalid status change
if(($mahasiswa->status == Mahasiswa::STATUS_TOPIK_DITERIMA || $mahasiswa->status == Mahasiswa::STATUS_TOPIK_DITOLAK) && $mahasiswa->t_topik2 == NULL ||
$mahasiswa->status == Mahasiswa::STATUS_SIAP_SEMINAR_TOPIK && $mahasiswa->t_topik3 == NULL ||
($mahasiswa->status == Mahasiswa::STATUS_LULUS_SEMINAR_TOPIK || $mahasiswa->status == Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK) && $mahasiswa->t_topik4 == NULL ||
$mahasiswa->status == Mahasiswa::STATUS_MENUNGGU_PROPOSAL && $mahasiswa->t_proposal1 == NULL ||
$mahasiswa->status == Mahasiswa::STATUS_PROPOSAL_TELAH_DIAJUKAN && $mahasiswa->t_proposal2 == NULL ||
($mahasiswa->status == Mahasiswa::STATUS_PROPOSAL_DITERIMA || $mahasiswa->status == Mahasiswa::STATUS_PROPOSAL_DITOLAK) && $mahasiswa->t_proposal3 == NULL ||
$mahasiswa->status == Mahasiswa::STATUS_SIAP_SEMINAR_PROPOSAL && $mahasiswa->t_proposal4 == NULL ||
($mahasiswa->status == Mahasiswa::STATUS_LULUS_SEMINAR_PROPOSAL || $mahasiswa->status == Mahasiswa::STATUS_GAGAL_SEMINAR_PROPOSAL) && $mahasiswa->t_proposal4 == NULL ||
$mahasiswa->status == Mahasiswa::STATUS_DOSEN_PEMBIMBING_TELAH_DIPILIH && $mahasiswa->t_proposal4 == NULL ||
$mahasiswa->status == Mahasiswa::STATUS_MASA_BIMBINGAN && $mahasiswa->t_proposal4 == NULL ||
$mahasiswa->status == Mahasiswa::STATUS_SIAP_SEMINAR_TESIS && $mahasiswa->t_seminar1 == NULL ||
($mahasiswa->status == Mahasiswa::STATUS_LULUS_SEMINAR_TESIS || $mahasiswa->status == Mahasiswa::STATUS_GAGAL_SEMINAR_TESIS) && $mahasiswa->t_seminar2 == NULL ||
$mahasiswa->status == Mahasiswa::STATUS_SIAP_SIDANG_TESIS && $mahasiswa->t_sidang == NULL
){
return abort(400);
}
return view('manajer.detail_mahasiswa_control',
[
'mahasiswa' => $mahasiswa,
......
public/mix-manifest.json
+ 1
− 1
View file @ 89512544
{
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css"
}
}
\ No newline at end of file
resources/views/dosen/index.blade.php
+ 6
− 6
View file @ 89512544
......@@ -253,7 +253,7 @@
@php($usr = $mhs->user())
<div class="border border-color-black pt-1 pr-1 pl-1 pb-1">
<div class="row">
<table class="col-md-8">
<table class="col-md-8 col-sm-8">
<tr>
<td>
Mahasiswa
......@@ -334,7 +334,7 @@
<div class="card-body">
<div class="border border-color-black pt-1 pr-1 pl-1 pb-1">
<div class="row">
<table class="col-md-8">
<table class="col-md-8 col-sm-8">
<tr>
<td>
Mahasiswa
......@@ -605,7 +605,7 @@
@php($jadwalbimbingan = \Carbon\Carbon::createFromFormat("Y-m-d H:i:s",$item->gethasilBimbingan()[0]->waktu_bimbingan_selanjutnya))
@if($jadwalbimbingan >= $currenttime)
<div class="row">
<div class="col-md-4 text-center" style="border-right: 1px solid grey">
<div class="col-md-4 col-sm-4 text-center" style="border-right: 1px solid grey">
<i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i>
<div>{{$jadwalbimbingan->format('d M Y')}}</div>
</div>
......@@ -635,7 +635,7 @@
@php($jadwalseminar = \Carbon\Carbon::createFromFormat("Y-m-d H:i:s", $datetimeString))
@if($jadwalseminar >= $currenttime)
<div class="row">
<div class="col-md-4 text-center" style="border-right: 1px solid grey">
<div class="col-md-4 col-sm-4 text-center" style="border-right: 1px solid grey">
<i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i>
<div>{{$jadwalseminar->format('d M Y')}}</div>
</div>
......@@ -661,7 +661,7 @@
@php($user = $st->tesis->mahasiswa->user())
@if($st->tanggal.'T'.$st->waktu >= $currenttime)
<div class="row">
<div class="col-md-4 text-center" style="border-right: 1px solid grey">
<div class="col-md-4 col-sm-4 text-center" style="border-right: 1px solid grey">
<i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i>
<div>{{date("d M Y", strtotime($st->tanggal.'T'.$st->jam.'UTC'))}}</div>
</div>
......@@ -698,7 +698,7 @@
@php($user = $st->tesis->mahasiswa->user())
@if($st->tanggal.'T'.$st->waktu >= $currenttime)
<div class="row">
<div class="col-md-4 text-center" style="border-right: 1px solid grey">
<div class="col-md-4 col-sm-4 text-center" style="border-right: 1px solid grey">
<i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i>
<div>{{date("d M Y", strtotime($st->tanggal.'T'.$st->jam.'UTC'))}}</div>
</div>
......
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