app/controllers/DashboardController.php

@@ -12,7 +12,7 @@ class DashboardController extends Controller {
             "mileage" => [],
             "liters" => []
         ];
-        $raw_data = $default_car ? $refuel->latest_data($default_car['id'], 0) : [];
+        $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']);

app/controllers/RefuelController.php

@@ -46,7 +46,6 @@ class RefuelController extends Controller {
                     'validationErrors' => $validator->errors() ?: [],
                     'vehicles' => $vehicles,
                     'title' => 'New refuel record',
-                    'status' => '400'
                 ]);
                 return;
             }

app/models/Refuel.php

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

app/models/Vehicle.php

@@ -35,7 +35,7 @@ class Vehicle {
     }
 
     public function getVehiclesByUser($user_id) {
-        $stmt = $this->db->prepare("SELECT id, name, registration_plate, fuel_type, note, is_default, created_at FROM vehicles WHERE user_id = ?");
+        $stmt = $this->db->prepare("SELECT id, name, registration_plate, fuel_type, note, created_at FROM vehicles WHERE user_id = ?");
         $stmt->bind_param("i", $user_id);
         $stmt->execute();
         $result = $stmt->get_result();

app/views/dashboard/index.php

@@ -98,26 +98,25 @@
 
 <script>
     const data2 = <?= json_encode($data['date_price_data']); ?>;
-	let cnt_ltr = 0;
+    let cnt_ltr = 0
-    let last_ltr = 0;
+    let cnt_km = 0
-    let last_km = 0;
+    let first_km = 0
-	let first_km = 0;
+
+    console.log(data2)
 
     for(let i = 0; i < data2['liters'].length; i++) {
-		if(i === 0) {
+        if(i == 0) {
             first_km = data2['mileage'][i]
-			continue; // skip bcs were expecting that this was first full tank refuel so this is base value
         }
         cnt_ltr += data2['liters'][i]
-        last_ltr = data2['liters'][i]
+        cnt_km =+ data2['mileage'][i]
-        last_km = data2['mileage'][i]
     }
 
-    // cnt_ltr -= last_ltr // this would be used if we would track consumption from 0km
+    console.log("Liters", cnt_ltr, cnt_km, first_km)
-	last_km -= first_km
+    console.log("Avg", (cnt_km - first_km) / cnt_ltr)
 
-    document.querySelector("#avg-fl-cnsmp").textContent =
+    document.querySelector("#avg-fl-cnsmp").textContent = Math.floor((cnt_km - first_km) / cnt_ltr) + " l/100km"
-		(cnt_ltr/last_km*100).toFixed(1) + " l/100km";
 </script>
 
+
 <script defer src="/js/offline-records.js"></script>

app/views/vehicles/index.php

@@ -14,20 +14,18 @@
                 <p><?= htmlspecialchars($vehicle['fuel_type']) ?></p>
                 <p><?= htmlspecialchars($vehicle['note'] ?? "") ?></p>
 
-                <div class="vehicle-actions">
+                <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>
 
-                    <?php if(!$vehicle['is_default']): ?>
                     <br>
                     <form method="POST" action="/vehicles/default">
                         <input type="number" name="vehicle_id" value="<?= $vehicle['id'] ?>" style="display: none">
                         <input type="submit" value="Set as default" class="btn-primary">
                     </form>
-                    <?php endif; ?>
                 </div>
             </div>
         <?php endforeach; ?>

core/View.php

@@ -7,11 +7,6 @@ class View
         // Store the data 
         $this->data = $data;
 
-        // check for status code in data
-        if(isset($this->data['status'])){
-            http_response_code($this->data['status']);
-        }
-
         // Capture the view content
         ob_start();
         require_once views . $view . '.php';

docker-compose.yaml

@@ -6,8 +6,6 @@ services:
       MARIADB_ROOT_PASSWORD: root
     ports:
       - 3306:3306
-    volumes:
-      - fuelstats_mariadb_data:/var/lib/mysql
     networks:
       - fuelstats-network
     profiles: ["prod", "dev"]
@@ -44,6 +42,3 @@ services:
 networks:
   fuelstats-network:
     driver: bridge
-
-volumes:
-  fuelstats_mariadb_data:

public/css/vehicles.css

@@ -27,10 +27,3 @@
 	align-items: center;
 	margin-bottom: 1rem;
 }
-
-.vehicle-actions {
-	display: flex;
-	flex-direction: row;
-	gap: .5rem;
-	margin-top: 1rem;
-}

public/js/offline-records.js

@@ -45,16 +45,12 @@ setInterval(async () => {
 				showDashboard();
 			});
 		}
-	}
 
 		if (localStorage.getItem("refuelOfflineData")) {
-		Array.from(divActions.children).forEach(
-			(el) => (el.style.display = "none"),
-		);
-		btnOffline.style.display = "block";
 			btnOffline.textContent = "Sync data";
 			btnOffline.setAttribute("disabled", "disabled");
 		}
