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

Faserplanung/Zeiterfassung

Browse Source 
* Zeiterfassung
 * Faserplanung Koordinatenanzeige bei Rohrverzeichnis bearbeiten hinzugefügt
 * Migrations
This commit is contained in:
Spitzer Daniel
2024-04-23 20:30:08 +02:00
parent 6310e2446e
commit 1ab898fbce
7 changed files with 109 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/FiberPlanPipe/FiberPlanPipeModel.php
View File

@@ -364,7 +364,7 @@ INNER JOIN `Address` ON (`Address`.`id`=`Addresstype`.`address_id`)
}
}
$html .= '</select></div><div class="col-lg-2"><input type="hidden" name="endpointid[]" value="' . $Endpoint->id . '" ></div></div>';
$html .= '</select></div><input type="hidden" name="endpointid[]" value="' . $Endpoint->id . '" ><div class="col-lg-2 endpoint_coordinates text-center"></div></div>';
echo $html;
$counter++;
}

20
application/TimerecordingEmployee/TimerecordingEmployeeController.php
View File

@@ -118,7 +118,23 @@ class TimerecordingEmployeeController extends mfBaseController
$data['type'] = trim($r->type);
$data['bmd_active'] = trim($r->bmd_active);
$data['overtime'] = $overtime;
#
if ($r->bpahours) {
$bpahours = $r->bpahours;
$bpahours = str_replace(',', '.', $bpahours);
if (is_numeric($bpahours)) {
$bpahours = $bpahours * 3600;
$data['bpahours'] = $bpahours;
}
}
if ($r->bpahours_value) {
$bpahours_value = $r->bpahours_value;
$bpahours_value = str_replace(',', '.', $bpahours_value);
if (is_numeric($bpahours_value)) {
$data['bpahours_value'] = $bpahours_value;
}
}
if (!$data['overtime']) {
$data['overtime'] = 0;
@@ -149,8 +165,6 @@ class TimerecordingEmployeeController extends mfBaseController
} else {
$timerecordingemployees = TimerecordingEmployeeModel::create($data);
}
// var_dump($filestore);
// exit;
$id = $timerecordingemployees->save();
if (!$id) {

1
application/TimerecordingEmployee/TimerecordingEmployeeModel.php
View File

@@ -15,6 +15,7 @@ class TimerecordingEmployeeModel
private $overtime_now;
private $overtime_timestamp;
private $bpahours;
private $bpahours_value;
private $startdate;
private $enddate;
private $bmd_active;