Zeiterfassung Update

* Transfer Überstunden50/100,Mehrstunden20 zurück in Gutstunden/Mehrstunden
 * Textuelle Anzeige von transferierten Stunden
 * Kalender Anzeige verbesserungen
 * Offene Krankenstände werden virtuell 2 Wochen in die Zukunft angezeit im Kalender
This commit is contained in:
Spi
2024-05-16 14:51:45 +02:00
parent 1e57d983b7
commit 4d08114918
5 changed files with 285 additions and 80 deletions
+11 -3
View File
@@ -152,6 +152,13 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
margin-left: 0;
margin-right: 0;
}
.fc .fc-daygrid-day.fc-day-today {
background-color: rgb(239 240 255);
}
.fc-event-title {
font-weight: 500;
}
</style>
<script type="text/javascript"
src="<?= self::getResourcePath() ?>assets/js/calendar/moment/moment.min.js?<?= date('U') ?>"></script>
@@ -209,7 +216,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
$.getJSON(requestUrl, function (data) {
}).done(function (json) {
var bgcolors = ['rgba(251, 71, 71,0.2)', 'rgba(253, 126, 20, 0.25)', 'rgba(91, 71, 251, 0.2)', 'rgba(71, 251, 151, 0.2)', 'rgba(251, 71, 194, 0.2)', 'rgba(20, 251, 253, 0.25)'];
var bgcolors = ['rgb(71 93 251 / 34%)', 'rgb(228 187 249 / 65%)', 'rgb(243 251 117 / 68%)', 'rgb(71 251 176 / 68%)', 'rgb(119 206 247 / 65%)', 'rgb(251 196 71 / 68%)','rgb(251 171 216 / 69%)','rgb(152 155 243 / 65%)','rgb(243 152 109 / 68%)','rgb(255 187 187 / 65%)','rgb(131 245 60 / 68%)','rgb(144 241 245 / 65%)'];
//read data from json
var json = json.data;
var holidays = [];
@@ -218,12 +225,12 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
$.each(json, function (index, value) {
if (oldname != value.user.user) {
colorcount++;
if (colorcount > 5) {
if (colorcount > 11) {
colorcount = 0;
}
oldname = value.user.user;
}
if (value.hourday.hourday!='5') {
if (value.hourday.hourday != '5') {
holidays.push({
id: cindex,
backgroundColor: bgcolors[colorcount],
@@ -275,6 +282,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
var calendarEl = document.getElementById('calendar');
var calendar = new FullCalendar.Calendar(calendarEl, {
locale: 'de',
themeSystem: 'bootstrap4',
headerToolbar: {
left: "prev,today,next",
center: 'title',