TODO.md

@@ -25,8 +25,8 @@
 ## What has to be done
 - [x] Vehicle delete
 - [ ] intro tutorial when no car exist or just dont show anything
-- [x] change/set default car
-- [x] hide errors
+- [ ] change/set default car
+- [ ] hide errors
 
 ## Nice to have
 - [ ] specific car view - charts, fuel records

app/controllers/DashboardController.php

@@ -10,17 +10,21 @@ 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', [

app/controllers/RefuelController.php

@@ -18,7 +18,6 @@ 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();
@@ -30,7 +29,6 @@ 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"]);
@@ -59,7 +57,6 @@ class RefuelController extends Controller {
                 'liters' => $liters,
                 'price_per_liter' => $price_per_liter,
                 'total_price' => $total_price,
-                'mileage' => $mileage,
             ]);
 
             if ($result === true) {

app/controllers/VehicleController.php

@@ -75,18 +75,6 @@ class VehicleController extends Controller {
         $this->view('vehicles/index', ['title' => 'Vehicles', 'vehicles' => $vehicles]);
     }
 
-    public function setDefault() {
-        $vehicle = new Vehicle();
-        // TODO: Validate the request
-        $result = $vehicle->setDefaultVehicle($_POST['vehicle_id'], $_SESSION['user']['id']);
-        if($result != true) {
-            echo "Something went wrong";
-            return;
-        }
-
-        $this->view('vehicles/index', ['title' => 'Vehicles', 'vehicles' => $vehicles]);
-    }
-
     public function api_get() {
         if(!$_SERVER['REQUEST_METHOD'] === 'GET') {
             echo "Wrong method, use GET";

app/models/Refuel.php

@@ -10,12 +10,12 @@ class Refuel {
     public function create($data) {
         try{
             $stmt = $this->db->prepare("
-                INSERT INTO refueling_records (user_id, vehicle_id, fuel_type, note, liters, price_per_liter, total_price, mileage, created_at)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, NOW())
+                INSERT INTO refueling_records (user_id, vehicle_id, fuel_type, note, liters, price_per_liter, total_price, created_at)
+                VALUES (?, ?, ?, ?, ?, ?, ?, NOW())
             ");
 
             $stmt->bind_param(
-                "iissdddi",
+                "iissddd",
                 $data['user_id'],
                 $data['vehicle_id'],
                 $data['fuel_type'],
@@ -23,7 +23,6 @@ class Refuel {
                 $data['liters'],
                 $data['price_per_liter'],
                 $data['total_price'],
-                $data['mileage'],
             );
 
             if ($stmt->execute()) {
@@ -39,7 +38,7 @@ class Refuel {
     public function latest_data($vehicle_id, $record_count) {
         try {
             $stmt = $this->db->prepare("
-                SELECT `liters`, `price_per_liter`, `total_price`, `mileage`, `created_at`
+                SELECT `liters`, `price_per_liter`, `total_price`, `created_at`
                 FROM `refueling_records`
                 WHERE `vehicle_id` = ?
                 ORDER BY created_at DESC
@@ -69,7 +68,6 @@ class Refuel {
                     `r`.`liters`, 
                     `r`.`price_per_liter`, 
                     `r`.`total_price`, 
-                    `r`.`mileage`, 
                     `r`.`created_at`
                 FROM `refueling_records` AS `r`
                 JOIN `vehicles` AS `v` ON `r`.`vehicle_id` = `v`.`id`

app/models/Vehicle.php

@@ -61,39 +61,6 @@ class Vehicle {
         return $result->fetch_assoc();
     }
 
-    public function setDefaultVehicle($vehicle_id, $user_id) {
-        try {
-            $this->db->begin_transaction();
-
-            $stmt = $this->db->prepare("
-                UPDATE `vehicles` 
-                SET `is_default` = 0 
-                WHERE `user_id` = ? AND `is_default` = 1
-            ");
-            $stmt->bind_param("i", $user_id);
-            $stmt->execute();
-            $stmt->close();
-
-            $stmt = $this->db->prepare("
-                UPDATE `vehicles` 
-                SET `is_default` = 1 
-                WHERE `id` = ? AND `user_id` = ?
-            ");
-            $stmt->bind_param("ii", $vehicle_id, $user_id);
-
-            if ($stmt->execute()) {
-                $this->db->commit();
-                return true;
-            } else {
-                $this->db->rollback();
-                return "Error: " . $stmt->error;
-            }
-        } catch (mysqli_sql_exception $e) {
-            $this->db->rollback();
-            return $e->getMessage();
-        }
-    }
-
     public function delete($vehicle_id, $user_id) {
         try {
             $stmt = $this->db->prepare("SELECT id FROM vehicles WHERE id = ? AND user_id = ?");

app/views/dashboard/index.php

@@ -23,8 +23,6 @@
                 <p><?= $data['latest_record']['price_per_liter'] ?>,-/liter</p>
                 <b>Total price:</b>
                 <p><?= $data['latest_record']['total_price'] ?>,-</p>
-                <b>Mileage:</b>
-                <p><?= $data['latest_record']['mileage'] ?> km</p>
             </div>
         </section>
 
@@ -47,13 +45,6 @@
             <p><?= $data['default_car']['name'] . " | " . $data['default_car']['registration_plate']?></p>
             <canvas id="chart-gas-price"></canvas>
         </section>
-
-        <section class="card history-graph">
-            <h2>Average fuel consumption</h2>
-            <hr>
-            <p><?= $data['default_car']['name'] . " | " . $data['default_car']['registration_plate']?></p>
-            <b id="avg-fl-cnsmp"></b>
-        </section>
     </div>
 </section>
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
@@ -73,28 +64,4 @@
         },
     });
 </script>
-
-<script>
-    const data2 = <?= json_encode($data['date_price_data']); ?>;
-    let cnt_ltr = 0
-    let cnt_km = 0
-    let first_km = 0
-
-    console.log(data2)
-
-    for(let i = 0; i < data2['liters'].length; i++) {
-        if(i == 0) {
-            first_km = data2['mileage'][i]
-        }
-        cnt_ltr += data2['liters'][i]
-        cnt_km =+ data2['mileage'][i]
-    }
-
-    console.log("Liters", cnt_ltr, cnt_km, first_km)
-    console.log("Avg", (cnt_km - first_km) / cnt_ltr)
-
-    document.querySelector("#avg-fl-cnsmp").textContent = Math.floor((cnt_km - first_km) / cnt_ltr) + " l/100km"
-</script>
-
-
 <script defer src="/js/offline-records.js"></script>

app/views/refuel/create.php

@@ -52,12 +52,6 @@
             <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="<?= htmlspecialchars($_POST['mileage'] ?? '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" value="<?= htmlspecialchars($_POST['note'] ?? '') ?>">
         <?php if (isset($this->get('validationErrors')['note'])): ?>

app/views/vehicles/index.php

@@ -14,15 +14,10 @@
                 <p><?= htmlspecialchars($vehicle['fuel_type']) ?></p>
                 <p><?= htmlspecialchars($vehicle['note'] ?? "") ?></p>
                 <div class="actions">
-                    <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>
-
-                    <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">
-                    </form>
+                <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>
                 </div>
             </div>
         <?php endforeach; ?>

core/Database.php

@@ -63,6 +63,7 @@ class Database {
             username VARCHAR(50) NOT NULL,
             email VARCHAR(100) NOT NULL UNIQUE,
             password VARCHAR(255) NOT NULL,
+            points INT DEFAULT 0,
             created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
         ) ENGINE=InnoDB;";
 
@@ -98,7 +99,6 @@ class Database {
                 liters DOUBLE(10, 2) NOT NULL,
                 price_per_liter DOUBLE(10, 2) NOT NULL,
                 total_price DOUBLE(10, 2) NOT NULL,
-                mileage INT UNSIGNED NULL,
                 created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
                 FOREIGN KEY (vehicle_id) REFERENCES vehicles(id) ON DELETE CASCADE,
                 FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE

public/index.php

@@ -47,7 +47,6 @@ $router->group('/vehicles', ['RequireAuth'], function ($router) {
     $router->add('/create', 'VehicleController@create');
     $router->add('/edit/{id}', 'VehicleController@edit');
     $router->add('/delete', 'VehicleController@delete');
-    $router->add('/default', 'VehicleController@setDefault');
 });
 
 $router->group('/refuel', ['RequireAuth'], function ($router) {

public/js/offline-records.js

@@ -204,12 +204,6 @@ btnOffline.addEventListener("click", async (e) => {
             <!--     <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'])): ?> -->
@@ -235,7 +229,6 @@ btnOffline.addEventListener("click", async (e) => {
 			total_price: document.querySelector(
 				"form#offline_refuel_add #total_price",
 			).value,
-			mileage: document.querySelector("form#offline_refuel_add #mileage").value,
 			note: document.querySelector("form#offline_refuel_add #note").value,
 		};