Skip to content

S
simpkm
Commit 3d359ced by novanbagus
Options

Merge branch 'master' of http://git.unesa.ac.id/farendi/simpkm

parents eba931fe b92469b1
Showing with 468 additions and 115 deletions
app/Http/Controllers/Dosen/KelompokController.php
...@@ -21,16 +21,19 @@ class KelompokController extends Controller ...@@ -21,16 +21,19 @@ class KelompokController extends Controller
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function index() public function index(Request $request)
{ {
// //
$title = 'Daftar Kelompok'; $title = 'Daftar Kelompok';
$bio = auth()->user()->rBiodata; $bio = auth()->user()->rBiodata;
$getDosen = GetDataApiController::getDosen(); $getDosen = GetDataApiController::getDosen();
$periode = Periode::where('status', 1)->first(); // $periode = Periode::where('status', 1)->first();
$periode = Periode::query()->get();
$year = !is_null($request->year) ? $request->year : now()->year;
$kelompok = Kelompok::with(['rAnggota']) $kelompok = Kelompok::with(['rAnggota'])
->where('nidn_dosen', $bio->noidentitas) ->where('nidn_dosen', $bio->noidentitas)
->whereYear('created_at', $year)
->orderBy('kode') ->orderBy('kode')
->get(); ->get();
...@@ -42,6 +45,7 @@ class KelompokController extends Controller ...@@ -42,6 +45,7 @@ class KelompokController extends Controller
'cekKel' => $cekKel, 'cekKel' => $cekKel,
'dosen' => $getDosen['data'], 'dosen' => $getDosen['data'],
'periode' => $periode, 'periode' => $periode,
'year' => $year,
]; ];
return view('backend.dosen.kelompok.index', $data); return view('backend.dosen.kelompok.index', $data);
......
app/Http/Controllers/Dosen/MonevController.php
...@@ -15,12 +15,14 @@ use Auth; ...@@ -15,12 +15,14 @@ use Auth;
class MonevController extends Controller class MonevController extends Controller
{ {
public function monev($id) public function monev($id, Request $request)
{ {
$bio = auth()->user()->rBiodata; $bio = auth()->user()->rBiodata;
$nidn = $bio->noidentitas; $nidn = $bio->noidentitas;
$periode = Periode::where('status', 1)->first(); $periode = Periode::query()->get();
$jadwal = JadwalKegiatan::where('periode_id', $periode->periode_id)->where('nama','Monev Internal '.$id)->first(); $year = !is_null($request->year) ? $request->year : now()->year;
$jadwal = JadwalKegiatan::where('periode_id', $periode->where('status', 1)->first()->periode_id)
->where('nama','Monev Internal '.$id)->first();
$title = 'Monev Internal '.$id; $title = 'Monev Internal '.$id;
$proposal = MonevInternal::with(['rProposal', 'rJenisMonev']) $proposal = MonevInternal::with(['rProposal', 'rJenisMonev'])
...@@ -32,6 +34,7 @@ class MonevController extends Controller ...@@ -32,6 +34,7 @@ class MonevController extends Controller
->whereHas('rJenisMonev', function ($query) use($id){ ->whereHas('rJenisMonev', function ($query) use($id){
$query->where('nama', 'Monev Internal '.$id); $query->where('nama', 'Monev Internal '.$id);
}) })
->whereYear('created_at', $year)
->orderBy('created_at') ->orderBy('created_at')
->get(); ->get();
...@@ -40,6 +43,9 @@ class MonevController extends Controller ...@@ -40,6 +43,9 @@ class MonevController extends Controller
'proposal' => $proposal, 'proposal' => $proposal,
'title' => $title, 'title' => $title,
'jadwal' => $jadwal, 'jadwal' => $jadwal,
'periode' => $periode,
'idmonev' => $id,
'year' => $year,
]; ];
return view('backend.dosen.monev.indexmonev'.$id, $data); return view('backend.dosen.monev.indexmonev'.$id, $data);
......
app/Http/Controllers/Dosen/ProposalController.php
...@@ -24,22 +24,27 @@ class ProposalController extends Controller ...@@ -24,22 +24,27 @@ class ProposalController extends Controller
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function index() public function index(Request $request)
{ {
// //
$title = 'Daftar Proposal'; $title = 'Daftar Proposal';
$bio = auth()->user()->rBiodata; $bio = auth()->user()->rBiodata;
$periode = Periode::query()->get();
$year = !is_null($request->year) ? $request->year : now()->year;
$proposal = Proposal::with(['rKelompok', 'rJenis']) $proposal = Proposal::with(['rKelompok', 'rJenis'])
->whereHas('rKelompok', function ($query) use($bio){ ->whereHas('rKelompok', function ($query) use($bio){
$query->where('nidn_dosen', $bio->noidentitas); $query->where('nidn_dosen', $bio->noidentitas);
}) })
->whereYear('created_at', $year)
->orderBy('kelompok_id') ->orderBy('kelompok_id')
->get(); ->get();
$data = [ $data = [
'proposal' => $proposal, 'proposal' => $proposal,
'title' => $title, 'title' => $title,
'periode' => $periode,
'year' => $year,
]; ];
return view('backend.dosen.proposal.index', $data); return view('backend.dosen.proposal.index', $data);
...@@ -51,7 +56,7 @@ class ProposalController extends Controller ...@@ -51,7 +56,7 @@ class ProposalController extends Controller
$proposal = Proposal::query()->find(decrypt($proId['id'])); $proposal = Proposal::query()->find(decrypt($proId['id']));
$proposal->status = 2; $proposal->status = 1;
$proposal->date_approval = now(); $proposal->date_approval = now();
$proposal->save(); $proposal->save();
......
app/Http/Controllers/Dosen/SeleksiController.php
...@@ -19,45 +19,55 @@ use Auth; ...@@ -19,45 +19,55 @@ use Auth;
class SeleksiController extends Controller class SeleksiController extends Controller
{ {
public function seleksiInternal() public function seleksiInternal(Request $request)
{ {
// //
$title = 'Seleksi Internal Mahasiswa'; $title = 'Seleksi Internal Mahasiswa';
$bio = auth()->user()->rBiodata; $bio = auth()->user()->rBiodata;
$nim = $bio->noidentitas; $nim = $bio->noidentitas;
$periode = Periode::query()->get();
$year = !is_null($request->year) ? $request->year : now()->year;
$proposal = Proposal::with(['rKelompok', 'rJenis']) $proposal = Proposal::with(['rKelompok', 'rJenis'])
->whereHas('rKelompok', function ($query) use($bio){ ->whereHas('rKelompok', function ($query) use($bio){
$query->where('nidn_dosen', $bio->noidentitas); $query->where('nidn_dosen', $bio->noidentitas);
}) })
->whereYear('created_at', $year)
->orderBy('kelompok_id') ->orderBy('kelompok_id')
->get(); ->get();
$data = [ $data = [
'proposal' => $proposal, 'proposal' => $proposal,
'title' => $title, 'title' => $title,
'periode' => $periode,
'year' => $year,
]; ];
return view('backend.dosen.seleksi.index_internal', $data); return view('backend.dosen.seleksi.index_internal', $data);
} }
public function seleksiBelmawa() public function seleksiBelmawa(Request $request)
{ {
// //
$title = 'Seleksi Belmawa Mahasiswa'; $title = 'Seleksi Belmawa Mahasiswa';
$bio = auth()->user()->rBiodata; $bio = auth()->user()->rBiodata;
$nim = $bio->noidentitas; $nim = $bio->noidentitas;
$periode = Periode::query()->get();
$year = !is_null($request->year) ? $request->year : now()->year;
$proposal = Proposal::with(['rKelompok', 'rJenis']) $proposal = Proposal::with(['rKelompok', 'rJenis'])
->whereHas('rKelompok', function ($query) use($bio){ ->whereHas('rKelompok', function ($query) use($bio){
$query->where('nidn_dosen', $bio->noidentitas); $query->where('nidn_dosen', $bio->noidentitas);
}) })
->whereYear('created_at', $year)
->orderBy('kelompok_id') ->orderBy('kelompok_id')
->get(); ->get();
$data = [ $data = [
'proposal' => $proposal, 'proposal' => $proposal,
'title' => $title, 'title' => $title,
'periode' => $periode,
'year' => $year,
]; ];
return view('backend.dosen.seleksi.index_belmawa', $data); return view('backend.dosen.seleksi.index_belmawa', $data);
......
app/Http/Controllers/Mahasiswa/KelompokController.php
...@@ -22,24 +22,24 @@ class KelompokController extends Controller ...@@ -22,24 +22,24 @@ class KelompokController extends Controller
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function index() public function index(Request $request)
{ {
// //
$title = 'Kelompok Mahasiswa'; $title = 'Kelompok Mahasiswa';
$bio = auth()->user()->rBiodata; $bio = auth()->user()->rBiodata;
$nim = $bio->noidentitas; $nim = $bio->noidentitas;
$getDosen = GetDataApiController::getDosen(); $getDosen = GetDataApiController::getDosen();
$periode = Periode::where('status', 1)->first(); $periode = Periode::query()->get();
$year = !is_null($request->year) ? $request->year : now()->year;
$kelompok = Kelompok::with(['rAnggota']) $kelompok = Kelompok::with(['rAnggota'])
->whereHas('rAnggota', function ($query) use($nim){ ->whereHas('rAnggota', function ($query) use($nim){
$query->where('nim', $nim); $query->where('nim', $nim);
}) })
->whereYear('created_at', $year)
->orderBy('kode') ->orderBy('kode')
->get(); ->get();
$cekKel = $kelompok->where('created_user', auth()->user()->id)->count(); $cekKel = $kelompok->where('created_user', auth()->user()->id)->count();
// $getMhs = GetDataApiController::getAccount(20030244001); // $getMhs = GetDataApiController::getAccount(20030244001);
...@@ -51,6 +51,7 @@ class KelompokController extends Controller ...@@ -51,6 +51,7 @@ class KelompokController extends Controller
'cekKel' => $cekKel, 'cekKel' => $cekKel,
'dosen' => $getDosen['data'], 'dosen' => $getDosen['data'],
'periode' => $periode, 'periode' => $periode,
'year' => $year,
]; ];
return view('backend.mahasiswa.kelompok.index', $data); return view('backend.mahasiswa.kelompok.index', $data);
......
app/Http/Controllers/Mahasiswa/MonevController.php
...@@ -21,12 +21,14 @@ use Auth; ...@@ -21,12 +21,14 @@ use Auth;
class MonevController extends Controller class MonevController extends Controller
{ {
public function monev($id) public function monev($id, Request $request)
{ {
$bio = auth()->user()->rBiodata; $bio = auth()->user()->rBiodata;
$nim = $bio->noidentitas; $nim = $bio->noidentitas;
$periode = Periode::where('status', 1)->first(); $periode = Periode::query()->get();
$jadwal = JadwalKegiatan::where('periode_id', $periode->periode_id)->where('nama','Monev Internal '.$id)->first(); $year = !is_null($request->year) ? $request->year : now()->year;
$jadwal = JadwalKegiatan::where('periode_id', $periode->where('status', 1)->first()->periode_id)
->where('nama','Monev Internal '.$id)->first();
$title = 'Monev Internal '.$id; $title = 'Monev Internal '.$id;
$proposal = MonevInternal::with(['rProposal', 'rJenisMonev']) $proposal = MonevInternal::with(['rProposal', 'rJenisMonev'])
...@@ -40,6 +42,7 @@ class MonevController extends Controller ...@@ -40,6 +42,7 @@ class MonevController extends Controller
->whereHas('rJenisMonev', function ($query) use($id){ ->whereHas('rJenisMonev', function ($query) use($id){
$query->where('nama', 'Monev Internal '.$id); $query->where('nama', 'Monev Internal '.$id);
}) })
->whereYear('created_at', $year)
->orderBy('created_at') ->orderBy('created_at')
->get(); ->get();
...@@ -48,6 +51,9 @@ class MonevController extends Controller ...@@ -48,6 +51,9 @@ class MonevController extends Controller
'proposal' => $proposal, 'proposal' => $proposal,
'title' => $title, 'title' => $title,
'jadwal' => $jadwal, 'jadwal' => $jadwal,
'periode' => $periode,
'idmonev' => $id,
'year' => $year,
]; ];
return view('backend.mahasiswa.monev.indexmonev'.$id, $data); return view('backend.mahasiswa.monev.indexmonev'.$id, $data);
......
app/Http/Controllers/Mahasiswa/ProposalController.php
...@@ -24,12 +24,14 @@ class ProposalController extends Controller ...@@ -24,12 +24,14 @@ class ProposalController extends Controller
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function index() public function index(Request $request)
{ {
// //
$title = 'Proposal Mahasiswa'; $title = 'Proposal Mahasiswa';
$bio = auth()->user()->rBiodata; $bio = auth()->user()->rBiodata;
$nim = $bio->noidentitas; $nim = $bio->noidentitas;
$periode = Periode::query()->get();
$year = !is_null($request->year) ? $request->year : now()->year;
$proposal = Proposal::with(['rKelompok', 'rJenis']) $proposal = Proposal::with(['rKelompok', 'rJenis'])
->whereHas('rKelompok', function ($query) use($nim){ ->whereHas('rKelompok', function ($query) use($nim){
...@@ -37,12 +39,15 @@ class ProposalController extends Controller ...@@ -37,12 +39,15 @@ class ProposalController extends Controller
$query->where('nim', $nim); $query->where('nim', $nim);
}); });
}) })
->whereYear('created_at', $year)
->orderBy('kelompok_id') ->orderBy('kelompok_id')
->get(); ->get();
$data = [ $data = [
'proposal' => $proposal, 'proposal' => $proposal,
'title' => $title, 'title' => $title,
'periode' => $periode,
'year' => $year,
]; ];
return view('backend.mahasiswa.proposal.index', $data); return view('backend.mahasiswa.proposal.index', $data);
...@@ -65,7 +70,7 @@ class ProposalController extends Controller ...@@ -65,7 +70,7 @@ class ProposalController extends Controller
$kelompok = Kelompok::where('created_user', auth()->user()->id) $kelompok = Kelompok::where('created_user', auth()->user()->id)
->where('periode_id', $periode->periode_id) ->where('periode_id', $periode->periode_id)
->where('status', '1') ->where('status', '0')
->first(); ->first();
if(is_null($kelompok)){ if(is_null($kelompok)){
......
app/Http/Controllers/Mahasiswa/SeleksiController.php
...@@ -20,12 +20,14 @@ use Auth; ...@@ -20,12 +20,14 @@ use Auth;
class SeleksiController extends Controller class SeleksiController extends Controller
{ {
public function seleksiInternal() public function seleksiInternal(Request $request)
{ {
// //
$title = 'Seleksi Internal Mahasiswa'; $title = 'Seleksi Internal Mahasiswa';
$bio = auth()->user()->rBiodata; $bio = auth()->user()->rBiodata;
$nim = $bio->noidentitas; $nim = $bio->noidentitas;
$periode = Periode::query()->get();
$year = !is_null($request->year) ? $request->year : now()->year;
$proposal = Proposal::with(['rKelompok', 'rJenis', 'rNilai']) $proposal = Proposal::with(['rKelompok', 'rJenis', 'rNilai'])
->whereHas('rKelompok', function ($query) use($nim){ ->whereHas('rKelompok', function ($query) use($nim){
...@@ -33,6 +35,7 @@ class SeleksiController extends Controller ...@@ -33,6 +35,7 @@ class SeleksiController extends Controller
$query->where('nim', $nim); $query->where('nim', $nim);
}); });
}) })
->whereYear('created_at', $year)
->orderBy('kelompok_id') ->orderBy('kelompok_id')
->get(); ->get();
// dd($proposal); // dd($proposal);
...@@ -40,6 +43,8 @@ class SeleksiController extends Controller ...@@ -40,6 +43,8 @@ class SeleksiController extends Controller
$data = [ $data = [
'proposal' => $proposal, 'proposal' => $proposal,
'title' => $title, 'title' => $title,
'periode' => $periode,
'year' => $year,
]; ];
return view('backend.mahasiswa.seleksi.index_internal', $data); return view('backend.mahasiswa.seleksi.index_internal', $data);
...@@ -76,25 +81,30 @@ class SeleksiController extends Controller ...@@ -76,25 +81,30 @@ class SeleksiController extends Controller
} }
public function seleksiBelmawa() public function seleksiBelmawa(Request $request)
{ {
// //
$title = 'Seleksi Belmawa Mahasiswa'; $title = 'Seleksi Belmawa Mahasiswa';
$bio = auth()->user()->rBiodata; $bio = auth()->user()->rBiodata;
$nim = $bio->noidentitas; $nim = $bio->noidentitas;
$periode = Periode::query()->get();
$year = !is_null($request->year) ? $request->year : now()->year;
$proposal = Proposal::with(['rKelompok', 'rJenis']) $proposal = Proposal::with(['rKelompok', 'rJenis', 'rNilai'])
->whereHas('rKelompok', function ($query) use($nim){ ->whereHas('rKelompok', function ($query) use($nim){
$query->whereHas('rAnggota', function ($query) use($nim){ $query->whereHas('rAnggota', function ($query) use($nim){
$query->where('nim', $nim); $query->where('nim', $nim);
}); });
}) })
->whereYear('created_at', $year)
->orderBy('kelompok_id') ->orderBy('kelompok_id')
->get(); ->get();
$data = [ $data = [
'proposal' => $proposal, 'proposal' => $proposal,
'title' => $title, 'title' => $title,
'periode' => $periode,
'year' => $year,
]; ];
return view('backend.mahasiswa.seleksi.index_belmawa', $data); return view('backend.mahasiswa.seleksi.index_belmawa', $data);
...@@ -105,7 +115,7 @@ class SeleksiController extends Controller ...@@ -105,7 +115,7 @@ class SeleksiController extends Controller
// //
$title = 'Edit Proposal Belmawa'; $title = 'Edit Proposal Belmawa';
$proposal = Proposal::with(['rJenis'])->find($id); $proposal = Proposal::with(['rJenis', 'rNilai'])->find($id);
$data = [ $data = [
'proposal' => $proposal, 'proposal' => $proposal,
......
app/Http/Controllers/Operator/SelectController.php
...@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Operator; ...@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Operator;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Models\Kelompok; use App\Models\Kelompok;
use App\Http\Controllers\GetDataApiController;
use Session; use Session;
......
app/Models/MonevInternal.php
...@@ -52,6 +52,10 @@ class MonevInternal extends Model ...@@ -52,6 +52,10 @@ class MonevInternal extends Model
return $this->hasOne(VDaftarProposal::class, 'proposal_id', 'proposal_id')->with(['rReviewerBio1', 'rReviewerBio2']); return $this->hasOne(VDaftarProposal::class, 'proposal_id', 'proposal_id')->with(['rReviewerBio1', 'rReviewerBio2']);
} }
public function rNilaiMonev()
{
return $this->hasOne(VDaftarMonev::class, 'proposal_id', 'proposal_id')->with(['rReviewerBio1', 'rReviewerBio2']);
}
} }
app/Models/Proposal.php
...@@ -88,5 +88,10 @@ class Proposal extends Model ...@@ -88,5 +88,10 @@ class Proposal extends Model
return $this->hasOne(VDaftarProposal::class, 'proposal_id', 'proposal_id')->with(['rReviewerBio1', 'rReviewerBio2']); return $this->hasOne(VDaftarProposal::class, 'proposal_id', 'proposal_id')->with(['rReviewerBio1', 'rReviewerBio2']);
} }
public function rNilaiMonev()
{
return $this->hasOne(VDaftarMonev::class, 'proposal_id', 'proposal_id')->with(['rReviewerBio1', 'rReviewerBio2']);
}
} }
app/Models/VDaftarMonev.php 0 → 100644
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class VDaftarMonev extends Model
{
public $incrementing = false;
protected $table = 'daftar_proposal_monev';
public function rReviewerBio1()
{
return $this->hasOne(Reviewer::class, 'reviewer_id', 'reviewer_id_1');
}
public function rReviewerBio2()
{
return $this->hasOne(Reviewer::class, 'reviewer_id', 'reviewer_id_2');
}
}
resources/views/auth/login.blade.php
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
<div class="text-primary text-center p-4"> <div class="text-primary text-center p-4">
<h5 class="text-white font-size-20">LOGIN</h5> <h5 class="text-white font-size-20">LOGIN</h5>
<p class="text-white-50">Sistem Informasi PKM.</p> <p class="text-white-50">Sistem Informasi PKM.</p>
<a href="index.html" class="logo logo-admin"> <a href="{{ url('/') }}" class="logo logo-admin">
<img src="assets/images/logo-sm.png" height="24" alt="logo"> <img src="{{ asset('theme/images/logo-login.png') }}" height="66" alt="logo">
</a> </a>
</div> </div>
</div> </div>
......
resources/views/backend/dosen/kelompok/index.blade.php
...@@ -35,16 +35,25 @@ ...@@ -35,16 +35,25 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<div class="row col-mb-3"> <form action="{{ route('dosen.kelompok.index') }}">
<label class="col-sm-1 col-form-label">Tahun : </label> <div class="row">
<div class="col-sm-2"> <div class="col-md-8"></div>
<select class="form-select"> <div class="col-md-4 text-right">
<option value="2021">2021</option> <div class="row">
<option value="2022">2022</option> <label class="col-sm-3 col-form-label"></label>
<option value="2023">2023</option> <label class="col-sm-3 col-form-label">Tahun : </label>
</select> <div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div> </div>
</div><br> </div>
</form>
<br>
<table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
<tr> <tr>
...@@ -164,11 +173,10 @@ ...@@ -164,11 +173,10 @@
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="col-12"> <div class="col-12">
<h5 class="font-size-16">Silahkan pilih dosen pembimbing : </h5> <h5 class="font-size-16">Silahkan pilih dosen pembimbing : </h5>
<p> <p>
<input type="hidden" name="periode" value="{{ $periode['periode_id'] }}" > <input type="hidden" name="periode" value="{{ $periode->where('status', 1)->first()->periode_id; }}" >
<select class="form-select" style="width: 100%" id="selectmodal" name="dosen"> <select class="form-select" style="width: 100%" id="selectmodal" name="dosen">
<option selected>Pilih Dosen</option> <option selected>Pilih Dosen</option>
@foreach($dosen as $item) @foreach($dosen as $item)
...@@ -224,6 +232,8 @@ ...@@ -224,6 +232,8 @@
timer: 1500 timer: 1500
}); });
location.reload();
}, },
error: function(xhr, status, error){ error: function(xhr, status, error){
Swal.fire({ Swal.fire({
...@@ -263,7 +273,8 @@ ...@@ -263,7 +273,8 @@
timer: 1500 timer: 1500
}); });
$('#'+rowId).remove(); location.reload();
}, },
error: function(xhr, status, error){ error: function(xhr, status, error){
Swal.fire({ Swal.fire({
......
resources/views/backend/dosen/monev/indexmonevI.blade.php
...@@ -33,7 +33,25 @@ ...@@ -33,7 +33,25 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('dosen.monev-index', ['id' => $idmonev]) }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
@if(($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now())) @if(($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now()))
<table id="datatable" class="table table-bordered dt-responsive" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
...@@ -111,22 +129,22 @@ ...@@ -111,22 +129,22 @@
<tr> <tr>
<th>Nilai</th> <th>Nilai</th>
<td> <td>
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<h5 class="text-muted mt-3">Nilai - {{ $item->rNilai->nilai_1 }}</h5> <h5 class="text-muted mt-3">Nilai - {{ $item->rNilaiMonev->nilai_1 }}</h5>
</td> </td>
<td> <td>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<h5 class="text-primary mt-3">Nilai - {{ $item->rNilai->nilai_2 }}</h5> <h5 class="text-primary mt-3">Nilai - {{ $item->rNilaiMonev->nilai_2 }}</h5>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
<td colspan="2"> <td colspan="2">
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_1 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_2 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p>
</td> </td>
</tr> </tr>
</table> </table>
......
resources/views/backend/dosen/monev/indexmonevII.blade.php
...@@ -33,9 +33,26 @@ ...@@ -33,9 +33,26 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('dosen.monev-index', ['id' => $idmonev]) }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
@if(($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now())) @if(($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now()))
<table id="datatable" class="table table-bordered dt-responsive" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
<tr> <tr>
...@@ -112,22 +129,22 @@ ...@@ -112,22 +129,22 @@
<tr> <tr>
<th>Nilai</th> <th>Nilai</th>
<td> <td>
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<h5 class="text-muted mt-3">Nilai - {{ $item->rNilai->nilai_1 }}</h5> <h5 class="text-muted mt-3">Nilai - {{ $item->rNilaiMonev->nilai_1 }}</h5>
</td> </td>
<td> <td>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<h5 class="text-primary mt-3">Nilai - {{ $item->rNilai->nilai_2 }}</h5> <h5 class="text-primary mt-3">Nilai - {{ $item->rNilaiMonev->nilai_2 }}</h5>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
<td colspan="2"> <td colspan="2">
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_1 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_2 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p>
</td> </td>
</tr> </tr>
</table> </table>
......
resources/views/backend/dosen/monev/indexmonevIII.blade.php
...@@ -33,9 +33,26 @@ ...@@ -33,9 +33,26 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('dosen.monev-index', ['id' => $idmonev]) }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
@if(($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now())) @if(($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now()))
<table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
<tr> <tr>
...@@ -116,22 +133,22 @@ ...@@ -116,22 +133,22 @@
<tr> <tr>
<th>Nilai</th> <th>Nilai</th>
<td> <td>
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<h5 class="text-muted mt-3">Nilai - {{ $item->rNilai->nilai_1 }}</h5> <h5 class="text-muted mt-3">Nilai - {{ $item->rNilaiMonev->nilai_1 }}</h5>
</td> </td>
<td> <td>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<h5 class="text-primary mt-3">Nilai - {{ $item->rNilai->nilai_2 }}</h5> <h5 class="text-primary mt-3">Nilai - {{ $item->rNilaiMonev->nilai_2 }}</h5>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
<td colspan="2"> <td colspan="2">
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_1 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_2 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p>
</td> </td>
</tr> </tr>
</table> </table>
......
resources/views/backend/dosen/proposal/index.blade.php
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<div class="float-end d-none d-md-block"> <div class="float-end d-none d-md-block">
<a href="{{ URL::to('mahasiswa/proposal/create') }}" type="button" class="btn btn-primary waves-effect waves-light"> <i class="fas fa-plus-circle"></i> Tambah Data</a>
</div> </div>
</div> </div>
</div> </div>
...@@ -36,7 +34,25 @@ ...@@ -36,7 +34,25 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('dosen.proposal.index') }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
<table id="datatable" class="table table-bordered dt-responsive" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
<tr> <tr>
...@@ -66,6 +82,7 @@ ...@@ -66,6 +82,7 @@
<strong> Keterangan : </strong> <br> <strong> Keterangan : </strong> <br>
Upload proposal pada : -<br> Upload proposal pada : -<br>
Disetujui proposal pada : -<br> Disetujui proposal pada : -<br>
@else
@if($item->status == '1') @if($item->status == '1')
<span class="badge bg-success">Sudah Disetujui Dosen</span> <br> <span class="badge bg-success">Sudah Disetujui Dosen</span> <br>
<strong> Keterangan : </strong> <br> <strong> Keterangan : </strong> <br>
...@@ -82,7 +99,7 @@ ...@@ -82,7 +99,7 @@
<td> <td>
<button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->proposal_id }}" href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->proposal_id)) }}" class="btn btn-info btn-sm"><i class="far fa-eye"></i> Lihat</button> <button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->proposal_id }}" href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->proposal_id)) }}" class="btn btn-info btn-sm"><i class="far fa-eye"></i> Lihat</button>
@if($item->upload_dokumen) @if($item->status == '0')
<a onclick="setuju('{{ encrypt($item->proposal_id) }}', 'row-{{ $token }}')" class="btn btn-success btn-sm"><i class="fas fa-check"></i> Setuju</a> <a onclick="setuju('{{ encrypt($item->proposal_id) }}', 'row-{{ $token }}')" class="btn btn-success btn-sm"><i class="fas fa-check"></i> Setuju</a>
@endif @endif
...@@ -179,6 +196,8 @@ function setuju(id, rowId){ ...@@ -179,6 +196,8 @@ function setuju(id, rowId){
timer: 1500 timer: 1500
}); });
location.reload();
}, },
error: function(xhr, status, error){ error: function(xhr, status, error){
Swal.fire({ Swal.fire({
......
resources/views/backend/dosen/seleksi/index_belmawa.blade.php
...@@ -35,7 +35,25 @@ ...@@ -35,7 +35,25 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('dosen.seleksi-belmawa') }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
<table id="datatable" class="table table-bordered dt-responsive" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
<tr> <tr>
......
resources/views/backend/dosen/seleksi/index_internal.blade.php
...@@ -35,7 +35,25 @@ ...@@ -35,7 +35,25 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('dosen.seleksi-internal') }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
<table id="datatable" class="table table-bordered dt-responsive" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
<tr> <tr>
......
resources/views/backend/mahasiswa/kelompok/index.blade.php
...@@ -37,7 +37,25 @@ ...@@ -37,7 +37,25 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('mahasiswa.kelompok.index') }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
<table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
<tr> <tr>
...@@ -155,7 +173,7 @@ ...@@ -155,7 +173,7 @@
<div class="col-12"> <div class="col-12">
<h5 class="font-size-16">Silahkan pilih dosen pembimbing : </h5> <h5 class="font-size-16">Silahkan pilih dosen pembimbing : </h5>
<p> <p>
<input type="hidden" name="periode" value="{{ $periode['periode_id'] }}" > <input type="hidden" name="periode" value="{{ $periode->where('status', 1)->first()->periode_id; }}" >
<select class="form-select" style="width: 100%" id="selectmodal" name="dosen"> <select class="form-select" style="width: 100%" id="selectmodal" name="dosen">
<option selected>Pilih Dosen</option> <option selected>Pilih Dosen</option>
@foreach($dosen as $item) @foreach($dosen as $item)
......
resources/views/backend/mahasiswa/monev/indexmonevI.blade.php
...@@ -33,6 +33,25 @@ ...@@ -33,6 +33,25 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('mahasiswa.monev-index', ['id' => $idmonev]) }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
@if(($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now())) @if(($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now()))
<table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
...@@ -113,22 +132,22 @@ ...@@ -113,22 +132,22 @@
<tr> <tr>
<th>Nilai</th> <th>Nilai</th>
<td> <td>
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<h5 class="text-muted mt-3">Nilai - {{ $item->rNilai->nilai_1 }}</h5> <h5 class="text-muted mt-3">Nilai - {{ $item->rNilaiMonev->nilai_1 }}</h5>
</td> </td>
<td> <td>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<h5 class="text-primary mt-3">Nilai - {{ $item->rNilai->nilai_2 }}</h5> <h5 class="text-primary mt-3">Nilai - {{ $item->rNilaiMonev->nilai_2 }}</h5>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
<td colspan="2"> <td colspan="2">
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_1 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_2 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p>
</td> </td>
</tr> </tr>
</table> </table>
......
resources/views/backend/mahasiswa/monev/indexmonevII.blade.php
...@@ -33,9 +33,26 @@ ...@@ -33,9 +33,26 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('mahasiswa.monev-index', ['id' => $idmonev]) }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
@if(($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now())) @if(($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now()))
<table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
<tr> <tr>
...@@ -115,22 +132,22 @@ ...@@ -115,22 +132,22 @@
<tr> <tr>
<th>Nilai</th> <th>Nilai</th>
<td> <td>
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<h5 class="text-muted mt-3">Nilai - {{ $item->rNilai->nilai_1 }}</h5> <h5 class="text-muted mt-3">Nilai - {{ $item->rNilaiMonev->nilai_1 }}</h5>
</td> </td>
<td> <td>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<h5 class="text-primary mt-3">Nilai - {{ $item->rNilai->nilai_2 }}</h5> <h5 class="text-primary mt-3">Nilai - {{ $item->rNilaiMonev->nilai_2 }}</h5>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
<td colspan="2"> <td colspan="2">
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_1 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_2 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p>
</td> </td>
</tr> </tr>
</table> </table>
......
resources/views/backend/mahasiswa/monev/indexmonevIII.blade.php
...@@ -33,8 +33,26 @@ ...@@ -33,8 +33,26 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('mahasiswa.monev-index', ['id' => $idmonev]) }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
@if(($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now())) @if(($jadwal->tanggal_mulai <= Carbon\Carbon::now()) && ($jadwal->tanggal_selesai >= Carbon\Carbon::now()))
<table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
<tr> <tr>
...@@ -122,22 +140,22 @@ ...@@ -122,22 +140,22 @@
<tr> <tr>
<th>Nilai</th> <th>Nilai</th>
<td> <td>
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<h5 class="text-muted mt-3">Nilai - {{ $item->rNilai->nilai_1 }}</h5> <h5 class="text-muted mt-3">Nilai - {{ $item->rNilaiMonev->nilai_1 }}</h5>
</td> </td>
<td> <td>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<h5 class="text-primary mt-3">Nilai - {{ $item->rNilai->nilai_2 }}</h5> <h5 class="text-primary mt-3">Nilai - {{ $item->rNilaiMonev->nilai_2 }}</h5>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Komentar</th> <th>Komentar</th>
<td colspan="2"> <td colspan="2">
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilai->rReviewerBio1 ? $item->rNilai->rReviewerBio1->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_1 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilai->rReviewerBio2 ? $item->rNilai->rReviewerBio2->nama : '' }}</h4> <h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilai->reviewer_komentar_2 }}"</p> <p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p>
</td> </td>
</tr> </tr>
</table> </table>
......
resources/views/backend/mahasiswa/monev/upload_monev.blade.php
...@@ -46,7 +46,13 @@ ...@@ -46,7 +46,13 @@
</div> </div>
<div class=" row mb-3"> <div class=" row mb-3">
<label class="col-sm-2 col-form-label">Komentar Review</label> <label class="col-sm-2 col-form-label">Komentar Review</label>
<label class="col-sm-10 col-form-label"></label> <label class="col-sm-10 col-form-label">
<h4 class="card-title mb-4">Reviewer 1 - {{ $item->rNilaiMonev->rReviewerBio1 ? $item->rNilaiMonev->rReviewerBio1->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2 - {{ $item->rNilaiMonev->rReviewerBio2 ? $item->rNilaiMonev->rReviewerBio2->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $item->rNilaiMonev->reviewer_komentar_2 }}"</p>
</label>
</div> </div>
<div class="row mb-3" class="dropzone"> <div class="row mb-3" class="dropzone">
<label for="kode" class="col-sm-2 col-form-label">Upload Revisi Proposal</label> <label for="kode" class="col-sm-2 col-form-label">Upload Revisi Proposal</label>
......
resources/views/backend/mahasiswa/proposal/index.blade.php
...@@ -35,7 +35,25 @@ ...@@ -35,7 +35,25 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('mahasiswa.proposal.index') }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
<table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
<tr> <tr>
...@@ -60,10 +78,24 @@ ...@@ -60,10 +78,24 @@
<td>{{ $item->rJenis->nama }}</td> <td>{{ $item->rJenis->nama }}</td>
<td>{{ $item->judul }}</td> <td>{{ $item->judul }}</td>
<td> <td>
@if(is_null($item->status)) @if(is_null($item->upload_dokumen))
<span class="badge bg-danger">Menunggu Persetujuan Dosen</span> <span class="badge bg-danger">Belum Upload Proposal</span>
<strong> Keterangan : </strong> <br>
Upload proposal pada : -<br>
Disetujui proposal pada : -<br>
@else @else
<span class="badge bg-success">Sudah Disetujui Dosen</span> @if($item->status == '0')
<span class="badge bg-warning">Menunggu Persetujuan Dosen</span>
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Disetujui proposal pada : <h6 class="text-primary"> {{ $item->date_approval }} </h6>
@else
<span class="badge bg-success">Sudah Disetujui Dosen</span>
<span class="badge bg-warning">Menunggu Persetujuan Dosen</span> <br>
<strong> Keterangan : </strong> <br>
Upload proposal pada : <h6 class="text-primary"> {{ $item->date_upload }} </h6>
Disetujui proposal pada :
@endif
@endif @endif
</td> </td>
<td> <td>
......
resources/views/backend/mahasiswa/seleksi/index_belmawa.blade.php
...@@ -35,7 +35,25 @@ ...@@ -35,7 +35,25 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('mahasiswa.seleksi-belmawa') }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
<table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
<tr> <tr>
...@@ -60,17 +78,19 @@ ...@@ -60,17 +78,19 @@
<td>{{ $item->rJenis->nama }}</td> <td>{{ $item->rJenis->nama }}</td>
<td>{{ $item->judul }}</td> <td>{{ $item->judul }}</td>
<td> <td>
@if(is_null($item->status)) @if($item->status == '2')
<span class="badge bg-success">Lolos Seleksi Internal</span> <span class="badge bg-success">Lolos Seleksi Internal</span>
@else @else
<span class="badge bg-danger">Tidak Lolos Seleksi Internal</span> <span class="badge bg-danger">Tidak Lolos Seleksi Internal</span>
@endif @endif
</td> </td>
<td> <td>
@if(is_null($item->revisi_filebelmawa)) @if($item->status == '2')
<a href="{{ URL::to('mahasiswa/seleksi-belmawa/revisi', $item->proposal_id) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-edit"></i> Edit</a> @if(is_null($item->revisi_filebelmawa))
@else <a href="{{ URL::to('mahasiswa/seleksi-belmawa/revisi', $item->proposal_id) }}" type="button" class="btn btn-warning btn-sm waves-effect waves-light"> <i class="fas fa-edit"></i> Edit</a>
<button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->proposal_id }}" href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->proposal_id)) }}" class="btn btn-info btn-sm">Lihat</button> @else
<button data-bs-toggle="modal" data-bs-target="{{ '#lihat'.$item->proposal_id }}" href="{{ URL::to('mahasiswa/kelompok-new', encrypt($item->proposal_id)) }}" class="btn btn-info btn-sm">Lihat</button>
@endif
@endif @endif
<div id="{{ 'lihat'.$item->proposal_id }}" class="modal fade" tabindex="-1" role="dialog" <div id="{{ 'lihat'.$item->proposal_id }}" class="modal fade" tabindex="-1" role="dialog"
......
resources/views/backend/mahasiswa/seleksi/index_internal.blade.php
...@@ -35,7 +35,25 @@ ...@@ -35,7 +35,25 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<form action="{{ route('mahasiswa.seleksi-internal') }}">
<div class="row">
<div class="col-md-8"></div>
<div class="col-md-4 text-right">
<div class="row">
<label class="col-sm-3 col-form-label"></label>
<label class="col-sm-3 col-form-label">Tahun : </label>
<div class="col-sm-6">
<select class="form-select" name="year" onchange="this.form.submit()">
@foreach($periode as $per)
<option value="{{ $per->nama }}" {{ $year == $per->nama ? 'selected' : '' }}>{{ $per->nama }}</option>
@endforeach
</select>
</div>
</div>
</div>
</div>
</form>
<br>
<table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;"> <table id="datatable" class="table table-bordered dt-responsive nowrap" style="border-collapse: collapse; border-spacing: 0; width: 100%;">
<thead> <thead>
<tr> <tr>
......
resources/views/backend/mahasiswa/seleksi/revisi_belmawa.blade.php
...@@ -44,7 +44,13 @@ ...@@ -44,7 +44,13 @@
</div> </div>
<div class=" row mb-3"> <div class=" row mb-3">
<label class="col-sm-2 col-form-label">Komentar Review</label> <label class="col-sm-2 col-form-label">Komentar Review</label>
<label class="col-sm-10 col-form-label"></label> <label class="col-sm-10 col-form-label">
<h4 class="card-title mb-4">Reviewer 1 - {{ $proposal->rNilai->rReviewerBio1 ? $proposal->rNilai->rReviewerBio1->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $proposal->rNilai->reviewer_komentar_1 }}"</p>
<h4 class="card-title mb-4">Reviewer 2 - {{ $proposal->rNilai->rReviewerBio2 ? $proposal->rNilai->rReviewerBio2->nama : '' }}</h4>
<p class="text-muted mb-3 pb-4">" {{ $proposal->rNilai->reviewer_komentar_2 }}"</p>
</label>
</div> </div>
<div class="row mb-3" class="dropzone"> <div class="row mb-3" class="dropzone">
<label for="kode" class="col-sm-2 col-form-label">Upload Revisi Proposal</label> <label for="kode" class="col-sm-2 col-form-label">Upload Revisi Proposal</label>
......
resources/views/layouts/master.blade.php
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<!-- LOGO --> <!-- LOGO -->
<div class="navbar-brand-box"> <div class="navbar-brand-box">
<a href="index.html" class="logo logo-light"> <a href="{{ url('/dashboard') }}" class="logo logo-light">
<span class="logo-sm"> <span class="logo-sm">
<img src="{{ asset('theme/images/logo-sm.png') }}" alt="" height="22"> <img src="{{ asset('theme/images/logo-sm.png') }}" alt="" height="22">
</span> </span>
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
<div class="dropdown d-inline-block"> <div class="dropdown d-inline-block">
<button type="button" class="btn header-item waves-effect" id="page-header-user-dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button type="button" class="btn header-item waves-effect" id="page-header-user-dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@if (Auth::user()->roles->first()->name != 'mahasiswa') @if (Auth::user()->roles->first()->name != 'mahasiswa')
<img src="https://siakadu.unesa.ac.id/photo/fotomhs/{{ is_null(Auth::user()->rBiodata) ? '01' : Auth::user()->rBiodata->noidentitas }}.jpg" alt="Header Avatar" class="rounded-circle header-profile-user" > <img src="https://siakadu.unesa.ac.id/photo/fotomhs/{{ is_null(Auth::user()->rBiodata) ? '01' : Auth::user()->rBiodata->noidentitas }}.jpg" alt="Header Avatar" class="rounded-circle header-profile-user" >
@else @else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment