From b821c9f2c44700067ab5feb9c99184d77455e3ca Mon Sep 17 00:00:00 2001 From: Spi Date: Sun, 5 May 2024 12:36:47 +0200 Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20Update=20Monatsabschluss/Verrec?= =?UTF-8?q?hnung=20*=20Berechnungen=20aller=20=C3=9C50/=C3=9C100/M25=20sow?= =?UTF-8?q?ie=20Steuerfrei=20und=20Pflichtig=20*=20Transfer=20Mehrstunden?= =?UTF-8?q?=20auf=20=C3=9C50/=C3=9C100/M25=20*=20Anpassungen=20der=20Expor?= =?UTF-8?q?ts=20LZs=20MehrstundenGL=20=C3=9CGL=20=C3=9C50,=C3=9C100,M25=20?= =?UTF-8?q?*=20Autoberechnung=20der=20anteiligen=20Mehrstunden=20*=20autom?= =?UTF-8?q?atische=20=C3=9C100=20Rausrechnung=20laut=20gesetzlichen=20Vorg?= =?UTF-8?q?aben?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bugfixes: * Start und Enddatum eines Mitarbeiters werden nun überall berücksichtigt. * Textuelle Bereinigungen * Umfangreiche Testscenarien Verechnung/Exports --- .../default/TimerecordingBilling/Detail.php | 8 +- .../TimerecordingBilling/DetailClosed.php | 66 +++++-- Layout/default/TimerecordingEmployee/Form.php | 10 +- .../Timerecording/TimerecordingController.php | 65 ++++--- .../TimerecordingBillingController.php | 165 +++++++++++++++--- .../TimerecordingBillingEmployeeModel.php | 13 +- .../TimerecordingEmployeeController.php | 28 ++- .../TimerecordingReportController.php | 70 +++++--- ...ng_billing_employee_add_fields_backups.php | 33 ++++ ...ling_employee_add_fields_plushours_all.php | 31 ++++ public/assets/js/datatables-std.js | 8 +- 11 files changed, 386 insertions(+), 111 deletions(-) create mode 100644 db/migrations/20240502074407_timerecording_billing_employee_add_fields_backups.php create mode 100644 db/migrations/20240505072300_timerecording_billing_employee_add_fields_plushours_all.php diff --git a/Layout/default/TimerecordingBilling/Detail.php b/Layout/default/TimerecordingBilling/Detail.php index 9d85df9ca..8c493fa41 100644 --- a/Layout/default/TimerecordingBilling/Detail.php +++ b/Layout/default/TimerecordingBilling/Detail.php @@ -22,7 +22,7 @@
-
+

Liste aller Mitarbeiter

