gdc_cmod/app/Views/shared/script_validation.php
mahdahar 0b4fdcfe5f feat: Extend audit trail with tube received tracking and enhance PDF workflow
Major Updates:

1. Extended Audit Trail System
   - Added tube received events tracking from SP_TUBES table (TUBESTATUS=4)
   - New audit tab "Receive" in dialog_audit.php to display tube reception history
   - ApiRequestsAuditController now fetches and returns tube received events with:
     * Sample type, tube status, collection date, and user information
   - Audit events sorted chronologically combining validation, sampling, and receiving events

2. Enhanced PDF Generation Workflow
   - Created new PdfHelper library with methods for PDF generation and posting to spooler
   - Reports can now be generated via GET /report/{accessnumber}/pdf endpoint
   - Updated PDF spooler API endpoint from port 3030 to 3000
   - Added retry PDF button with spinner animation for failed generations
   - Fixed PDF status check to use correct spooler endpoint

3. Validation UI Improvements
   - Added toast notification showing PDF queued after second validation (val2)
   - Retry PDF button appears when val1 and val2 are complete
   - Toast notifications success/error states with auto-dismiss after 2 seconds
   - Loading state with spinning icon during PDF retry operation

4. Report Template Fixes
   - Fixed typo in Val2 By display (added missing ":")
   - Consistent formatting with Val1 By : and Val2 By :

5. Documentation Updates
   - TODO.md updated with:
     * Auto generate PDF (in progress)
     * Print Eng Result (pending)
     * Add Receive to Audit (completed)

6. Cleanup
   - Removed legacy Node.js spooler implementation (node_spooler directory)
   - Deleted P0_log.txt (SQL setup scripts no longer needed in repo)
   - Cleaned up .gitignore to remove stale node_spooler entries

