|
+ État |
Asset ↕
|
@@ -170,7 +179,9 @@
const selAllHead = document.getElementById('select-all-head');
const selCount = document.getElementById('selection-count');
const btnPre = document.getElementById('btn-prepatch');
- const btnPatch = document.getElementById('btn-patch');
+ const btnAddElig = document.getElementById('btn-add-eligible');
+ const btnReport = document.getElementById('btn-report');
+ const btnUnset = document.getElementById('btn-unset');
const fInter = document.getElementById('filter-intervenant');
const fEnv = document.getElementById('filter-env');
const fReset = document.getElementById('filter-reset');
@@ -221,14 +232,37 @@
function refreshSelection(){
const visible = tbody.querySelectorAll('tr:not(.row-hidden)');
const visibleCb = tbody.querySelectorAll('tr:not(.row-hidden) input.row-cb');
- const checked = tbody.querySelectorAll('input.row-cb:checked').length;
- selCount.textContent = checked + ' sélectionné(s) · ' + visible.length + ' visible(s)';
+ const checkedCb = Array.from(tbody.querySelectorAll('input.row-cb:checked'));
+ const checked = checkedCb.length;
+ const eligibleSelected = checkedCb.filter(cb => cb.dataset.eligible === '1').length;
+ selCount.textContent = checked + ' sélectionné(s) · ' + visible.length + ' visible(s)' + (eligibleSelected ? ' · ' + eligibleSelected + ' éligible(s)' : '');
const allVisibleChecked = visibleCb.length > 0 && Array.from(visibleCb).every(cb => cb.checked);
selAll.checked = allVisibleChecked;
selAllHead.checked = allVisibleChecked;
const hasSel = checked > 0;
- btnPre.disabled = !hasSel;
- btnPatch.disabled = !hasSel;
+ if (btnAddElig) btnAddElig.disabled = !hasSel;
+ if (btnReport) btnReport.disabled = !hasSel;
+ if (btnUnset) btnUnset.disabled = !hasSel;
+ // Pré-patching : actif uniquement si au moins 1 row éligible sélectionnée
+ btnPre.disabled = eligibleSelected === 0;
+ }
+
+ function getSelectedRowIds(){
+ return Array.from(tbody.querySelectorAll('input.row-cb:checked')).map(cb => parseInt(cb.dataset.id, 10)).filter(x => x);
+ }
+
+ async function postAction(payload){
+ const r = await fetch('/patching/import/' + importId + '/rows/action', {
+ method: 'POST', headers: {'Content-Type':'application/json'},
+ body: JSON.stringify(payload),
+ });
+ const j = await r.json();
+ if (!j.ok) { alert('Erreur : ' + (j.msg || 'inconnue')); return false; }
+ return true;
+ }
+
+ async function reloadCurrentSheet(){
+ if (sel.value) await loadSheet(sel.value);
}
function applyFilters(){
@@ -315,11 +349,19 @@
const assetCell = r.server_id
? '' + display + ''
: '' + escapeHTML(r.asset_name || '') + ' ⚠';
+ let badge = '';
+ if (r.is_eligible) {
+ badge = '✓ ÉLIG.';
+ } else if (r.reported_to_sheet) {
+ const t = r.report_reason ? ('Reporté → ' + r.reported_to_sheet + ' : ' + r.report_reason) : ('Reporté → ' + r.reported_to_sheet);
+ badge = '⤳ ' + escapeHTML(r.reported_to_sheet) + '';
+ }
return '
'
- + ' | '
+ + ' | '
+ + '' + badge + ' | '
+ '' + assetCell + ' | '
+ '' + escapeHTML(r.environnement||'') + ' | '
+ '' + escapeHTML(r.domaine||'') + ' | '
@@ -356,13 +398,37 @@
thAsset.addEventListener('click', () => { cycleSort('asset'); updateSortArrow(); renderTable(); });
thDate.addEventListener('click', () => { cycleSort('date'); updateSortArrow(); renderTable(); });
- btnPre.addEventListener('click', () => {
- const ids = Array.from(tbody.querySelectorAll('input.row-cb:checked')).map(cb => cb.dataset.serverId).filter(x => x);
- alert('Pré-patching à brancher (étape 2) — ' + ids.length + ' serveur(s) résolu(s) en base.');
+ if (btnAddElig) btnAddElig.addEventListener('click', async () => {
+ const ids = getSelectedRowIds();
+ if (!ids.length) return;
+ if (!confirm('Marquer ' + ids.length + ' ligne(s) comme éligibles au patching ?')) return;
+ if (await postAction({row_ids: ids, action: 'eligible'})) await reloadCurrentSheet();
});
- btnPatch.addEventListener('click', () => {
- const ids = Array.from(tbody.querySelectorAll('input.row-cb:checked')).map(cb => cb.dataset.serverId).filter(x => x);
- alert('Patching by-step à brancher (étape 3) — ' + ids.length + ' serveur(s) résolu(s) en base.');
+ if (btnReport) btnReport.addEventListener('click', async () => {
+ const ids = getSelectedRowIds();
+ if (!ids.length) return;
+ const target = (prompt('Reporter vers quelle semaine ? (ex: S23)') || '').trim();
+ if (!target) return;
+ if (!/^S\d{1,2}$/i.test(target)) { alert('Format attendu : Sxx (ex S23)'); return; }
+ const reason = (prompt('Raison du report (optionnel) :') || '').trim();
+ if (await postAction({row_ids: ids, action: 'report', target_sheet: target.toUpperCase(), reason})) await reloadCurrentSheet();
+ });
+ if (btnUnset) btnUnset.addEventListener('click', async () => {
+ const ids = getSelectedRowIds();
+ if (!ids.length) return;
+ if (!confirm('Annuler éligibilité ET report sur ' + ids.length + ' ligne(s) ?')) return;
+ if (await postAction({row_ids: ids, action: 'unset_eligible'})) {
+ await postAction({row_ids: ids, action: 'unset_report'});
+ await reloadCurrentSheet();
+ }
+ });
+ btnPre.addEventListener('click', () => {
+ const ids = Array.from(tbody.querySelectorAll('input.row-cb:checked'))
+ .filter(cb => cb.dataset.eligible === '1')
+ .map(cb => cb.dataset.id);
+ if (!ids.length) { alert('Aucune ligne éligible sélectionnée.'); return; }
+ // Étape B : workflow iexec à brancher
+ window.location.href = '/patching/iexec?row_ids=' + ids.join(',');
});
})();
diff --git a/migrate_planning_imports_v4.sql b/migrate_planning_imports_v4.sql
new file mode 100644
index 0000000..bd04337
--- /dev/null
+++ b/migrate_planning_imports_v4.sql
@@ -0,0 +1,33 @@
+-- Migration v4 : actions sur les rows du planning importé
+-- - is_eligible : ligne marquée éligible au patching (passe au workflow iexec)
+-- - reported_to_sheet : si reportée, semaine cible (ex 'S23')
+-- - report_reason : raison du report
+-- - last_action_* : tracking dernière action (qui/quand)
+-- + table patch_planning_row_log : audit log de chaque action posée
+-- Idempotent
+
+ALTER TABLE public.patch_planning_import_rows
+ ADD COLUMN IF NOT EXISTS is_eligible boolean NOT NULL DEFAULT false,
+ ADD COLUMN IF NOT EXISTS reported_to_sheet text,
+ ADD COLUMN IF NOT EXISTS report_reason text,
+ ADD COLUMN IF NOT EXISTS last_action_at timestamptz,
+ ADD COLUMN IF NOT EXISTS last_action_by integer REFERENCES public.users(id) ON DELETE SET NULL;
+
+CREATE INDEX IF NOT EXISTS idx_pp_rows_eligible
+ ON public.patch_planning_import_rows(import_id, sheet_name)
+ WHERE is_eligible = true;
+
+CREATE TABLE IF NOT EXISTS public.patch_planning_row_log (
+ id SERIAL PRIMARY KEY,
+ row_id integer NOT NULL REFERENCES public.patch_planning_import_rows(id) ON DELETE CASCADE,
+ action text NOT NULL, -- 'eligible', 'unset_eligible', 'report', 'unset_report'
+ details jsonb, -- {target_sheet, reason, ...}
+ performed_by integer REFERENCES public.users(id) ON DELETE SET NULL,
+ performed_at timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX IF NOT EXISTS idx_pp_row_log_row ON public.patch_planning_row_log(row_id);
+CREATE INDEX IF NOT EXISTS idx_pp_row_log_at ON public.patch_planning_row_log(performed_at DESC);
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON public.patch_planning_row_log TO patchcenter;
+GRANT USAGE, SELECT ON SEQUENCE public.patch_planning_row_log_id_seq TO patchcenter;