diff --git a/app/Http/Controllers/SidangTesisController.php b/app/Http/Controllers/SidangTesisController.php
index d2da1d7e361aa0f0a7700a32b74e202a40d3dbf9..4be6b15a98121ad914a9a1598c658b7ef93bc315 100644
--- a/app/Http/Controllers/SidangTesisController.php
+++ b/app/Http/Controllers/SidangTesisController.php
@@ -7,9 +7,7 @@ use App\Thesis;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\User;
-
use App\Mahasiswa;
-
use Illuminate\Support\Facades\Storage;
class SidangTesisController extends Controller
@@ -521,7 +519,6 @@ class SidangTesisController extends Controller
$sidang->save();
$mhs->status = Mahasiswa::STATUS_SIAP_SIDANG_TESIS;
$mhs->save();
-
return back();
} else{
return abort(403);
diff --git a/resources/views/dosen/detail_mahasiswa.blade.php b/resources/views/dosen/detail_mahasiswa.blade.php
index af8a80f943031bf89a6f0d79c9d4ba5010f20a89..36e962c73c7d1565786dc5aa9618660f79a45e3e 100644
--- a/resources/views/dosen/detail_mahasiswa.blade.php
+++ b/resources/views/dosen/detail_mahasiswa.blade.php
@@ -53,7 +53,6 @@
@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">
@@ -61,7 +60,6 @@
</button>
</a>
</fieldset>
-
@endif
</div>
@@ -71,7 +69,7 @@
@if ($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SIDANG_TESIS)
@if($sidangTesis)
@if (!is_null($sidangTesis->jam) && !is_null($sidangTesis->tempat))
- < class="mb-2">
+ <div class="mb-2">
<h3>
Penilaian Sidang Tesis
</h3>
@@ -154,7 +152,6 @@
</div>
</form>
</div>
-
</fieldset>
@endif
@endif
@@ -274,9 +271,7 @@
</form>
</div>
</div>
-
</fieldset>
-
@endif
@if($seminarTesis)
@if($seminarTesis->tesis->dosen_pembimbing1 == Auth::user()->id && $seminarTesis->approval_pembimbing1 && ($seminarTesis->approval_pembimbing2 || !$tesis->dosen_pembimbing2))
@@ -311,7 +306,6 @@
</fieldset>
@endif
@endif
- @endif
@if($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SEMINAR_TESIS)
<div class="control-seminar-tesis mb-2">
diff --git a/resources/views/dosen/index.blade.php b/resources/views/dosen/index.blade.php
index 72c0341cc9a067f12c740dec7b7a6836890cb338..2919fe14eb4e6a7f4b7e008ebf4dfda6cc73b0c1 100644
--- a/resources/views/dosen/index.blade.php
+++ b/resources/views/dosen/index.blade.php
@@ -275,7 +275,6 @@
</div>
@endif
@endif
-
@if(!is_null($item->tesis()))
@php($seminar = $item->tesis()->seminarTesis())
@if(!is_null($seminar))
@@ -349,9 +348,7 @@
<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>
<h6>
Topik: {{$st->tesis->topic}} <br>
@@ -386,7 +383,6 @@
<div class="row mb-4">
<div class="col">
<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/edit_user.blade.php b/resources/views/edit_user.blade.php
index e999482e54c8948518a65324fd23c6ef14bd5b65..bb464c93742ba578330304a6aba8efc60d27438a 100644
--- a/resources/views/edit_user.blade.php
+++ b/resources/views/edit_user.blade.php
@@ -118,7 +118,7 @@
<label for="status" class="col-md-4 col-form-label text-md-right">Status</label>
<select class="mr-4" name="status" id="status" >
@foreach($mhs->statusString as $key=>$val)
- <option value="{{$key}}">{{$key}} - {{$val}}</option>
+ <option value="{{$key}}" @if($mhs->status == $key) selected @endif >{{$key}} - {{$val}}</option>
@endforeach
</select>
<button class="btn btn-blue">Submit</button>
diff --git a/resources/views/manajer/penjadwalan.blade.php b/resources/views/manajer/penjadwalan.blade.php
index ba26866b4ea4386d4fba65a9cc44ffb98d950318..a2f7baf5a666996051f6964a9bac4e01f9fcf81b 100644
--- a/resources/views/manajer/penjadwalan.blade.php
+++ b/resources/views/manajer/penjadwalan.blade.php
@@ -62,7 +62,6 @@
<td>
<input type="hidden" id="id{{$item->topic->mahasiswa_id}}" name="id{{$item->topic->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->topic->mahasiswa_id}}">
<input type="hidden" id="tp{{$item->topic->mahasiswa_id}}" name="tp{{$item->topic->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->topic_id}}">
-
<input type="datetime-local" id="sch{{$item->topic->mahasiswa_id}}" name="sch{{$item->topic->mahasiswa_id}}" class="form-control col-lg-12 " value="" onkeyup="updateSaveButton()">
</td>
</tr>
@@ -134,7 +133,6 @@
<td>
<input type="hidden" id="id{{$item->mahasiswa_id}}" name="id{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->mahasiswa_id}}">
<input type="hidden" id="tp{{$item->mahasiswa_id}}" name="tp{{$item->mahasiswa_id}}" class="form-control col-md-8 " value="{{$item->id}}">
-
<input type="datetime-local" id="sch{{$item->mahasiswa_id}}" name="sch{{$item->mahasiswa_id}}" class="form-control col-lg-12 " value="" onkeyup="updateSaveButton2()">
</td>
</tr>
@@ -162,7 +160,6 @@
</div>
</div>
</div>
-
@endsection
@section('bottomjs')
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
index a7052025f8583d74df2fda6399e3eab5dab6b106..a70137c02d4de3af989bb0607ff2f55b51d6b82f 100644
--- a/tests/Unit/ExampleTest.php
+++ b/tests/Unit/ExampleTest.php
@@ -15,58 +15,58 @@ class ExampleTest extends TestCase
*/
public function testBasicTest()
{
- $this->assertTrue(true);
+ //$this->assertTrue(true);
//register
-// $response = $this->get('/register');
-// $response->assertStatus(403);
-//
-// //login test
-// $response = $this->get('/login');
-// $response->assertStatus(200);
-//
-// $username = 'admin';
-// $password = 'admin123';
-// Session::start();
-//
-// $response = $this->followingRedirects()->call('POST', '/login', [
-// 'username' => 'a',
-// 'password' => 'a',
-// '_token' => csrf_token()
-// ]);
-//
-// $this->assertEquals(200, $response->getStatusCode());
-// $this->assertEquals('auth.login', $response->original->name());
-//
-// $response = $this->followingRedirects()->call('POST', '/login', [
-// 'username' => $username,
-// 'password' => $password,
-// '_token' => csrf_token()
-// ]);
-//
-// $this->assertEquals(200, $response->getStatusCode());
-//
-// //register admin
-// $response = $this->get('/register');
-// $response->assertStatus(200);
-//
-// $response = $this->followingRedirects()->call('POST', '/register', [
-// 'username' => $username,
-// 'password' => $password,
-// 'password_confirmation' => $password,
-// 'phone' => '123456789',
-// 'email' => 'akun@palsu.com',
-// 'name' => $username,
-// 'role' => 'Manajer',
-// '_token' => csrf_token()
-// ]);
-//
-// $this->assertEquals(200, $response->getStatusCode());
-//
-// $response = $this->followingRedirects()->call('POST', '/logout',[
-// '_token' => csrf_token()
-// ]);
-//
-// $this->assertEquals(200, $response->getStatusCode());
+ $response = $this->get('/register');
+ $response->assertStatus(403);
+
+ //login test
+ $response = $this->get('/login');
+ $response->assertStatus(200);
+
+ $username = 'admin';
+ $password = 'admin';
+ Session::start();
+
+ $response = $this->followingRedirects()->call('POST', '/login', [
+ 'username' => 'a',
+ 'password' => 'a',
+ '_token' => csrf_token()
+ ]);
+
+ $this->assertEquals(200, $response->getStatusCode());
+ $this->assertEquals('auth.login', $response->original->name());
+
+ $response = $this->followingRedirects()->call('POST', '/login', [
+ 'username' => $username,
+ 'password' => $password,
+ '_token' => csrf_token()
+ ]);
+
+ $this->assertEquals(200, $response->getStatusCode());
+
+ //register admin
+ $response = $this->get('/register');
+ $response->assertStatus(200);
+
+ $response = $this->followingRedirects()->call('POST', '/register', [
+ 'username' => $username,
+ 'password' => $password,
+ 'password_confirmation' => $password,
+ 'phone' => '123456789',
+ 'email' => 'akun@palsu.com',
+ 'name' => $username,
+ 'role' => 'Manajer',
+ '_token' => csrf_token()
+ ]);
+
+ $this->assertEquals(200, $response->getStatusCode());
+
+ $response = $this->followingRedirects()->call('POST', '/logout',[
+ '_token' => csrf_token()
+ ]);
+
+ $this->assertEquals(200, $response->getStatusCode());
}
}