Zeiterfassung Feiertage Anpassungen

Feldgrößen / Datum wird nun mit Wochentag angezeigt
This commit is contained in:
Spitzer Daniel
2024-01-14 14:08:39 +01:00
parent 96baeddd17
commit 5d01cbe6d1
2 changed files with 6 additions and 23 deletions

View File

@@ -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

View File

@@ -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");
}
}