Files Changed:
- app/Controllers/ApiRequestsAuditController.php (tube received audit)
- app/Controllers/ReportController.php (port update: 3030 → 3000)
- app/Libraries/PdfHelper.php (new library)
- app/Views/report/template.php (typo fix)
- app/Views/shared/content_requests.php (retry PDF button)
- app/Views/shared/dialog_audit.php (receive tab)
- app/Views/shared/script_requests.php (retry handler, tube events)
- app/Views/shared/script_validation.php (enhanced toast)
- TODO.md (pending/completed tasks)
- .gitignore (cleanup)
- Deleted: node_spooler/* (legacy implementation)
- Deleted: P0_log.txt (no longer needed)
2026-02-04 11:09:42 +07:00

217 lines
5.6 KiB
PHP

document.addEventListener('alpine:init', () => {
Alpine.data("validatePage", () => ({
// validate page specific
unvalidatedList: [],
isLoading: false,
isValidating: false,
// Date filter - missing in original code!
filter: { date1: "", date2: "" },
filterTable: "",
// Sorting & Pagination (shared with dashboard)
sortCol: 'REQDATE',
sortAsc: false,
currentPage: 1,
pageSize: 30,
sort(col) {
if (this.sortCol === col) {
this.sortAsc = !this.sortAsc;
} else {
this.sortCol = col;
this.sortAsc = true;
}
},
nextPage() {
if (this.currentPage < this.unvalidatedTotalPages) this.currentPage++;
},
prevPage() {
if (this.currentPage > 1) this.currentPage--;
},
get unvalidatedTotalPages() {
return Math.ceil(this.unvalidatedFiltered.length / this.pageSize) || 1;
},
get unvalidatedSorted() {
return this.unvalidatedFiltered.slice().sort((a, b) => {
let modifier = this.sortAsc ? 1 : -1;
if (a[this.sortCol] < b[this.sortCol]) return -1 * modifier;
if (a[this.sortCol] > b[this.sortCol]) return 1 * modifier;
return 0;
});
},
get unvalidatedPaginated() {
const start = (this.currentPage - 1) * this.pageSize;
const end = start + this.pageSize;
return this.unvalidatedSorted.slice(start, end);
},
get unvalidatedFiltered() {
if (!this.filterTable) return this.unvalidatedList;
const searchTerm = this.filterTable.toLowerCase();
return this.unvalidatedList.filter(item =>
Object.values(item).some(value =>
String(value).toLowerCase().includes(searchTerm)
)
);
},
get unvalidatedCount() {
return this.unvalidatedList.length;
},
init() {
this.today = new Date().toISOString().slice(0, 10);
this.filter.date1 = this.today;
this.filter.date2 = this.today;
this.$watch('filterTable', () => {
this.currentPage = 1;
});
// Auto-fetch on page load
this.fetchUnvalidated();
// Keyboard shortcuts for dialog
document.addEventListener('keydown', (e) => {
if (this.isDialogValOpen) {
// N key - skip to next
if (e.key === 'n' || e.key === 'N') {
if (!e.target.closest('input, textarea, button')) {
e.preventDefault();
this.skipToNext();
}
}
}
});
},
fetchUnvalidated() {
this.isLoading = true;
this.unvalidatedList = [];
let param = new URLSearchParams(this.filter).toString();
fetch(`${BASEURL}/api/validate/unvalidated?${param}`, {
method: 'GET',
headers: { 'Content-Type': 'application/json' },
}).then(res => res.json()).then(data => {
this.unvalidatedList = data.data ?? [];
}).finally(() => {
this.isLoading = false;
});
},
resetUnvalidated() {
this.filter.date1 = this.today;
this.filter.date2 = this.today;
this.fetchUnvalidated();
},
/*
* validate dialog methods
*/
valAccessnumber: null,
valItem: null,
currentIndex: 0,
isDialogValOpen: false,
toast: { show: false, message: '', type: 'success' },
showToast(message, type = 'success') {
this.toast = { show: true, message, type };
setTimeout(() => {
this.toast.show = false;
}, 2000);
},
openValDialogByIndex(index) {
const filtered = this.unvalidatedFiltered;
if (index < 0 || index >= filtered.length) {
this.showToast('No more requests', 'error');
this.closeValDialog();
return;
}
const item = filtered[index];
this.currentIndex = index;
this.valAccessnumber = item.SP_ACCESSNUMBER;
this.valItem = item;
this.isDialogValOpen = true;
// Focus validate button after dialog renders - use setTimeout for reliability
setTimeout(() => {
const btn = document.getElementById('validate-btn');
if (btn) btn.focus();
}, 50);
},
openValDialog(accessnumber) {
// Find index by accessnumber
const filtered = this.unvalidatedFiltered;
const index = filtered.findIndex(item => item.SP_ACCESSNUMBER === accessnumber);
if (index !== -1) {
this.openValDialogByIndex(index);
} else {
this.openValDialogByIndex(0);
}
},
closeValDialog() {
this.isDialogValOpen = false;
this.valAccessnumber = null;
this.valItem = null;
},
skipToNext() {
const nextIndex = (this.currentIndex + 1) % this.unvalidatedFiltered.length;
this.closeValDialog();
// Use setTimeout for reliable focus after dialog re-renders
setTimeout(() => this.openValDialogByIndex(nextIndex), 50);
},
validate(accessnumber, userid) {
if (!confirm(`Validate request ${accessnumber}?`)) return;
this.isValidating = true;
fetch(`${BASEURL}/api/requests/validate/${accessnumber}`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ userid: `${userid}` })
}).then(response => response.json()).then(data => {
if (data.val === 2) {
this.showToast(`Validated (val2): ${accessnumber} - PDF queued`);
} else {
this.showToast(`Validated: ${accessnumber}`);
}
this.unvalidatedList = this.unvalidatedList.filter(
item => item.SP_ACCESSNUMBER !== accessnumber
);
const filteredLength = this.unvalidatedFiltered.length;
if (filteredLength > 0) {
const nextIndex = Math.min(this.currentIndex, filteredLength - 1);
this.closeValDialog();
setTimeout(() => this.openValDialogByIndex(nextIndex), 50);
} else {
this.closeValDialog();
this.showToast('All requests validated!');
}
if (data.message && data.message.includes('already validate')) {
alert(data.message);
}
}).catch(() => {
this.showToast('Validation failed', 'error');
}).finally(() => {
this.isValidating = false;
});
},
getPreviewUrl() {
return `<?=base_url()?>report/${this.valAccessnumber}`;
},
}));
});