меньше
${[0,.2,.4,.6,.8,1].map(hi=>`
`).join('')}
больше
@@ -620,7 +712,7 @@ function renderClientsList() {
if(visible.length===0){wrap.innerHTML=`
${clientsOnlyOpen?'Нет клиентов с открытыми заявками':'Нет повторных обращений'}
`;return;}
wrap.innerHTML=`
- ${visible.map(([name,v])=>{ const dv=clientsOnlyOpen?v.open:v.count,pct=dv/maxV*100,opPct=v.count?v.open/v.count*100:0; return'
'+escHtml(name)+'
'+v.count+''+(v.open?''+v.open+' откр.':'')+'
'; }).join('')}
+ ${visible.map(([name,v])=>{ const dv=clientsOnlyOpen?v.open:v.count,pct=dv/maxV*100,opPct=v.count?v.open/v.count*100:0; return'
'+escHtml(name)+'
'+v.count+''+(v.open?''+v.open+' откр.':'')+'
'; }).join('')}
${!clientsExpanded&&hidden>0?`
+ ещё ${hidden} — показать все
`:''}`;
}
@@ -648,10 +740,28 @@ function donutLegend(sc,uc,tot){
}
function escHtml(s){return String(s).replace(/&/g,'&').replace(//g,'>');}
+function escAttr(s){return String(s).replace(/&/g,'&').replace(//g,'>').replace(/"/g,'"').replace(/'/g,''');}
+
+function wDiffBadge(diff){
+ if(diff===0) return '
= 0';
+ if(diff>0) return '
↑ +'+diff+'';
+ return '
↓ '+diff+'';
+}
function showLineTip(event,el){const tip=document.getElementById('line-tooltip');if(!tip)return;tip.textContent=`${el.dataset.lbl}: ${el.dataset.val} откр.`;tip.style.display='block';const wr=document.getElementById('stats-line-chart').getBoundingClientRect();tip.style.left=Math.min(event.clientX-wr.left+12,wr.width-130)+'px';tip.style.top=Math.max(event.clientY-wr.top-36,4)+'px';}
function hideLineTip(){const t=document.getElementById('line-tooltip');if(t)t.style.display='none';}
+function showActTip(event,el){
+ let tip=document.getElementById('stats-act-tooltip');
+ if(!tip){tip=document.createElement('div');tip.id='stats-act-tooltip';tip.className='stats-act-tooltip';document.body.appendChild(tip);}
+ const cr=el.dataset.actCr||'0',cl=el.dataset.actCl||'0',lbl=el.dataset.actLbl||'';
+ tip.innerHTML=`
${escHtml(lbl)}▲ Создано: ${cr} ▼ Закрыто: ${cl}`;
+ tip.style.display='block';
+ tip.style.left=(event.clientX+14)+'px';
+ tip.style.top=Math.max(event.clientY-48,8)+'px';
+}
+function hideActTip(){const t=document.getElementById('stats-act-tooltip');if(t)t.style.display='none';}
+
function openTaskById(id){const i=allData.findIndex(x=>x.task.id===id);if(i!==-1){closeStatsPage();setTimeout(()=>openDetail(i),100);}}
function onDataLoaded(){if(statsPageOpen)renderStatsPage();}
diff --git a/public/js/ui.js b/public/js/ui.js
index 0a4af68..be82eb0 100644
--- a/public/js/ui.js
+++ b/public/js/ui.js
@@ -1,13 +1,14 @@
// ── Column visibility ─────────────────────────────────────────────
const ALL_COLS = [
- { key:'num', label:'# Заявка', def:true },
- { key:'title', label:'Тема', def:true },
- { key:'intrastatus', label:'Статус в интре', def:true },
- { key:'client', label:'Клиент', def:true },
- { key:'date', label:'Время ответа', def:true },
- { key:'created', label:'Создана', def:true },
- { key:'preview', label:'Превью/Заметка', def:true },
- { key:'status', label:'Статус', def:true },
+ { key:'num', label:'# Заявка', def:true },
+ { key:'title', label:'Тема', def:true },
+ { key:'intrastatus', label:'Статус в интре', def:true },
+ { key:'servstatus', label:'Служ. статус в интре', def:true },
+ { key:'client', label:'Клиент', def:true },
+ { key:'date', label:'Время ответа', def:true },
+ { key:'created', label:'Создана', def:true },
+ { key:'preview', label:'Превью/Заметка', def:true },
+ { key:'status', label:'Статус', def:true },
];
let visibleCols = new Set(ALL_COLS.filter(c=>c.def).map(c=>c.key));
let colMenuOpen = false;
@@ -37,6 +38,7 @@ const ADV_FILTER_CONFIG = {
labelId: 'filter-object-label',
allLabel: 'Объекты: все',
shortLabel: 'Объекты',
+ hasSearch: true,
},
'filter-intra-select': {
panelId: 'filter-intra-panel',
@@ -144,6 +146,28 @@ function buildAdvancedFilterPanel(selectId){
return;
}
+ if (cfg.hasSearch) {
+ const searchWrap = document.createElement('div');
+ searchWrap.className = 'adv-filter-search-wrap';
+ const searchInput = document.createElement('input');
+ searchInput.type = 'text';
+ searchInput.className = 'adv-filter-search';
+ searchInput.placeholder = 'Поиск…';
+ searchInput.setAttribute('autocomplete', 'off');
+ searchInput.addEventListener('input', () => {
+ const q = searchInput.value.toLowerCase();
+ panel.querySelectorAll('.adv-filter-item').forEach(item => {
+ const text = item.querySelector('.adv-filter-text')?.textContent || '';
+ item.style.display = text.toLowerCase().includes(q) ? '' : 'none';
+ });
+ });
+ searchInput.addEventListener('click', e => e.stopPropagation());
+ searchWrap.appendChild(searchInput);
+ panel.appendChild(searchWrap);
+ // Focus after render
+ requestAnimationFrame(() => searchInput.focus());
+ }
+
const selectedCount=opts.filter((o)=>o.selected).length;
const actions=document.createElement('div');
actions.className='adv-filter-actions';
@@ -455,6 +479,47 @@ function intraStatusBadge(task) {
else if (lc.includes('ожидан') || lc.includes('hold')) cls = 'sb-intra-hold';
return `
${esc(name)}`;
}
+// ── IntraDesk additional field — badge helper ─────────────────────
+function _addfieldBadgeHtml(val) {
+ if (!val) return '
—';
+ const match = (typeof MARKS_CONFIG !== 'undefined' ? MARKS_CONFIG : [])
+ .find((m) => m.label && m.label.toLowerCase() === val.toLowerCase());
+ if (match) {
+ return `
` +
+ `${esc(val)}`;
+ }
+ return `
${esc(val)}`;
+}
+
+// ── IntraDesk additional field — interactive picker ───────────────
+function intraAddfieldPickerHtml(task) {
+ const tid = String(task.id);
+ const val = task._addfield_status || null;
+ const cfg = typeof MARKS_CONFIG !== 'undefined' ? MARKS_CONFIG : [];
+ const items = cfg.map((m) => `
+
+ ${esc(m.label)}
+
`).join('');
+ const clearItem = `
+ — очистить
+
`;
+ return `
+ ${_addfieldBadgeHtml(val)}
+
+
`;
+}
+
+async function setIntraAddfield(taskId, value, e) {
+ if (e) e.stopPropagation();
+ const r = await apiPost(`/api/tasks/${taskId}/intra-addfield`, { value: value || null });
+ if (!r?.ok) { showToast(`❌ ${r?.error || 'Ошибка'}`, 'warn'); return; }
+ // Обновляем кеш локально до следующего SSE
+ const item = allData.find((d) => String(d.task.id) === String(taskId));
+ if (item) { item.task._addfield_status = value || null; renderTable(); }
+}
// Who answered — ring class for avatar
function whoAnsweredRing(lc){
if(!lc) return 'ring-none';
@@ -498,15 +563,45 @@ function statusPickerHtml(tid){
}
function ispShow(el){
const dd=el.querySelector('.isp-dropdown');
- if(!dd) return;
+ const inner=dd?.querySelector('.isp-dropdown-inner');
+ if(!dd||!inner) return;
+ /** Список чуть заходит на бейдж — без «дыры», курсор не теряет hover */
+ const OVERLAP=4;
+ const edge=6;
const r=el.getBoundingClientRect();
- dd.style.top=(r.bottom)+'px';
- dd.style.left=r.left+'px';
+ inner.style.maxHeight='';
+ inner.style.overflowY='';
+ dd.classList.remove('isp-drop-up');
dd.style.display='block';
+ dd.style.left=r.left+'px';
+ dd.style.top=(r.bottom-OVERLAP)+'px';
+ let h=dd.getBoundingClientRect().height;
+ const spaceBelow=window.innerHeight-r.bottom+OVERLAP;
+ const spaceAbove=r.top+OVERLAP;
+ const flipUp=h>spaceBelow&&spaceAbove>=spaceBelow;
+ if(flipUp){
+ let top=r.top-h+OVERLAP;
+ if(top
spaceBelow){
+ inner.style.maxHeight=Math.max(80,spaceBelow-edge)+'px';
+ inner.style.overflowY='auto';
+ dd.style.top=(r.bottom-OVERLAP)+'px';
+ }
}
function ispHide(el){
const dd=el.querySelector('.isp-dropdown');
- if(dd) dd.style.display='none';
+ if(!dd) return;
+ dd.style.display='none';
+ dd.classList.remove('isp-drop-up');
+ const inner=dd.querySelector('.isp-dropdown-inner');
+ if(inner){ inner.style.maxHeight=''; inner.style.overflowY=''; }
}
// ── Column picker ─────────────────────────────────────────────────
@@ -709,6 +804,7 @@ function renderTable(keepPage){
${sc('num') ?'# | ' :''}
${sc('title') ?'Тема | ' :''}
${sc('intrastatus')?'Статус в интре | ':''}
+ ${sc('servstatus') ?'Служ. статус в интре | ':''}
${sc('status') ?'Статус | ' :''}
${sc('client') ?'Кто ответил | ' :''}
${sc('date') ?`Время ответа${sortArrow('date')} | ` :''}
@@ -747,6 +843,7 @@ function renderTable(keepPage){
${sc('num') ?`#${num}${unreadDot} | `:''}
${sc('title') ?`${esc(task.name)} ${orgName?`${esc(orgName)} `:''} | `:''}
${sc('intrastatus')?`${intraStatusBadge(task)} | `:''}
+ ${sc('servstatus') ?`${intraAddfieldPickerHtml(task)} | `:''}
${sc('status') ?`${statusPickerHtml(tid)} | `:''}
${sc('client') ?`
diff --git a/refresh-service.js b/refresh-service.js
index 25e2bb2..4ac9c4d 100644
--- a/refresh-service.js
+++ b/refresh-service.js
@@ -22,6 +22,8 @@ const REMOVE_EVENT_TYPES = new Set([
const COMMENT_EVENT_TYPES = new Set([50, 55]);
+const INTRA_ADDFIELD_ALIAS = 'addfield_2f6eaa2vnutrennij_statusSingleSelect';
+
function toBoolFlag(value) {
return String(value || '0') === '1' || value === true;
}
@@ -164,6 +166,9 @@ function createRefreshService({ db, fetch, getSettings, sseBroadcast, logger = c
INSERT INTO marks(task_id,mark_type,is_active,set_by,set_at) VALUES(?,?,?,?,?)
ON CONFLICT(task_id,mark_type) DO UPDATE SET is_active=excluded.is_active,set_by=excluded.set_by,set_at=excluded.set_at
`),
+ getStatusKeyByLabel: db.prepare(
+ "SELECT key FROM internal_statuses WHERE is_active=1 AND lower(label)=lower(?) LIMIT 1"
+ ),
};
function getSyncState() {
@@ -205,6 +210,7 @@ function createRefreshService({ db, fetch, getSettings, sseBroadcast, logger = c
auto_reset_on_update: toBoolFlag(s.auto_reset_on_update),
sync_reply_wait: toBoolFlag(s.sync_reply_wait),
sync_done_with_intra: toBoolFlag(s.sync_done_with_intra),
+ sync_addfield_status: toBoolFlag(s.sync_addfield_status),
intra_done_status_ids: doneIds,
};
}
@@ -277,10 +283,29 @@ function createRefreshService({ db, fetch, getSettings, sseBroadcast, logger = c
}
}
+ async function updateIntraAdditionalField(taskNumber, statusLabel, apiKey) {
+ if (!apiKey) throw new Error('API ключ не задан');
+ const url = `https://apigw.intradesk.ru/changes/v3/tasks/?ApiKey=${apiKey}`;
+ const response = await fetch(url, {
+ method: 'PUT',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({
+ number: Number(taskNumber),
+ blocks: { [INTRA_ADDFIELD_ALIAS]: JSON.stringify({ value: statusLabel || null }) },
+ Channel: 'api',
+ }),
+ timeout: 15000,
+ });
+ if (!response.ok) {
+ const text = await response.text().catch(() => '');
+ throw new Error(`IntraDesk вернул ${response.status}: ${text.slice(0, 200)}`);
+ }
+ }
+
async function applyStatusAutomationForChangedTasks(changedTaskIds, tasksById, settings, reason = '') {
const changedIds = [...(changedTaskIds || [])].map((v) => String(v));
if (!changedIds.length) return;
- if (!settings.sync_done_with_intra && !settings.sync_reply_wait && !settings.auto_reset_on_update) return;
+ if (!settings.sync_done_with_intra && !settings.sync_reply_wait && !settings.auto_reset_on_update && !settings.sync_addfield_status) return;
const systemStatuses = getSystemStatusKeys();
const doneKey = systemStatuses.done || null;
@@ -326,6 +351,18 @@ function createRefreshService({ db, fetch, getSettings, sseBroadcast, logger = c
if (!applied && settings.auto_reset_on_update && currentMark) {
clearTaskMarks(taskId, 'system');
+ applied = true;
+ }
+
+ if (settings.sync_addfield_status) {
+ const addfieldVal = task._addfield_status;
+ if (addfieldVal) {
+ const row = stmts.getStatusKeyByLabel.get(addfieldVal);
+ if (row && currentMark !== row.key) {
+ setExclusiveMark(taskId, row.key, 'system');
+ logger.log(`[Refresh] Inbound addfield sync: task ${taskId} → mark "${row.key}" (${reason})`);
+ }
+ }
}
}
}
@@ -421,6 +458,8 @@ function createRefreshService({ db, fetch, getSettings, sseBroadcast, logger = c
if (task.executorgroup && dictMap[task.executorgroup]) task._executorgroupname = dictMap[task.executorgroup];
const statusKey = task.statusid || task.status;
if (statusKey && dictMap[statusKey]) task._statusname = dictMap[statusKey];
+ const af = (task.additionalfields?.data || []).find((d) => d.alias === INTRA_ADDFIELD_ALIAS);
+ task._addfield_status = af?.value?.stringvalue || null;
});
upsertIntraStatusesFromTasks(tasks);
@@ -741,6 +780,7 @@ function createRefreshService({ db, fetch, getSettings, sseBroadcast, logger = c
requestRemoveTask,
parseWebhookAction,
extractWebhookTaskId,
+ updateIntraAdditionalField,
};
}
diff --git a/server.js b/server.js
index 45f900c..1249f49 100644
--- a/server.js
+++ b/server.js
@@ -767,9 +767,61 @@ app.post('/api/marks', auth, (req, res) => {
task_id, mark_type: markType, value: !!value, by: req.user.username, at: now,
cleared_marks: clearedMarks,
});
+
+ // Outbound sync: push mark label to IntraDesk additional field
+ const settings = getSettings();
+ if (settings.sync_addfield_status === '1' && settings.api_key) {
+ try {
+ const cacheRow = db.prepare('SELECT data FROM tasks_cache WHERE id=1').get();
+ const tasks = JSON.parse(cacheRow?.data || '[]');
+ const task = tasks.find((t) => String(t.id) === String(task_id));
+ if (task) {
+ const statusLabel = value
+ ? db.prepare('SELECT label FROM internal_statuses WHERE key=?').get(markType)?.label || null
+ : null;
+ refreshService.updateIntraAdditionalField(task.tasknumber, statusLabel, settings.api_key)
+ .catch((e) => console.error('[Marks] IntraDesk addfield update error:', e.message));
+ }
+ } catch (e) {
+ console.error('[Marks] Outbound sync error:', e.message);
+ }
+ }
+
res.json({ ok: true });
});
+// ── IntraDesk additional field (direct set) ───────────────────────
+app.post('/api/tasks/:taskId/intra-addfield', auth, async (req, res) => {
+ const taskId = String(req.params.taskId || '').trim();
+ const { value } = req.body || {};
+ const statusLabel = value ? String(value).trim() : null;
+ if (!taskId) return res.status(400).json({ error: 'task_id required' });
+
+ const s = getSettings();
+ if (!s.api_key) return res.status(400).json({ error: 'API ключ не задан' });
+
+ const cacheRow = db.prepare('SELECT data FROM tasks_cache WHERE id=1').get();
+ const tasks = JSON.parse(cacheRow?.data || '[]');
+ const task = tasks.find((t) => String(t.id) === taskId);
+ if (!task) return res.status(404).json({ error: 'Задача не найдена в кеше' });
+
+ try {
+ await refreshService.updateIntraAdditionalField(task.tasknumber, statusLabel, s.api_key);
+ } catch (e) {
+ console.error('[AddField] IntraDesk update error:', e.message);
+ return res.status(502).json({ error: `Ошибка IntraDesk: ${e.message}` });
+ }
+
+ // Обновляем значение в локальном кеше немедленно
+ task._addfield_status = statusLabel;
+ const now = new Date().toISOString();
+ db.prepare('UPDATE tasks_cache SET data=?, updated_at=? WHERE id=1')
+ .run(JSON.stringify(tasks), now);
+
+ sseBroadcast('intra_addfield', { task_id: taskId, value: statusLabel, by: req.user.username });
+ res.json({ ok: true, value: statusLabel });
+});
+
// ── Notes ─────────────────────────────────────────────────────────
app.get('/api/notes', auth, (req, res) => {
const r = {};
@@ -904,6 +956,7 @@ const ALLOWED_SETTINGS = new Set([
'sync_reply_wait',
'sync_done_with_intra',
'intra_done_status_ids',
+ 'sync_addfield_status',
]);
app.get('/api/settings', auth, adminOnly, (req, res) => {
@@ -922,6 +975,7 @@ app.get('/api/settings', auth, adminOnly, (req, res) => {
sync_reply_wait: s.sync_reply_wait || '0',
sync_done_with_intra: s.sync_done_with_intra || '0',
intra_done_status_ids: s.intra_done_status_ids || '',
+ sync_addfield_status: s.sync_addfield_status || '0',
api_key_set: !!s.api_key,
webhook_secret_set: !!s.webhook_secret,
});
@@ -935,7 +989,7 @@ app.post('/api/settings', auth, adminOnly, (req, res) => {
setSetting(k, normalizeCsvIds(v));
return;
}
- if (k === 'auto_reset_on_update' || k === 'sync_reply_wait' || k === 'sync_done_with_intra') {
+ if (k === 'auto_reset_on_update' || k === 'sync_reply_wait' || k === 'sync_done_with_intra' || k === 'sync_addfield_status') {
setSetting(k, String(v) === '1' || v === true ? '1' : '0');
return;
}
diff --git a/start-local.bat b/start-local.bat
new file mode 100644
index 0000000..b938cc6
--- /dev/null
+++ b/start-local.bat
@@ -0,0 +1,48 @@
+@echo off
+setlocal enabledelayedexpansion
+
+cd /d "%~dp0"
+
+if not exist ".env" (
+ echo [ERROR] Файл .env не найден.
+ echo Скопируйте .env.example в .env и заполните переменные.
+ pause
+ exit /b 1
+)
+
+if not exist "data" mkdir data
+
+where docker >nul 2>&1
+if errorlevel 1 (
+ echo [ERROR] Docker не найден. Установите Docker Desktop: https://www.docker.com/products/docker-desktop
+ pause
+ exit /b 1
+)
+
+:: Читаем PORT из .env для вывода в консоль
+set PORT=3000
+for /f "usebackq tokens=1,* delims==" %%A in (".env") do (
+ set "ln=%%A"
+ if /i "!ln!" == "APP_PORT" set PORT=%%B
+)
+
+echo.
+echo ================================================
+echo Intra Monitor — локальный запуск в Docker
+echo Сборка образа из исходников...
+echo ================================================
+echo.
+
+docker compose -f docker-compose.local.yml up -d --build
+if errorlevel 1 (
+ echo [ERROR] docker compose завершился с ошибкой.
+ pause
+ exit /b 1
+)
+
+echo.
+echo [OK] Контейнер запущен: http://localhost:%PORT%
+echo Логи: docker compose -f docker-compose.local.yml logs -f
+echo Стоп: docker compose -f docker-compose.local.yml down
+echo.
+pause
|