@@ -108,6 +108,9 @@ +
@@ -135,6 +138,9 @@ }); $('body').on('click', '#month-complete', function () { if (confirm('Monat ' + $('#month').data('month') + ' wirklich abschließen?')) { + $('#datatable_wrapper').hide(); + $('#page-header').hide(); + $('.spinner-big').show(); $.post(" 'completemonth']) ?>", { month: $.trim($('#month').data('month')), ajax: 1 diff --git a/Layout/default/TimerecordingBilling/DetailClosed.php b/Layout/default/TimerecordingBilling/DetailClosed.php index 7b4ec113b..66d95337b 100644 --- a/Layout/default/TimerecordingBilling/DetailClosed.php +++ b/Layout/default/TimerecordingBilling/DetailClosed.php @@ -52,7 +52,7 @@
-
+

Liste aller Mitarbeiter

@@ -64,15 +64,17 @@ Mitarbeiter/PersNr. Leistungszeiten Nichtleistungszeiten - Iststunden (NLZ+LZ) + Istst.(NLZ+LZ) Sollstunden Sollabweichung - Gesamt Überstunden + Mehrstunden + Ges. Überst. superexpertEnabled()): ?> Black P. Stunden - Ü50 - Ü100 + M25 + Ü50 + Ü100 Diäten Homeoffice @@ -83,6 +85,7 @@ + superexpertEnabled()): ?> @@ -91,6 +94,7 @@ + @@ -113,19 +117,21 @@ } ?> - ( - ) timerecordingEmployee->user->name ?> + () timerecordingEmployee->user->name ?> ishours / 3600, 2), "2", ",", ".") ?> ishourssum / 3600, 2), "2", ",", ".") ?> musthours / 3600, 2), "2", ",", ".") ?> - ishourssum - $timerecording->musthours) == 0) ? '
' : '' ?>ishourssum - $timerecording->musthours) / 3600, 2), "2", ",", ".") ?> - ishourssum - $timerecording->musthours) > 0) ? '' : '
' ?> + ishourssum-$timerecording->musthours) / 3600, 2), "2", ",", ".") ?> + + plushours_all == 0) ? '
' : '' ?>plushours_all) / 3600, 2), "2", ",", ".") ?> + plushours_all > 0) ? '' : '
' ?> timerecordingEmployee->overtime_now == 0) ? '
' : '' ?>timerecordingEmployee->overtime_now / 3600, 2), "2", ",", ".") ?> timerecordingEmployee->overtime_now > 0) ? '' : '
' ?> superexpertEnabled()): ?> timerecordingEmployee->bpahours / 3600, 2), "2", ",", ".") ?> + plushours25 / 3600, 2), "2", ",", ".") ?> overtime50free / 3600, 2), "2", ",", ".") ?> overtime100free / 3600, 2), "2", ",", ".") ?> diet, 2, ',', '.') . " €" ?> @@ -134,7 +140,9 @@ - +
@@ -157,6 +165,12 @@ + + + + '); + $('#overtimes').html(''); $('#submit-button').data('type', 'difference'); + $('#plushours25_div').show(); } if (button.hasClass('change-overtime')) { $('#overtimeModal-title').text('Überstunden Transfer'); $('#overtimes').html(''); $('#submit-button').data('type', 'overtime'); $('#overtimeModal').data('id', button.data('id')); + $('#plushours25_div').hide(); } $('.change-overtime-value').val(''); }); + + $('body').on('click', '#month-abort', function () { + if (confirm('Monatsabschluss ' + $('#month').data('month') + ' wirklich rückgängig machen?')) { + $('#datatable_wrapper').hide(); + $('#page-header').hide(); + $('.spinner-big').show(); + $.post(" 'abortmonth']) ?>", { + month: $.trim($('#month').data('month')), + ajax: 1 + }).done(function (data) { + window.location.href = " $month]) ?>"; + }); + } + + }); + $('body').on('change', '.change-overtime-value', function () { //$('#overtime-hours').data('hours') to float var difference = 0; @@ -278,12 +312,14 @@ }); $('body').on('click', '#submit-button', function () { var id = $('#overtimeModal').data('id'); + var plushours25 = $('#plushours25').val(); var overtime50 = $('#overtime50').val(); var overtime100 = $('#overtime100').val(); var overtimebpa = $('#overtimebpa').val(); $.post(" 'saveovertime']) ?>", { id: id, type: $(this).data('type'), + plushours25: plushours25, overtime50: overtime50, overtime100: overtime100, overtimebpa: overtimebpa, diff --git a/Layout/default/TimerecordingEmployee/Form.php b/Layout/default/TimerecordingEmployee/Form.php index bc48cb497..26db7b565 100644 --- a/Layout/default/TimerecordingEmployee/Form.php +++ b/Layout/default/TimerecordingEmployee/Form.php @@ -143,25 +143,25 @@ $daysSelect .= ""; -
+ -
+ -
+
Überstunden 50 - var hidesearch = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; + var hidesearch = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12]; superexpertEnabled()): ?> - hidesearch = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]; + hidesearch = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,12,13]; $(document).ready(function () { - // $('.buttons-excel').closest('div').append('
'); + superexpertEnabled()): ?> + $('.buttons-excel').closest('div').prepend('
'); + $('.buttons-excel').closest('div').append('
'); $('.buttons-excel').closest('div').append('
'); @@ -221,24 +237,42 @@ } }); - $('#overtimeModal').on('shown.bs.modal', function (event) { + $('#overtimeModal').on('show.bs.modal', function (event) { var button = $(event.relatedTarget); if (button.hasClass('change-difference')) { $('#overtimeModal-title').text('Mehrstunden Transfer'); $('#overtimeModal').data('id', button.data('id')); - $('#overtimes').html('		Mehrstunden: ' + button.data('hours') + ' (6,5)Mehrstunden: ' + button.data('hours') + 'Überstunden: ' + button.data('hours') + '