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

fix: Update PrimeReact to v10.8.3 and fix all compilation errors

Browse Source
This commit is contained in:
dahoud
2025-10-13 03:01:36 +00:00
parent 2a2e54c0e3
commit 30cad6220b
85 changed files with 928 additions and 2020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/(main)/devis/[id]/convert/page.tsx
View File

@@ -18,6 +18,7 @@ import { InputNumber } from 'primereact/inputnumber';
import { devisService, factureService } from '../../../../../services/api';
import { formatCurrency, formatDate } from '../../../../../utils/formatters';
import type { Devis, Facture } from '../../../../../types/btp';
import { StatutFacture, TypeFacture } from '../../../../../types/btp';
const ConvertDevisPage = () => {
const params = useParams();
@@ -27,15 +28,15 @@ const ConvertDevisPage = () => {
const [devis, setDevis] = useState<Devis | null>(null);
const [facture, setFacture] = useState<Partial<Facture>>({
numero: '',
dateEmission: new Date(),
dateEcheance: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
dateEmission: new Date().toISOString(),
dateEcheance: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString(),
objet: '',
description: '',
montantHT: 0,
montantTTC: 0,
tauxTVA: 20,
statut: 'BROUILLON',
type: 'FACTURE',
statut: StatutFacture.BROUILLON,
typeFacture: TypeFacture.FACTURE,
actif: true,
lignes: []
});
@@ -62,9 +63,8 @@ const ConvertDevisPage = () => {
const loadDevis = async () => {
try {
setLoading(true);
const response = await devisService.getById(devisId);
const devisData = response.data;
const devisData = await devisService.getById(devisId);
if (devisData.statut !== 'ACCEPTE') {
toast.current?.show({
severity: 'warn',
@@ -81,20 +81,17 @@ const ConvertDevisPage = () => {
// Initialiser la facture avec les données du devis
setFacture({
numero: newNumero,
dateEmission: new Date(),
dateEcheance: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
dateEmission: new Date().toISOString(),
dateEcheance: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString(),
objet: devisData.objet,
description: devisData.description,
montantHT: devisData.montantHT,
montantTTC: devisData.montantTTC,
tauxTVA: devisData.tauxTVA,
statut: 'BROUILLON',
type: 'FACTURE',
statut: StatutFacture.BROUILLON,
typeFacture: TypeFacture.FACTURE,
actif: true,
clientId: devisData.clientId,
client: devisData.client,
devisId: devisData.id,
lignes: devisData.lignes ? [...devisData.lignes] : []
client: devisData.client
});
// Initialiser toutes les lignes comme sélectionnées
@@ -127,8 +124,8 @@ const ConvertDevisPage = () => {
const calculateMontants = () => {
if (!facture.lignes) return;
const lignesSelectionnees = facture.lignes.filter((_, index) => selectedLignes[index]);
let montantHT = lignesSelectionnees.reduce((sum, ligne) => sum + (ligne.montantHT || 0), 0);
const lignesSelectionnees = facture.lignes?.filter((_, index) => selectedLignes[index]) || [];
let montantHT = lignesSelectionnees.reduce((sum, ligne) => sum + (ligne.montantLigne || 0), 0);
// Appliquer le pourcentage d'acompte si nécessaire
if (createAcompte && acomptePercentage > 0) {
@@ -177,26 +174,26 @@ const ConvertDevisPage = () => {
// Ajuster les montants si c'est un acompte
if (createAcompte && acomptePercentage > 0) {
lignesFacture.forEach(ligne => {
ligne.montantHT = (ligne.montantHT || 0) * (acomptePercentage / 100);
ligne.prixUnitaire = ligne.montantHT / (ligne.quantite || 1);
ligne.montantLigne = (ligne.montantLigne || 0) * (acomptePercentage / 100);
ligne.prixUnitaire = ligne.montantLigne / (ligne.quantite || 1);
});
}
const factureData = {
...facture,
lignes: lignesFacture,
type: createAcompte ? 'ACOMPTE' : facture.type
typeFacture: createAcompte ? TypeFacture.ACOMPTE : facture.typeFacture
};
const response = await factureService.create(factureData);
const createdFacture = await factureService.create(factureData);
toast.current?.show({
severity: 'success',
summary: 'Succès',
detail: 'Facture créée avec succès'
});
router.push(`/factures/${response.data.id}`);
router.push(`/factures/${createdFacture.id}`);
} catch (error) {
console.error('Erreur lors de la conversion:', error);
@@ -372,9 +369,9 @@ const ConvertDevisPage = () => {
<label htmlFor="type" className="font-semibold">Type de facture</label>
<Dropdown
id="type"
value={facture.type}
value={facture.typeFacture}
options={typeFactureOptions}
onChange={(e) => setFacture(prev => ({ ...prev, type: e.value }))}
onChange={(e) => setFacture(prev => ({ ...prev, typeFacture: e.value }))}
className="w-full"
/>
</div>

44
app/(main)/devis/[id]/duplicate/page.tsx
View File

@@ -17,6 +17,7 @@ import { Message } from 'primereact/message';
import { devisService, clientService } from '../../../../../services/api';
import { formatCurrency } from '../../../../../utils/formatters';
import type { Devis } from '../../../../../types/btp';
import { StatutDevis } from '../../../../../types/btp';
const DuplicateDevisPage = () => {
const params = useParams();
@@ -24,17 +25,17 @@ const DuplicateDevisPage = () => {
const toast = useRef<Toast>(null);
const [originalDevis, setOriginalDevis] = useState<Devis | null>(null);
const [newDevis, setNewDevis] = useState<Devis>({
const [newDevis, setNewDevis] = useState<Partial<Devis>>({
id: '',
numero: '',
dateEmission: new Date(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
dateEmission: new Date().toISOString(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString(),
objet: '',
description: '',
montantHT: 0,
montantTTC: 0,
tauxTVA: 20,
statut: 'BROUILLON',
statut: StatutDevis.BROUILLON,
actif: true,
lignes: []
});
@@ -52,14 +53,13 @@ const DuplicateDevisPage = () => {
const loadData = async () => {
try {
setLoading(true);
const [devisResponse, clientsResponse] = await Promise.all([
const [original, clients] = await Promise.all([
devisService.getById(originalDevisId),
clientService.getAll()
]);
const original = devisResponse.data;
setOriginalDevis(original);
setClients(clientsResponse.data);
setClients(clients);
// Générer un nouveau numéro de devis
const newNumero = await generateNewNumero();
@@ -68,16 +68,15 @@ const DuplicateDevisPage = () => {
setNewDevis({
id: '',
numero: newNumero,
dateEmission: new Date(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
dateEmission: new Date().toISOString(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString(),
objet: `${original.objet} (Copie)`,
description: original.description,
montantHT: original.montantHT,
montantTTC: original.montantTTC,
tauxTVA: original.tauxTVA,
statut: 'BROUILLON',
statut: StatutDevis.BROUILLON,
actif: true,
clientId: original.clientId,
client: original.client,
lignes: original.lignes ? [...original.lignes] : []
});
@@ -107,8 +106,8 @@ const DuplicateDevisPage = () => {
};
const calculateMontants = () => {
const montantHT = (newDevis.lignes || []).reduce((sum, ligne) => sum + (ligne.montantHT || 0), 0);
const montantTTC = montantHT * (1 + newDevis.tauxTVA / 100);
const montantHT = (newDevis.lignes || []).reduce((sum, ligne) => sum + (ligne.montantLigne || 0), 0);
const montantTTC = montantHT * (1 + (newDevis.tauxTVA || 0) / 100);
setNewDevis(prev => ({
...prev,
@@ -126,7 +125,7 @@ const DuplicateDevisPage = () => {
setSaving(true);
// Validation
if (!newDevis.numero || !newDevis.objet || !newDevis.clientId) {
if (!newDevis.numero || !newDevis.objet || !newDevis.client) {
toast.current?.show({
severity: 'warn',
summary: 'Attention',
@@ -135,15 +134,15 @@ const DuplicateDevisPage = () => {
return;
}
const response = await devisService.create(newDevis);
const createdDevis = await devisService.create(newDevis);
toast.current?.show({
severity: 'success',
summary: 'Succès',
detail: 'Devis dupliqué avec succès'
});
router.push(`/devis/${response.data.id}`);
router.push(`/devis/${createdDevis.id}`);
} catch (error) {
console.error('Erreur lors de la duplication:', error);
@@ -297,9 +296,12 @@ const DuplicateDevisPage = () => {
<label htmlFor="client" className="font-semibold">Client *</label>
<Dropdown
id="client"
value={newDevis.clientId}
value={newDevis.client?.id}
options={clients}
onChange={(e) => setNewDevis(prev => ({ ...prev, clientId: e.value }))}
onChange={(e) => {
const selectedClient = clients.find(c => c.id === e.value);
setNewDevis(prev => ({ ...prev, client: selectedClient }));
}}
optionLabel="nom"
optionValue="id"
placeholder="Sélectionner un client"

46
app/(main)/devis/[id]/edit/page.tsx
View File

@@ -18,23 +18,24 @@ import { Dialog } from 'primereact/dialog';
import { devisService, clientService } from '../../../../../services/api';
import { formatCurrency } from '../../../../../utils/formatters';
import type { Devis, LigneDevis } from '../../../../../types/btp';
import { StatutDevis } from '../../../../../types/btp';
const EditDevisPage = () => {
const params = useParams();
const router = useRouter();
const toast = useRef<Toast>(null);
const [devis, setDevis] = useState<Devis>({
const [devis, setDevis] = useState<Partial<Devis>>({
id: '',
numero: '',
dateEmission: new Date(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
dateEmission: new Date().toISOString(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString(),
objet: '',
description: '',
montantHT: 0,
montantTTC: 0,
tauxTVA: 20,
statut: 'BROUILLON',
statut: StatutDevis.BROUILLON,
actif: true,
lignes: []
});
@@ -43,13 +44,13 @@ const EditDevisPage = () => {
const [loading, setLoading] = useState(true);
const [saving, setSaving] = useState(false);
const [showLigneDialog, setShowLigneDialog] = useState(false);
const [editingLigne, setEditingLigne] = useState<LigneDevis | null>(null);
const [nouvelleLigne, setNouvelleLigne] = useState<LigneDevis>({
const [editingLigne, setEditingLigne] = useState<any>(null);
const [nouvelleLigne, setNouvelleLigne] = useState<Partial<LigneDevis>>({
designation: '',
quantite: 1,
unite: 'unité',
prixUnitaire: 0,
montantHT: 0
montantLigne: 0
});
const devisId = params.id as string;
@@ -81,13 +82,13 @@ const EditDevisPage = () => {
const loadData = async () => {
try {
setLoading(true);
const [devisResponse, clientsResponse] = await Promise.all([
const [devisData, clientsData] = await Promise.all([
devisService.getById(devisId),
clientService.getAll()
]);
setDevis(devisResponse.data);
setClients(clientsResponse.data);
setDevis(devisData);
setClients(clientsData);
} catch (error) {
console.error('Erreur lors du chargement:', error);
toast.current?.show({
@@ -101,8 +102,8 @@ const EditDevisPage = () => {
};
const calculateMontants = () => {
const montantHT = (devis.lignes || []).reduce((sum, ligne) => sum + (ligne.montantHT || 0), 0);
const montantTTC = montantHT * (1 + devis.tauxTVA / 100);
const montantHT = (devis.lignes || []).reduce((sum, ligne) => sum + (ligne.montantLigne || 0), 0);
const montantTTC = montantHT * (1 + (devis.tauxTVA || 0) / 100);
setDevis(prev => ({
...prev,
@@ -144,7 +145,7 @@ const EditDevisPage = () => {
quantite: 1,
unite: 'unité',
prixUnitaire: 0,
montantHT: 0
montantLigne: 0
});
setShowLigneDialog(true);
};
@@ -156,11 +157,11 @@ const EditDevisPage = () => {
};
const handleSaveLigne = () => {
const montantHT = nouvelleLigne.quantite * nouvelleLigne.prixUnitaire;
const ligneComplete = { ...nouvelleLigne, montantHT };
const nouvelleLignes = [...(devis.lignes || [])];
const montantLigne = (nouvelleLigne.quantite || 0) * (nouvelleLigne.prixUnitaire || 0);
const ligneComplete = { ...nouvelleLigne, montantLigne };
const nouvelleLignes = [...(devis.lignes || [])] as any[];
if (editingLigne && editingLigne.index !== undefined) {
nouvelleLignes[editingLigne.index] = ligneComplete;
} else {
@@ -267,9 +268,12 @@ const EditDevisPage = () => {
<label htmlFor="client" className="font-semibold">Client *</label>
<Dropdown
id="client"
value={devis.clientId}
value={devis.client?.id}
options={clients}
onChange={(e) => setDevis(prev => ({ ...prev, clientId: e.value }))}
onChange={(e) => {
const selectedClient = clients.find(c => c.id === e.value);
setDevis(prev => ({ ...prev, client: selectedClient }));
}}
optionLabel="nom"
optionValue="id"
placeholder="Sélectionner un client"

16
app/(main)/devis/[id]/page.tsx
View File

@@ -37,8 +37,8 @@ const DevisDetailPage = () => {
const loadDevis = async () => {
try {
setLoading(true);
const response = await devisService.getById(devisId);
setDevis(response.data);
const devisData = await devisService.getById(devisId);
setDevis(devisData);
} catch (error) {
console.error('Erreur lors du chargement du devis:', error);
setError('Impossible de charger le devis');
@@ -140,7 +140,7 @@ const DevisDetailPage = () => {
const handleAccept = async () => {
try {
await devisService.updateStatut(devisId, 'ACCEPTE');
await devisService.update(devisId, { statut: 'ACCEPTE' as any });
loadDevis();
toast.current?.show({
severity: 'success',
@@ -158,7 +158,7 @@ const DevisDetailPage = () => {
const handleReject = async () => {
try {
await devisService.updateStatut(devisId, 'REFUSE');
await devisService.update(devisId, { statut: 'REFUSE' as any });
loadDevis();
toast.current?.show({
severity: 'success',
@@ -187,7 +187,7 @@ const DevisDetailPage = () => {
const toolbarEndTemplate = () => (
<div className="flex align-items-center gap-2">
{devis?.statut === 'EN_ATTENTE' && (
{devis?.statut === 'ENVOYE' && (
<>
<Button
label="Accepter"
@@ -252,9 +252,9 @@ const DevisDetailPage = () => {
<div>
<h2 className="text-2xl font-bold mb-2">Devis #{devis.numero}</h2>
<p className="text-600 mb-3">{devis.objet}</p>
<Tag
value={devis.statut}
severity={getStatutSeverity(devis.statut)}
<Tag
value={devis.statut}
severity={getStatutSeverity(devis.statut) as any}
className="mb-2"
/>
</div>

12
app/(main)/devis/acceptes/page.tsx
View File

@@ -106,8 +106,7 @@ const DevisAcceptesPage = () => {
case 'create_chantier':
await devisActionsService.createChantierFromDevis({
devisId: selectedDevisItem.id,
dateDebutSouhaitee: chantierData.dateDebut.toISOString(),
notes: chantierData.notes
dateDebutSouhaitee: chantierData.dateDebut.toISOString()
});
message = 'Chantier créé avec succès';
break;
@@ -316,7 +315,7 @@ RECOMMANDATIONS:
<Button
icon="pi pi-eye"
rounded
severity="secondary"
severity={"secondary" as any}
size="small"
tooltip="Voir détails"
onClick={() => {
@@ -376,7 +375,7 @@ RECOMMANDATIONS:
{hasContract ? (
<Tag value="Contrat" severity="success" className="text-xs" />
) : (
<Tag value="Pas de contrat" severity="secondary" className="text-xs" />
<Tag value="Pas de contrat" severity={"secondary" as any} className="text-xs" />
)}
{hasChantier ? (
<Tag value="Chantier" severity="success" className="text-xs" />
@@ -450,6 +449,7 @@ RECOMMANDATIONS:
value={devis}
selection={selectedDevis}
onSelectionChange={(e) => setSelectedDevis(e.value)}
selectionMode="multiple"
dataKey="id"
paginator
rows={10}
@@ -584,4 +584,6 @@ RECOMMANDATIONS:
);
};
export default DevisAcceptesPage;
export default DevisAcceptesPage;

17
app/(main)/devis/attente/page.tsx
View File

@@ -16,6 +16,7 @@ import { ProgressBar } from 'primereact/progressbar';
import { devisService } from '../../../../services/api';
import { formatDate, formatCurrency } from '../../../../utils/formatters';
import type { Devis } from '../../../../types/btp';
import { StatutDevis } from '../../../../types/btp';
const DevisAttentePage = () => {
const [devis, setDevis] = useState<Devis[]>([]);
@@ -118,15 +119,15 @@ const DevisAttentePage = () => {
switch (actionType) {
case 'send':
newStatut = 'ENVOYE';
newStatut = StatutDevis.ENVOYE;
message = 'Devis envoyé au client';
break;
case 'accept':
newStatut = 'ACCEPTE';
newStatut = StatutDevis.ACCEPTE;
message = 'Devis accepté par le client';
break;
case 'refuse':
newStatut = 'REFUSE';
newStatut = StatutDevis.REFUSE;
message = 'Devis refusé par le client';
break;
case 'extend':
@@ -353,9 +354,9 @@ STATISTIQUES:
return (
<div className="flex align-items-center gap-2">
<Tag
value={rowData.statut === 'BROUILLON' ? 'Brouillon' : 'Envoyé'}
severity={rowData.statut === 'BROUILLON' ? 'secondary' : 'info'}
<Tag
value={rowData.statut === 'BROUILLON' ? 'Brouillon' : 'Envoyé'}
severity={(rowData.statut === 'BROUILLON' ? 'secondary' : 'info') as any}
/>
<Tag
value={urgency.level}
@@ -484,6 +485,7 @@ STATISTIQUES:
value={devis}
selection={selectedDevis}
onSelectionChange={(e) => setSelectedDevis(e.value)}
selectionMode="multiple"
dataKey="id"
paginator
rows={10}
@@ -549,4 +551,5 @@ STATISTIQUES:
);
};
export default DevisAttentePage;
export default DevisAttentePage;

12
app/(main)/devis/expires/page.tsx
View File

@@ -117,8 +117,7 @@ const DevisExpiresPage = () => {
case 'renew':
await devisActionsService.renewDevis({
devisId: selectedDevisItem.id,
nouveaueDateValidite: renewData.newValidityDate.toISOString(),
modifications: renewData.modifications
nouveaueDateValidite: renewData.newValidityDate.toISOString()
});
message = 'Devis renouvelé avec succès';
break;
@@ -275,7 +274,7 @@ RECOMMANDATIONS:
<Button
label="Archiver sélection"
icon="pi pi-archive"
severity="secondary"
severity={"secondary" as any}
size="small"
onClick={bulkArchive}
disabled={selectedDevis.length === 0}
@@ -329,7 +328,7 @@ RECOMMANDATIONS:
<Button
icon="pi pi-archive"
rounded
severity="secondary"
severity={"secondary" as any}
size="small"
tooltip="Archiver"
onClick={() => archiveDevis(rowData)}
@@ -478,6 +477,7 @@ RECOMMANDATIONS:
value={devis}
selection={selectedDevis}
onSelectionChange={(e) => setSelectedDevis(e.value)}
selectionMode="multiple"
dataKey="id"
paginator
rows={10}
@@ -603,4 +603,6 @@ RECOMMANDATIONS:
);
};
export default DevisExpiresPage;
export default DevisExpiresPage;

51
app/(main)/devis/nouveau/page.tsx
View File

@@ -35,20 +35,20 @@ const NouveauDevisPage = () => {
const [clients, setClients] = useState<any[]>([]);
const [lignes, setLignes] = useState<DevisLigne[]>([]);
const [devis, setDevis] = useState<Devis>({
const [devis, setDevis] = useState<Partial<Devis>>({
id: '',
numero: '',
dateEmission: new Date(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
dateEmission: new Date().toISOString(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString(),
objet: '',
description: '',
montantHT: 0,
montantTTC: 0,
tauxTVA: 20,
statut: 'BROUILLON',
statut: 'BROUILLON' as any,
actif: true,
client: null,
chantier: null
client: undefined,
chantier: undefined
});
const [nouvelleLigne, setNouvelleLigne] = useState<DevisLigne>({
@@ -389,13 +389,13 @@ const NouveauDevisPage = () => {
<label htmlFor="dateEmission" className="font-bold">
Date d'émission <span className="text-red-500">*</span>
</label>
<Calendar
id="dateEmission"
value={devis.dateEmission}
onChange={(e) => onDateChange(e, 'dateEmission')}
dateFormat="dd/mm/yy"
showIcon
className={errors.dateEmission ? 'p-invalid' : ''}
<Calendar
id="dateEmission"
value={devis.dateEmission ? new Date(devis.dateEmission) : null}
onChange={(e) => onDateChange(e, 'dateEmission')}
dateFormat="dd/mm/yy"
showIcon
className={errors.dateEmission ? 'p-invalid' : ''}
/>
{errors.dateEmission && <small className="p-error">{errors.dateEmission}</small>}
</div>
@@ -404,14 +404,14 @@ const NouveauDevisPage = () => {
<label htmlFor="dateValidite" className="font-bold">
Date de validité <span className="text-red-500">*</span>
</label>
<Calendar
id="dateValidite"
value={devis.dateValidite}
onChange={(e) => onDateChange(e, 'dateValidite')}
dateFormat="dd/mm/yy"
showIcon
className={errors.dateValidite ? 'p-invalid' : ''}
minDate={devis.dateEmission}
<Calendar
id="dateValidite"
value={devis.dateValidite ? new Date(devis.dateValidite) : null}
onChange={(e) => onDateChange(e, 'dateValidite')}
dateFormat="dd/mm/yy"
showIcon
className={errors.dateValidite ? 'p-invalid' : ''}
minDate={devis.dateEmission ? new Date(devis.dateEmission) : undefined}
/>
{errors.dateValidite && <small className="p-error">{errors.dateValidite}</small>}
</div>
@@ -626,17 +626,17 @@ const NouveauDevisPage = () => {
<div className="field col-12 md:col-6">
<label className="font-bold">Date d'émission :</label>
<p>{devis.dateEmission?.toLocaleDateString('fr-FR')}</p>
<p>{devis.dateEmission ? new Date(devis.dateEmission).toLocaleDateString('fr-FR') : ''}</p>
</div>
<div className="field col-12 md:col-6">
<label className="font-bold">Date de validité :</label>
<p>{devis.dateValidite?.toLocaleDateString('fr-FR')}</p>
<p>{devis.dateValidite ? new Date(devis.dateValidite).toLocaleDateString('fr-FR') : ''}</p>
</div>
<div className="field col-12">
<label className="font-bold">Lignes du devis :</label>
<DataTable value={lignes} size="small">
<DataTable value={lignes} size="normal">
<Column field="designation" header="Désignation" />
<Column
field="quantite"
@@ -747,4 +747,5 @@ const NouveauDevisPage = () => {
);
};
export default NouveauDevisPage;
export default NouveauDevisPage;

74
app/(main)/devis/page.tsx
View File

@@ -36,20 +36,20 @@ const DevisPage = () => {
const [devisDialog, setDevisDialog] = useState(false);
const [deleteDevisDialog, setDeleteDevisDialog] = useState(false);
const [deleteDevisssDialog, setDeleteDevisssDialog] = useState(false);
const [devisItem, setDevisItem] = useState<Devis>({
const [devisItem, setDevisItem] = useState<Partial<Devis>>({
id: '',
numero: '',
dateEmission: new Date(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
dateEmission: new Date().toISOString(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString(),
objet: '',
description: '',
montantHT: 0,
montantTTC: 0,
tauxTVA: 20,
statut: 'BROUILLON',
statut: 'BROUILLON' as any,
actif: true,
client: null,
chantier: null
client: undefined,
chantier: undefined
});
const [submitted, setSubmitted] = useState(false);
const toast = useRef<Toast>(null);
@@ -99,17 +99,17 @@ const DevisPage = () => {
setDevisItem({
id: '',
numero: '',
dateEmission: new Date(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
dateEmission: new Date().toISOString(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString(),
objet: '',
description: '',
montantHT: 0,
montantTTC: 0,
tauxTVA: 20,
statut: 'BROUILLON',
statut: 'BROUILLON' as any,
actif: true,
client: null,
chantier: null
client: undefined,
chantier: undefined
});
setSubmitted(false);
setDevisDialog(true);
@@ -154,7 +154,7 @@ const DevisPage = () => {
validationErrors.push("Le taux de TVA doit être entre 0 et 100%");
}
if (!devisItem.dateValidite || devisItem.dateValidite <= new Date()) {
if (!devisItem.dateValidite || new Date(devisItem.dateValidite) <= new Date()) {
validationErrors.push("La date de validité doit être dans le futur");
}
@@ -173,9 +173,8 @@ const DevisPage = () => {
let updatedDevis = [...devis];
const devisToSave = {
...devisItem,
client: devisItem.client ? { id: devisItem.client } : null, // Envoyer seulement l'ID du client
montantTTC: devisItem.montantHT * (1 + devisItem.tauxTVA / 100)
};
montantTTC: (devisItem.montantHT || 0) * (1 + (devisItem.tauxTVA || 0) / 100)
} as any;
if (devisItem.id) {
// Mise à jour du devis existant
@@ -193,17 +192,17 @@ const DevisPage = () => {
setDevisItem({
id: '',
numero: '',
dateEmission: new Date(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
dateEmission: new Date().toISOString(),
dateValidite: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString(),
objet: '',
description: '',
montantHT: 0,
montantTTC: 0,
tauxTVA: 20,
statut: 'BROUILLON',
statut: 'BROUILLON' as any,
actif: true,
client: null,
chantier: null
client: undefined,
chantier: undefined
});
} catch (error) {
ErrorHandler.handleApiError(error, 'sauvegarde du devis');
@@ -214,7 +213,7 @@ const DevisPage = () => {
const editDevis = (devis: Devis) => {
setDevisItem({
...devis,
client: devis.client?.id || null
client: devis.client || undefined
});
setDevisDialog(true);
};
@@ -367,9 +366,9 @@ const DevisPage = () => {
};
return (
<Tag
value={getLabel(rowData.statut)}
severity={getSeverity(rowData.statut)}
<Tag
value={getLabel(rowData.statut)}
severity={getSeverity(rowData.statut) as any}
/>
);
};
@@ -437,6 +436,7 @@ const DevisPage = () => {
value={devis}
selection={selectedDevis}
onSelectionChange={(e) => setSelectedDevis(e.value)}
selectionMode="multiple"
dataKey="id"
paginator
rows={10}
@@ -523,24 +523,24 @@ const DevisPage = () => {
<div className="field col-12 md:col-6">
<label htmlFor="dateEmission">Date d'émission</label>
<Calendar
id="dateEmission"
value={devisItem.dateEmission}
onChange={(e) => onDateChange(e, 'dateEmission')}
dateFormat="dd/mm/yy"
showIcon
<Calendar
id="dateEmission"
value={devisItem.dateEmission ? new Date(devisItem.dateEmission) : null}
onChange={(e) => onDateChange(e, 'dateEmission')}
dateFormat="dd/mm/yy"
showIcon
/>
</div>
<div className="field col-12 md:col-6">
<label htmlFor="dateValidite">Date de validité</label>
<Calendar
id="dateValidite"
value={devisItem.dateValidite}
onChange={(e) => onDateChange(e, 'dateValidite')}
dateFormat="dd/mm/yy"
showIcon
minDate={devisItem.dateEmission}
<Calendar
id="dateValidite"
value={devisItem.dateValidite ? new Date(devisItem.dateValidite) : null}
onChange={(e) => onDateChange(e, 'dateValidite')}
dateFormat="dd/mm/yy"
showIcon
minDate={devisItem.dateEmission ? new Date(devisItem.dateEmission) : undefined}
/>
</div>

12
app/(main)/devis/workflow/[id]/page.tsx
View File

@@ -75,8 +75,8 @@ const DevisWorkflowPage = () => {
setLoading(true);
// Charger le devis
const devisResponse = await devisService.getById(devisId);
setDevis(devisResponse.data);
const devisData = await devisService.getById(devisId);
setDevis(devisData);
// TODO: Charger les données de workflow depuis l'API
// const workflowResponse = await devisService.getWorkflow(devisId);
@@ -346,9 +346,9 @@ const DevisWorkflowPage = () => {
<h5 className="text-blue-900 mb-2">{workflowSteps[activeStep].nom}</h5>
<p className="text-blue-800 mb-2">{workflowSteps[activeStep].description}</p>
</div>
<Tag
<Tag
value={workflowSteps[activeStep].statut}
severity={getStepStatus(workflowSteps[activeStep], activeStep)}
severity={getStepStatus(workflowSteps[activeStep], activeStep) as any}
/>
</div>
@@ -444,9 +444,9 @@ const DevisWorkflowPage = () => {
field="statut"
header="Statut"
body={(rowData, options) => (
<Tag
<Tag
value={rowData.statut}
severity={getStepStatus(rowData, options.rowIndex)}
severity={getStepStatus(rowData, options.rowIndex) as any}
/>
)}
/>

24
app/(main)/devis/workflow/page.tsx
View File

@@ -308,7 +308,7 @@ const WorkflowDevis = () => {
return (
<div className="flex align-items-center gap-2">
<i className={`pi ${config.icon} text-${config.color}`} />
<Tag value={config.label} severity={config.color} />
<Tag value={config.label} severity={config.color as any} />
</div>
);
};
@@ -343,7 +343,7 @@ const WorkflowDevis = () => {
return (
<div className="flex align-items-center gap-2">
<Badge value={`${joursRestants}j`} severity={severity} />
<Badge value={`${joursRestants}j`} severity={severity as any} />
{rowData.nbRelances > 0 && (
<Badge value={`${rowData.nbRelances}R`} severity="info" />
)}
@@ -378,7 +378,7 @@ const WorkflowDevis = () => {
<Button
icon="pi pi-eye"
size="small"
severity="secondary"
severity={"secondary" as any}
tooltip="Voir détails"
/>
</div>
@@ -496,9 +496,9 @@ const WorkflowDevis = () => {
<div><strong>Objet:</strong> {selectedDevis.objet}</div>
<div>
<strong>Statut:</strong>
<Tag
value={statutsConfig[selectedDevis.statut as keyof typeof statutsConfig]?.label}
severity={statutsConfig[selectedDevis.statut as keyof typeof statutsConfig]?.color}
<Tag
value={statutsConfig[selectedDevis.statut as keyof typeof statutsConfig]?.label}
severity={statutsConfig[selectedDevis.statut as keyof typeof statutsConfig]?.color as any}
className="ml-2"
/>
</div>
@@ -524,7 +524,7 @@ const WorkflowDevis = () => {
key={transition.action}
label={transition.label}
icon={`pi ${transition.icon}`}
severity={transition.color}
severity={transition.color as any}
className="justify-content-start"
onClick={() => executerAction(transition.action)}
/>
@@ -542,9 +542,9 @@ const WorkflowDevis = () => {
content={(item) => (
<div className="p-2">
<div className="flex align-items-center gap-2 mb-1">
<Tag
value={statutsConfig[item.statut as keyof typeof statutsConfig]?.label}
severity={statutsConfig[item.statut as keyof typeof statutsConfig]?.color}
<Tag
value={statutsConfig[item.statut as keyof typeof statutsConfig]?.label}
severity={statutsConfig[item.statut as keyof typeof statutsConfig]?.color as any}
/>
</div>
<div className="text-sm text-color-secondary mb-1">
@@ -617,4 +617,6 @@ const WorkflowDevis = () => {
);
};
export default WorkflowDevis;
export default WorkflowDevis;