on progress

This commit is contained in:
JokoPrasetio 2026-03-03 14:04:31 +07:00
parent 2ded2e8ae8
commit ce8848a2b8
7 changed files with 391 additions and 18 deletions

View File

@ -167,6 +167,9 @@ class DashboardController extends Controller
} }
$query = FileDirectory::where('statusenabled', true) $query = FileDirectory::where('statusenabled', true)
->where('status_action', 'approved') ->where('status_action', 'approved')
->where(function($q){
$q->where('is_akre', false)->orWhereNull('is_akre');
})
->whereIn('id_unit_kerja', $unitIds) ->whereIn('id_unit_kerja', $unitIds)
->when(!empty($kategoriIds), function ($q) use ($kategoriIds) { ->when(!empty($kategoriIds), function ($q) use ($kategoriIds) {
$q->whereIn('master_kategori_directory_id', $kategoriIds); $q->whereIn('master_kategori_directory_id', $kategoriIds);
@ -931,6 +934,9 @@ class DashboardController extends Controller
? array_values(array_filter($kategori)) ? array_values(array_filter($kategori))
: array_values(array_filter(explode(',', (string) $kategori))); : array_values(array_filter(explode(',', (string) $kategori)));
$query = FileDirectory::where('statusenabled', true)->where('status_action', 'approved') $query = FileDirectory::where('statusenabled', true)->where('status_action', 'approved')
->where(function($q){
$q->where('is_akre', false)->orWhereNull('is_akre');
})
->when(!empty($unitIds), function ($q) use ($unitIds) { ->when(!empty($unitIds), function ($q) use ($unitIds) {
$q->whereIn('id_unit_kerja', $unitIds); $q->whereIn('id_unit_kerja', $unitIds);
}) })
@ -1051,11 +1057,15 @@ class DashboardController extends Controller
$isAtasan = MappingUnitKerjaPegawai::where('statusenabled', true)->where(function($q){ $isAtasan = MappingUnitKerjaPegawai::where('statusenabled', true)->where(function($q){
$q->where('objectatasanlangsungfk', auth()->user()?->dataUser?->id)->orWhere('objectpejabatpenilaifk', auth()->user()->objectpegawaifk); $q->where('objectatasanlangsungfk', auth()->user()?->dataUser?->id)->orWhere('objectpejabatpenilaifk', auth()->user()->objectpegawaifk);
})->exists(); })->exists();
foreach ($datas as $index => $data) { foreach ($datas as $index => $data) {
list($id_unit_kerja, $nama_unit_kerja) = explode('/', $data['id_unit_kerja'],2); list($id_unit_kerja, $nama_unit_kerja) = explode('/', $data['id_unit_kerja'],2);
list($id_sub_unit_kerja, $nama_sub_unit_kerja) = explode('/', $data['id_sub_unit_kerja'],2); list($id_sub_unit_kerja, $nama_sub_unit_kerja) = explode('/', $data['id_sub_unit_kerja'],2);
list($master_kategori_directory_id, $nama_kategori) = explode('/', $data['master_kategori_directory_id'],2); if($data['is_akre'] === "1"){
$path = "{$data['akre_type']}/{$data['akre_segment']}/{$data['akre_item']}";
}else{
list($master_kategori_directory_id, $nama_kategori) = explode('/', $data['master_kategori_directory_id'],2);
$path = "{$nama_unit_kerja}/{$nama_sub_unit_kerja}/{$nama_kategori}";
}
$uploadedFile = request()->file("data.$index.file"); $uploadedFile = request()->file("data.$index.file");
if(!$uploadedFile){ if(!$uploadedFile){
@ -1086,11 +1096,6 @@ class DashboardController extends Controller
'is_akre' => ($data['is_akre'] ?? null) == "1" 'is_akre' => ($data['is_akre'] ?? null) == "1"
]; ];
$fd = FileDirectory::create($payload); $fd = FileDirectory::create($payload);
if($data['is_akre'] === "2"){
$path = "{$nama_unit_kerja}/{$nama_sub_unit_kerja}/{$nama_kategori}";
}else{
$path = "TKRS/{$data['akre_tkrs_parent']}/{$data['akre_tkrs_child']}";
}
$disk = Storage::disk('s3'); $disk = Storage::disk('s3');
$imageName = $this->buildStoredFileName( $imageName = $this->buildStoredFileName(
@ -2255,4 +2260,37 @@ class DashboardController extends Controller
]; ];
return view('dataAkreditasi.index', $data); return view('dataAkreditasi.index', $data);
} }
public function dataTableAkreditasi(Request $request)
{
$keyword = $request->query('keyword');
$perPage = (int) $request->query('per_page', 10);
$query = FileDirectory::query()
->where('statusenabled', true)
->where('status_action', 'approved')
->where('is_akre', true);
// Logic Pencarian
$query->when($keyword, function ($q) use ($keyword) {
$q->where(function ($sub) use ($keyword) {
$sub->where('nama_dokumen', 'ILIKE', "%{$keyword}%")
->orWhere('no_dokumen', 'ILIKE', "%{$keyword}%")
->orWhere('file', 'ILIKE', "%{$keyword}%"); // Cari juga berdasarkan nama file di path
});
});
$data = $query->orderBy('entry_at', 'desc')->paginate($perPage);
return response()->json([
'status' => true,
'message' => 'Berhasil mendapatkan data',
'data' => $data->items(),
'pagination' => [
'current_page' => $data->currentPage(),
'total' => $data->total(),
'per_page' => $data->perPage(),
'last_page' => $data->lastPage(),
'has_more' => $data->hasMorePages(),
]
]);
}
} }

View File

@ -62,6 +62,7 @@ document.addEventListener('DOMContentLoaded', () => {
} }
function buildRow(item){ function buildRow(item){
console.log(item);
let tanggal = item.entry_at ? formatTanggal(item.entry_at) : '-'; let tanggal = item.entry_at ? formatTanggal(item.entry_at) : '-';
let tanggalExp = item.tgl_expired ? formatTanggal(item.tgl_expired) : '-'; let tanggalExp = item.tgl_expired ? formatTanggal(item.tgl_expired) : '-';
@ -117,8 +118,13 @@ document.addEventListener('DOMContentLoaded', () => {
data-no_dokumen="${item.no_dokumen || '-'}" data-no_dokumen="${item.no_dokumen || '-'}"
data-tanggal_terbit="${item.tanggal_terbit || '-'}" data-tanggal_terbit="${item.tanggal_terbit || '-'}"
data-permission_file="${item.permission_file || '-'}">${item.nama_dokumen}</a></td> data-permission_file="${item.permission_file || '-'}">${item.nama_dokumen}</a></td>
<td>${item.folder || '-'}</td> ${item.is_akre ? `<td colspan="2" class="text-center">Dokumen akreditasi</td>` :
<td>${item.part || '-'}</td> `
<td>${item.folder || '-'}</td>
<td>${item.part || '-'}</td>
`
}
<td class="text-nowrap">${tanggalTerbit}</td> <td class="text-nowrap">${tanggalTerbit}</td>
<td class="text-nowrap">${tanggalExp}</td> <td class="text-nowrap">${tanggalExp}</td>
<td class="text-nowrap">${tanggal}</td> <td class="text-nowrap">${tanggal}</td>

View File

@ -0,0 +1,329 @@
@extends('layout.main')
@section('body_main')
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-body p-3">
<div class="tab-content">
<div class="tab-pane fade show active">
<div class="d-flex justify-content-between align-items-start mb-3">
<h4 class="mb-0">Dokumen Umum</h4>
<div class="d-flex align-items-start gap-3">
<!-- DOWNLOAD + COUNT -->
{{-- <a
href="/download-excel/data-umum"
class="btn btn-success btn-sm"
>
<i class="ti ti-download me-1"></i>
Download Excel
</a> --}}
<div class="d-flex flex-column align-items-start">
<button
type="button"
class="btn btn-primary btn-sm"
id="btnDownloadMultiple"
disabled
>
<i class="ti ti-download me-1"></i>
Download Terpilih
</button>
<span
id="selectedCount"
class="small text-muted mt-1"
>
0 dipilih
</span>
</div>
<!-- Tambah Dokumen -->
<button
type="button"
class="btn btn-success btn-sm"
data-bs-toggle="modal"
data-bs-target="#modalCreateFile"
>
<i class="ti ti-plus me-1"></i>
Tambah Dokumen
</button>
</div>
</div>
<div class="d-flex flex-column flex-md-row align-items-md-center gap-2 mb-3">
<div class="d-flex flex-column flex-md-row align-items-md-center gap-2 flex-grow-1">
<input type="search" id="tableSearch" class="form-control"
placeholder="Cari nama dokumen atau No Dokumen" autocomplete="off">
</div>
<div class="d-flex align-items-center gap-2">
</div>
</div>
<div class="table-responsive" style="max-height: 70vh; overflow-y:auto;">
<table class="table table-sm table-hover align-middle mb-0 table-fixed" id="lastUpdatedTable">
<thead>
<tr>
<th class="text-center" style="width: 36px;">
<input type="checkbox" id="checkAllRows" class="form-check-input">
</th>
<th>Aksi</th>
<th>Nama Dokumen</th>
<th>Tipe Dokumen</th>
<th>Tanggal Unggah</th>
</tr>
</thead>
<tbody id="tableDataAkreditasi">
<!-- data dari fetch masuk sini -->
</tbody>
</table>
</div>
<div class="d-flex flex-wrap align-items-center gap-2 mt-3">
<div class="d-flex align-items-center gap-1">
<span class="small text-muted">Tampilkan</span>
<select id="tablePageSize" class="form-select form-select-sm" style="width: 80px;">
<option value="5">5</option>
<option value="10" selected>10</option>
<option value="20">20</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
<span class="small text-muted">data</span>
</div>
<div id="paginationControls" class="ms-auto"></div>
<div class="small text-muted text-nowrap" id="tableSummary">
Memuat data...
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
// === STATE MANAGEMENT ===
let currentData = [];
let selectedIds = [];
let currentPath = "";
let searchTimer;
// === INITIALIZATION ===
document.addEventListener('DOMContentLoaded', () => {
fetchData();
initEventListeners();
});
// === EVENT LISTENERS ===
function initEventListeners() {
// Search dengan Debounce
document.getElementById('tableSearch').addEventListener('input', (e) => {
clearTimeout(searchTimer);
searchTimer = setTimeout(() => {
fetchData(e.target.value, 1);
}, 500);
});
// Per Page Change
document.getElementById('tablePageSize').addEventListener('change', (e) => {
const keyword = document.getElementById('tableSearch').value;
fetchData(keyword,1);
});
// Check All Rows
document.getElementById('checkAllRows').addEventListener('change', function() {
const checkboxes = document.querySelectorAll('.row-checkbox');
selectedIds = [];
checkboxes.forEach(cb => {
cb.checked = this.checked;
if (this.checked) selectedIds.push(cb.value);
});
updateDownloadButton();
});
}
// === CORE FUNCTIONS ===
/**
* Mengambil data dari server
*/
function fetchData(keyword = '', page = 1) {
const tbody = document.getElementById('tableDataAkreditasi');
const perPage = document.getElementById('tablePageSize').value;
tbody.innerHTML = '<tr><td colspan="5" class="text-center">Memuat data...</td></tr>';
fetch(`/datatable-akreditasi?keyword=${encodeURIComponent(keyword)}&per_page=${perPage}&page=${page}`)
.then(res => res.json())
.then(response => {
if (response.status) {
currentData = response.data || [];
renderTable(keyword);
updateSummary(response.pagination.total);
} else {
tbody.innerHTML = `<tr><td colspan="5" class="text-center text-danger">${response.message}</td></tr>`;
}
})
.catch(err => {
console.error('Error fetching data:', err);
tbody.innerHTML = '<tr><td colspan="5" class="text-center text-danger">Gagal memuat data dari server.</td></tr>';
});
}
/**
* Merender tabel berdasarkan mode (Folder vs Search)
*/
function renderTable(keyword = '') {
const tbody = document.getElementById('tableDataAkreditasi');
tbody.innerHTML = '';
if (currentData.length === 0) {
tbody.innerHTML = '<tr><td colspan="5" class="text-center">Tidak ada data ditemukan</td></tr>';
return;
}
// MODE 1: SEARCH VIEW (Flat View - Langsung tampilkan semua file)
if (keyword.length > 0) {
currentData.forEach(item => renderFileRow(tbody, item));
return;
}
// MODE 2: EXPLORER VIEW (Folder Navigation)
// Tombol Kembali
if (currentPath !== "") {
const displayPath = currentPath
.replace(/\/$/, "")
.replace(/\//g, ' <i class="ti ti-chevron-right mx-1 text-muted"></i> ');
tbody.innerHTML += `
<tr class="table-light">
<td></td>
<td colspan="4">
<div class="d-flex small">
<!-- Kembali -->
<div class="text-primary d-flex align-items-center cursor-pointer"
onclick="goBack()">
<i class="ti ti-arrow-back-up me-1"></i>
<span class="fw-semibold">Kembali</span>
</div>
<!-- Lokasi -->
<div class="d-flex align-items-center text-muted">
<i class="ti ti-folder-open me-1"></i>
<span class="fw-semibold me-1">Lokasi:</span>
<span>${displayPath}</span>
</div>
</div>
</td>
</tr>
`;
}
const folders = new Set();
const filesInCurrentPath = [];
currentData.forEach(item => {
if (item.file && item.file.startsWith(currentPath)) {
const relativePath = item.file.substring(currentPath.length);
const parts = relativePath.split('/');
if (parts.length > 1) {
folders.add(parts[0]); // Ini Folder
} else {
filesInCurrentPath.push(item); // Ini File
}
}
});
// Render Folder
folders.forEach(folderName => {
tbody.innerHTML += `
<tr style="cursor:pointer" onclick="openFolder('${folderName}')">
<td></td>
<td><i class="ti ti-folder text-warning fs-5"></i></td>
<td><strong>${folderName}</strong></td>
<td colspan="2">Folder</td>
</tr>`;
});
// Render File
filesInCurrentPath.forEach(item => renderFileRow(tbody, item));
}
/**
* Render Baris File (Digunakan di kedua mode)
*/
function renderFileRow(targetTbody, item) {
const fileName = item.file ? item.file.split('/').pop() : 'Unknown';
const typeDok = fileName.split('.').pop().toUpperCase();
const isChecked = selectedIds.includes(String(item.file_directory_id)) ? 'checked' : '';
targetTbody.innerHTML += `
<tr>
<td class="text-center">
<input type="checkbox" class="form-check-input row-checkbox"
value="${item.file_directory_id}" ${isChecked} onchange="handleRowCheck(this)">
</td>
<td>
<div class="btn-group">
<a href="/file-download/${item.file_directory_id}" target="_blank"
class="btn btn-sm btn-outline-primary" download title="Download">
<i class="ti ti-download"></i>
</a>
</div>
</td>
<td>
<div class="d-flex flex-column">
<strong>${item.nama_dokumen || fileName}</strong>
<small class="text-muted" style="font-size: 10px;">Path: ${item.file}</small>
</div>
</td>
<td><span class="badge bg-light text-primary border">${typeDok}</span></td>
<td>${item.entry_at || '-'}</td>
</tr>`;
}
// === NAVIGATION FUNCTIONS ===
function openFolder(name) {
currentPath += name + "/";
renderTable();
}
function goBack() {
const parts = currentPath.split('/').filter(p => p !== "");
parts.pop();
currentPath = parts.length > 0 ? parts.join('/') + "/" : "";
renderTable();
}
// === UTILITY FUNCTIONS ===
function handleRowCheck(checkbox) {
const val = String(checkbox.value);
if (checkbox.checked) {
if (!selectedIds.includes(val)) selectedIds.push(val);
} else {
selectedIds = selectedIds.filter(id => id !== val);
document.getElementById('checkAllRows').checked = false;
}
updateDownloadButton();
}
function updateDownloadButton() {
const btn = document.getElementById('btnDownloadMultiple');
const countLabel = document.getElementById('selectedCount');
btn.disabled = selectedIds.length === 0;
countLabel.innerText = `${selectedIds.length} dipilih`;
}
function updateSummary(total) {
const summary = document.getElementById('tableSummary');
if (summary) summary.innerText = `Total: ${total} data`;
}
</script>
@endsection

View File

@ -872,11 +872,10 @@
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label class="form-label fw-semibold">Kategori Dokumen <span class="text-danger">*</span></label> <label class="form-label fw-semibold">Kategori Dokumen</label>
<select class="form-select" <select class="form-select"
name="data[${colCount}][master_kategori_directory_id]" name="data[${colCount}][master_kategori_directory_id]"
id="select_kategori_${colCount}" id="select_kategori_${colCount}">
required>
<option value="" disabled selected>Pilih Kategori</option> <option value="" disabled selected>Pilih Kategori</option>
@foreach ($katDok as $kat) @foreach ($katDok as $kat)
<option value="{{ $kat->master_kategori_directory_id }}/{{ $kat->nama_kategori_directory }}"> <option value="{{ $kat->master_kategori_directory_id }}/{{ $kat->nama_kategori_directory }}">

View File

@ -34,8 +34,8 @@
</select> </select>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label class="form-label fw-semibold">Kategori Dokumen <span class="text-danger">*</span></label> <label class="form-label fw-semibold">Kategori Dokumen</label>
<select class="form-control" name="data[0][master_kategori_directory_id]" id="select_kategori_0" required> <select class="form-control" name="data[0][master_kategori_directory_id]" id="select_kategori_0">
<option value="" disable>Pilih Kategori</option> <option value="" disable>Pilih Kategori</option>
@foreach ($katDok as $kat) @foreach ($katDok as $kat)
<option value="{{ $kat->master_kategori_directory_id }}/{{ $kat->nama_kategori_directory }}">{{ $kat->nama_kategori_directory }}</option> <option value="{{ $kat->master_kategori_directory_id }}/{{ $kat->nama_kategori_directory }}">{{ $kat->nama_kategori_directory }}</option>

View File

@ -31,8 +31,8 @@
</select> </select>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label class="form-label fw-semibold">Kategori Dokumen <span class="text-danger">*</span></label> <label class="form-label fw-semibold">Kategori Dokumen</label>
<select class="form-control" name="master_kategori_directory_id" id="edit_kategori" required> <select class="form-control" name="master_kategori_directory_id" id="edit_kategori">
<option value="" disabled selected>Pilih Kategori</option> <option value="" disabled selected>Pilih Kategori</option>
@foreach ($katDok as $kat) @foreach ($katDok as $kat)
<option value="{{ $kat->master_kategori_directory_id }}/{{ $kat->nama_kategori_directory }}">{{ $kat->nama_kategori_directory }}</option> <option value="{{ $kat->master_kategori_directory_id }}/{{ $kat->nama_kategori_directory }}">{{ $kat->nama_kategori_directory }}</option>

View File

@ -17,6 +17,7 @@ Route::middleware(['auth'])->group(function(){
Route::get('/data-umum', [DashboardController::class, 'dataUmum']); Route::get('/data-umum', [DashboardController::class, 'dataUmum']);
Route::get('/datatable-umum', [DashboardController::class, 'datatableDataUmum']); Route::get('/datatable-umum', [DashboardController::class, 'datatableDataUmum']);
Route::get('/data-akreditasi', [DashboardController::class, 'dataAkreditasi']); Route::get('/data-akreditasi', [DashboardController::class, 'dataAkreditasi']);
Route::get('/datatable-akreditasi', [DashboardController::class, 'dataTableAkreditasi']);
Route::get('/download-excel/data-umum', [DashboardController::class, 'downloadDataUmumExcel']); Route::get('/download-excel/data-umum', [DashboardController::class, 'downloadDataUmumExcel']);
Route::post('/uploadv2', [DashboardController::class, 'storeVersion2']); Route::post('/uploadv2', [DashboardController::class, 'storeVersion2']);
Route::get('/file-preview/{id}', [DashboardController::class, 'dataPdf']); Route::get('/file-preview/{id}', [DashboardController::class, 'dataPdf']);