From cf500aabb3d48237516419b90581bc0a53d2a3af Mon Sep 17 00:00:00 2001 From: Gabriele Cimaschi Date: Wed, 9 Sep 2026 11:04:14 +0200 Subject: [PATCH] tutto di troppo: fix visualizzazione email. style: riviste icone invio ed elimina, postato aggiungi ticket al grppo e informazioni laterali da a cc. --- public/index.html | 10 + public/js/app.js | 78 ++++++++ public/js/views/shortcuts.js | 217 ++++++++++++++++++++++ public/js/views/ticketCreate.js | 13 ++ public/js/views/ticketDetail.js | 293 +++++++++++++++++++++++------- public/js/views/timeAccounting.js | 73 ++++++-- routes/tickets.js | 144 ++++++++++++++- 7 files changed, 743 insertions(+), 85 deletions(-) create mode 100644 public/js/views/shortcuts.js diff --git a/public/index.html b/public/index.html index fe7c192..0e42366 100644 --- a/public/index.html +++ b/public/index.html @@ -162,6 +162,15 @@ Storico AttivitΓ  Turbo +
  • + + + + + + Shortcuts + +
    • @@ -249,6 +258,7 @@ + diff --git a/public/js/app.js b/public/js/app.js index 07a28c3..e3be841 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -53,6 +53,69 @@ const App = { } }, + getShortcut(id) { + try { + const stored = localStorage.getItem('otrs_shortcuts'); + const customMap = stored ? JSON.parse(stored) : {}; + if (customMap[id]) return customMap[id]; + } catch (e) {} + + const defaults = { + create_ticket_open: { ctrl: true, alt: true, shift: false, key: 'n', enabled: true }, + create_ticket_submit: { ctrl: true, alt: false, shift: false, key: 'Enter', enabled: true }, + quick_edit_save: { ctrl: true, alt: false, shift: false, key: 'Enter', enabled: true }, + }; + return defaults[id] || { ctrl: true, alt: false, shift: false, key: 'Enter', enabled: true }; + }, + + saveCustomShortcut(id, combo) { + try { + const stored = localStorage.getItem('otrs_shortcuts'); + const customMap = stored ? JSON.parse(stored) : {}; + customMap[id] = combo; + localStorage.setItem('otrs_shortcuts', JSON.stringify(customMap)); + } catch (e) { + console.error(e); + } + }, + + isShortcutTriggered(e, id) { + const sc = this.getShortcut(id); + if (!sc || !sc.enabled) return false; + + const isCtrlOrCmd = sc.ctrl ? (e.ctrlKey || e.metaKey) : (!e.ctrlKey && !e.metaKey); + const isAlt = sc.alt ? e.altKey : !e.altKey; + const isShift = sc.shift ? e.shiftKey : !e.shiftKey; + + let targetKey = sc.key.toLowerCase(); + let pressedKey = e.key.toLowerCase(); + + if (targetKey === 'space' && (pressedKey === ' ' || pressedKey === 'space')) { + return isCtrlOrCmd && isAlt && isShift; + } + + return isCtrlOrCmd && isAlt && isShift && (pressedKey === targetKey); + }, + + formatShortcutLabel(sc) { + if (!sc) return ''; + const parts = []; + if (sc.ctrl) parts.push(navigator.platform.includes('Mac') ? 'Cmd' : 'Ctrl'); + if (sc.alt) parts.push('Alt'); + if (sc.shift) parts.push('Shift'); + let keyName = sc.key; + if (keyName === 'Enter') keyName = 'Invio'; + else if (keyName === ' ' || keyName === 'Space') keyName = 'Spazio'; + parts.push(keyName); + return parts.join(' + '); + }, + + linkifyText(text) { + if (!text) return ''; + const urlRegex = /(https?:\/\/[^\s<]+)/g; + return text.replace(urlRegex, url => `${url}`); + }, + openTab(id, tn, title) { const exists = this.tabs.find(t => String(t.id) === String(id)); if (!exists) { @@ -197,6 +260,16 @@ const App = { toggleClearBtn(); } + // Global keyboard shortcuts (e.g. Crea Nuovo Ticket) + document.addEventListener('keydown', (e) => { + if (this.isShortcutTriggered(e, 'create_ticket_open')) { + if (window.location.hash !== '#/tickets/new') { + e.preventDefault(); + window.location.hash = '#/tickets/new'; + } + } + }); + // Check DB connection this.checkConnection(); @@ -369,6 +442,11 @@ const App = { titleEl.textContent = 'Storico AttivitΓ '; ActivityLogView.render(); + } else if (hash === '#/shortcuts') { + document.getElementById('nav-shortcuts')?.classList.add('active'); + titleEl.textContent = 'Shortcuts'; + ShortcutsView.render(); + } else if (hash === '#/mail-management') { document.getElementById('nav-mail-management')?.classList.add('active'); titleEl.textContent = 'Gestione Mail'; diff --git a/public/js/views/shortcuts.js b/public/js/views/shortcuts.js new file mode 100644 index 0000000..72e6c03 --- /dev/null +++ b/public/js/views/shortcuts.js @@ -0,0 +1,217 @@ +/** + * ShortcutsView β€” Gestione Shortcuts e Scorciatoie da Tastiera + * Visualizza e permette la personalizzazione delle scorciatoie da tastiera. + */ +const ShortcutsView = { + editingId: null, + + render() { + const container = document.getElementById('view-container'); + const shortcuts = this.getShortcutsList(); + + container.innerHTML = ` +
    +
    + + + + + Shortcuts e Scorciatoie da Tastiera +
    + +
    + +
    +

    + Personalizza o abilita/disabilita le scorciatoie da tastiera rapide per velocizzare la gestione dei ticket e delle consuntivazioni. +

    + +
    + ${shortcuts.map(sc => this.buildShortcutRow(sc)).join('')} +
    +
    + + + + `; + + this.bindEvents(); + }, + + getShortcutsList() { + const list = [ + { + id: 'create_ticket_open', + name: 'Crea Nuovo Ticket', + description: 'Apre la pagina di creazione di un nuovo ticket', + context: 'Globale', + defaultCombo: { ctrl: true, alt: true, shift: false, key: 'n', enabled: true } + }, + { + id: 'create_ticket_submit', + name: 'Invia Nuovo Ticket', + description: 'Invia il modulo e crea un nuovo ticket', + context: 'Pagina Nuovo Ticket', + defaultCombo: { ctrl: true, alt: false, shift: false, key: 'Enter', enabled: true } + }, + { + id: 'quick_edit_save', + name: 'Salva Modifica Rapida', + description: 'Salva le modifiche apportate nei campi di Modifica Rapida', + context: 'Pagina Dettaglio Ticket (Modifica Rapida)', + defaultCombo: { ctrl: true, alt: false, shift: false, key: 'Enter', enabled: true } + } + ]; + + return list.map(item => { + const current = App.getShortcut(item.id); + return { + ...item, + currentCombo: current + }; + }); + }, + + buildShortcutRow(sc) { + const combo = sc.currentCombo; + const label = App.formatShortcutLabel(combo); + const keysHtml = label.split(' + ').map(k => ` + + ${App.escapeHtml(k)} + + `).join(' + '); + + return ` +
    +
    +
    + ${App.escapeHtml(sc.name)} + + ${App.escapeHtml(sc.context)} + +
    +
    + ${App.escapeHtml(sc.description)} +
    +
    + +
    +
    + ${combo.enabled ? keysHtml : 'Disabilitato'} +
    + +
    + + +
    +
    +
    + `; + }, + + bindEvents() { + // Reset all + document.getElementById('sc-reset-all')?.addEventListener('click', () => { + if (confirm('Ripristinare tutte le scorciatoie da tastiera ai valori predefiniti?')) { + localStorage.removeItem('otrs_shortcuts'); + Toast.success('Shortcuts ripristinati ai valori predefiniti'); + this.render(); + } + }); + + // Toggles + document.querySelectorAll('.sc-toggle-input').forEach(toggle => { + toggle.addEventListener('change', (e) => { + const id = e.target.dataset.id; + const current = App.getShortcut(id); + current.enabled = e.target.checked; + App.saveCustomShortcut(id, current); + Toast.success(`Shortcut ${current.enabled ? 'abilitato' : 'disabilitato'}`); + this.render(); + }); + }); + + // Edit button + let recordedCombo = null; + const modal = document.getElementById('sc-modal'); + const recorder = document.getElementById('sc-key-recorder'); + const saveBtn = document.getElementById('sc-modal-save'); + const cancelBtn = document.getElementById('sc-modal-cancel'); + + document.querySelectorAll('.sc-edit-btn').forEach(btn => { + btn.addEventListener('click', () => { + this.editingId = btn.dataset.id; + const item = this.getShortcutsList().find(x => x.id === this.editingId); + document.getElementById('sc-modal-title').textContent = `Modifica: ${item ? item.name : ''}`; + recordedCombo = null; + recorder.innerHTML = 'Premi i tasti sulla tastiera...'; + saveBtn.disabled = true; + modal.style.display = 'flex'; + recorder.focus(); + }); + }); + + cancelBtn?.addEventListener('click', () => { + modal.style.display = 'none'; + }); + + recorder?.addEventListener('keydown', (e) => { + e.preventDefault(); + e.stopPropagation(); + + // Ignore lone modifier presses + if (['Control', 'Alt', 'Shift', 'Meta'].includes(e.key)) { + return; + } + + const ctrl = e.ctrlKey || e.metaKey; + const alt = e.altKey; + const shift = e.shiftKey; + let key = e.key; + + if (key === ' ') key = 'Space'; + + recordedCombo = { ctrl, alt, shift, key, enabled: true }; + const label = App.formatShortcutLabel(recordedCombo); + recorder.innerHTML = label.split(' + ').map(k => ` + + ${App.escapeHtml(k)} + + `).join(' + '); + + saveBtn.disabled = false; + }); + + saveBtn?.addEventListener('click', () => { + if (this.editingId && recordedCombo) { + App.saveCustomShortcut(this.editingId, recordedCombo); + Toast.success('Combinazione salvata!'); + modal.style.display = 'none'; + this.render(); + } + }); + } +}; diff --git a/public/js/views/ticketCreate.js b/public/js/views/ticketCreate.js index 8503ad9..d065b98 100644 --- a/public/js/views/ticketCreate.js +++ b/public/js/views/ticketCreate.js @@ -747,5 +747,18 @@ const TicketCreateView = { el.addEventListener('input', () => this.saveState()); el.addEventListener('change', () => this.saveState()); }); + + // Shortcut to submit ticket + const createFormEl = document.querySelector('.create-form'); + if (createFormEl) { + createFormEl.addEventListener('keydown', (e) => { + if (App.isShortcutTriggered(e, 'create_ticket_submit')) { + e.preventDefault(); + if (submitBtn && !submitBtn.disabled) { + submitBtn.click(); + } + } + }); + } }, }; diff --git a/public/js/views/ticketDetail.js b/public/js/views/ticketDetail.js index 5f71c8f..a751b1a 100644 --- a/public/js/views/ticketDetail.js +++ b/public/js/views/ticketDetail.js @@ -4,7 +4,7 @@ */ const TicketDetailView = { ticketId: null, - htmlMode: false, + htmlMode: true, originalValues: {}, noteAttachments: [], @@ -13,13 +13,15 @@ const TicketDetailView = { const body = this.noteQuill ? this.noteQuill.root.innerHTML.trim() : ''; const subject = document.getElementById('note-subject') ? document.getElementById('note-subject').value.trim() : ''; const time_unit = document.getElementById('note-time-units') ? document.getElementById('note-time-units').value.trim() : ''; + const ticket_state_id = document.getElementById('note-ticket-state') ? document.getElementById('note-ticket-state').value : ''; - if ((body !== '


    ' && body !== '') || subject !== '' || time_unit !== '' || this.noteAttachments.length > 0) { + if ((body !== '


    ' && body !== '') || subject !== '' || time_unit !== '' || this.noteAttachments.length > 0 || ticket_state_id !== '') { App.saveDraft(this.ticketId, { type: 'note', body, subject, time_unit, + ticket_state_id, attachments: [...this.noteAttachments] }); } else { @@ -27,6 +29,42 @@ const TicketDetailView = { } }, + extractLinks(htmlOrText) { + if (!htmlOrText) return []; + const links = []; + const seen = new Set(); + + // 1. Extract tags + const anchorRegex = /]*?\s+)?href=["']([^"']+)["'][^>]*>(.*?)<\/a>/gi; + let match; + while ((match = anchorRegex.exec(htmlOrText)) !== null) { + let url = match[1].trim().replace(/&/g, '&'); + let text = match[2].replace(/<[^>]+>/g, '').trim(); + if (!text) text = url; + + if (/^(javascript|mailto|tel|cid|#|\/api\/tickets\/attachments)/i.test(url)) { + continue; + } + if (!seen.has(url)) { + seen.add(url); + links.push({ url, text }); + } + } + + // 2. Extract plain HTTP/HTTPS URLs from text + const plainUrlRegex = /(https?:\/\/[^\s<"'>]+)/gi; + while ((match = plainUrlRegex.exec(htmlOrText)) !== null) { + let url = match[1].trim().replace(/[.,;)]+$/, ''); + if (/^\/api\/tickets\/attachments/i.test(url)) continue; + if (!seen.has(url)) { + seen.add(url); + links.push({ url, text: url }); + } + } + + return links; + }, + updateNoteAttachmentList() { const listEl = document.getElementById('note-file-list'); if (!listEl) return; @@ -158,8 +196,8 @@ const TicketDetailView = {
    -
    -
    +
    +
    πŸ“‹ #${ticket.tn} @@ -177,6 +215,34 @@ const TicketDetailView = { ${ticket.lock_name === 'lock' ? 'πŸ”’ Bloccato' : ''}
    + + +
    @@ -241,10 +307,6 @@ const TicketDetailView = {
    -
    - - -
    @@ -253,7 +315,11 @@ const TicketDetailView = {
    -
    +
    +
    + + +
    @@ -262,7 +328,17 @@ const TicketDetailView = {
    -
    Aggiungi Nota
    +
    +
    Aggiungi Nota
    +
    + + +
    +
    @@ -304,34 +380,82 @@ const TicketDetailView = {
    ${articles.length > 0 ? articles.map(a => { - const hasHtml = (a.a_content_type || '').toLowerCase().includes('html') || a.a_body.includes(''); + const hasHtml = a.has_html || (a.a_content_type || '').toLowerCase().includes('html') || /<(div|p|br|table|html|body|span|img|a|style)\b/i.test(a.html_body || a.a_body || ''); - let processedBody = a.a_body || ''; + let processedBody = (hasHtml && a.html_body) ? a.html_body : (a.a_body || ''); const articleAttachments = (attachments || []).filter(att => att.article_id === a.article_id); + const usedAttachmentIds = new Set(); - if (hasHtml) { + if (hasHtml && this.htmlMode) { articleAttachments.forEach(att => { + let replaced = false; if (att.content_id) { const cleanCid = att.content_id.replace(/[<>]/g, '').trim(); if (cleanCid) { const escapedCid = cleanCid.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); const regex = new RegExp(`cid:?`, 'gi'); - processedBody = processedBody.replace(regex, `/api/tickets/attachments/${att.id}`); + if (regex.test(processedBody)) { + processedBody = processedBody.replace(regex, `/api/tickets/attachments/${att.id}`); + replaced = true; + } } } if (att.filename) { const escapedFilename = att.filename.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); const regexFilename = new RegExp(`cid:?`, 'gi'); - processedBody = processedBody.replace(regexFilename, `/api/tickets/attachments/${att.id}`); + if (regexFilename.test(processedBody)) { + processedBody = processedBody.replace(regexFilename, `/api/tickets/attachments/${att.id}`); + replaced = true; + } + const regexSrc = new RegExp(`src=["']${escapedFilename}["']`, 'gi'); + if (regexSrc.test(processedBody)) { + processedBody = processedBody.replace(regexSrc, `src="/api/tickets/attachments/${att.id}"`); + replaced = true; + } + + const nameWithoutExt = att.filename.replace(/\.[^/.]+$/, ''); + if (nameWithoutExt && nameWithoutExt.length > 3) { + const escapedBase = nameWithoutExt.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); + const regexBase = new RegExp(`cid:\\s]*>?`, 'gi'); + if (regexBase.test(processedBody)) { + processedBody = processedBody.replace(regexBase, `/api/tickets/attachments/${att.id}`); + replaced = true; + } + } + } + if (att.disposition === 'inline' || replaced) { + usedAttachmentIds.add(att.id); } }); + + if (!processedBody.includes('')) { + processedBody = processedBody.replace('', ''); + } else { + processedBody = `${processedBody}`; + } + } } - const displayBody = this.htmlMode && hasHtml - ? `` - : `
    ${App.escapeHtml(a.a_body || '')}
    `; + const displayBody = (this.htmlMode && hasHtml) + ? `` + : `
    ${App.linkifyText(App.escapeHtml(a.a_body || ''))}
    `; - const visibleAttachments = articleAttachments.filter(att => att.filename !== 'file-1' && att.filename !== 'file-2'); + const visibleAttachments = articleAttachments.filter(att => { + const fname = (att.filename || '').toLowerCase(); + if (fname.startsWith('file-1') || fname.startsWith('file-2') || fname.startsWith('file-3')) { + return false; + } + if (usedAttachmentIds.has(att.id)) { + return false; + } + return true; + }); + + const extractedLinks = this.extractLinks(processedBody || a.a_body || ''); return `
    @@ -341,8 +465,12 @@ const TicketDetailView = { ID: ${a.article_id} ${App.escapeHtml(a.a_from || a.creator_first + ' ' + a.creator_last || 'Sistema')} ${a.channel_name ? `via ${a.channel_name}` : ''} - - + +
    @@ -373,20 +501,68 @@ const TicketDetailView = {
    - ${a.a_subject ? `
    ${App.escapeHtml(a.a_subject)}
    ` : ''} - ${displayBody} + ${a.a_subject ? `
    ${App.escapeHtml(a.a_subject)}
    ` : ''} - ${visibleAttachments.length > 0 ? ` -
    - ${visibleAttachments.map(att => ` - - πŸ“Ž - ${App.escapeHtml(att.filename)} - (${Math.round(att.content_size / 1024)} KB) - - `).join('')} +
    +
    + ${displayBody} + + ${visibleAttachments.length > 0 ? ` +
    + ${visibleAttachments.map(att => ` + + πŸ“Ž + ${App.escapeHtml(att.filename)} + (${Math.round(att.content_size / 1024)} KB) + + `).join('')} +
    + ` : ''}
    - ` : ''} + + +
    +
    + + Dettagli Mail +
    +
    + Da: + ${App.escapeHtml(a.a_from || 'β€”')} +
    +
    + A: + ${App.escapeHtml(a.a_to || 'β€”')} +
    + ${a.a_cc ? ` +
    + Cc: + ${App.escapeHtml(a.a_cc)} +
    + ` : ''} + +
    + + + Link contenuti + + ${extractedLinks.length} +
    + + ${extractedLinks.length > 0 ? ` +
    + ${extractedLinks.map(link => ` + + 🌐 + ${App.escapeHtml(link.text || link.url)} + + `).join('')} +
    + ` : ` +
    Nessun link presente
    + `} +
    +
    `; }).join('') : ` @@ -497,37 +673,6 @@ const TicketDetailView = {
    ` : ''} - -
    `; @@ -579,6 +724,9 @@ const TicketDetailView = { if (document.getElementById('note-time-units')) { document.getElementById('note-time-units').value = noteDraft.time_unit || ''; } + if (document.getElementById('note-ticket-state') && noteDraft.ticket_state_id) { + document.getElementById('note-ticket-state').value = noteDraft.ticket_state_id; + } this.noteAttachments = noteDraft.attachments || []; this.updateNoteAttachmentList(); } @@ -891,6 +1039,19 @@ const TicketDetailView = { } }); + // Shortcut for Quick Edit save + const quickEditContainer = container.querySelector('.quick-edit'); + if (quickEditContainer) { + quickEditContainer.addEventListener('keydown', (e) => { + if (App.isShortcutTriggered(e, 'quick_edit_save')) { + e.preventDefault(); + if (saveBtn && !saveBtn.disabled) { + saveBtn.click(); + } + } + }); + } + // Send note const noteSendBtn = document.getElementById('note-send'); noteSendBtn.addEventListener('click', async () => { @@ -925,6 +1086,9 @@ const TicketDetailView = { return; } + const noteStateSelect = document.getElementById('note-ticket-state'); + const ticket_state_id = noteStateSelect ? noteStateSelect.value : null; + try { noteSendBtn.disabled = true; noteSendBtn.innerHTML = ' Invio...'; @@ -935,6 +1099,7 @@ const TicketDetailView = { subject, body, time_unit, + ticket_state_id: ticket_state_id ? parseInt(ticket_state_id) : undefined, attachments: this.noteAttachments.length > 0 ? this.noteAttachments : undefined }), }); diff --git a/public/js/views/timeAccounting.js b/public/js/views/timeAccounting.js index 4a6745c..82c9ea8 100644 --- a/public/js/views/timeAccounting.js +++ b/public/js/views/timeAccounting.js @@ -46,7 +46,25 @@ const TimeAccountingView = { date: this.selectedDate, }); - const data = await App.api(`/api/tickets/time-accounting/summary?${params}`); + let data = await App.api(`/api/tickets/time-accounting/summary?${params}`); + + // If non-working days are hidden, ensure selectedDate is a valid working day + if (!this.showNonWorkingDays) { + const workDays = (data && data.work_days) || [1, 2, 3, 4, 5]; + const parts = this.selectedDate.split('-').map(Number); + const d = new Date(parts[0], parts[1] - 1, parts[2]); + let shifted = false; + while (workDays.length > 0 && !workDays.includes(d.getDay())) { + d.setDate(d.getDate() - 1); + shifted = true; + } + if (shifted) { + this.selectedDate = this.formatLocalISO(d); + params.set('date', this.selectedDate); + data = await App.api(`/api/tickets/time-accounting/summary?${params}`); + } + } + this.summaryData = data; // Auto-select first article if current selection is invalid @@ -192,22 +210,43 @@ const TimeAccountingView = { const targetMins = (data && data.target_minutes) || 480; const workDays = (data && data.work_days) || [1, 2, 3, 4, 5]; - // Generate 7 days before and 7 days after selected date (15 days total) + // Generate 2 full weeks of days (15 calendar days if showing all, or 10-11 working days if hiding non-working days) + const dateList = []; + if (this.showNonWorkingDays) { + for (let offset = -7; offset <= 7; offset++) { + const d = new Date(selected); + d.setDate(d.getDate() + offset); + dateList.push(d); + } + } else { + const before = []; + let dPrev = new Date(selected); + while (before.length < 5) { + dPrev.setDate(dPrev.getDate() - 1); + if (workDays.includes(dPrev.getDay())) { + before.unshift(new Date(dPrev)); + } + } + const current = new Date(selected); + const after = []; + let dNext = new Date(selected); + while (after.length < 5) { + dNext.setDate(dNext.getDate() + 1); + if (workDays.includes(dNext.getDay())) { + after.push(new Date(dNext)); + } + } + dateList.push(...before, current, ...after); + } + const days = []; - for (let offset = -7; offset <= 7; offset++) { - const d = new Date(selected); - d.setDate(d.getDate() + offset); + for (const d of dateList) { const isoStr = this.formatLocalISO(d); const dayOfWeek = d.getDay(); // 0 = Sun, 1 = Mon ... 6 = Sat const isWorkDay = workDays.includes(dayOfWeek); const isSelected = isoStr === this.selectedDate; const isToday = isoStr === todayStr; - // Filter out non-working days if toggle is off, unless it's currently selected - if (!isWorkDay && !this.showNonWorkingDays && !isSelected) { - continue; - } - const dayNum = d.getDate(); const weekdayName = weekdays[dayOfWeek]; const monthName = months[d.getMonth()]; @@ -413,9 +452,7 @@ const TimeAccountingView = { document.getElementById('ta-btn-toggle-nonwork')?.addEventListener('click', () => { this.showNonWorkingDays = !this.showNonWorkingDays; localStorage.setItem('otrs_ta_show_non_working_days', this.showNonWorkingDays); - const container = document.getElementById('view-container'); - container.innerHTML = this.buildHtml(this.summaryData); - this.bindEvents(); + this.loadData(); }); // Day pill clicks @@ -428,18 +465,24 @@ const TimeAccountingView = { // Previous day button document.getElementById('ta-day-prev')?.addEventListener('click', () => { + const workDays = (this.summaryData && this.summaryData.work_days) || [1, 2, 3, 4, 5]; const parts = this.selectedDate.split('-').map(Number); const d = new Date(parts[0], parts[1] - 1, parts[2]); - d.setDate(d.getDate() - 1); + do { + d.setDate(d.getDate() - 1); + } while (!this.showNonWorkingDays && workDays.length > 0 && !workDays.includes(d.getDay())); this.selectedDate = this.formatLocalISO(d); this.loadData(); }); // Next day button document.getElementById('ta-day-next')?.addEventListener('click', () => { + const workDays = (this.summaryData && this.summaryData.work_days) || [1, 2, 3, 4, 5]; const parts = this.selectedDate.split('-').map(Number); const d = new Date(parts[0], parts[1] - 1, parts[2]); - d.setDate(d.getDate() + 1); + do { + d.setDate(d.getDate() + 1); + } while (!this.showNonWorkingDays && workDays.length > 0 && !workDays.includes(d.getDay())); this.selectedDate = this.formatLocalISO(d); this.loadData(); }); diff --git a/routes/tickets.js b/routes/tickets.js index 841b82f..4f0c504 100644 --- a/routes/tickets.js +++ b/routes/tickets.js @@ -443,6 +443,62 @@ router.get('/:id', async (req, res) => { [id] ); + // Fetch HTML body attachment content for articles if present (e.g. file-1, file-1.html, text/html) + const htmlAttachmentsRes = await pool.query( + `SELECT id, article_id, filename, content_type, content + FROM article_data_mime_attachment + WHERE article_id IN (SELECT id FROM article WHERE ticket_id = $1) + AND ( + filename LIKE 'file-%' + OR content_type LIKE '%html%' + OR disposition = 'inline' + ) + ORDER BY id ASC`, + [id] + ); + + const htmlBodyMap = {}; + for (const row of htmlAttachmentsRes.rows) { + if (row.content) { + let contentStr = ''; + if (Buffer.isBuffer(row.content)) { + contentStr = row.content.toString('utf-8'); + } else if (typeof row.content === 'string') { + contentStr = row.content; + } + + const cleaned = contentStr.replace(/\s+/g, ''); + const base64Regex = /^[A-Za-z0-9+/]*={0,2}$/; + if (cleaned.length > 20 && cleaned.length % 4 === 0 && base64Regex.test(cleaned)) { + try { + const decoded = Buffer.from(cleaned, 'base64').toString('utf-8'); + if (decoded && /<(div|p|br|table|html|body|span|img|a|style)\b/i.test(decoded)) { + contentStr = decoded; + } + } catch (e) {} + } + + if (contentStr && /<(div|p|br|table|html|body|span|img|a|style)\b/i.test(contentStr)) { + const fname = (row.filename || '').toLowerCase(); + if (!htmlBodyMap[row.article_id] || fname.startsWith('file-1') || fname.startsWith('file-2')) { + htmlBodyMap[row.article_id] = contentStr; + } + } + } + } + + articlesResult.rows.forEach(a => { + if (htmlBodyMap[a.article_id]) { + a.html_body = htmlBodyMap[a.article_id]; + a.has_html = true; + } else if (a.a_body && ((a.a_content_type || '').toLowerCase().includes('html') || /<(div|p|br|table|html|body|span|img|a|style)\b/i.test(a.a_body))) { + a.html_body = a.a_body; + a.has_html = true; + } else { + a.has_html = false; + } + }); + let otrsWebUrl = null; const apiUrl = process.env.OTRS_API_URL; if (apiUrl) { @@ -1111,7 +1167,7 @@ router.get('/:id/articles', async (req, res) => { // ============================================================ router.post('/:id/articles', async (req, res) => { const { id } = req.params; - const { subject, body, is_visible_for_customer = 0, time_unit, attachments } = req.body; + const { subject, body, is_visible_for_customer = 0, time_unit, attachments, ticket_state_id } = req.body; const operatorId = parseInt(req.headers['x-agent-id'], 10) || 1; const isHtml = body && /<[a-z][\s\S]*>/i.test(body); @@ -1131,6 +1187,27 @@ router.post('/:id/articles', async (req, res) => { } }; + if (ticket_state_id) { + payload.Ticket = { StateID: parseInt(ticket_state_id, 10) }; + try { + const stateTypeRes = await pool.query( + `SELECT tst.name AS type_name + FROM ticket_state ts + JOIN ticket_state_type tst ON ts.type_id = tst.id + WHERE ts.id = $1`, + [ticket_state_id] + ); + if (stateTypeRes.rows.length > 0) { + const typeName = stateTypeRes.rows[0].type_name.toLowerCase(); + if (typeName.includes('closed') || typeName === 'closed successful' || typeName === 'closed unsuccessful') { + payload.Ticket.LockID = 1; + } + } + } catch (err) { + console.error('Error checking state type for REST API payload:', err); + } + } + if (time_unit) { payload.Article.TimeUnit = parseFloat(time_unit); payload.Article.TimeUnits = parseFloat(time_unit); @@ -1182,7 +1259,7 @@ router.post('/:id/articles', async (req, res) => { const client = await pool.connect(); try { const { id } = req.params; - const { subject, body, is_visible_for_customer = 0, time_unit, attachments } = req.body; + const { subject, body, is_visible_for_customer = 0, time_unit, attachments, ticket_state_id } = req.body; const operatorId = parseInt(req.headers['x-agent-id'], 10) || 1; // Check if this article was already inserted (e.g., via REST API or concurrent request) @@ -1243,12 +1320,67 @@ router.post('/:id/articles', async (req, res) => { await client.query('BEGIN'); - // Verify ticket exists - const ticketCheck = await client.query('SELECT id FROM ticket WHERE id = $1', [id]); + // Verify ticket exists & get current state + const ticketCheck = await client.query( + 'SELECT id, ticket_state_id, ticket_priority_id, queue_id, user_id, type_id FROM ticket WHERE id = $1', + [id] + ); if (ticketCheck.rows.length === 0) { await client.query('ROLLBACK'); return res.status(404).json({ error: 'Ticket not found' }); } + const currentTicket = ticketCheck.rows[0]; + + // Check if ticket state should be updated + if (ticket_state_id && parseInt(ticket_state_id, 10) !== currentTicket.ticket_state_id) { + const newStateId = parseInt(ticket_state_id, 10); + const stateTypeRes = await client.query( + `SELECT tst.name AS type_name + FROM ticket_state ts + JOIN ticket_state_type tst ON ts.type_id = tst.id + WHERE ts.id = $1`, + [newStateId] + ); + let lockIdToSet = null; + if (stateTypeRes.rows.length > 0) { + const typeName = stateTypeRes.rows[0].type_name.toLowerCase(); + if (typeName.includes('closed') || typeName === 'closed successful' || typeName === 'closed unsuccessful') { + lockIdToSet = 1; + } + } + + if (lockIdToSet !== null) { + await client.query( + `UPDATE ticket SET ticket_state_id = $1, ticket_lock_id = $2, change_time = $3, change_by = $4 WHERE id = $5`, + [newStateId, lockIdToSet, getLocalTimestamp(), operatorId, id] + ); + } else { + await client.query( + `UPDATE ticket SET ticket_state_id = $1, change_time = $2, change_by = $3 WHERE id = $4`, + [newStateId, getLocalTimestamp(), operatorId, id] + ); + } + + const htResult = await client.query( + `SELECT id FROM ticket_history_type WHERE name = 'StateUpdate'` + ); + if (htResult.rows.length > 0) { + await client.query( + `INSERT INTO ticket_history ( + name, history_type_id, ticket_id, type_id, queue_id, + owner_id, priority_id, state_id, create_time, create_by, change_time, change_by + ) VALUES ( + '%%', $1, $2, $3, $4, + $5, $6, $7, $8, $9, $8, $9 + )`, + [ + htResult.rows[0].id, id, currentTicket.type_id || 1, currentTicket.queue_id, + currentTicket.user_id, currentTicket.ticket_priority_id, newStateId, + getLocalTimestamp(), operatorId + ] + ); + } + } // Get sender type for "agent" const senderResult = await client.query( @@ -1946,9 +2078,9 @@ router.get('/time-accounting/summary', async (req, res) => { const targetDate = new Date(`${dateStr}T00:00:00Z`); const startDateObj = new Date(targetDate); - startDateObj.setDate(startDateObj.getDate() - 7); + startDateObj.setDate(startDateObj.getDate() - 14); const endDateObj = new Date(targetDate); - endDateObj.setDate(endDateObj.getDate() + 7); + endDateObj.setDate(endDateObj.getDate() + 14); const startTime = `${startDateObj.toISOString().slice(0, 10)} 00:00:00`; const endTime = `${endDateObj.toISOString().slice(0, 10)} 23:59:59`;