diff --git a/artifacts/cra-app/src/pages/timesheet-detail.tsx b/artifacts/cra-app/src/pages/timesheet-detail.tsx index 7707c08..3535433 100644 --- a/artifacts/cra-app/src/pages/timesheet-detail.tsx +++ b/artifacts/cra-app/src/pages/timesheet-detail.tsx @@ -289,9 +289,8 @@ export default function TimesheetDetailPage() {
- {/* Actions bar */} {isEditable && ( -
+
)} - {/* The Grid */} -
- - +
+
+ + + {daysArray.map(day => ( + + ))} + + + - {daysArray.map(day => ( ))} - @@ -332,24 +337,24 @@ export default function TimesheetDetailPage() { {!timesheet.lines || timesheet.lines.length === 0 ? ( - ) : ( timesheet.lines.map(line => ( - ); })} - )) )} - + - {daysArray.map(day => ( - ))} -
+ Projet -
- {day.dayName} - {day.dayNum} +
+ {day.dayName.slice(0, 2)} + {day.dayNum}
+ Total
+ Aucun projet ajouté. Cliquez sur "Ajouter un projet" pour commencer.
-
-
-
{line.projectName}
-
{line.projectCode} {line.client ? `• ${line.client}` : ''}
+
+
+
+
{line.projectName}
+
{line.projectCode} {line.client ? `• ${line.client}` : ''}
{isEditable && (
+ {rowTotals[line.id] > 0 ? ( - - {rowTotals[line.id]}h - + {rowTotals[line.id]}h ) : "-"}
+ Total du jour + {colTotals[day.dateStr] > 0 ? colTotals[day.dateStr] : ""} + {grandTotal}h