Skip to content

S
sipeka
Commit 0b37fad0 by Siti Aisah
Options

add master periode, filter periode, fix dashboard

parent ef9c054f
Showing with 318 additions and 48 deletions
app/Http/Controllers/Admin/LaporanController.php
......@@ -19,22 +19,20 @@ public function index(Request $request) {
if(empty(Session::get('periode'))) {
$rs = DB::table('v_saku_new')
->select('nama', 'nip', 'unit', DB::raw('COUNT(id_pengajuan) as jumlah'))
->groupBy('nama', 'nip', 'unit')
->get();
$periode = DB::table('ms_periode')->where('is_aktif', 1)->first();
Session::put('periode', $periode->periode);
} else {
$periode = DB::table('ms_periode')->where('periode', Session::get('periode'))->first();
}
$rs = DB::table('v_saku_new')
->select('nama', 'nip', 'unit', DB::raw('COUNT(id_pengajuan) as jumlah'))
->whereBetween('tanggal_keputusan', [$periode->tanggal_awal, $periode->tanggal_akhir])
->groupBy('nama', 'nip', 'unit')
->get();
}
$data = [
'rs' => $rs,
'periode' => $filter_periode
......@@ -47,26 +45,22 @@ public function download(Request $request) {
if(empty(Session::get('periode'))) {
$data['rs'] = DB::table('v_saku_new')
->select('nama', 'nip', 'unit', DB::raw('COUNT(id_pengajuan) as jumlah'))
->groupBy('nama', 'nip', 'unit')
->get();
$data['nama_file'] = 'Laporan Reviewer Sipeka Semua Periode';
$periode = DB::table('ms_periode')->where('is_aktif', 1)->first();
Session::put('periode', $periode->periode);
} else {
$periode = DB::table('ms_periode')->where('periode', Session::get('periode'))->first();
}
$data['nama_file'] = 'Laporan Reviewer Sipeka Periode '. $periode->periode;
$data['rs'] = DB::table('v_saku_new')
->select('nama', 'nip', 'unit', DB::raw('COUNT(id_pengajuan) as jumlah'))
->whereBetween('tanggal_keputusan', [$periode->tanggal_awal, $periode->tanggal_akhir])
->groupBy('nama', 'nip', 'unit')
->get();
$data['nama_file'] = 'Laporan Reviewer Sipeka Periode '. $periode->periode;
}
return view('laporan.excel', $data);
}
}
app/Http/Controllers/Admin/PeriodeController.php 0 → 100644
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Http\Support\ValidationRule;
use App\Models\Admin\Periode;
use Exception;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Redirect;
class PeriodeController extends Controller
{
public function index(){
$periode = Periode::query()->get();
$data = [
'periode' => $periode
];
return view('Admin.Periode.index', $data);
}
public function store(Request $request){
DB::beginTransaction();
try{
$rule = [
'periode' => 'required',
'tanggal_awal' => 'required|date',
'tanggal_akhir' => 'required|date',
'is_aktif' => 'required'
];
$request->validate($rule, ValidationRule::getErrorMessage($rule));
$periode = [
'periode' => $request->periode,
'tanggal_awal' => $request->tanggal_awal,
'tanggal_akhir' => $request->tanggal_akhir,
'is_aktif' => $request->is_aktif,
];
Periode::query()->create($periode);
DB::commit();
return Redirect::route('periode.index')
->with('success', 'Periode berhasil ditambahkan');
}
catch(Exception $e){
Log::error($e);
DB::rollBack();
return Redirect::route('periode.index')
->with('error', 'Periode gagal ditambahkan');
}
}
public function update(Request $request, $id){
DB::beginTransaction();
try{
$id = decrypt($id);
$rule = [
'periode' => 'required',
'tanggal_awal' => 'required|date',
'tanggal_akhir' => 'required|date',
'is_aktif' => 'required'
];
$request->validate($rule, ValidationRule::getErrorMessage($rule));
$periode = [
'periode' => $request->periode,
'tanggal_awal' => $request->tanggal_awal,
'tanggal_akhir' => $request->tanggal_akhir,
'is_aktif' => $request->is_aktif,
];
Periode::where('periode', $id)->update($periode);
DB::commit();
return Redirect::route('periode.index')
->with('success', 'Periode berhasil diupdate');
}
catch(Exception $e){
Log::error($e);
DB::rollBack();
return Redirect::route('periode.index')
->with('error', 'Periode gagal diupdate');
}
}
// public function destroy($id) {
// $id = decrypt($id);
// DB::beginTransaction();
// try{
// User::where('id', $id)->delete();
// DB::commit();
// return Redirect::route('user.index')
// ->with('success', 'User berhasil dihapus');
// }
// catch(Exception $e){
// Log::error($e);
// DB::rollBack();
// return Redirect::route('user.index')
// ->with('error', 'User gagal dihapus');
// }
// }
}
app/Http/Controllers/Admin/SakuController.php
......@@ -9,23 +9,37 @@
use Storage;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Session;
class SakuController extends Controller
{
public function index() {
public function index(Request $request) {
// $penelaah = DB::table('tr_penelaah')->orderBy('id_pengajuan')->get();
$filter_periode = DB::table('ms_periode')->orderBy('periode','asc')->get();
Session::put('periode', $request->periode);
if(empty(Session::get('periode'))) {
$periode = DB::table('ms_periode')->where('is_aktif', 1)->first();
Session::put('periode', $periode->periode);
} else {
$periode = DB::table('ms_periode')->where('periode', Session::get('periode'))->first();
}
$penelaah = DB::table('tr_penelaah')
->select('tr_penelaah.*', 'tr_pengajuan.id_pengajuan as id_pengajuan_epk', 'tr_pengajuan.no_sk', 'tr_pengajuan.judul', 'tr_pengajuan.peneliti', 'tr_pengajuan.tahun', 'tr_pengajuan.klasifikasi', 'tr_pengajuan.file_ec', 'ms_kategori.nama_kategori')
->join('tr_pengajuan', 'tr_pengajuan.id', 'tr_penelaah.id_pengajuan')
->join('ms_kategori', 'ms_kategori.id', 'tr_pengajuan.id_kategori')
->join('bantuan_pengusul', 'bantuan_pengusul.id_pengajuan', 'tr_pengajuan.id_pengajuan')
->whereBetween('bantuan_pengusul.tanggal_keputusan', [$periode->tanggal_awal, $periode->tanggal_akhir])
->orderBy('id_pengajuan')
->get();
$data = [
'penelaah' => $penelaah,
'periode' => $filter_periode
];
return view('saku.index', $data);
......
app/Http/Controllers/Admin/TransaksiController.php
......@@ -19,11 +19,23 @@ class TransaksiController extends Controller
public function index(Request $request) {
$filter_periode = DB::table('ms_periode')->orderBy('periode','asc')->get();
Session::put('status', $request->status);
Session::put('periode', $request->periode);
if(empty(Session::get('status'))) {
if(empty(Session::get('periode'))){
$periode = DB::table('ms_periode')->where('is_aktif', 1)->first();
Session::put('periode', $periode->periode);
$pengusul = DB::table('bantuan_pengusul')->get();
} else {
$periode = DB::table('ms_periode')->where('periode', Session::get('periode'))->first();
}
$pengusul = DB::table('bantuan_pengusul')
->whereBetween('tanggal_keputusan', [$periode->tanggal_awal, $periode->tanggal_akhir])
->get();
} else {
......@@ -35,11 +47,30 @@ public function index(Request $request) {
if(Session::get('status') == '1'){
$pengusul = DB::table('bantuan_pengusul')->whereIn('id_pengajuan',$list)->get();
if(empty(Session::get('periode'))){
$periode = DB::table('ms_periode')->where('is_aktif', 1)->first();
Session::put('periode', $periode->periode);
} else {
$periode = DB::table('ms_periode')->where('periode', Session::get('periode'))->first();
}
$pengusul = DB::table('bantuan_pengusul')
->whereIn('id_pengajuan',$list)
->whereBetween('tanggal_keputusan', [$periode->tanggal_awal, $periode->tanggal_akhir])
->get();
}elseif(Session::get('status') == '2'){
if(empty(Session::get('periode'))){
$periode = DB::table('ms_periode')->where('is_aktif', 1)->first();
Session::put('periode', $periode->periode);
} else {
$periode = DB::table('ms_periode')->where('periode', Session::get('periode'))->first();
}
$pengusul = DB::table('bantuan_pengusul')->whereNotIn('id_pengajuan',$list)->get();
$pengusul = DB::table('bantuan_pengusul')
->whereNotIn('id_pengajuan',$list)
->whereBetween('tanggal_keputusan', [$periode->tanggal_awal, $periode->tanggal_akhir])
->get();
}
......@@ -49,7 +80,8 @@ public function index(Request $request) {
$data = [
'pengusul' => $pengusul,
'kategori' => $kategori
'kategori' => $kategori,
'periode' => $filter_periode
];
return view('transaksi.index', $data);
......
app/Http/Support/ValidationRule.php
......@@ -8,13 +8,12 @@ class ValidationRule{
'numeric' => 'must be a number',
'string' => 'must be a string',
'unique' => 'must be unique',
'required' => 'must be filled',
'numeric' => 'must be numeric',
'regex' => 'must be a combination of uppercase letters, lowercase letters, numbers and characters',
'max' => 'must be maximum',
'min' => 'must be minimum',
'email' => 'is invalid',
'mimes' => 'file type must pdf',
'date' => 'must be a valid date', // Menambahkan pesan untuk date
'unique' => 'must be unique'
];
......
app/Models/Admin/Periode.php 0 → 100644
<?php
namespace App\Models\Admin;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Periode extends Model
{
use HasFactory;
public $incrementing = false;
protected $table = 'ms_periode';
protected $keyType = 'string';
protected $fillable = [
'periode',
'tanggal_awal',
'tanggal_akhir',
'is_aktif',
];
}
resources/views/dashboard.blade.php
......@@ -56,19 +56,39 @@
}
@endphp
<h4 class="fw-bolder mb-0">{{ $jsarjana }}</h4>
<p class="card-text font-small-3 mb-0">Mhs S1/D4</p>
<p class="card-text font-small-3 mb-0">Mhs S1/D4 Unesa</p>
</div>
</div>
</div>
<div class="col-xl-3 col-sm-6 col-12 mb-2 mb-xl-0">
<div class="d-flex flex-row">
<div class="avatar bg-light-info me-2">
<div class="avatar bg-light-primary me-2">
<div class="avatar-content">
<i data-feather="users" class="avatar-icon"></i>
</div>
</div>
<div class="my-auto">
@php
if(isset($jumlah['e38b64e5-4bc8-49fc-999b-bf4cb6052236'])){
$jsarjanaluar = $jumlah['e38b64e5-4bc8-49fc-999b-bf4cb6052236'];
} else {
$jsarjanaluar = 0;
}
@endphp
<h4 class="fw-bolder mb-0">{{ $jsarjanaluar }}</h4>
<p class="card-text font-small-3 mb-0">Mhs S1/D4 Luar</p>
</div>
</div>
</div>
<div class="col-xl-3 col-sm-6 col-12 mb-2 mb-xl-0">
<div class="d-flex flex-row">
<div class="avatar bg-light-info me-2">
<div class="avatar-content">
<i data-feather='users' class="avatar-icon"></i>
</div>
</div>
<div class="my-auto">
@php
if(isset($jumlah['11459605-89b4-4dfc-9586-519802e989e4'])){
$jpasca = $jumlah['11459605-89b4-4dfc-9586-519802e989e4'];
} else {
......@@ -76,19 +96,41 @@
}
@endphp
<h4 class="fw-bolder mb-0">{{ $jpasca }}</h4>
<p class="card-text font-small-3 mb-0">Mhs S2/S3</p>
<p class="card-text font-small-3 mb-0">Mhs S2/S3 Unesa</p>
</div>
</div>
</div>
<div class="col-xl-3 col-sm-6 col-12 mb-2 mb-sm-0">
<div class="col-xl-3 col-sm-6 col-12 mb-2 mb-xl-0">
<div class="d-flex flex-row">
<div class="avatar bg-light-danger me-2">
<div class="avatar bg-light-info me-2">
<div class="avatar-content">
<i data-feather="users" class="avatar-icon"></i>
</div>
</div>
<div class="my-auto">
@php
if(isset($jumlah['81814ab3-299d-42c2-aa49-9f3c80d887ca'])){
$jpascaluar = $jumlah['81814ab3-299d-42c2-aa49-9f3c80d887ca'];
} else {
$jpascaluar = 0;
}
@endphp
<h4 class="fw-bolder mb-0">{{ $jpascaluar }}</h4>
<p class="card-text font-small-3 mb-0">Mhs S2/S3 Luar</p>
</div>
</div>
</div>
</div><br>
<div class="row">
<div class="col-xl-3 col-sm-6 col-12 mb-2 mb-xl-0">
<div class="d-flex flex-row">
<div class="avatar bg-light-success me-2">
<div class="avatar-content">
<i data-feather='users' class="avatar-icon"></i>
</div>
</div>
<div class="my-auto">
@php
if(isset($jumlah['ec949871-68fa-4357-8084-547db716faf6'])){
$jdosen = $jumlah['ec949871-68fa-4357-8084-547db716faf6'];
} else {
......@@ -96,11 +138,11 @@
}
@endphp
<h4 class="fw-bolder mb-0">{{ $jdosen }}</h4>
<p class="card-text font-small-3 mb-0">Dosen</p>
<p class="card-text font-small-3 mb-0">Dosen Unesa</p>
</div>
</div>
</div>
<div class="col-xl-3 col-sm-6 col-12">
<div class="col-xl-3 col-sm-6 col-12 mb-2 mb-xl-0">
<div class="d-flex flex-row">
<div class="avatar bg-light-success me-2">
<div class="avatar-content">
......@@ -109,6 +151,26 @@
</div>
<div class="my-auto">
@php
if(isset($jumlah['53aff26e-c76f-4b7a-b7c5-88d31afe5880'])){
$jdosenluar = $jumlah['53aff26e-c76f-4b7a-b7c5-88d31afe5880'];
} else {
$jdosenluar = 0;
}
@endphp
<h4 class="fw-bolder mb-0">{{ $jdosenluar }}</h4>
<p class="card-text font-small-3 mb-0">Dosen Luar</p>
</div>
</div>
</div>
<div class="col-xl-3 col-sm-6 col-12">
<div class="d-flex flex-row">
<div class="avatar bg-light-danger me-2">
<div class="avatar-content">
<i data-feather="users" class="avatar-icon"></i>
</div>
</div>
<div class="my-auto">
@php
if(isset($jumlah['790fdbb1-36e7-447c-9a38-55b62816395c'])){
$jindustri = $jumlah['790fdbb1-36e7-447c-9a38-55b62816395c'];
} else {
......
resources/views/laporan/index.blade.php
......@@ -20,7 +20,6 @@
<div class="col-md-3">
<label>Periode</label>
<select name="periode" class="form-control">
<option value="">Semua</option>
@foreach($periode as $p)
<option value={{ $p->periode }} @if( Session::get('periode') == $p->periode) selected="selected" @endif>{{ $p->periode }}</option>
@endforeach
......@@ -50,6 +49,7 @@
</tr>
</thead>
<tbody>
@if($rs->isNotEmpty())
@php
$no = 1;
@endphp
......@@ -65,6 +65,9 @@
$no++;
@endphp
@endforeach
@else
<td colspan="5" style="text-align: center">Data tidak ditemukan.</td>
@endif
</tbody>
</table>
</div>
......
resources/views/layouts/menu.blade.php
......@@ -7,6 +7,8 @@
</li>
<li data-menu="" class="{{ (request()->getRequestUri() == "/user") ? 'active' : '' }}"><a href="{{route('user.index')}}" class="dropdown-item d-flex align-items-center" data-bs-toggle="" data-i18n="Email" ><i data-feather='user'></i><span data-i18n="Email">Master User</span></a>
</li>
<li data-menu="" class="{{ (request()->getRequestUri() == "/periode") ? 'active' : '' }}"><a href="{{route('periode.index')}}" class="dropdown-item d-flex align-items-center" data-bs-toggle="" data-i18n="Email" ><i data-feather='calendar'></i><span data-i18n="Email">Master Periode</span></a>
</li>
</ul>
</li>
<li class="dropdown nav-item" data-menu="dropdown"><a class="dropdown-toggle nav-link d-flex align-items-center" href="#" data-bs-toggle="dropdown"><i data-feather='edit'></i><span data-i18n="Apps">Transaksi</span></a>
......
resources/views/saku/index.blade.php
......@@ -9,17 +9,25 @@
<div class="card-body">
<div class="card-text">
<div class="row">
<div class="col-md-8">
{{-- @livewire('admin.masters.registrasi.add-registrasi-component') --}}
<div class="panel panel-info">
<div class="panel-body">
<form action="{{ route('saku.index') }}" method="GET">
<div class="row">
<div class="col-md-3">
<label>Periode</label>
<select name="periode" class="form-control">
@foreach($periode as $p)
<option value={{ $p->periode }} @if( Session::get('periode') == $p->periode) selected="selected" @endif>{{ $p->periode }}</option>
@endforeach
</select>
</div>
<div class="col-md-2">
<br>
<button class="btn btn-info pull-lefts">Cari</button>
</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">Cari : </label>
<div class="col-sm-6">
<input type="text" class="form-control align-right" placeholder="Search" wire:model="keyword">
</div>
</div> --}}
</form>
</div>
</div>
</div>
</div>
......@@ -41,6 +49,7 @@
</tr>
</thead>
<tbody>
@if($penelaah->isNotEmpty())
@php
$no = 1;
$nomorsurat = $penelaah[0]->no_sk;
......@@ -85,6 +94,9 @@
$no++;
@endphp
@endforeach
@else
<td colspan="8" style="text-align: center">Data tidak ditemukan.</td>
@endif
</tbody>
</table>
</div>
......
resources/views/transaksi/index.blade.php
......@@ -35,15 +35,14 @@
<option value="2" @if( Session::get('status') =='2') selected="selected" @endif>BELUM</option>
</select>
</div>
{{-- <div class="col-md-3">
<label>Kategori</label>
<select name="kategori" class="form-control">
<option value="">Pilih</option>
@foreach($kategori as $k)
<option value="{{ $k->id }}" @if( Session::get('kategori') == $k->id) selected="selected" @endif>{{ $k->kode_kategori }} - {{ $k->nama_kategori }}</option>
<div class="col-md-3">
<label>Periode</label>
<select name="periode" class="form-control">
@foreach($periode as $p)
<option value={{ $p->periode }} @if( Session::get('periode') == $p->periode) selected="selected" @endif>{{ $p->periode }}</option>
@endforeach
</select>
</div> --}}
</div>
<div class="col-md-2">
<br>
<button class="btn btn-info pull-lefts">Cari</button>
......@@ -73,6 +72,7 @@
</tr>
</thead>
<tbody>
@if($pengusul->isNotEmpty())
@foreach($pengusul as $item)
<tr>
<td>{{ $no }}</td>
......@@ -175,6 +175,9 @@
@endphp
<!-- / edit registrasi modal -->
@endforeach
@else
<td colspan="7" style="text-align: center">Data tidak ditemukan.</td>
@endif
</tbody>
</table>
</div>
......
routes/web.php
......@@ -4,6 +4,7 @@
use App\Http\Controllers\Admin\DashboardController;
use App\Http\Controllers\Admin\KategoriController;
use App\Http\Controllers\Admin\LaporanController;
use App\Http\Controllers\Admin\PeriodeController;
use App\Http\Controllers\Admin\TransaksiController;
use App\Http\Controllers\Admin\SakuController;
use App\Http\Controllers\Admin\UserController;
......@@ -34,5 +35,6 @@
Route::resource('laporan', LaporanController::class);
Route::post('/excel', [LaporanController::class, 'download'])->name('laporan.download');
Route::resource('user', UserController::class);
Route::resource('periode', PeriodeController::class);
Route::get('/logout', [LoginController::class, 'logout'])->name('admin.logout');
});
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