From 5d01cbe6d10002ba8c4e06183903fbe7787f1df0 Mon Sep 17 00:00:00 2001
From: Spitzer Daniel <daniel.spitzer@inode.at>
Date: Sun, 14 Jan 2024 14:08:39 +0100
Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20Feiertage=20Anpassungen=20Feldg?=
 =?UTF-8?q?r=C3=B6=C3=9Fen=20/=20Datum=20wird=20nun=20mit=20Wochentag=20an?=
 =?UTF-8?q?gezeigt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Layout/default/TimerecordingHoliday/Index.php | 27 ++++---------------
 .../TimerecordingHolidayController.php        |  2 +-
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/Layout/default/TimerecordingHoliday/Index.php b/Layout/default/TimerecordingHoliday/Index.php
index aa3e88512..338d3d0f4 100644
--- a/Layout/default/TimerecordingHoliday/Index.php
+++ b/Layout/default/TimerecordingHoliday/Index.php
@@ -1,24 +1,7 @@
-<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
+<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php");
+$daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
+?>
 
-<?php
-//echo "[
-//";
-//foreach ($timerecordingholidays as $timerecordingholiday):
-//
-//
-//echo "[
-//      'timestamp'  => $timerecordingholiday->timestamp,
-//      'description'  => '$timerecordingholiday->description',
-//      'create_by'  => $timerecordingholiday->create_by,
-//      'edit_by'  => $timerecordingholiday->edit_by,
-//      'create'  => $timerecordingholiday->create,
-//      'edit'  => $timerecordingholiday->edit
-//      ],
-//      ";
-//
-//endforeach;
-//echo "]";
-//?>
 
 
     <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
@@ -57,7 +40,7 @@
             <table id="datatable" class="table table-striped table-hover table-sm">
                 <thead>
                 <tr>
-                    <th class="text-center">Datum</th>
+                    <th style="width: 200px;" class="text-center">Datum</th>
                     <th class="text-center">Name</th>
                     <th class="edit-width"></th>
                 </tr>
@@ -70,7 +53,7 @@
                 <tbody>
                 <?php foreach ($timerecordingholidays as $timerecordingholiday): ?>
                     <tr>
-                        <td data-order="<?= $timerecordingholiday->timestamp ?>"><?= date("d.m.Y", $timerecordingholiday->timestamp) ?></td>
+                        <td data-order="<?= $timerecordingholiday->timestamp ?>"><?= $daysgerm[date("w", $timerecordingholiday->timestamp)]." ".date("d.m.Y", $timerecordingholiday->timestamp) ?></td>
                         <td><?= $timerecordingholiday->description ?></td>
                         <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
                             <a href="<?= self::getUrl("TimerecordingHoliday", "edit", ["id" => $timerecordingholiday->id]) ?>"><i
diff --git a/application/TimerecordingHoliday/TimerecordingHolidayController.php b/application/TimerecordingHoliday/TimerecordingHolidayController.php
index 742f38cf7..123910ada 100644
--- a/application/TimerecordingHoliday/TimerecordingHolidayController.php
+++ b/application/TimerecordingHoliday/TimerecordingHolidayController.php
@@ -11,7 +11,7 @@ class TimerecordingHolidayController extends mfBaseController
         $this->me = $me;
         $this->layout()->set("me", $me);
 
-        if (!$me->is(["Admin"])) {
+        if (!$me->can(["Fibu"])) {
             $this->redirect("Dashboard");
         }
     }