Zeiterfassung Update
* Neue migration für Homeoffice/Urlaubsänderungen * Soll zeiten nun vom Startdatum abhängig * Neue Summierung der Sollzeiten in der Personalverwaltung * Urlaubstage werden nun Tage statt Stunden angezeigt (in Buchungen und Auswertungen) * Urlaube werden nun bis 1.1.2024 berücksichtigt * Homeoffice Flag nun möglich * Abwesenheitskalender Sichtbar für alle * Neuer Buchungszeitraum für Urlaubsgutschrift/Urlaubsminderung
This commit is contained in:
@@ -223,16 +223,19 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
|
||||
}
|
||||
oldname = value.user.user;
|
||||
}
|
||||
holidays.push({
|
||||
id: cindex,
|
||||
backgroundColor: bgcolors[colorcount],
|
||||
start: value.cstart.cstart,
|
||||
end: value.cend.cend,
|
||||
title: value.ccategory.ccategory + " " + value.user.user,
|
||||
description: value.ccategory.ccategory + " " + value.user.user
|
||||
});
|
||||
if (value.hourday.hourday!='5') {
|
||||
holidays.push({
|
||||
id: cindex,
|
||||
backgroundColor: bgcolors[colorcount],
|
||||
start: value.cstart.cstart,
|
||||
end: value.cend.cend,
|
||||
title: value.ccategory.ccategory + " " + value.user.user,
|
||||
description: value.ccategory.ccategory + " " + value.user.user
|
||||
});
|
||||
cindex++;
|
||||
}
|
||||
oldname = value.user.user;
|
||||
cindex++;
|
||||
|
||||
});
|
||||
|
||||
var initialLocaleCode = 'en';
|
||||
|
||||
@@ -319,6 +319,8 @@ class TimerecordingReportController extends mfBaseController
|
||||
'category' => array('category' => $category, 'order' => $timerecording->timerecordingCategory->name),
|
||||
'comment' => array('comment' => $timerecording->comment, 'order' => $timerecording->comment),
|
||||
'edit' => array('edit' => $edit, 'order' => $edit),
|
||||
'hourday' => array('hourday' => $timerecording->timerecordingCategory->hourday, 'order' => $timerecording->timerecordingCategory->hourday),
|
||||
|
||||
);
|
||||
}
|
||||
endforeach;
|
||||
|
||||
Reference in New Issue
Block a user