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

Zeiterfassung Anpassungen Jobrad Feature

Browse Source 
* Jobrad ist nun direkt in die Verrechnung inkludiert mit eigener DB Spalte
 * Migration Jobrad Verrechnung
 * Diverse Bugfixes
This commit is contained in:
Daniel Spitzer
2024-07-14 13:11:51 +02:00
parent 1fba2e392e
commit d52d83327f
5 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Layout/default/TimerecordingBilling/DetailClosed.php
View File

@@ -193,7 +193,7 @@
}
?>
<tr>
<td class="text-nowrap">(<?= $employee_number ?>) <?= $timerecording->timerecordingEmployee->user->name ?> <?= ($timerecording->timerecordingEmployee->jobbike == 1) ? '<div class="float-right"><i title="Jobrad" class="fa-sharp fa-regular fa-person-biking"></i></div>' : '' ?></td>
<td class="text-nowrap">(<?= $employee_number ?>) <?= $timerecording->timerecordingEmployee->user->name ?> <?= ($timerecording->jobbike == 1) ? '<div class="float-right"><i title="Jobrad" class="fa-sharp fa-regular fa-person-biking"></i></div>' : '' ?></td>
<td class="text-center"><?= number_format(round($timerecording->ishours / 3600, 2), "2", ",", ".") ?></td>
<td class="text-center"><?= $nlz ?></td>
<td class="text-center"><?= number_format(round($timerecording->ishourssum / 3600, 2), "2", ",", ".") ?></td>

2
Layout/default/TimerecordingEmployee/Index.php
View File

@@ -163,7 +163,7 @@ $type[3] = "Lehrling";
var hidesearch = [ 6, 7, 8, 9, 10,13];
var columnfilter = [0,11,12];
<?php if ($me->superexpertEnabled()): ?>
var columnfilter = [0,12];
var columnfilter = [0,12,13];
hidesearch = [ 6, 7, 8, 9, 10, 11,14];
<?php endif; ?>

10
application/TimerecordingBilling/TimerecordingBillingController.php
View File

@@ -269,7 +269,7 @@ class TimerecordingBillingController extends mfBaseController
if ($timerecordingBillingEmployee->overtime50free > 64800) {
$bodyarray = [$monthbmd, "1", $employee_number, "3110", "18", "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
if ($timerecordingBillingEmployee->timerecordingEmployee->jobbike == 1) {
if ($timerecordingBillingEmployee->jobbike == 1) {
$bodyarray = [$monthbmd, "1", $employee_number, "3115", "18", "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
$bodyarray = [$monthbmd, "1", $employee_number, "3116", "18", "", "", "", "", "", ""];
@@ -285,7 +285,7 @@ class TimerecordingBillingController extends mfBaseController
$overtime50free = str_replace(".", ",", $overtime50free);
$bodyarray = [$monthbmd, "1", $employee_number, "3110", $overtime50free, "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
if ($timerecordingBillingEmployee->timerecordingEmployee->jobbike == 1) {
if ($timerecordingBillingEmployee->jobbike == 1) {
$bodyarray = [$monthbmd, "1", $employee_number, "3115", $overtime50free, "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
$bodyarray = [$monthbmd, "1", $employee_number, "3116", $overtime50free, "", "", "", "", "", ""];
@@ -303,7 +303,7 @@ class TimerecordingBillingController extends mfBaseController
if ($timerecordingBillingEmployee->overtime100free > 64800) {
$bodyarray = [$monthbmd, "1", $employee_number, "3160", "18", "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
if ($timerecordingBillingEmployee->timerecordingEmployee->jobbike == 1) {
if ($timerecordingBillingEmployee->jobbike == 1) {
$bodyarray = [$monthbmd, "1", $employee_number, "3165", "18", "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
$bodyarray = [$monthbmd, "1", $employee_number, "3166", "18", "", "", "", "", "", ""];
@@ -318,7 +318,7 @@ class TimerecordingBillingController extends mfBaseController
} else {
$bodyarray = [$monthbmd, "1", $employee_number, "3160", $overtime100free, "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
if ($timerecordingBillingEmployee->timerecordingEmployee->jobbike == 1) {
if ($timerecordingBillingEmployee->jobbike == 1) {
$bodyarray = [$monthbmd, "1", $employee_number, "3165", $overtime100free, "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
$bodyarray = [$monthbmd, "1", $employee_number, "3166", $overtime100free, "", "", "", "", "", ""];
@@ -421,6 +421,7 @@ class TimerecordingBillingController extends mfBaseController
if ($export == 0) {
$reponse[$employee_number]['employee_id'] = $timerecordingsEmolyee->id;
$reponse[$employee_number]['user_id'] = $timerecordingsEmolyee->user_id;
$reponse[$employee_number]['jobbike'] = $timerecordingsEmolyee->jobbike;
$reponse[$employee_number]['homeoffice'] = $timerecording['time']['homeoffice'];
$reponse[$employee_number]['istimeall'] = $timerecording['time']['isorder'];
$reponse[$employee_number]['musttime'] = $timerecording['time']['mustorder'];
@@ -557,6 +558,7 @@ class TimerecordingBillingController extends mfBaseController
$data = [];
$data['timerecordingBilling_id'] = $id;
$data['timerecordingEmployee_id'] = $timerecording['employee_id'];
$data['jobbike'] = $timerecording['jobbike'];
$data['musthours'] = $timerecording['musttime'];
$data['overtime50'] = $timerecording['overtimes']['O50pfl'];
$data['overtime50free'] = $timerecording['overtimes']['O50free'];

1
application/TimerecordingBillingEmployee/TimerecordingBillingEmployeeModel.php
View File

@@ -20,6 +20,7 @@ class TimerecordingBillingEmployeeModel
private $nlz;
private $nlz_detail;
private $holidays;
private $jobbike;
private $transfer_plushours;
private $transfer_overtime;
private $transfer_bpahours;

31
db/migrations/20240714103718_timerecording_billing_employee_add_field_jobbike.php Normal file
View File

@@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
use Phinx\Migration\AbstractMigration;
final class TimerecordingBillingEmployeeAddFieldJobbike extends AbstractMigration
{
public function up(): void
{
if($this->getEnvironment() == "thetool") {
$table = $this->table("TimerecordingBillingEmployee", ["signed" => true]);
$table->addColumn("jobbike", "integer", ["null" => false, "default" => 0, "after" => "holidays"]);
$table->update();
}
if($this->getEnvironment() == "addressdb") {
}
}
public function down(): void
{
if($this->getEnvironment() == "thetool") {
$this->table("TimerecordingBillingEmployee")->removeColumn("jobbike")->save();
}
if($this->getEnvironment() == "addressdb") {
}
}
}