Merge branch 'spidev' into 'master'

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
3 changed files with 11 additions and 5 deletions

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>