donpat1to/Schichtenplaner
1
0
Fork 0
mirror of https://github.com/donpat1to/Schichtenplaner.git synced 2025-12-01 06:55:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed manager detection

Browse Source
This commit is contained in:
Patrick Mahnke-Hartmann
2025-11-05 09:43:28 +01:00
parent d0be1b4a61
commit c6dfa5b4c6
1 changed files with 134 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/src/pages/ShiftPlans/ShiftPlanView.tsx
View File

@@ -679,7 +679,7 @@ const ShiftPlanView: React.FC = () => {
const matchingScheduledShifts = scheduledShifts.filter(scheduled => { const matchingScheduledShifts = scheduledShifts.filter(scheduled => {
const dayOfWeek = getDayOfWeek(scheduled.date); const dayOfWeek = getDayOfWeek(scheduled.date);
return dayOfWeek === shiftPattern.dayOfWeek && return dayOfWeek === shiftPattern.dayOfWeek &&
scheduled.timeSlotId === shiftPattern.timeSlotId; scheduled.timeSlotId === shiftPattern.timeSlotId;
}); });
console.log(`📅 Shift Pattern: ${shiftPattern.id}`); console.log(`📅 Shift Pattern: ${shiftPattern.id}`);
@@ -932,7 +932,7 @@ const ShiftPlanView: React.FC = () => {
if (employee.isTrainee) { if (employee.isTrainee) {
backgroundColor = '#cda8f0'; // Trainee backgroundColor = '#cda8f0'; // Trainee
} else if (employee.roles?.includes('manager')) { } else if (employee.employeeType === 'manager') {
backgroundColor = '#CC0000'; // Manager backgroundColor = '#CC0000'; // Manager
} }
@@ -974,7 +974,7 @@ const ShiftPlanView: React.FC = () => {
const scheduledShift = scheduledShifts.find(scheduled => { const scheduledShift = scheduledShifts.find(scheduled => {
const scheduledDayOfWeek = getDayOfWeek(scheduled.date); const scheduledDayOfWeek = getDayOfWeek(scheduled.date);
return scheduledDayOfWeek === weekday.id && return scheduledDayOfWeek === weekday.id &&
scheduled.timeSlotId === timeSlot.id; scheduled.timeSlotId === timeSlot.id;
}); });
if (scheduledShift) { if (scheduledShift) {
@@ -1001,7 +1001,7 @@ const ShiftPlanView: React.FC = () => {
const scheduledShift = scheduledShifts.find(scheduled => { const scheduledShift = scheduledShifts.find(scheduled => {
const scheduledDayOfWeek = getDayOfWeek(scheduled.date); const scheduledDayOfWeek = getDayOfWeek(scheduled.date);
return scheduledDayOfWeek === weekday.id && return scheduledDayOfWeek === weekday.id &&
scheduled.timeSlotId === timeSlot.id; scheduled.timeSlotId === timeSlot.id;
}); });
if (scheduledShift) { if (scheduledShift) {
@@ -1054,7 +1054,7 @@ const ShiftPlanView: React.FC = () => {
alignItems: 'center', alignItems: 'center',
justifyContent: 'center' justifyContent: 'center'
}} }}
title={`Shift Validierung: timeSlotId=${shift.timeSlotId}, dayOfWeek=${shift.dayOfWeek}`} title={`Shift Validierung: timeSlotId=${shift.timeSlotId}, dayOfWeek=${shift.dayOfWeek}`}
> >
⚠️ ⚠️
</div> </div>
@@ -1124,7 +1124,7 @@ const ShiftPlanView: React.FC = () => {
{shiftPlan.status === 'published' ? 'Veröffentlicht' : 'Entwurf'} {shiftPlan.status === 'published' ? 'Veröffentlicht' : 'Entwurf'}
</div> </div>
</div> </div>
<div style={{ display: 'flex', gap: '10px', alignItems: 'center' }}> <div style={{ display: 'flex', gap: '10px', alignItems: 'center' }}>
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && ( {shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
<> <>
<button <button
@@ -1506,8 +1506,8 @@ const ShiftPlanView: React.FC = () => {
shiftPlan.status === 'published' shiftPlan.status === 'published'
? 'Angezeigt werden die aktuell zugewiesenen Mitarbeiter' ? 'Angezeigt werden die aktuell zugewiesenen Mitarbeiter'
: assignmentResult : assignmentResult
? 'Angezeigt werden die vorgeschlagenen Mitarbeiter für eine exemplarische Woche' ? 'Angezeigt werden die vorgeschlagenen Mitarbeiter für eine exemplarische Woche'
: 'Angezeigt wird "zugewiesene/benötigte Mitarbeiter" pro Schicht und Wochentag' : 'Angezeigt wird "zugewiesene/benötigte Mitarbeiter" pro Schicht und Wochentag'
} }
</div> </div>
)} )}