v1.2.30
- [INSTALL WAIT LIST] 수정 창에 생성자 표시. tooltip 위치를 주소 가리지 않도록 변경. 정렬 순서에 카테고리 우선 적용.
This commit is contained in:
parent
45b370316a
commit
a70e5feee8
|
|
@ -657,8 +657,10 @@ trait InstallAPI {
|
|||
$iw_uid = intval($_POST['iw_uid'] ?? 0);
|
||||
|
||||
$rs = qry("
|
||||
SELECT *
|
||||
FROM tbl_install_waitlist
|
||||
SELECT iw.*, CONCAT(m.m_firstname, ' ', m.m_lastname) as iw_created_member
|
||||
FROM tbl_install_waitlist iw
|
||||
LEFT OUTER JOIN tbl_member m
|
||||
ON iw.iw_created_by = m.m_uid
|
||||
WHERE iw_uid = '{$iw_uid}'
|
||||
LIMIT 1
|
||||
");
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ $sql = "
|
|||
) di ON di.di_wait_uid = iw.iw_uid
|
||||
WHERE {$statusWhere}
|
||||
$add_where
|
||||
ORDER BY iw_requested_due_date ASC, iw_request_at ASC
|
||||
ORDER BY iw_category, iw_requested_due_date ASC, iw_request_at ASC
|
||||
";
|
||||
$rs = $jdb->nQuery($sql, "Load waitlist error");
|
||||
|
||||
|
|
@ -441,7 +441,8 @@ $categoryLabels = [
|
|||
};
|
||||
|
||||
InstallWait.job = {
|
||||
type: data.iw_work_type
|
||||
type: data.iw_work_type,
|
||||
createdBy: data.iw_created_member
|
||||
};
|
||||
|
||||
InstallWait.status = (data.iw_status || '');
|
||||
|
|
@ -1374,9 +1375,20 @@ $categoryLabels = [
|
|||
`;
|
||||
|
||||
const tooltipHtml = `
|
||||
Req note: ${r.di_request_note || '-'}<br>
|
||||
CS note: ${r.di_cs_note || '-'}<br>
|
||||
Work note: ${r.di_work_note || '-'}
|
||||
<div class="mb-1">
|
||||
<strong>Req</strong><br>
|
||||
<small>${r.di_request_note || '-'}</small>
|
||||
</div>
|
||||
|
||||
<div class="mb-1">
|
||||
<br><strong>CS</strong><br>
|
||||
<small>${r.di_cs_note || '-'}</small>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<br><strong>Work</strong><br>
|
||||
<small>${r.di_work_note || '-'}</small>
|
||||
</div>
|
||||
`;
|
||||
|
||||
tr.setAttribute('data-bs-toggle', 'tooltip');
|
||||
|
|
@ -1396,7 +1408,13 @@ $categoryLabels = [
|
|||
|
||||
function initTooltips() {
|
||||
const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
|
||||
tooltipTriggerList.forEach(el => new bootstrap.Tooltip(el));
|
||||
|
||||
tooltipTriggerList.forEach(el => {
|
||||
new bootstrap.Tooltip(el, {
|
||||
placement: 'auto',
|
||||
boundary: 'window'
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function safeFitBounds(bounds, tryCount = 0) {
|
||||
|
|
|
|||
|
|
@ -378,9 +378,16 @@ function initInstallWaitStep3() {
|
|||
|
||||
function setStep3Title() {
|
||||
const jobLabel = InstallWait.job?.type || '';
|
||||
const acct = InstallWait.customer?.account ? ` of ${InstallWait.customer.account}` : '';
|
||||
const acct = InstallWait.customer?.account ? ` of ${InstallWait.customer.name} (${InstallWait.customer.account})` : '';
|
||||
const createdBy = InstallWait.job?.createdBy || '';
|
||||
const titleEl = document.getElementById('iwStep3Title');
|
||||
if (titleEl) titleEl.innerText = `Step 3 of 3 - ${jobLabel}${acct} Detail`;
|
||||
if (titleEl) titleEl.innerHTML = `Step 3 of 3 - ${jobLabel}${acct} Detail
|
||||
${createdBy ? `
|
||||
<small class="text-muted ms-2">
|
||||
created by ${createdBy}
|
||||
</small>
|
||||
` : ''}
|
||||
`;
|
||||
}
|
||||
|
||||
function renderStep3ActionBoxes() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue