From 3c1e864580f8ce6f2af9f1b45e1a23c19d5bd260 Mon Sep 17 00:00:00 2001
From: Daniel Spitzer <daniel.spitzer@inode.at>
Date: Sun, 16 Mar 2025 10:05:13 +0100
Subject: [PATCH] Zeiterfassung Fahrzeugverwaltung neue Features: * KM-Stand
 History * Journal * Neue Felder

---
 Layout/default/TimerecordingCar/Form.php                  | 4 ++--
 .../TimerecordingCar/TimerecordingCarController.php       | 8 +++++++-
 .../TimerecordingCarJournalModel.php                      | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Layout/default/TimerecordingCar/Form.php b/Layout/default/TimerecordingCar/Form.php
index 9da0bf7e9..005929ba1 100644
--- a/Layout/default/TimerecordingCar/Form.php
+++ b/Layout/default/TimerecordingCar/Form.php
@@ -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>
diff --git a/application/TimerecordingCar/TimerecordingCarController.php b/application/TimerecordingCar/TimerecordingCarController.php
index 19335be49..64e4ab5cb 100644
--- a/application/TimerecordingCar/TimerecordingCarController.php
+++ b/application/TimerecordingCar/TimerecordingCarController.php
@@ -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;
diff --git a/application/TimerecordingCarJournal/TimerecordingCarJournalModel.php b/application/TimerecordingCarJournal/TimerecordingCarJournalModel.php
index e12981c56..6f0390d0b 100644
--- a/application/TimerecordingCarJournal/TimerecordingCarJournalModel.php
+++ b/application/TimerecordingCarJournal/TimerecordingCarJournalModel.php
@@ -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);