Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'spidev' into 'master'

Browse Source 
Kalender Anpassungen

See merge request fronk/thetool!1409
This commit is contained in:
Daniel Spitzer
2025-06-04 06:56:47 +00:00
parent e5e49096a6 a71ae02128
commit c3237017a2
3 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Calendar/View.php
+1 -1
View File
@@ -200,7 +200,7 @@ endforeach;
data-calendar_id="<?= $calendar['calendar_id'] ?>" data-calendar_id="<?= $calendar['calendar_id'] ?>"
type="color" type="color"
class="form-control-color color-input" class="form-control-color color-input"
value="<?= $Calendar_colors[$calendar['calendar_id']]['bgcolor'] ?>" value="<?= ($Calendar_colors[$calendar['calendar_id']]['bgcolor']) ?: $standardCalendarColors[$calendar['calendar_id']] ?>"
title="Hintergrundfarbe"> title="Hintergrundfarbe">
<input data-calendar_id="<?= $calendar['calendar_id'] ?>" <input data-calendar_id="<?= $calendar['calendar_id'] ?>"
type="color" type="color"
application/Calendar/CalendarController.php
+2 -2
View File
@@ -18,7 +18,7 @@ class CalendarController extends mfBaseController
$this->me = $me; $this->me = $me;
$this->layout()->set("me", $me); $this->layout()->set("me", $me);
if (!$me->is(["Admin"])) { if (!$me->is(["Admin"]) && !$me->is(["employee"])) {
$this->redirect("Dashboard"); $this->redirect("Dashboard");
} }
} }
@@ -204,7 +204,7 @@ class CalendarController extends mfBaseController
} }
} }
} }
CalendarModel::cancelCalendarEvent($r,$this->me); CalendarModel::cancelCalendarEvent($r, $this->me);
die(); die();
case "updateCalendarColor": case "updateCalendarColor":
$r = $this->request; $r = $this->request;
application/Calendar/CalendarModel.php
+8
View File
@@ -44,6 +44,14 @@ class CalendarModel
); );
public static $standardCalendarColors = [ public static $standardCalendarColors = [
'#b3d5f3', '#d0e2c0', '#bac2d4', '#c6d4c0', '#e3e3e3',
'#acdce5', '#cdb6c0', '#aae0e1', '#d9d9d9', '#d9e5d5',
'#c8a7d5', '#aad8d0', '#dcadc3', '#d9e8e5', '#e4d8d5',
'#b4dcc5', '#b9d1e2', '#a3c1c2', '#cdd2b9', '#e3c8ce',
'#aae2c5', '#c7d0cc', '#d0c0da', '#dbdfc8', '#b4e3d7',
'#c3e4e3', '#c5c4e3', '#d0b7e5', '#b6e98c', '#e3d1de',
'#dbbeb3', '#e9aebc', '#b5cae7', '#dec2d4', '#aebbd5',
'#e2baaf', '#b6ebd5', '#a9c4bb', '#d7d2c5', '#d7e3d4',
'#b3d5f3', '#d0e2c0', '#bac2d4', '#c6d4c0', '#e3e3e3', '#b3d5f3', '#d0e2c0', '#bac2d4', '#c6d4c0', '#e3e3e3',
'#acdce5', '#cdb6c0', '#aae0e1', '#d9d9d9', '#d9e5d5', '#acdce5', '#cdb6c0', '#aae0e1', '#d9d9d9', '#d9e5d5',
'#c8a7d5', '#aad8d0', '#dcadc3', '#d9e8e5', '#e4d8d5', '#c8a7d5', '#aad8d0', '#dcadc3', '#d9e8e5', '#e4d8d5',