-
+ border:1px solid ${needsConfirm && !isOverdue ? "var(--accent)" : "var(--border)"};
+ border-radius:12px;">
+
+
${s.icon} ${escHtml(s.text)}
${a.address ? `
${escHtml(a.address)}
` : ""}
- ${a.scope_of_work ? `
${escHtml(a.scope_of_work.slice(0,60))}
` : ""}
+ ${a.scope_of_work ? `
${escHtml(a.scope_of_work.slice(0,80))}
` : ""}
+ ${a.date_range ? `
📅 ${escHtml(a.date_range)}
` : ""}
${a.scheduled_at ? `
${escHtml(fmtDate(a.scheduled_at))}
` : ""}
- ${a.signed_by_name ? `
✅ Подписан
` : ""}
+ ${a.confirmed_at ? `
✅ Согласовано
` : ""}
+ ${a.signed_by_name ? `
✍️ Подписан
` : ""}
+ ${needsConfirm ? `
+
+ ${confirmDeadline && !isOverdue ? `
+
+ ⏱ Осталось: —
+
+ ` : isOverdue ? `
⚠️ Срок подтверждения истёк
` : ""}
+
+
+ ` : ""}
`);
- asmCard.addEventListener("click", () => {
+
+ // Переход в детальный экран по тапу
+ asmCard.querySelector(".asm-tap").addEventListener("click", () => {
haptic && haptic("impact");
- if (typeof AssemblyDetailScreen !== "undefined") {
- location.hash = `#/assembly/${a.id}`;
- }
+ location.hash = `#/assembly/${a.id}`;
});
+
+ // Кнопка подтверждения
+ const confirmBtn = asmCard.querySelector(".confirm-date-btn");
+ if (confirmBtn) {
+ confirmBtn.addEventListener("click", (e) => {
+ e.stopPropagation();
+ haptic && haptic("impact");
+ _openScheduleOverlay(a.id, "assembly", c.client_name, () => {
+ // После подтверждения перезагружаем список
+ mount(container);
+ });
+ });
+ }
+
+ // Таймер обратного отсчёта
+ if (confirmDeadline && !isOverdue) {
+ const timerEl = asmCard.querySelector(`#timer-${a.id}`);
+ if (timerEl) {
+ const tick = () => {
+ const diff = confirmDeadline - new Date();
+ if (diff <= 0) { timerEl.textContent = "⚠️ Срок истёк"; return; }
+ const h = Math.floor(diff / 3600000);
+ const m = Math.floor((diff % 3600000) / 60000);
+ const s2 = Math.floor((diff % 60000) / 1000);
+ timerEl.textContent = `⏱ Осталось: ${h}ч ${m}м ${s2}с`;
+ };
+ tick();
+ const iv = setInterval(tick, 1000);
+ // Останавливаем таймер при уходе со страницы
+ const obs = new MutationObserver(() => {
+ if (!document.contains(timerEl)) { clearInterval(iv); obs.disconnect(); }
+ });
+ obs.observe(document.body, { childList: true, subtree: true });
+ }
+ }
+
screen.appendChild(asmCard);
});
}
@@ -302,19 +358,34 @@ const StaffClients = (function () {
screen.appendChild(el(`
📐 Замеры · ${c.measurements.length}
`));
c.measurements.forEach(m => {
const s = MEAS_STATUS[m.status] || { icon: "•", text: m.status, color: "#aaa" };
+ const needsConfirmM = !m.scheduled_at && m.status !== "done" && m.status !== "cancelled";
const mCard = el(`
+ border:1px solid ${needsConfirmM ? "var(--accent)" : "var(--border)"};border-radius:12px;">
${s.icon} ${escHtml(s.text)}
${m.address ? `
${escHtml(m.address)}
` : ""}
${m.zamer_no ? `
Замер №${escHtml(m.zamer_no)}
` : ""}
+ ${m.preferred_date ? `
📅 Клиент: ${escHtml(m.preferred_date)}
` : ""}
${m.scheduled_at ? `
${escHtml(fmtDate(m.scheduled_at))}
` : ""}
+ ${needsConfirmM ? `
+
+ ` : ""}
`);
+ const measConfirmBtn = mCard.querySelector(".confirm-meas-btn");
+ if (measConfirmBtn) {
+ measConfirmBtn.addEventListener("click", () => {
+ haptic && haptic("impact");
+ _openScheduleOverlay(m.id, "measurement", c.client_name, () => mount(container));
+ });
+ }
screen.appendChild(mCard);
});
}
@@ -322,5 +393,81 @@ const StaffClients = (function () {
screen.appendChild(el(`
`));
}
+ /* ── Оверлей выбора даты/времени ───────────────────────────── */
+ function _openScheduleOverlay(itemId, type, clientName, onSuccess) {
+ document.getElementById("schedule-overlay")?.remove();
+
+ // Минимальная дата — сегодня
+ const todayISO = new Date().toISOString().slice(0, 16);
+
+ const overlay = document.createElement("div");
+ overlay.id = "schedule-overlay";
+ overlay.style.cssText = `
+ position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:1000;
+ display:flex;align-items:flex-end;justify-content:center;
+ `;
+ overlay.innerHTML = `
+
+
+ ${type === "assembly" ? "📅 Дата сборки" : "📅 Дата замера"}
+
+
+ ${escHtml(clientName)}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `;
+ document.body.appendChild(overlay);
+
+ overlay.querySelector("#sc-cancel").addEventListener("click", () => overlay.remove());
+ overlay.addEventListener("click", e => { if (e.target === overlay) overlay.remove(); });
+
+ overlay.querySelector("#sc-confirm").addEventListener("click", async () => {
+ const dt = overlay.querySelector("#sc-datetime").value;
+ const note = overlay.querySelector("#sc-note").value.trim();
+ const errEl = overlay.querySelector("#sc-err");
+ if (!dt) { errEl.textContent = "Выберите дату и время"; return; }
+
+ const btn = overlay.querySelector("#sc-confirm");
+ btn.disabled = true;
+ btn.textContent = "Сохраняем…";
+ errEl.textContent = "";
+
+ try {
+ const path = type === "assembly" ? "assembly_schedule" : "measurement_schedule";
+ const idKey = type === "assembly" ? "assembly_id" : "measurement_id";
+ const res = await _api(path, { [idKey]: itemId, scheduled_at: dt, note });
+ if (res.error) throw new Error(res.error);
+ haptic && haptic("success");
+ overlay.remove();
+ if (typeof onSuccess === "function") onSuccess();
+ } catch (e) {
+ btn.disabled = false;
+ btn.textContent = "✅ Подтвердить";
+ errEl.textContent = "Ошибка: " + e.message;
+ }
+ });
+ }
+
return { mount };
})();