fr/fuel-stats
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Details

Browse Source 
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:
Filip Rojek
2025-02-01 18:38:49 +01:00
parent f90c707435
commit 7517bcb78f
8 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/DashboardController.php
View File

@ -3,8 +3,7 @@ class DashboardController extends Controller {
public function index() {
$vehicle = new Vehicle();
$vehicles = $vehicle->getVehiclesByUser($_SESSION['user']['id']);
$default_car = $vehicle->getDefaultVehicle($_SESSION['user']['id']);
$default_car = $vehicle->getDefaultVehicle($_SESSION['user']['id']) ?? null;
$refuel = new Refuel();
$data = [
@ -13,7 +12,7 @@ class DashboardController extends Controller {
"mileage" => [],
"liters" => []
];
$raw_data = $refuel->latest_data($default_car['id'], 5);
$raw_data = $default_car ? $refuel->latest_data($default_car['id'], 5) : [];
foreach($raw_data as $one) {
array_push($data['date'], date('d. m.', strtotime($one['created_at'])));
array_push($data['price'], $one['price_per_liter']);
@ -21,7 +20,8 @@ class DashboardController extends Controller {
array_push($data['liters'], $one['liters']);
}
$latest_record = $refuel->latest_one($_SESSION['user']['id'])[0];
$latest_data = $default_car ? $refuel->latest_one($default_car['id']) : [];
$latest_record = !empty($latest_data) ? $latest_data[0] : null;
$this->view('dashboard/index', [
'title' => 'Dashboard',

10
app/controllers/VehicleController.php
View File

@ -30,17 +30,21 @@ class VehicleController extends Controller {
}
$vehicle = new Vehicle();
$default_vehicle = $vehicle->getDefaultVehicle($_SESSION['user']['id']);
$is_default = $default_vehicle ? 0 : 1;
$result = $vehicle->create([
'name' => $name,
'registration_plate' => strtoupper($registration_plate),
'fuel_type' => $fuel_type,
'note' => $note,
'user_id' => $_SESSION['user']['id'],
'is_default' => $is_default
]);
if ($result === true) {
$this->redirect('/vehicles');
$this->redirect('/');
} else {
$this->view('vehicles/create', ['title' => 'Create vehicle', 'error' => $result, 'validationErrors' => []] );
}
@ -72,7 +76,7 @@ class VehicleController extends Controller {
return;
}
$this->view('vehicles/index', ['title' => 'Vehicles', 'vehicles' => $vehicles]);
header("Location: /vehicles");
}
public function setDefault() {
@ -84,7 +88,7 @@ class VehicleController extends Controller {
return;
}
$this->view('vehicles/index', ['title' => 'Vehicles', 'vehicles' => $vehicles]);
header("Location: /");
}
public function api_get() {