Added: mileage, average fuel consumption
All checks were successful
Build and Deploy Zola Website / build_and_deploy (push) Successful in 12s
All checks were successful
Build and Deploy Zola Website / build_and_deploy (push) Successful in 12s
This commit is contained in:
@ -10,21 +10,17 @@ class DashboardController extends Controller {
|
||||
$data = [
|
||||
"date" => [],
|
||||
"price" => [],
|
||||
"mileage" => [],
|
||||
"liters" => []
|
||||
];
|
||||
$raw_data = $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']);
|
||||
array_push($data['mileage'], $one['mileage']);
|
||||
array_push($data['liters'], $one['liters']);
|
||||
}
|
||||
|
||||
$latest_record = [
|
||||
'name',
|
||||
'liters',
|
||||
'price_per_liter',
|
||||
'total_price',
|
||||
'created_at'
|
||||
];
|
||||
|
||||
$latest_record = $refuel->latest_one($_SESSION['user']['id'])[0];
|
||||
|
||||
$this->view('dashboard/index', [
|
||||
|
@ -18,6 +18,7 @@ class RefuelController extends Controller {
|
||||
$liters = $_POST['liters'] ?? '';
|
||||
$price_per_liter = $_POST['price_per_liter'] ?? '';
|
||||
$total_price = $_POST['total_price'] ?? '';
|
||||
$mileage = $_POST['mileage'] ?? '';
|
||||
$note = $_POST['note'] ?? '';
|
||||
|
||||
$validator = new Validator();
|
||||
@ -29,6 +30,7 @@ class RefuelController extends Controller {
|
||||
$validator->number('liters', $liters);
|
||||
$validator->number('price_per_liter', $price_per_liter);
|
||||
$validator->number('total_price', $total_price);
|
||||
$validator->number('mileage', $mileage);
|
||||
|
||||
if (round($liters * $price_per_liter, 2) != $total_price) {
|
||||
$validator->setErrors(["total_price" => "Price calculation is wrong"]);
|
||||
@ -57,6 +59,7 @@ class RefuelController extends Controller {
|
||||
'liters' => $liters,
|
||||
'price_per_liter' => $price_per_liter,
|
||||
'total_price' => $total_price,
|
||||
'mileage' => $mileage,
|
||||
]);
|
||||
|
||||
if ($result === true) {
|
||||
|
Reference in New Issue
Block a user