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

Merge branch 'spidev' into 'master'

Browse Source 
Zeiterfassung Fahrzeugverwaltung neue Features:

See merge request fronk/thetool!1117
This commit is contained in:
Daniel Spitzer
2025-03-16 09:06:01 +00:00
parent 62c4aff842 3c1e864580
commit 720688e346
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Layout/default/TimerecordingCar/Form.php
View File

@@ -15,8 +15,8 @@ foreach ($timerecordingusers as $timerecordinguser) {
ksort($timerecordingUsers);
$cartypes = TimerecordingCarModel::$carTypes;
?>
<style>
.journal-textarea {
height: 213px !important;
@@ -261,7 +261,7 @@ $cartypes = TimerecordingCarModel::$carTypes;
<div class="col-lg-7">
<textarea cols="9" name="journal" id="journal"
class="form-control journal-textarea"><?= $timerecordingcars->service_station ?></textarea>
class="form-control journal-textarea"><?= $timerecordingCarJounalLast->journal ?></textarea>
</div>
</div>
</div>

8
application/TimerecordingCar/TimerecordingCarController.php
View File

@@ -102,6 +102,8 @@ class TimerecordingCarController extends mfBaseController
$this->layout()->setFlash("Auto nicht gefunden", "error");
$this->redirect("TimerecordingCar");
}
$timerecordingCarJounalLast=TimerecordingCarJournalModel::getFirst(["timerecordingCar_id"=>$id]);
$this->layout()->set("timerecordingCarJounalLast", $timerecordingCarJounalLast);
$this->layout()->set("mimetypes", $mimetypes);
$this->layout()->set("timerecordingcarDokuments", $timerecordingcarDokuments);
@@ -258,8 +260,12 @@ class TimerecordingCarController extends mfBaseController
// var_dump($filestore);
// exit;
$id = $timerecordingcars->save();
$timerecordingCarJounalLast=TimerecordingCarJournalModel::getFirst(["timerecordingCar_id"=>$id]);
if ($journal && $timerecordingCarJounalLast->journal != $journal) {
if ($journal) {
$journal_timestamp = $r->journal_timestamp;
$dataJournal = [];
$dataJournal['timerecordingCar_id'] = $id;

4
application/TimerecordingCarJournal/TimerecordingCarJournalModel.php
View File

@@ -77,12 +77,12 @@ class TimerecordingCarJournalModel
}
public static function getFirst()
public static function getFirst($filter)
{
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$res = $db->select("TimerecordingCarJournal", "*", "$where ");
$res = $db->select("TimerecordingCarJournal", "*", "$where ORDER by timestamp DESC LIMIT 1");
if ($db->num_rows($res)) {
$data = $db->fetch_object($res);
$item = new TimerecordingCarJournal($data);