@@ -1455,7 +1457,26 @@ function renderList(){
${escapeHtml(row.di_customer_name || '')}
- | ${renderContainers(row.containers)} |
+
+ ${split.install ? `
+
+
+
+
+ ${split.install}
+ |
+
+ ${split.pickup ? `
+
+
+
+
+ ${split.pickup}
+ |
${escapeHtml(row.di_address)},
@@ -1592,13 +1613,15 @@ function renderWorkType(type){
return ` ${type || '-'}`;
}
-function renderContainers(containers){
-
- if(!containers || containers.length === 0) return '';
+function renderContainersSplit(containers){
let installChips = '';
let pickupChips = '';
+ if(!containers || containers.length === 0){
+ return { install:'', pickup:'' };
+ }
+
containers.forEach(c => {
let chipClass = 'chip chip-company';
@@ -1627,30 +1650,10 @@ function renderContainers(containers){
}
});
- let html = ` `;
-
- if(installChips){
- html += `
-
-
-
- ${installChips}
- `;
- }
-
- if(pickupChips){
- html += `
- ${installChips ? ' ' : ''}
-
-
-
- ${pickupChips}
- `;
- }
-
- html += ` `;
-
- return html;
+ return {
+ install: installChips,
+ pickup: pickupChips
+ };
}
function toggleReorderMode(driverUid, btn){
diff --git a/public_html/doc/install_wait_list.php b/public_html/doc/install_wait_list.php
index 34bcf27..06310f8 100644
--- a/public_html/doc/install_wait_list.php
+++ b/public_html/doc/install_wait_list.php
@@ -8,6 +8,20 @@ if (!empty($kw_customer)) $where[] = "(iw_customer_name LIKE '%{$kw_cu
if (!empty($kw_work)) $where[] = "(iw_work_type = '{$kw_work}')";
if (!empty($_GET['kw_two_person'])) $where[] = "(iw_required_person_cnt IS NOT NULL AND iw_required_person_cnt > 0)";
+$kw_categories = $_GET['kw_category'] ?? [];
+if (!is_array($kw_categories)) $kw_categories = [$kw_categories];
+$kw_categories = array_filter(array_map('intval', $kw_categories), function($v){
+ return $v >= 0 && $v <= 5;
+});
+if ($kw_categories) {
+ $hasZero = in_array(0, $kw_categories);
+ $cats = array_filter($kw_categories, fn($v) => $v > 0);
+ $cond = [];
+ if ($cats) $cond[] = "iw_category IN (" . implode(',', $cats) . ")";
+ if ($hasZero) $cond[] = "(iw_category = 0 OR iw_category IS NULL)";
+ $where[] = '(' . implode(' OR ', $cond) . ')';
+}
+
$statusList = [];
if (!empty($_GET['kw_waiting'])) $statusList[] = "'WAITING'";
if (!empty($_GET['kw_draft'])) $statusList[] = "'DRAFT'";
@@ -216,6 +230,17 @@ function formatPhone($phone) {
return $phone;
}
+
+function getWaitCategoryColor($cat) {
+ switch ((int)$cat) {
+ case 1: return '#ff4d4f'; // red
+ case 2: return '#1677ff'; // blue
+ case 3: return '#52c41a'; // green
+ case 4: return '#fa9614'; // orange
+ case 5: return '#9254de'; // purple
+ default: return 'transparent';
+ }
+}
?>
@@ -436,12 +461,16 @@ function formatPhone($phone) {
btnNeedOilPickup.classList.add('iw-toggle-on');
}
+ InstallWait.category = parseInt(data.iw_category || 0, 10);
+
// job label 갱신
document.getElementById('iwStep3Title').innerText = `Step 3 of 3 - ${data.iw_work_type} Detail`;
// action box 다시 그림
setStep3Title();
renderStep3ActionBoxes();
+ renderCategorySelector();
+ bindCategoryEvents();
loadCurrentContainersIfNeeded(() => {
currentReady = true;
});
@@ -538,7 +567,7 @@ function formatPhone($phone) {
+
+
+
+
@@ -568,9 +615,9 @@ function formatPhone($phone) {
-
+
@@ -648,7 +695,9 @@ function formatPhone($phone) {
data-pickup-d=""
data-pickup-b=""
data-install-d=""
- data-install-b="">
+ data-install-b=""
+ data-category=""
+ >
@@ -701,6 +750,16 @@ function formatPhone($phone) {
+
+
+
+
@@ -1122,6 +1181,10 @@ function formatPhone($phone) {
loadDailyInstallPoints();
});
+ $(document).on('change', 'input[name="kw_category[]"]', function () {
+ searchWaitlist();
+ });
+
function resetTrialSelectionUI() {
// trial 데이터 초기화
iwTrialRows = {};
@@ -1260,7 +1323,7 @@ function formatPhone($phone) {
tr.dataset.orderSeq = r.di_order_seq;
}
tr.innerHTML = `
-
+ |
${r.is_trial ? '' : `
|
- ${r.di_order_seq} |
-
+ | ${r.di_order_seq} |
+
${r.di_accountno || ''}
-
+
${r.di_customer_name || ''}
|
${r.di_customer_driver_initial} |
- ${r.di_address || ''}
${r.di_city || ''} |
+ ${r.di_address || ''}
${r.di_city || ''} |
${(r.di_work_type || '').substring(0, 2)} |
${renderContainerSummary(r.pickup_d_cnt, r.pickup_b_cnt)} |
${renderContainerSummary(r.install_d_cnt, r.install_b_cnt)} |
diff --git a/public_html/js/install_wait_modal.js b/public_html/js/install_wait_modal.js
index fd12dbb..8593c71 100644
--- a/public_html/js/install_wait_modal.js
+++ b/public_html/js/install_wait_modal.js
@@ -2,11 +2,21 @@ window.InstallWait = window.InstallWait || {
step: 1,
customer: null,
job: null,
+ category: 0,
pickup: [],
schedule: { date:'', note:'' },
photos: []
};
+const IW_CATEGORY_COLORS = {
+ 0: 'transparent', // 없음
+ 1: '#ff4d4f',
+ 2: '#1677ff',
+ 3: '#52c41a',
+ 4: '#fa9614',
+ 5: '#9254de'
+};
+
/* 슬라이드 이동 (100vw 기준) */
function goInstallWaitStep(step) {
const wrapper = document.querySelector('.install-wait-steps-wrapper');
@@ -292,7 +302,8 @@ function initInstallWaitStep3() {
person_reason: twoOn ? document.getElementById('iwTwoPersonReason').value : null,
scheduled: recOn ? 1 : 0,
scheduled_cycle: recOn ? document.getElementById('iwRecurringDays').value: 0,
- need_oil: oilOn ? 1 : 0
+ need_oil: oilOn ? 1 : 0,
+ category: InstallWait.category || 0
};
btnStep3Complete.disabled = true;
@@ -344,10 +355,12 @@ function initInstallWaitStep3() {
};
InstallWait.pickup = InstallWait.pickup || [];
+ InstallWait.category = 0;
setStep3Title();
renderStep3ActionBoxes();
loadCurrentContainersIfNeeded();
+ renderCategorySelector();
bindStep3Toggles();
fillRequestBySelect('Customer');
initInstallWaitDatePickers();
@@ -431,6 +444,30 @@ function renderActionBox(action) {
`;
}
+function renderCategorySelector() {
+ const wrap = document.getElementById('iwCategorySelectorWrap');
+
+ if (!wrap) return;
+
+ wrap.innerHTML = `
+
+ ${[0,1,2,3,4,5].map(i => `
+
+ `).join('')}
+
+ `;
+}
+
function countTaskChips(action) {
// action: 'PICKUP' | 'INSTALL'
const wrap = document.querySelector(`.container-chips[data-action="${action}"]`);
@@ -937,6 +974,22 @@ function bindStep3Toggles() {
btnOil.onclick = () => {
btnOil.classList.toggle('iw-toggle-on');
};
+
+ bindCategoryEvents();
+}
+
+function bindCategoryEvents() {
+ document.querySelectorAll('.iw-cat-btn').forEach(btn => {
+ btn.onclick = function() {
+
+ document.querySelectorAll('.iw-cat-btn')
+ .forEach(b => b.classList.remove('active'));
+
+ this.classList.add('active');
+
+ InstallWait.category = parseInt(this.dataset.value, 10);
+ };
+ });
}
function getContainerIconByType(type) {
diff --git a/public_html/lib/add_install_wait_modal.php b/public_html/lib/add_install_wait_modal.php
index d80e5be..f82ddb7 100644
--- a/public_html/lib/add_install_wait_modal.php
+++ b/public_html/lib/add_install_wait_modal.php
@@ -187,59 +187,77 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |