Skip to content

S
simpmw
Commit 819f3ceb by Alfiro Pratama
Options

fix get value data

parent 45fc878b
Showing with 47 additions and 55 deletions
app/Http/Controllers/Api/DosenController.php
......@@ -19,7 +19,7 @@ class DosenController extends Controller
$total_count = 0;
$incomplete_results = true;
$periode = Periode::where('status', 1)->first();
$periode = Periode::where('status', '1')->first();
$items = [];
if (empty($getDosen)) {
......@@ -33,7 +33,7 @@ class DosenController extends Controller
if(str_contains(strtolower($item['nm_sdm']), strtolower($keyword))){
$jumlah_bimbingan = Kelompok::where('id_sdm', $item['id_sdm'])
->where('periode_id', $periode->periode_id)
->where('status_hapus', 0)
->where('status_hapus', '0')
->where('kirim', 1)
->whereYear('created_at', $periode->nama)
->count();
......
app/Http/Controllers/DashboardController.php
......@@ -25,13 +25,13 @@ class DashboardController extends Controller
{
//
$title = 'Dashboard PMW';
$pengumuman = $pengumuman = Pengumuman::query()->where('status', 1)->first();
$pengumuman = Pengumuman::query()->where('status', '1')->first();
$tahun = Periode::orderBy('nama', 'ASC')->get();
$jenis = Jenis::where('status_hapus', 0)->whereNotNull('nama')->orderBy('nama', 'ASC')->get();
$jenis = Jenis::where('status_hapus', '0')->whereNotNull('nama')->orderBy('nama', 'ASC')->get();
$proposal = DaftarProposal::all();
$jenis_monev = JenisMonev::where('status_hapus', 0)->get();
$monev = DaftarProposalMonev::where('status_hapus', 0)->get();
$jenis_monev = JenisMonev::where('status_hapus', '0')->get();
$monev = DaftarProposalMonev::where('status_hapus', '0')->get();
$fakultas = DB::connection('siakadu')->table('sms')->whereNull('id_induk_sms')->whereNull('kode_prodi')->get();
$data = [
......@@ -101,7 +101,7 @@ class DashboardController extends Controller
// 2️⃣ Query proposal per fakultas (1 query saja)
$proposalQuery = DaftarProposal::select('fakultas_ketua', DB::raw('COUNT(*) as total'))
->where('status_hapus', 0)
->where('status_hapus', '0')
->when($jenis_id, fn($q) => $q->where('jenis_id', $jenis_id))
->when($tahun, fn($q) => $q->where('periode', $tahun))
->when($tahap === 'proposal', fn($q) => $q) // Only show proposal data when tahap is 'proposal'
......@@ -113,7 +113,7 @@ class DashboardController extends Controller
// 3️⃣ Query Monev 1 (1 query)
$monev1Query = DaftarProposalMonev::select('fakultas_ketua', DB::raw('COUNT(*) as total'))
->where('jenis_monev_desc', 'Monev Internal I')
->where('status_hapus', 0)
->where('status_hapus', '0')
->when($jenis_id, fn($q) => $q->where('jenis_id', $jenis_id))
->when($tahun, fn($q) => $q->where('periode', $tahun))
->when($tahap === 'monev1', fn($q) => $q) // Only show monev1 data when tahap is 'monev1'
......@@ -125,7 +125,7 @@ class DashboardController extends Controller
// 4️⃣ Query Monev 2 (1 query)
$monev2Query = DaftarProposalMonev::select('fakultas_ketua', DB::raw('COUNT(*) as total'))
->where('jenis_monev_desc', 'Monev Internal II')
->where('status_hapus', 0)
->where('status_hapus', '0')
->when($jenis_id, fn($q) => $q->where('jenis_id', $jenis_id))
->when($tahun, fn($q) => $q->where('periode', $tahun))
->when($tahap === 'monev2', fn($q) => $q) // Only show monev2 data when tahap is 'monev2'
......
app/Http/Controllers/Mahasiswa/KelompokController.php
......@@ -30,7 +30,7 @@ class KelompokController extends Controller
$nim = $bio->noidentitas;
$getDosen = GetDataApiController::getDosen();
$periode = Periode::query()->orderBy('nama', 'ASC')->get();
$periode_aktif = Periode::where('status', 1)->first();
$periode_aktif = Periode::where('status', '1')->first();
$year = !is_null($request->year) ? $request->year : now()->year;
$kelompok = Kelompok::with(['rAnggota'])
......@@ -70,7 +70,7 @@ class KelompokController extends Controller
$bio = auth()->user()->rBiodata;
$nim = $bio->noidentitas;
$getDosen = GetDataApiController::getDosen();
$periode = Periode::query()->where('status', 1)->first();
$periode = Periode::query()->where('status', '1')->first();
$data = [
......@@ -91,7 +91,7 @@ class KelompokController extends Controller
$title = 'Tambah Kelompok Mahasiswa';
$kelompok = Kelompok::with('rAnggota')->where('kelompok_id', $kelompok_id)->first();
$periode = Periode::where('status', 1)->first();
$periode = Periode::where('status', '1')->first();
$getDosen = GetDataApiController::getDosen();
......
app/Http/Controllers/Mahasiswa/ProposalController.php
......@@ -65,7 +65,7 @@ class ProposalController extends Controller
{
//
$title = 'Upload Proposal Mahasiswa';
$periode = Periode::where('status', 1)->first();
$periode = Periode::where('status', '1')->first();
$getDosen = GetDataApiController::getDosen();
$jenis = Jenis::pluck('nama','jenis_id');
$bio = auth()->user()->rBiodata;
......@@ -135,7 +135,7 @@ class ProposalController extends Controller
'jenis.not_in' => 'Harap pilih Kategori PMW yang valid.',
]);
$periode = Periode::where('status', 1)->first();
$periode = Periode::where('status', '1')->first();
$uuid = Str::uuid();
$file_nama = $periode->nama.'_'.$uuid.'.'.$proposal['file']->getClientOriginalExtension();
......@@ -190,7 +190,7 @@ class ProposalController extends Controller
{
//
$title = 'Edit Upload Proposal Mahasiswa';
$periode = Periode::where('status', 1)->first();
$periode = Periode::where('status', '1')->first();
$getDosen = GetDataApiController::getDosen();
$jenis = Jenis::pluck('nama','jenis_id');
......
app/Http/Controllers/Mahasiswa/SeleksiController.php
......@@ -57,7 +57,7 @@ class SeleksiController extends Controller
{
//
$title = 'Tambah Proposal Mahasiswa';
$periode = Periode::where('status', 1)->first();
$periode = Periode::where('status', '1')->first();
$getDosen = GetDataApiController::getDosen();
$jenis = Jenis::pluck('nama','jenis_id');
$bio = auth()->user()->rBiodata;
......@@ -206,7 +206,7 @@ class SeleksiController extends Controller
<td>Komentar</td>
<td>
<h4 class='card-title mb-4'>Status Nilai</h4>";
if (!is_null($rata)) {
$data .= "<p class='mb-4 pb-4'><span class='badge bg-success'>Telah direview.</span></p>";
} else {
......@@ -221,7 +221,7 @@ class SeleksiController extends Controller
</td>
</tr>
";
// <p class='text-muted mb-3 pb-4'>" . $rata . "</p>
$response['html'] = $data;
......
app/Http/Controllers/Operator/JadwalKegiatanController.php
......@@ -8,7 +8,6 @@ use DB;
use URL;
use Auth;
use Uuid;
use Alert;
use Crypt;
use Carbon\Carbon;
......@@ -52,10 +51,7 @@ class JadwalKegiatanController extends Controller
}
}
Alert::success('Data berhasil disimpan')->persistent('Ok');
$successmessage = "Proses Setting Jadwal Berhasil.";
return redirect()->route('operator.jadwal-kegiatan.index')->with('successMessage', $successmessage);
return redirect()->route('operator.jadwal-kegiatan.index')->with('successMessage', 'Jadwal kegiatan berhasil disimpan.');
}
public function edit($id)
......
app/Http/Controllers/Operator/JenisController.php
......@@ -103,16 +103,12 @@ class JenisController extends Controller
if(Jenis::create($data))
{
Alert::success('Data berhasil disimpan')->persistent('Ok');
$successmessage = "Proses Tambah Kuesioner Berhasil.";
return redirect()->route('operator.jenis.index')->with('successMessage', 'Data berhasil disimpan.');
}
else
{
Alert::success('Data gagal disimpan')->persistent('Ok');
$successmessage = "Proses Tambah Kuesioner Gagal.";
return redirect()->route('operator.jenis.index')->with('errorMessage', 'Data gagal disimpan.');
}
return redirect()->route('operator.jenis.index')->with('successMessage', $successmessage);
}
public function edit($id)
......@@ -120,7 +116,8 @@ class JenisController extends Controller
$jenis = Jenis::where('jenis_id', '=', Crypt::decrypt($id))->get();
$data = [
'jenis' => $jenis
'jenis' => $jenis,
'encrypted_id' => $id,
];
return view('backend.operator.jenis.edit', compact('data'))->withTitle('Ubah Kategori PMW');
......@@ -131,12 +128,10 @@ class JenisController extends Controller
$data['nama'] = $request->input('nama');
$data['keterangan'] = $request->input('keterangan');
$jenis = Jenis::findOrFail($id);
$jenis = Jenis::where('jenis_id', Crypt::decrypt($id))->firstOrFail();
$jenis->update($data);
Alert::success('Data berhasil disimpan.')->persistent('Ok');
return redirect()->route('operator.jenis.index');
return redirect()->route('operator.jenis.index')->with('successMessage', 'Data berhasil diubah.');
}
......
app/Http/Controllers/Operator/JenisPenilaianMonevController.php
......@@ -105,7 +105,8 @@ class JenisPenilaianMonevController extends Controller
$data = [
'jenis' => $jenis,
'jenis_penilaian_monev' => $jenis_penilaian_monev
'jenis_penilaian_monev' => $jenis_penilaian_monev,
'encrypted_id' => $id,
];
return view('backend.operator.jenis_penilaian_monev.edit', compact('data'))->withTitle('Ubah Kategori PMW');
......@@ -113,13 +114,15 @@ class JenisPenilaianMonevController extends Controller
public function update(Request $request, $id)
{
$delete = JenisPenilaianMonev::where('jenis_id', $id)->delete($id);
$decrypted_id = Crypt::decrypt($id);
JenisPenilaianMonev::where('jenis_id', $decrypted_id)->delete();
for($i=0; $i<count($request->nama); $i++)
{
$uuid = decrypt($request->jenis_penilaian_monev_id[$i]);
$data['jenis_penilaian_monev_id'] = $uuid;
$data['jenis_id'] = $id;
$data['jenis_id'] = $decrypted_id;
$data['nama'] = $request->nama[$i];
$data['bobot'] = 1;
......@@ -129,9 +132,7 @@ class JenisPenilaianMonevController extends Controller
$data);
}
Alert::success('Data berhasil disimpan.')->persistent('Ok');
return redirect()->route('operator.jenis-penilaian-monev.index');
return redirect()->route('operator.jenis-penilaian-monev.index')->with('successMessage', 'Data berhasil diubah.');
}
......
app/Http/Controllers/Operator/MonevProposalController.php
......@@ -48,7 +48,7 @@ class MonevProposalController extends Controller
/* AJAX request */
public function getData(Request $request){
$periode = Periode::where('status', 1)->first();
$periode = Periode::where('status', '1')->first();
$reqPeriodeId = $periode->periode_id;
// parameter
......@@ -271,7 +271,7 @@ class MonevProposalController extends Controller
<th>Laporan Kemajuan</th>
<td>' . $laporan_kemajuan . '</td>
</tr>';
if ($record->jenis_monev_id !== '07cda89b-94ca-42a3-a197-8fc1260ebcfb') {
$aksi .= '
<tr>
......@@ -283,14 +283,14 @@ class MonevProposalController extends Controller
<td>' . $laporan_anggaran . '</td>
</tr>';
}
$aksi .= '
<tr>
<th>Laporan Lainnya</th>
<td>' . $laporan_luaran . '</td>
</tr>
</table>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
......@@ -587,7 +587,7 @@ class MonevProposalController extends Controller
}
public function reviewAnggaran($id)
{
{
$monev_id = decrypt($id);
$title = 'Laporan Anggaran Mahasiswa';
$anggaran = BuktiAnggaran::with(['rProposal', 'rMonev'])
......@@ -628,12 +628,12 @@ class MonevProposalController extends Controller
$monev = $request->monev;
$filename = sprintf(
'seleksi_monev_internal_%s_export.xlsx',
'seleksi_monev_internal_%s_export.xlsx',
$monev == 'Monev Internal I' ? 'i' : 'ii'
);
return Excel::download(new DaftarProposalMonevExport($jenis, $status, $tahun, $monev), $filename);
// $data = new DaftarProposalMonevExport($jenis, $status, $tahun, $monev);
// return $data->view();
}
......
app/Http/Controllers/Operator/ReviewerController.php
......@@ -114,7 +114,7 @@ class ReviewerController extends Controller
public function store(Request $request)
{
$periode = Periode::where('status', 1)->first();
$periode = Periode::where('status', '1')->first();
$reqPeriodeId = $periode->periode_id;
$reqJenisMonevId = 'ba11c2b5-d65d-4360-9717-98e4fa9b9188';
......
app/Http/Controllers/Operator/ReviewerMonevController.php
......@@ -121,7 +121,7 @@ class ReviewerMonevController extends Controller
public function store(Request $request)
{
$periode = Periode::where('status', 1)->first();
$periode = Periode::where('status', '1')->first();
$reqPeriodeId = $periode->periode_id;
$reqJenisMonevId = Crypt::decrypt($request->input('jenis_monev_id'));
......
app/Http/Controllers/Reviewer/DaftarMonevController.php
......@@ -44,7 +44,7 @@ class DaftarMonevController extends Controller
public function index($id)
{
$periode = Periode::where('status', 1)->first();
$periode = Periode::where('status', '1')->first();
$reqPeriodeId = $periode->periode_id;
$jenis_monev = JenisMonev::select('nama')->where('jenis_monev_id', Crypt::decrypt($id))->first();
......
resources/views/backend/operator/jenis/edit.blade.php
......@@ -11,7 +11,7 @@
@endsection
@php
$jenis = $data['jenis']['0'];
$id = $jenis->jenis_id;
$encrypted_id = $data['encrypted_id'];
@endphp
@section('contents')
......@@ -34,7 +34,7 @@
<div class="col-12">
<div class="card">
<div class="card-body">
{!! Form::model($jenis, ['route' => ['operator.jenis.update', $id], 'method'=>'patch', 'class'=>'form-horizontal']) !!}
{!! Form::model($jenis, ['route' => ['operator.jenis.update', $encrypted_id], 'method'=>'patch', 'class'=>'form-horizontal']) !!}
{!! csrf_field() !!}
<div class="row mb-3">
<label for="example-text-input" class="col-sm-2 col-form-label">Kategori PMW</label>
......
resources/views/backend/operator/jenis_penilaian_monev/edit.blade.php
......@@ -11,7 +11,7 @@
@endsection
@php
$jenis = $data['jenis']['0'];
$id = $jenis->jenis_id;
$encrypted_id = $data['encrypted_id'];
$jenis_penilaian_monev = $data['jenis_penilaian_monev'];
@endphp
......@@ -35,7 +35,7 @@
<div class="col-12">
<div class="card">
<div class="card-body">
{!! Form::model($jenis, ['route' => ['operator.jenis-penilaian-monev.update', $id], 'method'=>'patch', 'class'=>'form-horizontal']) !!}
{!! Form::model($jenis, ['route' => ['operator.jenis-penilaian-monev.update', $encrypted_id], 'method'=>'patch', 'class'=>'form-horizontal']) !!}
{!! csrf_field() !!}
<div class="row mb-3">
<label for="example-text-input" class="col-sm-2 col-form-label">Kategori PMW </label>
......
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