- |
- |
- |
+ |
+ |
- |
- |
- |
- |
+ |
+ |
+ |
|
diff --git a/app/Views/shared/content_validation.php b/app/Views/shared/content_validation.php
index d4419cb..334e180 100644
--- a/app/Views/shared/content_validation.php
+++ b/app/Views/shared/content_validation.php
@@ -3,7 +3,7 @@
-
+
diff --git a/app/Views/shared/content_validation_new.php b/app/Views/shared/content_validation_new.php
deleted file mode 100644
index 79c979b..0000000
--- a/app/Views/shared/content_validation_new.php
+++ /dev/null
@@ -1,276 +0,0 @@
-
-
-
-
-
-
-
-
- Pending Validation
-
-
-
-
-
- Not Started
-
-
-
-
- 1st Val
-
-
-
-
- Done
-
-
-
-
-
-
-
-
- Overall Progress
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Legend:
-
-
- Pending
-
-
-
- 1st Val
-
-
-
- Done
-
-
-
-
-
-
-
- |
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
-
-
-
- |
-
- |
-
-
-
-
-
-
-
-
-
- All Caught Up!
- No pending validations for this date range
-
-
-
-
-
-
-
-
- |
-
- Patient
-
-
- |
-
-
- Lab No
-
-
- |
-
-
- Reg No
-
-
- |
- Reff |
- Doctor |
- ResTo |
- Status |
- Action |
- Tests |
-
-
-
-
-
- |
-
-
- |
- |
- |
- |
- |
- |
-
-
-
- 1:
- 2:
-
- |
-
-
- |
- |
-
-
-
-
-
-
-
-
-
-
- Showing to
- of
- entries
-
-
-
-
-
-
-
-
-
-
-
-
-= $this->include('shared/dialog_val'); ?>
diff --git a/app/Views/shared/dialog_val.php b/app/Views/shared/dialog_val.php
index c6c34d4..0edb56f 100644
--- a/app/Views/shared/dialog_val.php
+++ b/app/Views/shared/dialog_val.php
@@ -38,7 +38,7 @@
Close (Esc)
-
diff --git a/app/Views/shared/layout.php b/app/Views/shared/layout.php
index 7ca7293..c62e706 100644
--- a/app/Views/shared/layout.php
+++ b/app/Views/shared/layout.php
@@ -25,6 +25,13 @@
.card-body {
font-size: 0.71rem !important;
}
+
+ /* Status Button Colors - Matching Row Backgrounds */
+ .btn-status-pend, .badge-status-pend { background-color: #ffffff; color: black; border: 1px solid #d1d5db; }
+ .btn-status-coll, .badge-status-coll { background-color: #d63031; color: white; }
+ .btn-status-recv, .badge-status-recv { background-color: #0984e3; color: white; }
+ .btn-status-inc, .badge-status-inc { background-color: #ffff00; color: black; }
+ .btn-status-fin, .badge-status-fin { background-color: #008000; color: white; }
diff --git a/app/Views/shared/script_requests.php b/app/Views/shared/script_requests.php
index 2d3393a..d840c21 100644
--- a/app/Views/shared/script_requests.php
+++ b/app/Views/shared/script_requests.php
@@ -8,12 +8,21 @@ document.addEventListener('alpine:init', () => {
counters: { Pend: 0, Coll: 0, Recv: 0, Inc: 0, Fin: 0, Total: 0 },
statusColor: {
Pend: 'bg-white text-black font-bold',
- PartColl: 'bg-orange-300 text-white font-bold',
- Coll: 'bg-orange-500 text-white font-bold',
- PartRecv: 'bg-blue-200 text-black font-bold',
- Recv: 'bg-blue-500 text-white font-bold',
- Inc: 'bg-yellow-500 text-white font-bold',
- Fin: 'bg-green-500 text-white font-bold',
+ PartColl: 'bg-[#ff99aa] text-black font-bold',
+ Coll: 'bg-[#d63031] text-white font-bold',
+ PartRecv: 'bg-[#a0c0d9] text-black font-bold',
+ Recv: 'bg-[#0984e3] text-white font-bold',
+ Inc: 'bg-[#ffff00] text-black font-bold',
+ Fin: 'bg-[#008000] text-white font-bold',
+ },
+ statusRowBg: {
+ Pend: 'bg-white text-black',
+ PartColl: 'bg-[#ff99aa] text-black',
+ Coll: 'bg-[#d63031] text-white',
+ PartRecv: 'bg-[#a0c0d9] text-black',
+ Recv: 'bg-[#0984e3] text-white',
+ Inc: 'bg-[#ffff00] text-black',
+ Fin: 'bg-[#008000] text-white',
},
filterTable: "",
filterKey: 'Total',
@@ -71,20 +80,9 @@ document.addEventListener('alpine:init', () => {
init() {
this.today = new Date().toISOString().slice(0, 10);
- // Check if running on development workstation (localhost)
- const isDev = window.location.hostname === 'localhost' ||
- window.location.hostname === '127.0.0.1' ||
- window.location.hostname.includes('.test');
-
- if (isDev) {
- // Development: specific date range for test data
- this.filter.date1 = '2025-01-02';
- this.filter.date2 = '2025-01-03';
- } else {
- // Production: default to today
- this.filter.date1 = this.today;
- this.filter.date2 = this.today;
- }
+ // Production: default to today
+ this.filter.date1 = this.today;
+ this.filter.date2 = this.today;
this.$watch('filterTable', () => {
this.currentPage = 1;
diff --git a/app/Views/shared/script_validation.php b/app/Views/shared/script_validation.php
index a5fc971..d33119b 100644
--- a/app/Views/shared/script_validation.php
+++ b/app/Views/shared/script_validation.php
@@ -68,20 +68,8 @@ document.addEventListener('alpine:init', () => {
init() {
this.today = new Date().toISOString().slice(0, 10);
- // Check if running on development workstation (localhost)
- const isDev = window.location.hostname === 'localhost' ||
- window.location.hostname === '127.0.0.1' ||
- window.location.hostname.includes('.test');
-
- if (isDev) {
- // Development: specific date range for test data
- this.filter.date1 = '2025-01-02';
- this.filter.date2 = '2025-01-03';
- } else {
- // Production: default to today
- this.filter.date1 = this.today;
- this.filter.date2 = this.today;
- }
+ this.filter.date1 = this.today;
+ this.filter.date2 = this.today;
this.$watch('filterTable', () => {
this.currentPage = 1;
@@ -220,5 +208,10 @@ document.addEventListener('alpine:init', () => {
this.isValidating = false;
});
},
+
+ getPreviewUrl() {
+ let base = 'http://glenlis/spooler_db/main_dev.php';
+ return `${base}?acc=${this.valAccessnumber}`;
+ },
}));
});
|