Updated: Improved vehicle and refuel data handling on dashboard
All checks were successful
Build and Deploy Zola Website / build_and_deploy (push) Successful in 14s
All checks were successful
Build and Deploy Zola Website / build_and_deploy (push) Successful in 14s
Updated: - DashboardController now fetches latest refuel record only for the default vehicle - VehicleController - first created vehicle is now set as default automatically - Refuel model - latest_one() now accepts vehicle_id instead of user_id - Dashboard view - improved handling when no vehicles or refuel records exist - CSS styles - adjusted dashboard layout and global action padding
This commit is contained in:
@ -5,8 +5,15 @@
|
||||
|
||||
<section class="dashboard">
|
||||
<h1>Welcome, <?= htmlspecialchars($_SESSION['user']['username']) ?>!</h1>
|
||||
<?php if(!isset($data['default_car'])): ?>
|
||||
|
||||
<div id="intro">
|
||||
<a href="/vehicles/create">Create your first vehicle</a>
|
||||
</div>
|
||||
<?php elseif (isset($data['latest_record'])): ?>
|
||||
|
||||
<div id="actions">
|
||||
<a href="/refuel/create" class="btn-green">Add new refuel record!</a>
|
||||
<a href="/refuel/create" class="btn-green">Add new refuel record</a>
|
||||
<a href="/vehicles" class="btn-primary">List all vehicles</a>
|
||||
<a class="btn-warning" id="btn-offline-add">Add new offline refuel record</a>
|
||||
</div>
|
||||
@ -25,6 +32,10 @@
|
||||
<p><?= $data['latest_record']['total_price'] ?>,-</p>
|
||||
<b>Mileage:</b>
|
||||
<p><?= $data['latest_record']['mileage'] ?> km</p>
|
||||
<?php if (isset($data['latest_record']['note'])): ?>
|
||||
<b>Note:</b>
|
||||
<p><?= $data['latest_record']['note'] ?></p>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@ -55,6 +66,17 @@
|
||||
<b id="avg-fl-cnsmp"></b>
|
||||
</section>
|
||||
</div>
|
||||
<?php else: ?>
|
||||
<div id="actions">
|
||||
<a href="/refuel/create" class="btn-green">Add new refuel record</a>
|
||||
<a href="/vehicles" class="btn-primary">List all vehicles</a>
|
||||
<a class="btn-warning" id="btn-offline-add">Add new offline refuel record</a>
|
||||
</div>
|
||||
<div class="alert-warning">
|
||||
<p>Default vehicle <b><i><?= $data['default_car']['name'] ?></i></b> doesn't have any refuel record yet.</p>
|
||||
<p>Select another vehicle or create first refuel record.</p>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</section>
|
||||
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
|
||||
<script>
|
||||
|
@ -4,7 +4,7 @@
|
||||
<p>No vehicles yet. <a href="/vehicles/create">Add your first vehicle</a>.</p>
|
||||
<?php else: ?>
|
||||
<div class="btn-wrapper">
|
||||
<a href="/vehicles/create" class="btn-green">Add new vehicle!</a>
|
||||
<a href="/vehicles/create" class="btn-green">Add new vehicle</a>
|
||||
</div>
|
||||
<div class="vehicle-wrapper">
|
||||
<?php foreach ($this->get('vehicles') as $vehicle): ?>
|
||||
@ -13,15 +13,18 @@
|
||||
<p><?= htmlspecialchars($vehicle['registration_plate']) ?></p>
|
||||
<p><?= htmlspecialchars($vehicle['fuel_type']) ?></p>
|
||||
<p><?= htmlspecialchars($vehicle['note'] ?? "") ?></p>
|
||||
|
||||
<div class="actions">
|
||||
<br>
|
||||
<form method="POST" action="/vehicles/delete">
|
||||
<input type="number" name="vehicle_id" value="<?= $vehicle['id'] ?>" style="display: none">
|
||||
<input type="submit" value="Delete vehicle" class="btn-danger">
|
||||
</form>
|
||||
|
||||
<br>
|
||||
<form method="POST" action="/vehicles/default">
|
||||
<input type="number" name="vehicle_id" value="<?= $vehicle['id'] ?>" style="display: none">
|
||||
<input type="submit" value="Set default" class="btn-primary">
|
||||
<input type="submit" value="Set as default" class="btn-primary">
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user