Skip to content

S
simpkm
Commit 3784e949 by novanbagus
Options

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

parents 92863ee8 76a907b0
Showing with 57 additions and 20 deletions
app/Http/Controllers/Mahasiswa/ProposalController.php
...@@ -61,6 +61,7 @@ class ProposalController extends Controller ...@@ -61,6 +61,7 @@ class ProposalController extends Controller
$getDosen = GetDataApiController::getDosen(); $getDosen = GetDataApiController::getDosen();
$jenis = Jenis::pluck('nama','jenis_id'); $jenis = Jenis::pluck('nama','jenis_id');
$bio = auth()->user()->rBiodata; $bio = auth()->user()->rBiodata;
$proposal = null;
$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)
...@@ -77,7 +78,8 @@ class ProposalController extends Controller ...@@ -77,7 +78,8 @@ class ProposalController extends Controller
'dosen' => $getDosen['data'], 'dosen' => $getDosen['data'],
'periode' => $periode, 'periode' => $periode,
'jenis' => $jenis, 'jenis' => $jenis,
'kelompok' => $kelompok 'kelompok' => $kelompok,
'proposal' => $proposal
]; ];
return view('backend.mahasiswa.proposal.create', $data); return view('backend.mahasiswa.proposal.create', $data);
......
config/fortify.php
...@@ -118,7 +118,7 @@ return [ ...@@ -118,7 +118,7 @@ return [
| |
*/ */
'views' => true, 'views' => false,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
......
pkmroute.txt 0 → 100644
File added
resources/views/backend/mahasiswa/proposal/create.blade.php
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<select class="form-select select2" name="jenis"> <select class="form-select select2" name="jenis">
<option selected>Pilih Jenis</option> <option selected>Pilih Jenis</option>
@foreach($jenis as $item => $pkm) @foreach($jenis as $item => $pkm)
<option value="{{ $item }}" {{ $proposal->jenis_id == $item ? 'selected' : '' }}>{{ $pkm }}</option> <option value="{{ $item }}" {{ $proposal ? $proposal->jenis_id == $item ? 'selected' : '' : '' }}>{{ $pkm }}</option>
@endforeach @endforeach
</select> </select>
</div> </div>
......
resources/views/layouts/menu.blade.php
...@@ -9,29 +9,48 @@ ...@@ -9,29 +9,48 @@
@if (Auth::user()->hasrole(['operator'])) @if (Auth::user()->hasrole(['operator']))
<li class="menu-title">Menu Operator</li> <li class="menu-title">Menu Operator</li>
<li>
<a href="{{ URL::to('/dashboard') }}" class="waves-effect"><i class="ti-home"></i><span>Dashboard</span></a>
</li>
<li>
<a href="{{ URL::to('/operator/user') }}" class="waves-effect"><i class="ti-user"></i><span>User</span></a>
</li>
<li class="{{ (request()->is('jenis/*')) ? 'mm-active' : '' }}"> <li>
<a href="{{ URL::to('jenis') }}" class="waves-effect"> <a href="javascript: void(0);" class="has-arrow waves-effect">
<i class="ti-home"></i> <i class="ti-settings"></i>
<span>Jenis PKM</span> <span>Seting</span>
</a> </a>
<ul class="sub-menu" aria-expanded="false">
<li class="{{ (request()->is('jenis/*')) ? 'mm-active' : '' }}">
<a href="{{ URL::to('jenis') }}" class="waves-effect">
<i class="ti-home"></i>
<span>Jenis PKM</span>
</a>
</li>
<li class="{{ (request()->is('jenis_penilaian_monev/*')) ? 'mm-active' : '' }}">
<a href="{{ URL::to('jenis_penilaian_monev') }}" class="waves-effect">
<i class="ti-home"></i>
<span>Penilaian Monev Internal</span>
</a>
</li>
<li class="{{ (request()->is('jadwal_kegiatan/*')) ? 'mm-active' : '' }}">
<a href="{{ URL::to('jadwal_kegiatan') }}" class="waves-effect">
<i class="ti-home"></i>
<span>Jadwal Kegiatan</span>
</a>
</li>
</ul>
</li> </li>
<li class="{{ (request()->is('jenis_penilaian_monev/*')) ? 'mm-active' : '' }}"> <li>
<a href="{{ URL::to('jenis_penilaian_monev') }}" class="waves-effect"> <a href="{{ URL::to('/operator/kelompok') }}" class="waves-effect"><i class="ti-id-badge"></i><span>Kelompok</span></a>
<i class="ti-home"></i>
<span>Penilaian Monev Internal</span>
</a>
</li> </li>
<li class="{{ (request()->is('jadwal_kegiatan/*')) ? 'mm-active' : '' }}"> <li>
<a href="{{ URL::to('jadwal_kegiatan') }}" class="waves-effect"> <a href="{{ URL::to('/operator/proposal') }}" class="waves-effect"><i class="ti-agenda"></i><span>Proposal</span></a>
<i class="ti-home"></i>
<span>Jadwal Kegiatan</span>
</a>
</li> </li>
<li class="{{ (request()->is('seleksi_internal*')) ? 'mm-active' : '' }}"> <li class="{{ (request()->is('seleksi_internal*')) ? 'mm-active' : '' }}">
<a href="javascript: void(0);" class="has-arrow waves-effect"> <a href="javascript: void(0);" class="has-arrow waves-effect">
<i class="ti-home"></i> <i class="ti-check"></i>
<span>Seleksi Internal</span> <span>Seleksi Internal</span>
</a> </a>
<ul class="sub-menu" aria-expanded="false"> <ul class="sub-menu" aria-expanded="false">
...@@ -39,6 +58,20 @@ ...@@ -39,6 +58,20 @@
<li><a href="{{ URL::to('seleksi_internal_proposal') }}">Daftar Proposal</a></li> <li><a href="{{ URL::to('seleksi_internal_proposal') }}">Daftar Proposal</a></li>
</ul> </ul>
</li> </li>
<li>
<a href="{{ URL::to('/operator/seleksi-belmawa') }}" class="waves-effect"><i class="ti-check-box"></i><span>Seleksi Belmawa</span></a>
</li>
<li>
<a href="javascript: void(0);" class="has-arrow waves-effect">
<i class="ti-layers-alt"></i>
<span>Monev Internal</span>
</a>
<ul class="sub-menu" aria-expanded="false">
<li><a href="{{ URL::to('/operator/monev-satu') }}">Monev Internal I</a></li>
<li><a href="{{ URL::to('/operator/monev-dua') }}">Monev Internal II</a></li>
<li><a href="{{ URL::to('/operator/monev-tiga') }}">Monev Internal III</a></li>
</ul>
</li>
@endif @endif
@if (Auth::user()->hasrole(['mahasiswa'])) @if (Auth::user()->hasrole(['mahasiswa']))
......
routes/web.php
...@@ -48,6 +48,8 @@ Route::group(['namespace' => 'Authentication'], function () { ...@@ -48,6 +48,8 @@ Route::group(['namespace' => 'Authentication'], function () {
Route::get('sso/{email}/{sessionid}', [LoginController::class, 'sso']); Route::get('sso/{email}/{sessionid}', [LoginController::class, 'sso']);
}); });
Route::get('login', [App\Http\Controllers\Auth\LoginController::class, 'showLoginForm'])->name('login');
Route::post('login', [Laravel\Fortify\Http\Controllers\AuthenticatedSessionController::class, 'store']);
Route::group(['middleware' => ['auth:sanctum', 'verified']], function () { Route::group(['middleware' => ['auth:sanctum', 'verified']], function () {
...@@ -136,7 +138,7 @@ Route::get('getDosen', [ReviewerController::class, 'getDosen'])->name('getDosen' ...@@ -136,7 +138,7 @@ Route::get('getDosen', [ReviewerController::class, 'getDosen'])->name('getDosen'
Route::resource('seleksi_internal_proposal', DaftarProposalController::class); Route::resource('seleksi_internal_proposal', DaftarProposalController::class);
Route::get('getDaftarProposal', [DaftarProposalController::class, 'getData'])->name('getDaftarProposal'); Route::get('getDaftarProposal', [DaftarProposalController::class, 'getData'])->name('getDaftarProposal');
Auth::routes(); //Auth::routes();
Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home'); Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
......
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