Merge branch 'develop' of...

Merge branch 'develop' of http://gitlab.informatika.org/IF3250-Kelas2-Kelompok7-S2_TESIS/S2_TESIS into develop

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>