LouisMazin/Boulangerie_Website
LouisMazin/Boulangerie_Website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
Louis Mazin 2026-09-25 16:54:01 +02:00
parent 30eab16473
commit 0fd446fc24
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/pages/TimeClockPage.jsx
View File

@ -1378,10 +1378,18 @@ const TimeClockPage = () => {
scanConflict.scanTime;
}
await timeApi.scanTimeEntry(scanConflict.code, options);
const resolutionResponse = await timeApi.scanTimeEntry(scanConflict.code, options);
resolved = true;
// La résolution ne rejoue pas le scan qui a déclenché le conflit.
// complete_missing_entry renseigne l'entrée et applique déjà la sortie scannée.
if (scanConflict.type === 'missing_entry') {
setScanMessage(resolutionResponse.message || 'Sortie enregistrée.');
setScanConflict(null);
await loadTimeEntries();
return;
}
// Les autres conflits nécessitent un nouveau pointage après résolution.
const scanOptions = {};
if (scanConflict.scanDate) {
scanOptions.scan_date = scanConflict.scanDate;