lionsdev/btpxpress-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Resolve TypeScript errors in page.tsx and phases-chantier/page.tsx

Browse Source
This commit is contained in:
dahoud
2025-10-15 20:01:04 +00:00
parent 763ab81da3
commit aed2ce0182
22 changed files with 152 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app/(main)/factures/page.tsx
View File

@@ -255,8 +255,7 @@ const FacturesPage = () => {
const editFacture = (facture: Facture) => {
setFacture({
...facture,
client: facture.client?.id || null
...facture
});
setFactureDialog(true);
};
@@ -390,7 +389,7 @@ const FacturesPage = () => {
/>
<ActionButton
icon="pi pi-send"
color="secondary"
color="blue"
tooltip="Envoyer par email"
onClick={() => {
toast.current?.show({
@@ -402,10 +401,12 @@ const FacturesPage = () => {
}}
/>
<EditButton
onClick={() => editFacture(rowData)}
tooltip="Modifier"
onClick={() => editFacture(rowData)}
/>
<DeleteButton
onClick={() => confirmDeleteFacture(rowData)}
tooltip="Supprimer"
onClick={() => confirmDeleteFacture(rowData)}
/>
</ActionButtonGroup>
);
@@ -456,9 +457,9 @@ const FacturesPage = () => {
};
return (
<Tag
value={getTypeLabel(rowData.type)}
severity={rowData.type === 'AVOIR' ? 'warning' : 'info'}
<Tag
value={getTypeLabel(rowData.typeFacture)}
severity={rowData.typeFacture === 'AVOIR' ? 'warning' : 'info'}
/>
);
};
@@ -526,6 +527,7 @@ const FacturesPage = () => {
value={factures}
selection={selectedFactures}
onSelectionChange={(e) => setSelectedFactures(e.value)}
selectionMode="checkbox"
dataKey="id"
paginator
rows={10}
@@ -575,12 +577,12 @@ const FacturesPage = () => {
</div>
<div className="field col-12 md:col-6">
<label htmlFor="type">Type</label>
<Dropdown
id="type"
value={facture.type}
options={types}
onChange={(e) => onDropdownChange(e, 'type')}
<label htmlFor="typeFacture">Type</label>
<Dropdown
id="typeFacture"
value={facture.typeFacture}
options={types}
onChange={(e) => onDropdownChange(e, 'typeFacture')}
placeholder="Sélectionnez un type"
/>
</div>
@@ -636,35 +638,35 @@ const FacturesPage = () => {
<div className="field col-12 md:col-4">
<label htmlFor="dateEmission">Date d'émission</label>
<Calendar
id="dateEmission"
value={facture.dateEmission}
onChange={(e) => onDateChange(e, 'dateEmission')}
dateFormat="dd/mm/yy"
showIcon
<Calendar
id="dateEmission"
value={facture.dateEmission ? new Date(facture.dateEmission) : null}
onChange={(e) => onDateChange(e, 'dateEmission')}
dateFormat="dd/mm/yy"
showIcon
/>
</div>
<div className="field col-12 md:col-4">
<label htmlFor="dateEcheance">Date d'échéance</label>
<Calendar
id="dateEcheance"
value={facture.dateEcheance}
onChange={(e) => onDateChange(e, 'dateEcheance')}
dateFormat="dd/mm/yy"
showIcon
minDate={facture.dateEmission}
<Calendar
id="dateEcheance"
value={facture.dateEcheance ? new Date(facture.dateEcheance) : null}
onChange={(e) => onDateChange(e, 'dateEcheance')}
dateFormat="dd/mm/yy"
showIcon
minDate={facture.dateEmission ? new Date(facture.dateEmission) : undefined}
/>
</div>
<div className="field col-12 md:col-4">
<label htmlFor="datePaiement">Date de paiement</label>
<Calendar
id="datePaiement"
value={facture.datePaiement}
onChange={(e) => onDateChange(e, 'datePaiement')}
dateFormat="dd/mm/yy"
showIcon
<Calendar
id="datePaiement"
value={facture.datePaiement ? new Date(facture.datePaiement) : null}
onChange={(e) => onDateChange(e, 'datePaiement')}
dateFormat="dd/mm/yy"
showIcon
/>
</div>

1
app/(main)/factures/payees/page.tsx
View File

@@ -488,6 +488,7 @@ RECOMMANDATIONS:
value={factures}
selection={selectedFactures}
onSelectionChange={(e) => setSelectedFactures(e.value)}
selectionMode="checkbox"
dataKey="id"
paginator
rows={10}

13
app/(main)/factures/relances/[id]/page.tsx
View File

@@ -20,6 +20,7 @@ import { Checkbox } from 'primereact/checkbox';
import { factureService } from '../../../../../services/api';
import { formatDate, formatCurrency } from '../../../../../utils/formatters';
import type { Facture } from '../../../../../types/btp';
import { StatutFacture } from '../../../../../types/btp';
interface Relance {
id: string;
@@ -85,7 +86,7 @@ const FactureRelancePage = () => {
// Charger la facture
const factureResponse = await factureService.getById(factureId);
setFacture(factureResponse.data);
setFacture(factureResponse);
// TODO: Charger les relances et templates depuis l'API
// const relancesResponse = await factureService.getRelances(factureId);
@@ -142,8 +143,8 @@ const FactureRelancePage = () => {
setTemplates(mockTemplates);
// Pré-remplir le destinataire
if (factureResponse.data.client) {
const client = factureResponse.data.client;
if (factureResponse.client) {
const client = factureResponse.client;
setNouvelleRelance(prev => ({
...prev,
destinataire: typeof client === 'string' ? client : client.email || client.nom
@@ -309,9 +310,9 @@ const FactureRelancePage = () => {
<div>
<h2 className="text-2xl font-bold mb-2">Relances - Facture #{facture.numero}</h2>
<p className="text-600 mb-3">{facture.objet}</p>
<Tag
value={facture.statut}
severity={facture.statut === 'EN_RETARD' ? 'danger' : 'warning'}
<Tag
value={facture.statut}
severity={facture.statut === StatutFacture.ECHUE ? 'danger' : 'warning'}
/>
</div>
<div className="text-right">

12
app/(main)/factures/relances/page.tsx
View File

@@ -314,7 +314,7 @@ BTP Express`
return <Tag value="À échoir" severity="info" />;
}
let severity = 'warning';
let severity: "warning" | "danger" = 'warning';
if (rowData.joursRetard > 60) severity = 'danger';
else if (rowData.joursRetard > 30) severity = 'warning';
@@ -340,7 +340,7 @@ BTP Express`
};
const risqueBodyTemplate = (rowData: any) => {
const config = {
const config: Record<string, { color: "success" | "warning" | "danger", icon: string }> = {
'FAIBLE': { color: 'success', icon: 'pi-check-circle' },
'MOYEN': { color: 'warning', icon: 'pi-exclamation-triangle' },
'FORT': { color: 'danger', icon: 'pi-times-circle' }
@@ -360,20 +360,22 @@ BTP Express`
<ActionButtonGroup>
<ActionButton
icon="pi pi-send"
color="warning"
color="orange"
tooltip="Envoyer relance"
onClick={() => ouvrirRelance(rowData)}
disabled={rowData.joursRetard <= 0}
/>
<ActionButton
icon="pi pi-phone"
color="info"
color="blue"
tooltip="Appeler client"
onClick={() => {}}
/>
<ViewButton
tooltip="Voir historique"
onClick={() => {}}
/>
</ActionButtonGroup>
);

15
app/(main)/factures/retard/page.tsx
View File

@@ -18,6 +18,7 @@ import { ProgressBar } from 'primereact/progressbar';
import { factureService } from '../../../../services/api';
import { formatDate, formatCurrency } from '../../../../utils/formatters';
import type { Facture } from '../../../../types/btp';
import { StatutFacture } from '../../../../types/btp';
import factureActionsService from '../../../../services/factureActionsService';
const FacturesRetardPage = () => {
@@ -66,12 +67,12 @@ const FacturesRetardPage = () => {
try {
setLoading(true);
const data = await factureService.getAll();
// Filtrer les factures en retard (échéance dépassée + statut EN_RETARD)
// Filtrer les factures en retard (échéance dépassée + statut ECHUE)
const facturesEnRetard = data.filter(facture => {
const today = new Date();
const echeanceDate = new Date(facture.dateEcheance);
return (facture.statut === 'EN_RETARD' ||
(echeanceDate < today && facture.statut !== 'PAYEE' && !facture.datePaiement));
return (facture.statut === StatutFacture.ECHUE ||
(echeanceDate < today && facture.statut !== StatutFacture.PAYEE && !facture.datePaiement));
});
setFactures(facturesEnRetard);
} catch (error) {
@@ -155,11 +156,12 @@ const FacturesRetardPage = () => {
break;
case 'legal_notice':
const delaiJours = Math.ceil((legalNoticeData.deadline.getTime() - Date.now()) / (1000 * 60 * 60 * 24));
await factureActionsService.sendMiseEnDemeure({
factureId: selectedFacture.id,
delaiPaiement: legalNoticeData.delai,
mentionsLegales: legalNoticeData.mentions,
fraisDossier: legalNoticeData.frais
delaiPaiement: delaiJours,
mentionsLegales: legalNoticeData.content,
fraisDossier: 0
});
message = 'Mise en demeure émise avec succès';
break;
@@ -535,6 +537,7 @@ ACTIONS RECOMMANDÉES:
value={factures}
selection={selectedFactures}
onSelectionChange={(e) => setSelectedFactures(e.value)}
selectionMode="checkbox"
dataKey="id"
paginator
rows={10}

6
app/(main)/factures/templates/page.tsx
View File

@@ -315,9 +315,9 @@ const FactureTemplatesPage = () => {
);
const typeBodyTemplate = (rowData: FactureTemplate) => (
<Tag
value={rowData.type}
severity={rowData.type === 'FACTURE' ? 'primary' : 'info'}
<Tag
value={rowData.type}
severity={rowData.type === 'FACTURE' ? 'success' : 'info'}
/>
);

4
app/(main)/gestionnaire/dashboard/page.tsx
View File

@@ -37,7 +37,7 @@ const GestionnaireDashboard = () => {
const { user: currentUser } = useAuth();
// Vérifier que l'utilisateur est connecté et est un gestionnaire
if (!currentUser || currentUser.role !== 'GESTIONNAIRE_PROJET') {
if (!currentUser || !currentUser.roles?.includes('GESTIONNAIRE_PROJET')) {
return (
<div className="flex align-items-center justify-content-center min-h-screen">
<div className="text-center">
@@ -200,7 +200,7 @@ const GestionnaireDashboard = () => {
<div>
<h2 className="text-primary m-0">Dashboard Gestionnaire</h2>
<p className="text-color-secondary m-0">
Bienvenue {currentUser.prenom} {currentUser.nom}
Bienvenue {currentUser.fullName || currentUser.username}
</p>
</div>
</div>

1
app/(main)/maintenance/page.tsx
View File

@@ -439,6 +439,7 @@ const MaintenancePage = () => {
header={header}
selection={selectedMaintenances}
onSelectionChange={(e) => setSelectedMaintenances(e.value)}
selectionMode="checkbox"
responsiveLayout="scroll"
>
<Column selectionMode="multiple" headerStyle={{ width: '3rem' }} />

2
app/(main)/maintenance/pieces/page.tsx
View File

@@ -439,9 +439,9 @@ const PiecesDetacheesPage = () => {
filterDisplay="menu"
globalFilterFields={['nom', 'reference', 'description', 'fournisseur']}
header={header}
subHeader={renderHeader()}
selection={selectedPieces}
onSelectionChange={(e) => setSelectedPieces(e.value)}
selectionMode="checkbox"
responsiveLayout="scroll"
>
<Column selectionMode="multiple" headerStyle={{ width: '3rem' }} />

1
app/(main)/maintenance/planification/page.tsx
View File

@@ -432,6 +432,7 @@ const PlanificationMaintenancePage = () => {
header={header}
selection={selectedMateriels}
onSelectionChange={(e) => setSelectedMateriels(e.value)}
selectionMode="checkbox"
responsiveLayout="scroll"
>
<Column selectionMode="multiple" headerStyle={{ width: '3rem' }} />

1
app/(main)/maintenance/urgente/page.tsx
View File

@@ -528,7 +528,6 @@ const MaintenanceUrgentePage = () => {
showTime
showIcon
dateFormat="dd/mm/yy"
timeFormat="24"
placeholder="Sélectionner date et heure"
/>
</div>

1
app/(main)/maintenances/en-cours/page.tsx
View File

@@ -281,6 +281,7 @@ const MaintenancesEnCoursPage = () => {
value={maintenances}
selection={selectedMaintenances}
onSelectionChange={(e) => setSelectedMaintenances(e.value)}
selectionMode="checkbox"
dataKey="id"
paginator
rows={10}

7
app/(main)/maintenances/nouvelle/page.tsx
View File

@@ -75,7 +75,12 @@ const NouvelleMaintenancePage = () => {
if (maintenance.description?.trim() && maintenance.materiel) {
try {
setSaving(true);
const savedMaintenance = await maintenanceService.create(maintenance);
const maintenanceData = {
...maintenance,
datePrevue: maintenance.datePrevue.toISOString(),
dateRealisee: maintenance.dateRealisee?.toISOString() || null
};
const savedMaintenance = await maintenanceService.create(maintenanceData);
toast.current?.show({
severity: 'success',

19
app/(main)/maintenances/page.tsx
View File

@@ -72,7 +72,7 @@ const MaintenancesPage = () => {
setMaintenance({
type: TypeMaintenance.PREVENTIVE,
statut: StatutMaintenance.PLANIFIEE,
datePrevue: new Date(),
datePrevue: new Date().toISOString(),
cout: 0
});
setSubmitted(false);
@@ -223,7 +223,7 @@ const MaintenancesPage = () => {
};
const dateRealisationBodyTemplate = (rowData: MaintenanceMateriel) => {
return formatDate(rowData.dateRealisation);
return formatDate(rowData.dateRealisee);
};
const actionBodyTemplate = (rowData: MaintenanceMateriel) => {
@@ -250,10 +250,12 @@ const MaintenancesPage = () => {
return 'success';
case TypeMaintenance.CORRECTIVE:
return 'danger';
case TypeMaintenance.PREDICTIVE:
case TypeMaintenance.REVISION:
return 'info';
case TypeMaintenance.CURATIVE:
case TypeMaintenance.CONTROLE_TECHNIQUE:
return 'warning';
case TypeMaintenance.NETTOYAGE:
return 'secondary';
default:
return undefined;
}
@@ -366,6 +368,7 @@ const MaintenancesPage = () => {
value={maintenances}
selection={selectedMaintenances}
onSelectionChange={(e) => setSelectedMaintenances(e.value)}
selectionMode="checkbox"
dataKey="id"
paginator
rows={10}
@@ -450,11 +453,11 @@ const MaintenancesPage = () => {
</div>
<div className="field col-12 md:col-6">
<label htmlFor="dateRealisation" className="font-bold">Date de réalisation</label>
<label htmlFor="dateRealisee" className="font-bold">Date de réalisation</label>
<Calendar
id="dateRealisation"
value={maintenance.dateRealisation ? new Date(maintenance.dateRealisation) : null}
onChange={(e) => onDateChange(e, 'dateRealisation')}
id="dateRealisee"
value={maintenance.dateRealisee ? new Date(maintenance.dateRealisee) : null}
onChange={(e) => onDateChange(e, 'dateRealisee')}
dateFormat="dd/mm/yy"
showIcon
/>

5
app/(main)/maintenances/planifiees/page.tsx
View File

@@ -92,7 +92,7 @@ const MaintenancesPlanifieesPage = () => {
const updatedMaintenance = {
...maintenance,
datePrevue: nouvelleDate,
datePrevue: nouvelleDate.toISOString(),
notes: `${maintenance.notes || ''}\nReportée le ${formatDate(new Date())}`
};
@@ -311,7 +311,7 @@ const MaintenancesPlanifieesPage = () => {
<div>
<div className="font-semibold">{m.materiel?.nom}</div>
<div className="text-sm text-500">{m.description}</div>
<Tag value={m.type?.replace('_', ' ')} severity={getTypeSeverity(m.type)} size="normal" className="mt-1" />
<Tag value={m.type?.replace('_', ' ')} severity={getTypeSeverity(m.type)} className="mt-1" />
</div>
)
}));
@@ -394,6 +394,7 @@ const MaintenancesPlanifieesPage = () => {
value={maintenances}
selection={selectedMaintenances}
onSelectionChange={(e) => setSelectedMaintenances(e.value)}
selectionMode="checkbox"
dataKey="id"
paginator
rows={10}

9
app/(main)/materiels/disponibles/page.tsx
View File

@@ -142,14 +142,18 @@ const MaterielsDisponiblesPage = () => {
switch (type) {
case TypeMateriel.ENGIN_CHANTIER:
return 'danger';
case TypeMateriel.OUTILLAGE:
case TypeMateriel.OUTIL_ELECTRIQUE:
case TypeMateriel.OUTIL_MANUEL:
return 'warning';
case TypeMateriel.EQUIPEMENT_SECURITE:
return 'success';
case TypeMateriel.VEHICULE:
return 'info';
case TypeMateriel.GRUE:
case TypeMateriel.BETONIERE:
return 'danger';
default:
return undefined;
return 'secondary';
}
};
@@ -295,6 +299,7 @@ const MaterielsDisponiblesPage = () => {
value={materiels}
selection={selectedMateriels}
onSelectionChange={(e) => setSelectedMateriels(e.value)}
selectionMode="checkbox"
dataKey="id"
paginator
rows={10}

21
app/(main)/materiels/maintenance-prevue/page.tsx
View File

@@ -52,7 +52,7 @@ const MaintenancePrevuePage = () => {
materiel: materiel,
type: TypeMaintenance.PREVENTIVE,
description: `Maintenance préventive programmée pour ${materiel.nom}`,
datePrevue: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000) // Dans 7 jours
datePrevue: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString() // Dans 7 jours
};
await maintenanceService.create(maintenanceData);
@@ -98,7 +98,7 @@ const MaintenancePrevuePage = () => {
}
const daysSinceLastMaintenance = Math.floor(
(Date.now() - new Date(derniereMaintenance.dateRealisation || derniereMaintenance.datePrevue).getTime()) / (1000 * 60 * 60 * 24)
(Date.now() - new Date(derniereMaintenance.dateRealisee || derniereMaintenance.datePrevue).getTime()) / (1000 * 60 * 60 * 24)
);
if (daysSinceLastMaintenance > 90) {
@@ -115,7 +115,7 @@ const MaintenancePrevuePage = () => {
if (!derniereMaintenance) {
return <span className="text-red-500">Aucune</span>;
}
return formatDate(derniereMaintenance.dateRealisation || derniereMaintenance.datePrevue);
return formatDate(derniereMaintenance.dateRealisee || derniereMaintenance.datePrevue);
};
const actionBodyTemplate = (rowData: Materiel) => {
@@ -146,7 +146,7 @@ const MaintenancePrevuePage = () => {
materiel: materiel,
type: TypeMaintenance.CORRECTIVE,
description: `Panne signalée sur ${materiel.nom}`,
datePrevue: new Date() // Immédiatement
datePrevue: new Date().toISOString() // Immédiatement
};
await maintenanceService.create(maintenanceData);
@@ -171,14 +171,18 @@ const MaintenancePrevuePage = () => {
switch (type) {
case TypeMateriel.ENGIN_CHANTIER:
return 'danger';
case TypeMateriel.OUTILLAGE:
case TypeMateriel.OUTIL_ELECTRIQUE:
case TypeMateriel.OUTIL_MANUEL:
return 'warning';
case TypeMateriel.EQUIPEMENT_SECURITE:
return 'success';
case TypeMateriel.VEHICULE:
return 'info';
case TypeMateriel.GRUE:
case TypeMateriel.BETONIERE:
return 'danger';
default:
return undefined;
return 'secondary';
}
};
@@ -237,7 +241,7 @@ const MaintenancePrevuePage = () => {
const derniereMaintenance = m.maintenances?.[0];
if (!derniereMaintenance) return true;
const daysSince = Math.floor(
(Date.now() - new Date(derniereMaintenance.dateRealisation || derniereMaintenance.datePrevue).getTime()) / (1000 * 60 * 60 * 24)
(Date.now() - new Date(derniereMaintenance.dateRealisee || derniereMaintenance.datePrevue).getTime()) / (1000 * 60 * 60 * 24)
);
return daysSince > 60;
}).length;
@@ -246,7 +250,7 @@ const MaintenancePrevuePage = () => {
const derniereMaintenance = m.maintenances?.[0];
if (!derniereMaintenance) return true;
const daysSince = Math.floor(
(Date.now() - new Date(derniereMaintenance.dateRealisation || derniereMaintenance.datePrevue).getTime()) / (1000 * 60 * 60 * 24)
(Date.now() - new Date(derniereMaintenance.dateRealisee || derniereMaintenance.datePrevue).getTime()) / (1000 * 60 * 60 * 24)
);
return daysSince > 90;
}).length;
@@ -311,6 +315,7 @@ const MaintenancePrevuePage = () => {
value={materiels}
selection={selectedMateriels}
onSelectionChange={(e) => setSelectedMateriels(e.value)}
selectionMode="checkbox"
dataKey="id"
paginator
rows={10}

31
app/(main)/materiels/page.tsx
View File

@@ -65,9 +65,7 @@ const MaterielsPage = () => {
const openNew = () => {
setMateriel({
statut: StatutMateriel.DISPONIBLE,
actif: true,
quantiteStock: 0,
seuilMinimum: 0
actif: true
});
setSubmitted(false);
setMaterielDialog(true);
@@ -234,14 +232,18 @@ const MaterielsPage = () => {
switch (type) {
case TypeMateriel.ENGIN_CHANTIER:
return 'danger';
case TypeMateriel.OUTILLAGE:
case TypeMateriel.OUTIL_ELECTRIQUE:
case TypeMateriel.OUTIL_MANUEL:
return 'warning';
case TypeMateriel.EQUIPEMENT_SECURITE:
return 'success';
case TypeMateriel.VEHICULE:
return 'info';
case TypeMateriel.GRUE:
case TypeMateriel.BETONIERE:
return 'danger';
default:
return undefined;
return 'secondary';
}
};
@@ -249,12 +251,15 @@ const MaterielsPage = () => {
switch (statut) {
case StatutMateriel.DISPONIBLE:
return 'success';
case StatutMateriel.EN_UTILISATION:
case StatutMateriel.UTILISE:
return 'warning';
case StatutMateriel.EN_MAINTENANCE:
case StatutMateriel.MAINTENANCE:
case StatutMateriel.EN_REPARATION:
return 'info';
case StatutMateriel.HORS_SERVICE:
return 'danger';
case StatutMateriel.RESERVE:
return 'secondary';
default:
return undefined;
}
@@ -347,6 +352,7 @@ const MaterielsPage = () => {
value={materiels}
selection={selectedMateriels}
onSelectionChange={(e) => setSelectedMateriels(e.value)}
selectionMode="checkbox"
dataKey="id"
paginator
rows={10}
@@ -505,17 +511,6 @@ const MaterielsPage = () => {
/>
</div>
<div className="field col-12 md:col-6">
<label htmlFor="quantiteStock" className="font-bold">Quantité en stock</label>
<InputNumber
id="quantiteStock"
value={materiel.quantiteStock}
onValueChange={(e) => onInputNumberChange(e.value, 'quantiteStock')}
min={0}
showButtons
/>
</div>
<div className="field col-12">
<label htmlFor="description" className="font-bold">Description</label>
<InputTextarea

22
app/(main)/materiels/stats/page.tsx
View File

@@ -133,7 +133,7 @@ const MaterielsStatsPage = () => {
const currentYear = new Date().getFullYear();
maintenances.forEach(maintenance => {
const date = new Date(maintenance.dateRealisation || maintenance.datePrevue);
const date = new Date(maintenance.dateRealisee || maintenance.datePrevue);
if (date.getFullYear() === currentYear) {
monthlyMaintenance[date.getMonth()]++;
}
@@ -173,14 +173,18 @@ const MaterielsStatsPage = () => {
switch (type) {
case TypeMateriel.ENGIN_CHANTIER:
return 'danger';
case TypeMateriel.OUTILLAGE:
case TypeMateriel.OUTIL_ELECTRIQUE:
case TypeMateriel.OUTIL_MANUEL:
return 'warning';
case TypeMateriel.EQUIPEMENT_SECURITE:
return 'success';
case TypeMateriel.VEHICULE:
return 'info';
case TypeMateriel.GRUE:
case TypeMateriel.BETONIERE:
return 'danger';
default:
return undefined;
return 'secondary';
}
};
@@ -194,12 +198,12 @@ const MaterielsStatsPage = () => {
? (materiels.filter(m => m.statut === StatutMateriel.DISPONIBLE).length / materiels.length) * 100
: 0;
const tauxMaintenance = materiels.length > 0
? (materiels.filter(m => m.statut === StatutMateriel.EN_MAINTENANCE).length / materiels.length) * 100
const tauxMaintenance = materiels.length > 0
? (materiels.filter(m => m.statut === StatutMateriel.MAINTENANCE || m.statut === StatutMateriel.EN_REPARATION).length / materiels.length) * 100
: 0;
const tauxUtilisation = materiels.length > 0
? (materiels.filter(m => m.statut === StatutMateriel.EN_UTILISATION).length / materiels.length) * 100
const tauxUtilisation = materiels.length > 0
? (materiels.filter(m => m.statut === StatutMateriel.UTILISE).length / materiels.length) * 100
: 0;
return (
@@ -302,7 +306,7 @@ const MaterielsStatsPage = () => {
</div>
<ProgressBar value={tauxUtilisation} showValue={false} className="mb-3" />
<div className="text-500">
{materiels.filter(m => m.statut === StatutMateriel.EN_UTILISATION).length} / {materiels.length} en utilisation
{materiels.filter(m => m.statut === StatutMateriel.UTILISE).length} / {materiels.length} en utilisation
</div>
</div>
</Card>
@@ -316,7 +320,7 @@ const MaterielsStatsPage = () => {
</div>
<ProgressBar value={tauxMaintenance} showValue={false} className="mb-3" />
<div className="text-500">
{materiels.filter(m => m.statut === StatutMateriel.EN_MAINTENANCE).length} / {materiels.length} en maintenance
{materiels.filter(m => m.statut === StatutMateriel.MAINTENANCE || m.statut === StatutMateriel.EN_REPARATION).length} / {materiels.length} en maintenance
</div>
</div>
</Card>

1
app/(main)/notifications/page.tsx
View File

@@ -233,6 +233,7 @@ const NotificationsPage = () => {
value={notifications}
selection={selectedNotifications}
onSelectionChange={(e) => setSelectedNotifications(e.value)}
selectionMode="checkbox"
dataKey="id"
paginator
rows={10}

2
app/(main)/page.tsx
View File

@@ -514,7 +514,7 @@ const LandingPage: Page = () => {
/>
<span className="text-gray-700 font-bold ml-3">BTPXpress</span>
<div style={{ marginLeft: '2.5rem' }}>
<LionsDevLogo size="normal" showText={true} />
<LionsDevLogo size="medium" showText={true} />
</div>
</div>
</div>

28
app/(main)/phases-chantier/page.tsx
View File

@@ -59,7 +59,8 @@ const PhasesChantierPage: Page = () => {
budgetPrevu: 0,
statut: 'PLANIFIEE' as StatutPhase,
critique: false,
notes: ''
notes: '',
ordreExecution: 1
});
const statutOptions = [
@@ -106,7 +107,8 @@ const PhasesChantierPage: Page = () => {
budgetPrevu: 0,
statut: 'PLANIFIEE',
critique: false,
notes: ''
notes: '',
ordreExecution: 1
});
setSubmitted(false);
setPhaseDialog(true);
@@ -122,7 +124,8 @@ const PhasesChantierPage: Page = () => {
budgetPrevu: phase.budgetPrevu || 0,
statut: phase.statut,
critique: phase.critique || false,
notes: phase.notes || ''
notes: phase.notes || '',
ordreExecution: phase.ordreExecution || 1
});
setSubmitted(false);
setPhaseDialog(true);
@@ -136,7 +139,7 @@ const PhasesChantierPage: Page = () => {
const deletePhase = async () => {
try {
if (currentPhase?.id) {
await phaseChantierService.delete(currentPhase.id);
await phaseChantierService.delete(Number(currentPhase.id));
await loadPhases();
toast.current?.show({
severity: 'success',
@@ -175,11 +178,12 @@ const PhasesChantierPage: Page = () => {
...formData,
dateDebutPrevue: formData.dateDebutPrevue?.toISOString(),
dateFinPrevue: formData.dateFinPrevue?.toISOString(),
chantierId: 1 // ID exemple - en production, viendrait du contexte
chantierId: '1', // ID exemple - en production, viendrait du contexte
ordreExecution: formData.ordreExecution || 1
};
if (currentPhase?.id) {
await phaseChantierService.update(currentPhase.id, phaseData);
await phaseChantierService.update(Number(currentPhase.id), phaseData);
} else {
await phaseChantierService.create(phaseData);
}
@@ -224,7 +228,7 @@ const PhasesChantierPage: Page = () => {
const startPhase = async (phase: PhaseChantier) => {
try {
if (phase.id) {
await phaseChantierService.start(phase.id);
await phaseChantierService.start(Number(phase.id));
await loadPhases();
toast.current?.show({
severity: 'success',
@@ -246,7 +250,7 @@ const PhasesChantierPage: Page = () => {
const completePhase = async (phase: PhaseChantier) => {
try {
if (phase.id) {
await phaseChantierService.complete(phase.id);
await phaseChantierService.complete(Number(phase.id));
await loadPhases();
toast.current?.show({
severity: 'success',
@@ -268,7 +272,7 @@ const PhasesChantierPage: Page = () => {
const suspendPhase = async (phase: PhaseChantier) => {
try {
if (phase.id) {
await phaseChantierService.suspend(phase.id);
await phaseChantierService.suspend(Number(phase.id));
await loadPhases();
toast.current?.show({
severity: 'success',
@@ -371,10 +375,9 @@ const PhasesChantierPage: Page = () => {
const retard = phaseChantierService.calculateRetard(rowData);
return (
<Badge
value={`${retard}j`}
<Badge
value={`${retard}j`}
severity="danger"
tooltip="Jours de retard"
/>
);
};
@@ -492,6 +495,7 @@ const PhasesChantierPage: Page = () => {
value={phases}
selection={selectedPhases}
onSelectionChange={(e) => setSelectedPhases(e.value as PhaseChantier[])}
selectionMode="checkbox"
dataKey="id"
paginator
rows={10}