From e4a1e2a85e61ceb9472b6f652710ce4a8b0ec7fa Mon Sep 17 00:00:00 2001 From: Daniel Spitzer Date: Sat, 11 Oct 2025 18:29:53 +0200 Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20Update=20*=20Nachtzulage=20wurd?= =?UTF-8?q?e=20in=20der=20Personaladministration=20hinzugef=C3=BCgt=20*=20?= =?UTF-8?q?Bei=20der=20Verrechnung=20werden=20=C3=9C100=20wenn=20Nachtzula?= =?UTF-8?q?ge=20aktiv=20ist=20anders=20bewertet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Layout/default/TimerecordingEmployee/Form.php | 906 +++++++++--------- .../TimerecordingEmployeeController.php | 4 + .../TimerecordingEmployeeModel.php | 1 + .../TimerecordingReportController.php | 9 +- ...recording_employee_add_nigth_allowance.php | 31 + 5 files changed, 508 insertions(+), 443 deletions(-) create mode 100644 db/migrations/20251011155801_timerecording_employee_add_nigth_allowance.php diff --git a/Layout/default/TimerecordingEmployee/Form.php b/Layout/default/TimerecordingEmployee/Form.php index 4827b921f..9058eb748 100644 --- a/Layout/default/TimerecordingEmployee/Form.php +++ b/Layout/default/TimerecordingEmployee/Form.php @@ -6,509 +6,537 @@ foreach ($days as $key => $day) { $daysSelect .= ""; ?> - + - - - - -
-
-
-
-
    -
  1. "> -
    2. -
  2. ">Personaladministration
    3. -
  3. id) ? "bearbeiten" : "Neu" ?>
    4. + } + + +
    +
    +
    +
    +
      +
    1. "> +
      2. +
    2. ">Personaladministration
      3. +
    3. id) ? "bearbeiten" : "Neu" ?>
      4. -
    -
    -

    id) ? "Personaladministration" : "Personaladministration" ?>

    +
+

id) ? "Personaladministration" : "Personaladministration" ?>

- -
-
+
+ +
+
-
-
-

id) ? "Personaladministration" : "Personaladministration" ?>

+
+
+

id) ? "Personaladministration" : "Personaladministration" ?>

-
"> -
-
- -
- -
-
- bmd_active) echo 'checked="checked"'; ?> - type="checkbox" name="bmd_active" value="1"/> -
-
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- "/> -
-
-
- -
- "/> -
-
-
- -
- "/> -
-
-
- -
- "/> -
-
- superexpertEnabled()): ?> -
- -
- bpahours / 3600) ?>"/> -
-
-
- -
- bpahours_value) ?>"/> -
-
- - - -
- -
- plushours / 3600) ?>"/> -
-
- -
- -
- overtime / 3600) ?>"/> -
-
-
- -
-
- auto_workinghours) echo 'checked="checked"'; ?> - type="checkbox" name="auto_workinghours" value="1"/> -
-
-
-
- -
-
- jobbike) echo 'checked="checked"'; ?> - type="checkbox" name="jobbike" value="1"/> -
-
-
- superexpertEnabled()): ?> + "> +
+
+ +
+
+

Allgemein

+ for="bmd_active">Aktive Verrechnung
- only_admin) echo 'checked="checked"'; ?> - type="checkbox" name="only_admin" value="1"/> + bmd_active) echo 'checked="checked"'; ?> + type="checkbox" name="bmd_active" value="1"/>
- -
+
- -
- + +
+
-
- +
+
+ +
+ +
+
+
+ +
+ "/> +
+
+
+ +
+ "/> +
+
+
+ +
+ "/> +
+
+
+ +
+ "/> +
+
+ superexpertEnabled()): ?> +
+ +
+ bpahours / 3600) ?>"/> +
+
+
+ +
+ bpahours_value) ?>"/> +
+
+ + - + +
+ plushours / 3600) ?>"/> +
+
- foreach ($timerecordingworkinghours as $timerecordingworkinghour): ?> -
-
- -
-
- -
-
- -
-
- +
+ +
+ overtime / 3600) ?>"/> +
+
+
+ +
+
+ auto_workinghours) echo 'checked="checked"'; ?> + type="checkbox" name="auto_workinghours" value="1"/> +
+
+
+
+ +
+
+ jobbike) echo 'checked="checked"'; ?> + type="checkbox" name="jobbike" value="1"/> +
+
+
+ + superexpertEnabled()): ?> +
+ +
+
+ only_admin) echo 'checked="checked"'; ?> + type="checkbox" name="only_admin" value="1"/>
- - +
+
-
-
+
+
+

Arbeitszeiten

+
+ +
+
+ night_allowance) echo 'checked="checked"'; ?> + type="checkbox" name="night_allowance" value="1"/> +
+
+
+
+
+ +
+ +
+
+ +
+
-
- -
- "> - - - + -
- - -
- -
- -
-
-
-
- -

Arbeitszeiten Historie

- - - - - - - - - - + foreach ($timerecordingworkinghours as $timerecordingworkinghour): ?> +
+
+ +
+
+ +
+
+ +
+
+ +
+
$timerecordingworkinghours): - if (!$timerecordingworkinghours['workinghours']) { - $historyworkingkours = '0 Stunden'; - $historyworkingkoursText = "keine"; - } else { - $historyworkingkoursText = $timerecordingworkinghours['workinghours']; - $hours = $timerecordingworkinghours['workingtime'] / 3600; - $historyworkingkours = $hours . ' Stunden'; - } - ?> - - - - - - - - -
ArbeitszeitenWochenstundenBis
-
+ endforeach; + endif + ?> +
- -
-
-
- -