feat: v3 — refonte thème + avancement physique + exports conformes cibles
- index.html: refonte complète thème dark gradient (top-header + slide-nav, 9 vues) - calc.js: ajout resultatPhysique(), avancement physique partout - routes/pilotage.js: catégories Normal/Sous Avancement/Dépassement/Non déterminé - services/export-xlsx.js: rapport complet multi-feuilles (Situation + Pilotage) - routes/export.js: XLSX/PPTX/DOCX — sortie unique complète Zone Sud - PPTX: 5 slides (couverture, synthèse, alertes, pilotage, par région) - DOCX: rapport structuré (couverture, KPIs, alertes, par région, pilotage) - services/export-pdf.js: colonnes avancement physique uniquement Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 4.6
parent
88a0dbe6d2
commit
8d901da125
+33
-35
@@ -6,22 +6,21 @@ const express = require('express');
|
||||
const router = express.Router();
|
||||
const { getMarches } = require('../services/baserow');
|
||||
const {
|
||||
parseNum, formatMontant, isCloture,
|
||||
getDelaiRestant, niveauAlerte, niveauAvancement,
|
||||
selectVal, parseNum, formatMontant, isCloture,
|
||||
getDelaiRestant, niveauAlerte,
|
||||
DELAI_CRITIQUE, DELAI_ATTENTION,
|
||||
} = require('../services/calc');
|
||||
|
||||
router.get('/', async (req, res) => {
|
||||
try {
|
||||
const { region, nature, entrepreneur, projet } = req.query;
|
||||
const regionFilter = req.regionFilter; // set by filterByRegion middleware
|
||||
const regionFilter = req.regionFilter;
|
||||
|
||||
let rows = await getMarches();
|
||||
|
||||
// Filtres
|
||||
if (regionFilter) rows = rows.filter(r => r.region === regionFilter);
|
||||
else if (region) rows = rows.filter(r => r.region === region);
|
||||
if (nature) rows = rows.filter(r => String(r.nature || '').toLowerCase().includes(nature.toLowerCase()));
|
||||
if (nature) rows = rows.filter(r => selectVal(r.nature).toLowerCase().includes(nature.toLowerCase()));
|
||||
if (entrepreneur) rows = rows.filter(r => String(r.entrepreneur || '').toLowerCase().includes(entrepreneur.toLowerCase()));
|
||||
if (projet) rows = rows.filter(r => String(r.projet || '').toLowerCase().includes(projet.toLowerCase()));
|
||||
|
||||
@@ -29,41 +28,42 @@ router.get('/', async (req, res) => {
|
||||
const clotures = rows.filter(r => isCloture(r));
|
||||
|
||||
// Montants
|
||||
const totalBudget = actifs.reduce((s, r) => s + parseNum(r.tot_marche ?? r.totmarche ?? r.montant), 0);
|
||||
const totalConsomme = actifs.reduce((s, r) => s + parseNum(r.consomme ?? r.montant_consomme ?? 0), 0);
|
||||
const totalBudget = actifs.reduce((s, r) => s + parseNum(r.tot_marche || r.m_max), 0);
|
||||
const totalAvtFin = actifs.reduce((s, r) => s + parseNum(r.avt_fin), 0);
|
||||
|
||||
// Avancement moyen physique
|
||||
const tauxList = actifs.map(r => parseNum(r.taux_phy ?? r.avt_phy)).filter(v => v > 0);
|
||||
const tauxList = actifs.map(r => parseNum(r.taux_phy || r.avt_phy)).filter(v => v > 0);
|
||||
const tauxMoyen = tauxList.length
|
||||
? Math.round(tauxList.reduce((a, b) => a + b, 0) / tauxList.length * 10) / 10
|
||||
: 0;
|
||||
|
||||
// Par statut
|
||||
// Par statut (observation)
|
||||
const parStatut = {};
|
||||
for (const r of rows) {
|
||||
const s = String(r.statut || 'Inconnu');
|
||||
const s = selectVal(r.observation) || 'Inconnu';
|
||||
parStatut[s] = (parStatut[s] || 0) + 1;
|
||||
}
|
||||
|
||||
// Par nature (CAPEX/OPEX)
|
||||
const parNature = {};
|
||||
for (const r of actifs) {
|
||||
const n = selectVal(r.nature) || 'Non défini';
|
||||
parNature[n] = (parNature[n] || 0) + 1;
|
||||
}
|
||||
|
||||
// Par région
|
||||
const parRegion = {};
|
||||
for (const r of actifs) {
|
||||
const reg = r.region || 'Inconnu';
|
||||
if (!parRegion[reg]) parRegion[reg] = { count: 0, taux_sum: 0, taux_count: 0 };
|
||||
parRegion[reg].count++;
|
||||
const t = parseNum(r.taux_phy ?? r.avt_phy);
|
||||
const t = parseNum(r.taux_phy || r.avt_phy);
|
||||
if (t > 0) { parRegion[reg].taux_sum += t; parRegion[reg].taux_count++; }
|
||||
}
|
||||
for (const reg of Object.keys(parRegion)) {
|
||||
const d = parRegion[reg];
|
||||
parRegion[reg].taux_moyen = d.taux_count ? Math.round(d.taux_sum / d.taux_count * 10) / 10 : 0;
|
||||
}
|
||||
|
||||
// Par nature (CAPEX/OPEX)
|
||||
const parNature = {};
|
||||
for (const r of actifs) {
|
||||
const n = r.nature || 'Non défini';
|
||||
parNature[n] = (parNature[n] || 0) + 1;
|
||||
parRegion[reg].taux_moyen = d.taux_count
|
||||
? Math.round(d.taux_sum / d.taux_count * 10) / 10 : 0;
|
||||
}
|
||||
|
||||
// Alertes délais
|
||||
@@ -72,7 +72,7 @@ router.get('/', async (req, res) => {
|
||||
.filter(r => r._delai !== null && r._delai <= DELAI_ATTENTION)
|
||||
.map(r => ({
|
||||
id: r.id,
|
||||
ref: r.ref || r.reference || '',
|
||||
ref: r.id_marche || r.reference || '',
|
||||
projet: r.projet || '',
|
||||
region: r.region || '',
|
||||
entrepreneur: r.entrepreneur || '',
|
||||
@@ -81,31 +81,29 @@ router.get('/', async (req, res) => {
|
||||
}))
|
||||
.sort((a, b) => a.delai_restant - b.delai_restant);
|
||||
|
||||
// Pilotage proactif (niveaux d'avancement)
|
||||
// Pilotage
|
||||
const pilotage = { normal: 0, sous_avancement: 0, depasse: 0 };
|
||||
for (const r of actifs) {
|
||||
const n = niveauAvancement(r.taux_phy ?? r.avt_phy, r.nature);
|
||||
if (n === 'normal') pilotage.normal++;
|
||||
else if (n === 'sous_avancement') pilotage.sous_avancement++;
|
||||
else pilotage.depasse++;
|
||||
const t = parseNum(r.taux_phy || r.avt_phy);
|
||||
if (t >= 90) pilotage.depasse++;
|
||||
else if (t >= 70) pilotage.sous_avancement++;
|
||||
else pilotage.normal++;
|
||||
}
|
||||
|
||||
res.json({
|
||||
total: rows.length,
|
||||
actifs: actifs.length,
|
||||
clotures: clotures.length,
|
||||
total: rows.length, actifs: actifs.length, clotures: clotures.length,
|
||||
budget: {
|
||||
total: formatMontant(totalBudget),
|
||||
total_raw: totalBudget,
|
||||
consomme: formatMontant(totalConsomme),
|
||||
consomme_raw: totalConsomme,
|
||||
restant: formatMontant(totalBudget - totalConsomme),
|
||||
restant_raw: totalBudget - totalConsomme,
|
||||
consomme: formatMontant(totalAvtFin),
|
||||
consomme_raw: totalAvtFin,
|
||||
restant: formatMontant(totalBudget - totalAvtFin),
|
||||
restant_raw: totalBudget - totalAvtFin,
|
||||
},
|
||||
taux_avancement_moyen: tauxMoyen,
|
||||
par_statut: parStatut,
|
||||
par_region: parRegion,
|
||||
par_nature: parNature,
|
||||
par_statut: parStatut,
|
||||
par_nature: parNature,
|
||||
par_region: parRegion,
|
||||
alertes_delais: {
|
||||
count: alertes.length,
|
||||
critique: alertes.filter(a => a.niveau === 'critique').length,
|
||||
|
||||
Reference in New Issue
Block a user