Zeiterfassung neues Feature:

Features für Project 7832:
* Das Pickerldatum Zusatzfeld
* Auftrennen PKW und Anhänger
* Dokumente Upload
* Standardsortierung
* Ausgeschieden Flag mit Datum
* zusätzliche migration
This commit is contained in:
Daniel Spitzer
2025-03-10 14:32:45 +01:00
parent c42b409972
commit e6131cda88
5 changed files with 93 additions and 60 deletions

View File

@@ -63,9 +63,9 @@
class="nav-link active"
id="home-tab"
data-toggle="tab"
href="#home"
href="#pkw"
role="tab"
aria-controls="home"
aria-controls="pkw"
aria-selected="true"
>PKW's</a>
</li>
@@ -74,9 +74,9 @@
class="nav-link"
id="profile-tab"
data-toggle="tab"
href="#user-tab"
href="#anhaenger"
role="tab"
aria-controls="user-tab"
aria-controls="anhaenger"
aria-selected="false"
>Anhänger</a>
</li>
@@ -85,11 +85,11 @@
<div class="tab-content" id="myTabContent">
<div
class="tab-pane fade show active"
id="home"
id="pkw"
role="tabpanel"
aria-labelledby="home-tab"
>
<table id="datatable" class="table table-striped table-hover table-sm">
<table id="datatable" class="table table-striped table-hover table-sm" style="width:100%">
<thead>
<tr class="bg-white">
<th class="text-center">Kennzeichen</th>
@@ -168,7 +168,7 @@
</div>
<div
class="tab-pane fade col-12"
id="user-tab"
id="anhaenger"
role="tabpanel"
aria-labelledby="profile-tab"
>
@@ -223,7 +223,7 @@
<tr>
<td>
<a class="<?= ($timerecordingcar->retired) ? 'retired-href' : 'text-underlined' ?>"
href="<?= self::getUrl("TimerecordingCar", "detail", ["id" => $timerecordingcar->id]) ?>"> <?= $timerecordingcar->number_plate ?></a>
href="<?= self::getUrl("TimerecordingCar", "detail", ["id" => $timerecordingcar->id,"hash" => "anhaenger"]) ?>"> <?= $timerecordingcar->number_plate ?></a>
</td>
<td><?= ($timerecordingcar->user_id) ? $timerecordingcar->user->name : "-" ?></td>
<td><?= $timerecordingcar->brand ?></td>
@@ -237,7 +237,7 @@
<td class="text-center"><?= ($timerecordingcar->retired) ? "Nein" : "Ja" ?></td>
</td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
<a href="<?= self::getUrl("TimerecordingCar", "edit", ["id" => $timerecordingcar->id]) ?>"><i
<a href="<?= self::getUrl("TimerecordingCar", "edit", ["id" => $timerecordingcar->id,"hash" => "anhaenger"]) ?>"><i
class="far fa-edit" title="Bearbeiten"></i></a>
<a href="<?= self::getUrl("TimerecordingCar", "delete", ["id" => $timerecordingcar->id]) ?>"
onclick="if(!confirm('Fahrzeug wirklich löschen?')) return false;"
@@ -453,6 +453,18 @@
table2.draw();
}
$(document).ready(function() {
// Überprüfen, ob ein Hash in der URL vorhanden ist und den entsprechenden Tab aktivieren
var hash = window.location.hash;
if (hash) {
$('#myTab a[href="' + hash + '"]').tab('show');
}
// Beim Wechseln eines Tabs den Hash in der URL aktualisieren
$('#myTab a').on('show.bs.tab', function(e) {
window.location.hash = e.target.hash;
});
});
</script>