+	}
 
 	if (isOnline && !visible) {
 		console.log("BACK ONLINE!!!");
@@ -111,19 +107,8 @@ btnOffline.addEventListener("click", async (e) => {
 			});
 
 			if (!res.ok) {
-				if (res.status == 400) {
-					const html = await res.text();
-
-					document.open();
-					document.write(html);
-					document.close();
-
-					localStorage.removeItem("refuelOfflineData");
-					return;
-				} else {
 				throw new Error(`Server error: ${res.statusText}`);
 			}
-			}
 
 			localStorage.removeItem("refuelOfflineData");
 			location.reload();
@@ -165,6 +150,11 @@ btnOffline.addEventListener("click", async (e) => {
     </div>
     <section class="form">
         <h1 class="header-form">Create offline record</h1>
+        <!-- <?php if ($this->get('error')): ?> -->
+        <!--     <div class="error" style="color: red; margin-bottom: 1rem;"> -->
+        <!--         <?= htmlspecialchars($this->get('error')) ?> -->
+        <!--     </div> -->
+        <!-- <?php endif; ?> -->
         <form id="offline_refuel_add">
             <label for="vehicle">Vehicle</label>
             <select name="vehicle" id="vehicle">
@@ -174,7 +164,13 @@ btnOffline.addEventListener("click", async (e) => {
 									`<option value="${el.id}">${el.name} | ${el.registration_plate}</option>`,
 							)
 							.join("")}
+            <!-- <?php foreach ($this->get('vehicles') as $vehicle): ?> -->
+            <!--     <option value="<?= $vehicle['id'] ?>"><?= $vehicle['name'] . " | " . $vehicle['registration_plate'] ?></option> -->
+            <!-- <?php endforeach; ?> -->
             </select>
+            <!-- <?php if (isset($this->get('validationErrors')['vehicle'])): ?> -->
+            <!--     <small class="error"><?= $this->get('validationErrors')['vehicle'] ?></small> -->
+            <!-- <?php endif; ?> -->
 
             <label for="fuel_type">Fuel type</label>
             <select name="fuel_type" id="fuel_type">
@@ -186,67 +182,45 @@ btnOffline.addEventListener("click", async (e) => {
                 <option value="Premium Gasoline 98">Premium Gasoline 98</option>
                 <option value="Other">Other</option>
             </select>
+            <!-- <?php if (isset($this->get('validationErrors')['fuel_type'])): ?> -->
+            <!--     <small class="error"><?= $this->get('validationErrors')['fuel_type'] ?></small> -->
+            <!-- <?php endif; ?> -->
 
             <label for="liters">Liters</label>
             <input type="number" name="liters" id="liters" min="0" step=".01" value="0.0">
+            <!-- <?php if (isset($this->get('validationErrors')['liters'])): ?> -->
             <!--     <small class="error"><?= $this->get('validationErrors')['liters'] ?></small> -->
+            <!-- <?php endif; ?> -->
 
             <label for="price_per_liter">Price per liter</label>
             <input type="number" name="price_per_liter" id="price_per_liter" min="0" step=".01" value="0.0">
+            <!-- <?php if (isset($this->get('validationErrors')['price_per_liter'])): ?> -->
             <!--     <small class="error"><?= $this->get('validationErrors')['price_per_liter'] ?></small> -->
+            <!-- <?php endif; ?> -->
 
             <label for="total_price">Total price</label>
             <input type="number" name="total_price" id="total_price" min="0" step=".01" value="0.0">
+            <!-- <?php if (isset($this->get('validationErrors')['total_price'])): ?> -->
             <!--     <small class="error"><?= $this->get('validationErrors')['total_price'] ?></small> -->
+            <!-- <?php endif; ?> -->
 
         		<label for="mileage">Mileage</label>
         		<input type="number" name="mileage" id="mileage" min="0" step="1" value="0">
+        		<!-- <?php if (isset($this->get('validationErrors')['mileage'])): ?> -->
          		<!--    	<small class="error"><?= $this->get('validationErrors')['mileage'] ?></small> -->
+        		<!-- <?php endif; ?> -->
 
             <label for="note">Note</label>
             <input type="text" name="note" id="note">
+            <!-- <?php if (isset($this->get('validationErrors')['note'])): ?> -->
             <!--     <small class="error"><?= $this->get('validationErrors')['note'] ?></small> -->
+            <!-- <?php endif; ?> -->
 
             <input type="submit" id="btn-offline-submit" value="Create fuel record">
         </form>
     </section>
   `;
 	document.querySelector("main").appendChild(offline);
-
-	const inp_lit = document.querySelector("input#liters");
-	const inp_ppl = document.querySelector("input#price_per_liter");
-	const inp_tot = document.querySelector("input#total_price");
-
-	const rnd = (num) => Math.round((num + Number.EPSILON) * 100) / 100;
-
-	function calculate() {
-		let liters = Number(inp_lit.value);
-		let price_per_liter = Number(inp_ppl.value);
-		let total_price = Number(inp_tot.value);
-
-		if (price_per_liter > 0 && liters > 0) {
-			total_price = rnd(liters * price_per_liter);
-		}
-
-		if (price_per_liter > 0 && total_price > 0) {
-			liters = rnd(total_price / price_per_liter);
-		}
-
-		if (liters > 0 && total_price > 0) {
-			price_per_liter = rnd(total_price / liters);
-		}
-
-		inp_lit.value = liters;
-		inp_ppl.value = price_per_liter;
-		inp_tot.value = total_price;
-	}
-
-	[inp_lit, inp_ppl, inp_tot].forEach((inp) => {
-		inp.addEventListener("change", () => {
-			calculate();
-		});
-	});
-
 	const btnSubmit = document.querySelector("#btn-offline-submit");
 	btnSubmit.addEventListener("click", (e) => {
 		e.preventDefault();