Asset management/fix last bugs

application/AssetManagement/AssetManagementController.php

@@ -119,12 +119,7 @@ class AssetManagementController extends TTCrud
 
         // Check for conflicting reservations if not forced
         if (empty($post['force'])) {
-            $now = time();
-            $conflictingReservations = AssetManagementReservationModel::dbSelect("
-                SELECT * FROM AssetManagementReservation 
-                WHERE assetId = {$post['assetId']} AND startDate <= $now AND (endDate IS NULL OR endDate >= $now)
-            ");
-
+            $conflictingReservations = AssetManagementReservationModel::getConflictingReservations($post['assetId']);
             if (!empty($conflictingReservations)) {
                 $res = $conflictingReservations[0];
                 $user = UserModel::getOne($res->userId);

application/AssetManagementReservation/AssetManagementReservationModel.php

@@ -9,4 +9,22 @@ class AssetManagementReservationModel extends TTCrudBaseModel {
     public ?string $notes;
     public int $createBy;
     public int $create;
+
+    public static function getConflictingReservations($assetId): array
+    {
+        $db = self::getDB();
+        $table = self::getFullyQualifiedTable();
+        $now = time();
+
+        $sql = "SELECT * FROM $table 
+                WHERE assetId = $assetId AND startDate <= $now AND (endDate IS NULL OR endDate >= $now)
+            ";
+
+        $result = $db->query($sql);
+        $reservations = [];
+        while ($row = $result->fetch_assoc()) {
+            $reservations[] = new self($row);
+        }
+        return $reservations;
+    }
 }