diff --git a/Layout/default/TimerecordingCar/Detail.php b/Layout/default/TimerecordingCar/Detail.php index 1c147c8ee..8e8a5bba6 100644 --- a/Layout/default/TimerecordingCar/Detail.php +++ b/Layout/default/TimerecordingCar/Detail.php @@ -1,6 +1,10 @@ initial_approval); $initialApprovalMonth = date("m", $timerecordingcar->initial_approval); +if ($timerecordingcar->override_approval) { + $overrideApproval = date("Y-m-d H:i:s", $timerecordingcar->override_approval); + $initialApprovalMonth = date("m", $timerecordingcar->override_approval); +} $firstApproval = strtotime('+' . $timerecordingcar->first_approval . 'years', strtotime($initialApproval)); if ($firstApproval < time()) { $firstApproval = strtotime(date("Y-$initialApprovalMonth-01", time())); @@ -9,9 +13,13 @@ if ($firstApproval < time()) { } } $approval = date("m/Y", $firstApproval); +$cartypes = TimerecordingCarModel::$carTypes; + ?> +
| Kennzeichen | -Fahrzeugverwalter | -Marke | -Model/Typ | -Erstzulassssung | -$57a | -Fahrtenbuch | -Kilometerstand | -- | |
|---|---|---|---|---|---|---|---|---|---|
| - | - | - | - | - | - | - | - | - |
| Kennzeichen | +Fahrzeugverwalter | +Marke | +Model/Typ | +Erstzulassung | +$57a | +Fahrtenbuch | +KM-Stand | +Aktiv | ++ |
|---|---|---|---|---|---|---|---|---|---|
| + | + | + | + | + | + | + | + | + | + |
| + $timerecordingcar->id]) ?>"> = $timerecordingcar->number_plate ?> + | += ($timerecordingcar->user_id) ? $timerecordingcar->user->name : "-" ?> | += $timerecordingcar->brand ?> | += $timerecordingcar->model ?> | +">= ($timerecordingcar->initial_approval) ? date("m/Y", $timerecordingcar->initial_approval) : "-" ?> | +">= ($timerecordingcar->initial_approval) ? $approval : "-" ?> | += ($timerecordingcar->timerecording) ? "Ja" : "Nein" ?> | += ($timerecordingcar->mileage_now) ? number_format($timerecordingcar->mileage_now, 0, ',', '.') . " KM" : "-" ?> + | = ($timerecordingcar->retired) ? "Nein" : "Ja" ?> | + ++ $timerecordingcar->id]) ?>"> + $timerecordingcar->id]) ?>" + onclick="if(!confirm('Fahrzeug wirklich löschen?')) return false;" + class="text-danger" + title="Löschen"> + | +
| Kennzeichen | +Fahrzeugverwalter | +Marke | +Model/Typ | +Erstzulassung | +$57a | +Fahrtenbuch | +KM-Stand | +Aktiv | ++ |
|---|---|---|---|---|---|---|---|---|---|
| + | + | + | + | + | + | + | + | + | + |
| + $timerecordingcar->id]) ?>"> = $timerecordingcar->number_plate ?> + | += ($timerecordingcar->user_id) ? $timerecordingcar->user->name : "-" ?> | += $timerecordingcar->brand ?> | += $timerecordingcar->model ?> | +">= ($timerecordingcar->initial_approval) ? date("m/Y", $timerecordingcar->initial_approval) : "-" ?> | +">= ($timerecordingcar->initial_approval) ? $approval : "-" ?> | += ($timerecordingcar->timerecording) ? "Ja" : "Nein" ?> | += ($timerecordingcar->mileage_now) ? number_format($timerecordingcar->mileage_now, 0, ',', '.') . " KM" : "-" ?> + | = ($timerecordingcar->retired) ? "Nein" : "Ja" ?> | + ++ $timerecordingcar->id]) ?>"> + $timerecordingcar->id]) ?>" + onclick="if(!confirm('Fahrzeug wirklich löschen?')) return false;" + class="text-danger" + title="Löschen"> + | +
' + fileList[i].name + '
'); + $('.attachment-div').append(`