${shift.location}
+ content: `
${shift.collecte?.id || shift.location}
${shift.requiredSkill}
`,
start: startTime,
end: endTime,
style: `background-color: ${shiftColor}`
});
- // Add to location timeline
+ // Add to shift-specific timeline (each shift has its own group)
byLocationItemDataSet.add({
id: `shift-${index}-loc`,
- group: shift.location,
+ group: `shift-group-${index}`,
content: `
${shift.employee.name}
${shift.requiredSkill}
`,
start: startTime,
@@ -482,8 +559,8 @@
// Unassigned shift
byLocationItemDataSet.add({
id: `shift-${index}-unassigned`,
- group: shift.location,
- content: `
Unassigned
+ group: `shift-group-${index}`,
+ content: `
Non assigné
${shift.requiredSkill}
`,
start: startTime,
end: endTime,
@@ -492,6 +569,51 @@
}
});
+ // Fallback for old format without collectes
+ if (!schedule.collectes && schedule.shifts) {
+ // Override groups for old format - use locations instead
+ byLocationGroupDataSet.clear();
+ const locations = [...new Set(schedule.shifts.map(shift => shift.location))];
+ locations.forEach(location => {
+ byLocationGroupDataSet.add({
+ id: location,
+ content: location
+ });
+ });
+
+ // Re-render shifts with location groups for old format
+ schedule.shifts.forEach((shift, index) => {
+ const startTime = new Date(shift.start);
+ const endTime = new Date(shift.end);
+
+ if (shift.employee) {
+ const hasRequiredSkill = shift.employee.skills.includes(shift.requiredSkill);
+ const skillColor = hasRequiredSkill ? COLORS.SKILL_MATCH : COLORS.SKILL_MISMATCH;
+ const shiftColor = getShiftColor(shift, shift.employee);
+
+ byLocationItemDataSet.add({
+ id: `shift-${index}-loc-old`,
+ group: shift.location,
+ content: `
${shift.employee.name}
+ ${shift.requiredSkill}
`,
+ start: startTime,
+ end: endTime,
+ style: `background-color: ${shiftColor}`
+ });
+ } else {
+ byLocationItemDataSet.add({
+ id: `shift-${index}-unassigned-old`,
+ group: shift.location,
+ content: `
Non assigné
+ ${shift.requiredSkill}
`,
+ start: startTime,
+ end: endTime,
+ style: `background-color: ${COLORS.UNASSIGNED}`
+ });
+ }
+ });
+ }
+
// Set timeline window
if (schedule.shifts.length > 0) {
const dates = schedule.shifts.map(shift => new Date(shift.start));
@@ -609,4 +731,4 @@
}