From b0fba622c540b83267657a1bb68155cc11e74c34 Mon Sep 17 00:00:00 2001
From: Arfinda Ilmania <findafn@gmail.com>
Date: Wed, 25 Apr 2018 22:46:45 +0700
Subject: [PATCH] handle penentuan jadwal
---
resources/views/mahasiswa/index.blade.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/resources/views/mahasiswa/index.blade.php b/resources/views/mahasiswa/index.blade.php
index 2421340..c425e3e 100644
--- a/resources/views/mahasiswa/index.blade.php
+++ b/resources/views/mahasiswa/index.blade.php
@@ -189,7 +189,7 @@
<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)
+ @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
@@ -348,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">
--
GitLab