diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 1917983dae702dec67b3bf9589c1af425506841a..d397594592538e5dcb7b1299fa5a66241b1f57cf 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -84,12 +84,13 @@ class RegisterController extends Controller $data = $request->all(); $username = $data['username']; if(User::where('username',$username)->count()>0) { - echo "User already exist"; + echo '<div class="alert alert-warning alert-dismissible fade show text-center"> + <button type="button" class="close" data-dismiss="alert">×</button> + <strong>Warning!</strong> This user already exist. + </div>'; + return view('auth.register'); } else { - echo "Creating user...<br>"; $user = $this->create($data); - echo "User: ".$user->username." created...<br>"; - echo "Creating Model"; $role = $data['role']; if($role == User::ROLE_DOSEN) { Dosen::create(['id'=>$user->id]); @@ -98,6 +99,7 @@ class RegisterController extends Controller } else if($role == User::ROLE_MANAJER) { Manajer::create(['id'=>$user->id]); } + return view('manajer.index'); } // echo $id; diff --git a/resources/views/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php index 1a2bbf51bf3b1b3a0aac357f946a454a9441d479..36e962c73c7d1565786dc5aa9618660f79a45e3e 100644 --- a/resources/views/dosen/detail_mahasiswa.blade.php +++ b/resources/views/dosen/detail_mahasiswa.blade.php @@ -41,17 +41,25 @@ </div> </div> <div class="row mt-3 justify-content-center "> - <a href="/seminartesis/create/{{$mahasiswa->user()->username}}"class="mb-4"> - <button class="btn btn-blue"> - Buat Pengajuan Seminar Tesis - </button> - </a> + @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS) + <fieldset disabled="disabled" class="mb-4"> + @endif + <a href="/seminartesis/create/{{$mahasiswa->user()->username}}"class="mb-4"> + <button class="btn btn-blue"> + Buat Pengajuan Seminar Tesis + </button> + </a> + </fieldset> + @if($mahasiswa->status == \App\Mahasiswa::STATUS_LULUS) + <fieldset disabled="disabled"> + @endif @if($mahasiswa->status >= \App\Mahasiswa::STATUS_LULUS_SEMINAR_TESIS) <a href="/sidangtesis/create/{{$mahasiswa->user()->username}}" class="mb-4"> <button class="btn btn-blue"> Buat Pengajuan Sidang Tesis </button> </a> + </fieldset> @endif </div> diff --git a/resources/views/dosen/index.blade.php b/resources/views/dosen/index.blade.php index d88da31efbc374ba0e17909f3c9a3e83e05374d5..2919fe14eb4e6a7f4b7e008ebf4dfda6cc73b0c1 100644 --- a/resources/views/dosen/index.blade.php +++ b/resources/views/dosen/index.blade.php @@ -286,14 +286,14 @@ @php($jadwalseminar = \Carbon\Carbon::createFromFormat("Y-m-d H:i:s", $datetimeString)) @if($jadwalseminar >= $currenttime) <div class="row"> - <div class="col-md-auto text-center" style="border-right: 1px solid grey"> + <div class="col-md-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> <div class="col"> <div class="row mb-4"> <div class="col"> - <h5><span class="badge badge-success">Seminar Tesis</span></h5> + <h5><span class="badge badge-warning text-color-white">Seminar Tesis</span></h5> <h4>{{$user->name}} - {{$user->username}}</h4> <h5> <span class="badge badge-primary">Tempat: {{$seminar->tempat}}</span> @@ -306,6 +306,36 @@ @endif @endif @endif + @php($sidang = $item->tesis()->sidangTesis()) + @if(!is_null($sidang)) + @php($date = $sidang->tanggal) + @php($time = $sidang->jam) + @if(!is_null($date) && !is_null($time)) + @php($user = $item->user()) + @php($datetimeString = $date." ".$time) + @php($jadwalsidang = \Carbon\Carbon::createFromFormat("Y-m-d H:i:s", $datetimeString)) + @if($jadwalsidang >= $currenttime) + <div class="row"> + <div class="col-md-4 text-center" style="border-right: 1px solid grey"> + <i class="fa fa-calendar-check-o mb-2" style="font-size:60px"></i> + <div>{{$jadwalsidang->format('d M Y')}}</div> + </div> + <div class="col"> + <div class="row mb-4"> + <div class="col"> + <h5><span class="badge badge-success">Sidang Tesis</span></h5> + <h4>{{$user->name}} - {{$user->username}}</h4> + <h5> + <span class="badge badge-primary">Tempat: {{$sidang->tempat}}</span> + <span class="badge badge-primary">Waktu: {{$jadwalseminar->format('g:i A')}}</span> + </h5> + </div> + </div> + </div> + </div> + @endif + @endif + @endif @endif @endforeach @foreach($dosen->upcomingSidangAsPenguji1 as $st) @@ -318,7 +348,7 @@ <div class="col"> <div class="row mb-4"> <div class="col"> - <h5><span class="badge badge-warning text-color-white">Sidang Tesis</span></h5> + <h5><span class="badge badge-success">Sidang Tesis</span></h5> <h4>{{$user->name}} - {{$user->username}}</h4> <h6> Topik: {{$st->tesis->topic}} <br> @@ -352,7 +382,7 @@ <div class="col"> <div class="row mb-4"> <div class="col"> - <h5><span class="badge badge-warning text-color-white">Sidang Tesis</span></h5> + <h5><span class="badge badge-sucess">Sidang Tesis</span></h5> <h4>{{$user->name}} - {{$user->username}}</h4> <h6> Topik: {{$st->tesis->topic}} <br> diff --git a/resources/views/mahasiswa/index.blade.php b/resources/views/mahasiswa/index.blade.php index daa279c3760fa0e71a44e1d267e0957e5bf43715..c425e3e15dfac969b2864574c254c944be51a39a 100644 --- a/resources/views/mahasiswa/index.blade.php +++ b/resources/views/mahasiswa/index.blade.php @@ -189,6 +189,10 @@ <div id="step1" class="container tab-pane fade"> @endif <h3 class="header">Seminar Topik</h3> + @if ($mahasiswa->seminarTopik() and $mahasiswa->status!=\App\Mahasiswa::STATUS_GAGAL_SEMINAR_TOPIK and $mahasiswa->status!=\App\Mahasiswa::STATUS_PROPOSAL_DITOLAK) + <p>Jadwal yang ditetapkan: <h4><span class="badge badge-info">{{date("d M Y H:i:s", strtotime($mahasiswa->seminarTopik()->schedule.'UTC'))}}</span></h4></p> + + @endif @if($mahasiswa->status >= \App\Mahasiswa::STATUS_TOPIK_TELAH_DIAJUKAN || $mahasiswa->status == \App\Mahasiswa::STATUS_TOPIK_DITOLAK || $mahasiswa->status == \App\Mahasiswa::STATUS_PROPOSAL_DITOLAK || @@ -344,7 +348,8 @@ @if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_PROPOSAL) <p>Proposal telah disetujui.</p> @php($seminar_proposal = $mahasiswa->seminarProposal()) - <p>Jadwal seminar: {{$seminar_proposal->schedule}}</p> + <p>Jadwal seminar: <h4><span class="badge badge-info">{{date("d M Y H:i:s", strtotime($seminar_proposal->schedule.'UTC'))}} + </span></h4></p> @php($proposal = $mahasiswa->proposal()) <div class="row col-md-12 flex-wrap-nowrap proposal-container"> <div class="row align-items-center justify-content-start file-name width-full">