goi
/
goiintra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.greenoilinc.com/hyojin.ahn/goiintra

This commit is contained in:
Kang Lee 2026-05-19 15:38:47 -04:00
parent 68d4944c47 a70e5feee8
commit 65ddd4109d
3 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public_html/assets/api/install.php
View File

@ -657,8 +657,10 @@ trait InstallAPI {
$iw_uid = intval($_POST['iw_uid'] ?? 0); $iw_uid = intval($_POST['iw_uid'] ?? 0);
$rs = qry(" $rs = qry("
SELECT * SELECT iw.*, CONCAT(m.m_firstname, ' ', m.m_lastname) as iw_created_member
FROM tbl_install_waitlist FROM tbl_install_waitlist iw
LEFT OUTER JOIN tbl_member m
ON iw.iw_created_by = m.m_uid
WHERE iw_uid = '{$iw_uid}' WHERE iw_uid = '{$iw_uid}'
LIMIT 1 LIMIT 1
"); ");

30
public_html/doc/install_wait_list.php
View File

@ -71,7 +71,7 @@ $sql = "
) di ON di.di_wait_uid = iw.iw_uid ) di ON di.di_wait_uid = iw.iw_uid
WHERE {$statusWhere} WHERE {$statusWhere}
$add_where $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"); $rs = $jdb->nQuery($sql, "Load waitlist error");
@ -441,7 +441,8 @@ $categoryLabels = [
}; };
InstallWait.job = { InstallWait.job = {
type: data.iw_work_type type: data.iw_work_type,
createdBy: data.iw_created_member
}; };
InstallWait.status = (data.iw_status || ''); InstallWait.status = (data.iw_status || '');
@ -1374,9 +1375,20 @@ $categoryLabels = [
`; `;
const tooltipHtml = ` const tooltipHtml = `
Req note: ${r.di_request_note || '-'}<br> <div class="mb-1">
CS note: ${r.di_cs_note || '-'}<br> <strong>Req</strong><br>
Work note: ${r.di_work_note || '-'} <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'); tr.setAttribute('data-bs-toggle', 'tooltip');
@ -1396,7 +1408,13 @@ $categoryLabels = [
function initTooltips() { function initTooltips() {
const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')); 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) { function safeFitBounds(bounds, tryCount = 0) {

11
public_html/js/install_wait_modal.js
View File

@ -378,9 +378,16 @@ function initInstallWaitStep3() {
function setStep3Title() { function setStep3Title() {
const jobLabel = InstallWait.job?.type || ''; 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'); 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() { function renderStep3ActionBoxes() {