diff --git a/.env.testing b/.env.testing
new file mode 100644
index 0000000000000000000000000000000000000000..831f96d6723ca625eeb68449f19e280b7cfce5d5
--- /dev/null
+++ b/.env.testing
@@ -0,0 +1,39 @@
+APP_NAME=Laravel
+APP_ENV=test
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=tesismanagement_test
+DB_USERNAME=gitlab_test
+DB_PASSWORD=gitlab_test
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+QUEUE_DRIVER=sync
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
diff --git a/.gitlab-ci.sh b/.gitlab-ci.sh
new file mode 100644
index 0000000000000000000000000000000000000000..cbf00a4094f923c52f8816beb800131b4b99e36d
--- /dev/null
+++ b/.gitlab-ci.sh
@@ -0,0 +1,13 @@
+composer install
+composer dump-autoload
+
+cp .env.testing .env
+
+npm install
+
+php artisan migrate
+php artisan key:generate
+php artisan config:cache
+
+npm run production
+
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..286241a4a078ef000d5892372c6db862a44c8b21
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,24 @@
+before_script:
+ - bash .gitlab-ci.sh
+variables:
+ MYSQL_DATABASE: gitlab_test
+ MYSQL_ROOT_PASSWORD: gitlab_test
+
+phpunit:php7.1:mysql5.6:
+ image: php:7.1
+ services:
+ - mysql:5.6
+ script:
+ - php vendor/bin/phpunit --colors
+ - npm test
+ after_script:
+ - sudo cp -rfvu ./ /var/www
+ - cd /var/www
+ - composer dump-autoload
+ - cp .env.production .env
+ - php artisan config:cache
+ - sudo chmod -R 777 storage
+ - php artisan migrate
+ - php artisan key:generate
+ only:
+ - master
diff --git a/app/Http/Controllers/SidangTesisController.php b/app/Http/Controllers/SidangTesisController.php
index 4be6b15a98121ad914a9a1598c658b7ef93bc315..d2da1d7e361aa0f0a7700a32b74e202a40d3dbf9 100644
--- a/app/Http/Controllers/SidangTesisController.php
+++ b/app/Http/Controllers/SidangTesisController.php
@@ -7,7 +7,9 @@ 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
@@ -519,6 +521,7 @@ 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 36e962c73c7d1565786dc5aa9618660f79a45e3e..af8a80f943031bf89a6f0d79c9d4ba5010f20a89 100644
--- a/resources/views/dosen/detail_mahasiswa.blade.php
+++ b/resources/views/dosen/detail_mahasiswa.blade.php
@@ -53,6 +53,7 @@
@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">
@@ -60,6 +61,7 @@
</button>
</a>
</fieldset>
+
@endif
</div>
@@ -69,7 +71,7 @@
@if ($mahasiswa->status >= \App\Mahasiswa::STATUS_SIAP_SIDANG_TESIS)
@if($sidangTesis)
@if (!is_null($sidangTesis->jam) && !is_null($sidangTesis->tempat))
- <div class="mb-2">
+ < class="mb-2">
<h3>
Penilaian Sidang Tesis
</h3>
@@ -152,6 +154,7 @@
</div>
</form>
</div>
+
</fieldset>
@endif
@endif
@@ -271,7 +274,9 @@
</form>
</div>
</div>
+
</fieldset>
+
@endif
@if($seminarTesis)
@if($seminarTesis->tesis->dosen_pembimbing1 == Auth::user()->id && $seminarTesis->approval_pembimbing1 && ($seminarTesis->approval_pembimbing2 || !$tesis->dosen_pembimbing2))
@@ -306,6 +311,7 @@
</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 2919fe14eb4e6a7f4b7e008ebf4dfda6cc73b0c1..72c0341cc9a067f12c740dec7b7a6836890cb338 100644
--- a/resources/views/dosen/index.blade.php
+++ b/resources/views/dosen/index.blade.php
@@ -275,6 +275,7 @@
</div>
@endif
@endif
+
@if(!is_null($item->tesis()))
@php($seminar = $item->tesis()->seminarTesis())
@if(!is_null($seminar))
@@ -348,7 +349,9 @@
<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>
@@ -383,6 +386,7 @@
<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/manajer/detail_mahasiswa_control.blade.php b/resources/views/manajer/detail_mahasiswa_control.blade.php
index ecbc01b6fc20efe63e408ee323acb2642616cb58..71df83ff1bc2a9c0e8d469a78e99bfc06b30f6ad 100644
--- a/resources/views/manajer/detail_mahasiswa_control.blade.php
+++ b/resources/views/manajer/detail_mahasiswa_control.blade.php
@@ -44,6 +44,7 @@
</div>
</div>
<div class="col-md-8">
+
@if($mahasiswa->status == \App\Mahasiswa::STATUS_LULUS)
<div class="alert alert-success row align-items-center flex-row display-flex flex-wrap-nowrap">
<i class="material-icons font-size-18-px mr-4">check_circle</i>
@@ -53,6 +54,7 @@
</div>
<fieldset disabled="disabled">
@endif
+
@if(isset($sidangTesis->dosen_penguji_1) && isset($sidangTesis->dosen_penguji_2))
<div class="mb-2">
<h3>
diff --git a/resources/views/manajer/penjadwalan.blade.php b/resources/views/manajer/penjadwalan.blade.php
index a2f7baf5a666996051f6964a9bac4e01f9fcf81b..ba26866b4ea4386d4fba65a9cc44ffb98d950318 100644
--- a/resources/views/manajer/penjadwalan.blade.php
+++ b/resources/views/manajer/penjadwalan.blade.php
@@ -62,6 +62,7 @@
<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>
@@ -133,6 +134,7 @@
<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>
@@ -160,6 +162,7 @@
</div>
</div>
</div>
+
@endsection
@section('bottomjs')