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

Updated: Removed LIMIT for all refuel records, fixed fuel consumption calculation on dashboard
All checks were successful
Build and Deploy Zola Website / build_and_deploy (push) Successful in 12s
Details

Browse Source
This commit is contained in:
Filip Rojek
2025-02-01 22:56:32 +01:00
parent 652b04bfa1
commit 4576800e27
3 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/models/Refuel.php
View File

@ -38,15 +38,24 @@ class Refuel {
public function latest_data($vehicle_id, $record_count) {
try {
$stmt = $this->db->prepare("
$sql = "
SELECT `liters`, `price_per_liter`, `total_price`, `mileage`, `created_at`
FROM `refueling_records`
WHERE `vehicle_id` = ?
ORDER BY created_at DESC
LIMIT ?;
");
ORDER BY created_at DESC";
if ($record_count > 0) {
$sql .= " LIMIT ?";
}
$stmt = $this->db->prepare($sql);
if ($record_count > 0) {
$stmt->bind_param("ii", $vehicle_id, $record_count);
} else {
$stmt->bind_param("i", $vehicle_id);
}
$stmt->bind_param("ii", $vehicle_id, $record_count);
if ($stmt->execute()) {
$result = $stmt->get_result();
$data = $result->fetch_all(MYSQLI_ASSOC);
@ -62,7 +71,7 @@ class Refuel {
public function latest_one($vehicle_id, $record_count = 1) {
try {
$stmt = $this->db->prepare("
$sql = "
SELECT
`r`.`vehicle_id`,
`v`.`name` AS `vehicle_name`,
@ -75,11 +84,20 @@ class Refuel {
FROM `refueling_records` AS `r`
JOIN `vehicles` AS `v` ON `r`.`vehicle_id` = `v`.`id`
WHERE `r`.`vehicle_id` = ?
ORDER BY `r`.`created_at` DESC
LIMIT ?;
");
ORDER BY `r`.`created_at` DESC";
if ($record_count > 0) {
$sql .= " LIMIT ?";
}
$stmt = $this->db->prepare($sql);
if ($record_count > 0) {
$stmt->bind_param("ii", $vehicle_id, $record_count);
} else {
$stmt->bind_param("i", $vehicle_id);
}
$stmt->bind_param("ii", $vehicle_id, $record_count);
if ($stmt->execute()) {
$result = $stmt->get_result();
$data = $result->fetch_all(MYSQLI_ASSOC);