From 08e8cc7d088c47379ecdc91f047eeb041618ac45 Mon Sep 17 00:00:00 2001
From: albert1413 <albertjovani@iesmontsia.org>
Date: Tue, 10 Dec 2024 19:15:08 +0100
Subject: [PATCH 1/4] feat: CRUD elementTypes

---
 .../Admin/ElementTypeController.php           | 81 +++++++++++++++++++
 app/src/app/Models/ElementType.php            | 32 ++++++++
 .../app/Views/Admin/ElementType/Create.php    | 40 +++++++++
 app/src/app/Views/Admin/ElementType/Edit.php  | 66 +++++++++++++++
 app/src/app/Views/Admin/ElementTypes.php      | 62 ++++++++++++++
 app/src/routes/admin.php                      | 33 ++++++++
 6 files changed, 314 insertions(+)
 create mode 100644 app/src/app/Controllers/Admin/ElementTypeController.php
 create mode 100644 app/src/app/Models/ElementType.php
 create mode 100644 app/src/app/Views/Admin/ElementType/Create.php
 create mode 100644 app/src/app/Views/Admin/ElementType/Edit.php
 create mode 100644 app/src/app/Views/Admin/ElementTypes.php

diff --git a/app/src/app/Controllers/Admin/ElementTypeController.php b/app/src/app/Controllers/Admin/ElementTypeController.php
new file mode 100644
index 00000000..2cba192b
--- /dev/null
+++ b/app/src/app/Controllers/Admin/ElementTypeController.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Controllers\Admin;
+
+use App\Core\Session;
+use App\Core\View;
+//use App\Models\Element;
+use App\Models\ElementType;
+
+class ElementTypeController
+{
+    public function index($queryParams)
+    {
+        $elementTypes = ElementType::findAll();
+        View::render([
+            'view' => 'Admin/ElementTypes',
+            'title' => 'Manage Elements Types',
+            'layout' => 'Admin/AdminLayout',
+            'data' => ['elementTypes' => $elementTypes],
+        ]);
+    }
+
+    public function create($queryParams)
+    {
+        //$elements = Element::findAll();
+        View::render([
+            'view' => 'Admin/ElementType/Create',
+            'title' => 'Add Element Type',
+            'layout' => 'Admin/AdminLayout',
+            'data' => [
+                //'elements' => $elements,
+            ],
+        ]);
+    }
+
+    public function store($postData)
+    {
+        $elementType = new ElementType();
+        $elementType->name = $postData['name'];
+        $elementType->description = $postData['description'];
+
+        $elementType->save();
+
+        Session::set('success', 'Element-Type created successfully');
+
+        header('Location: /admin/elementTypes');
+    }
+
+    public function edit($id, $queryParams)
+    {
+        $elementType = ElementType::find($id);
+        View::render([
+            'view' => 'Admin/ElementType/Edit',
+            'title' => 'Edit Element Type',
+            'layout' => 'Admin/AdminLayout',
+            'data' => ['elementType' => $elementType],
+        ]);
+    }
+
+    public function update($id, $postData)
+    {
+        $elementType = ElementType::find($id);
+        $elementType->name = $postData['name'];
+        $elementType->description = $postData['description'];
+        $elementType->save();
+
+        Session::set('success', 'Element-Type updated successfully');
+
+        header('Location: /admin/elementTypes');
+    }
+
+    public function destroy($id, $queryParams)
+    {
+        $elementType = ElementType::find($id);
+        $elementType->delete();
+
+        Session::set('success', 'Element-Type deleted successfully');
+
+        header('Location: /admin/elementTypes');
+    }
+}
diff --git a/app/src/app/Models/ElementType.php b/app/src/app/Models/ElementType.php
new file mode 100644
index 00000000..c5071c4f
--- /dev/null
+++ b/app/src/app/Models/ElementType.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Models;
+
+class ElementType extends BaseModel
+{
+    public string $name;
+
+    public string $description;
+
+    protected static function getTableName(): string
+    {
+        return 'element_types';
+    }
+
+    protected static function mapDataToModel($data): ElementType
+    {
+        $elementType = new self();
+        $elementType->id = $data['id'];
+        $elementType->name = $data['name'];
+        $elementType->description = $data['description'];
+        $elementType->created_at = $data['created_at'];
+
+        return $elementType;
+    }
+
+    //public function element(): Element
+    //{
+    //    return $this->belongsTo(Element::class, 'element_id');
+    //}
+
+}
diff --git a/app/src/app/Views/Admin/ElementType/Create.php b/app/src/app/Views/Admin/ElementType/Create.php
new file mode 100644
index 00000000..e9a1cb57
--- /dev/null
+++ b/app/src/app/Views/Admin/ElementType/Create.php
@@ -0,0 +1,40 @@
+<div class="mb-4 flex justify-end">
+    <a href="/elementTypes"
+        class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500 flex items-center space-x-2">
+        <!-- Heroicon for return/back (chevron-left) -->
+        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path>
+        </svg>
+        <span>Return to Element-Types</span>
+    </a>
+</div>
+
+<div class="bg-white p-8 border border-gray-300 rounded-lg shadow-md">
+    <h2 class="text-2xl font-semibold text-gray-800 mb-6">Create Element Type</h2>
+    <form action="/elementType/store" method="POST" class="space-y-6">
+
+        <!-- Name -->
+        <div>
+            <label for="name" class="block text-sm font-medium text-gray-700 mb-1">Name</label>
+            <input type="text" id="name" name="name"
+                   class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500"
+                   required>
+        </div>
+
+        <!-- Description -->
+        <div>
+            <label for="name" class="block text-sm font-medium text-gray-700 mb-1">Name</label>
+            <input type="text" id="name" name="name"
+                   class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500"
+                   required>
+        </div>
+        
+        <!-- Submit Button -->
+        <div class="flex items-center">
+            <button type="submit"
+                    class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg focus:outline-none focus:ring focus:ring-blue-500">
+                Create Element-Type
+            </button>
+        </div>
+    </form>
+</div>
diff --git a/app/src/app/Views/Admin/ElementType/Edit.php b/app/src/app/Views/Admin/ElementType/Edit.php
new file mode 100644
index 00000000..52ab9183
--- /dev/null
+++ b/app/src/app/Views/Admin/ElementType/Edit.php
@@ -0,0 +1,66 @@
+<div class="mb-4 flex justify-end">
+    <a href="/elements"
+        class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500 flex items-center space-x-2">
+        <!-- Heroicon for return/back (chevron-left) -->
+        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path>
+        </svg>
+        <span>Return to Elements</span>
+    </a>
+</div>
+
+<div class="bg-white p-8 border border-gray-300 rounded-lg shadow-md">
+    <h2 class="text-2xl font-semibold text-gray-800 mb-6">Edit Element</h2>
+    <form
+        action="/element/<?php echo htmlspecialchars($element->getId()); ?>/update"
+        method="POST" class="space-y-6">
+
+        <!-- Name -->
+        <div>
+            <label for="name" class="block text-sm font-medium text-gray-700 mb-1">Name</label>
+            <input type="text" id="name" name="name"
+                value="<?php echo htmlspecialchars($element->name); ?>"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+        </div>
+
+        <!-- Zone Name -->
+        <div>
+            <label for="zone_id" class="block text-sm font-medium text-gray-700 mb-1">Zone</label>
+            <input type="text" id="zone_id" name="zone_id"
+                value="<?php echo htmlspecialchars($element->zone_id); ?>"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+        </div>
+
+        <!-- Tree Type -->
+        <div>
+            <label for="tree_type_id" class="block text-sm font-medium text-gray-700 mb-1">Tree Type</label>
+            <input type="tree_type_id" id="tree_type_id" name="tree_type_id"
+                value="<?php echo htmlspecialchars($element->tree_type_id); ?>"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+        </div>
+
+        <!-- Latitude -->
+        <div>
+            <label for="latitude" class="block text-sm font-medium text-gray-700 mb-1">Latitude</label>
+            <input type="latitude" id="latitude" name="latitude"
+                value="<?php echo htmlspecialchars($element->latitude); ?>"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+        </div>
+
+        <!-- Longitude -->
+        <div>
+            <label for="longitude" class="block text-sm font-medium text-gray-700 mb-1">Longitude</label>
+            <input type="longitude" id="longitude" name="longitude"
+                value="<?php echo htmlspecialchars($element->longitude); ?>"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+        </div>
+
+        <!-- Submit Button -->
+        <div class="flex items-center">
+            <button type="submit"
+                class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg focus:outline-none focus:ring focus:ring-blue-500">
+                Update User
+            </button>
+        </div>
+    </form>
+</div>
diff --git a/app/src/app/Views/Admin/ElementTypes.php b/app/src/app/Views/Admin/ElementTypes.php
new file mode 100644
index 00000000..0ee80015
--- /dev/null
+++ b/app/src/app/Views/Admin/ElementTypes.php
@@ -0,0 +1,62 @@
+<?php
+
+use App\Core\Session;
+
+?>
+
+<?php if (Session::has('success')) { ?>
+    <div id="alert-msg" class="bg-blue-500 text-white px-4 py-3 rounded-lg mb-6" role="alert">
+        <strong class="font-bold">Success: </strong>
+        <span><?php echo htmlspecialchars(Session::get('success')); ?></span>
+    </div>
+<?php } ?>
+
+<div class="mb-4 flex justify-end">
+    <a href="/elementType/create"
+        class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500">
+        Create Element Type
+    </a>
+</div>
+
+<div class="overflow-x-auto">
+    <table class="min-w-full table-fixed bg-white border border-gray-300 rounded-lg shadow-md">
+        <thead>
+            <tr class="bg-gray-700 text-white text-left h-14">
+                <th class="px-4 py-2 border-b">ID</th>
+                <th class="px-4 py-2 border-b">Name</th>
+                <th class="px-4 py-2 border-b">Description</th>
+
+                <th class="px-4 py-2 border-b">Actions</th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php foreach ($elementTypes as $elementType) { ?>
+            <tr class="hover:bg-gray-50">
+                <td class="px-4 py-2 border-b">
+                    <?php echo $elementType->getId(); ?></td>
+                <td class="px-4 py-2 border-b">
+                    <?php echo $elementType->name; ?></td>
+                <td class="px-4 py-2 border-b">
+                    <?php echo $elementType->description; ?></td>
+                <td class="px-4 py-3 border-b text-center flex space-x-4">
+                    <!-- Edit Button (Pencil Icon) -->
+                    <a href="/elementType/<?php echo htmlspecialchars($elementType->getId()); ?>/edit"
+                        class="text-blue-500 hover:text-blue-700" title="Edit">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
+                        </svg>
+                    </a>
+                    <!-- Delete Button (Trash Icon) -->
+                    <a href="/elementType/<?php echo htmlspecialchars($elementType->getId()); ?>/delete"
+                        onclick="return confirm('Are you sure you want to delete this element?');"
+                        class="text-red-500 hover:text-red-700" title="Delete">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
+                        </svg>
+                    </a>
+                </td>
+            </tr>
+            <?php } ?>
+        </tbody>
+    </table>
+</div>
diff --git a/app/src/routes/admin.php b/app/src/routes/admin.php
index 81f96ffc..a6062126 100644
--- a/app/src/routes/admin.php
+++ b/app/src/routes/admin.php
@@ -3,6 +3,7 @@
 use App\Controllers\Admin\ContractController;
 use App\Controllers\Admin\DashboardController;
 use App\Controllers\Admin\ElementController;
+use App\Controllers\Admin\ElementTypeController;
 use App\Controllers\Admin\IncidenceController;
 use App\Controllers\Admin\TaskTypeController;
 use App\Controllers\Admin\TreeTypeController;
@@ -137,6 +138,27 @@
             'method' => 'destroy',
             'middlewares' => [AdminMiddleware::class],
         ],
+        // ElementType
+        '/admin/elementTypes' => [
+            'controller' => ElementTypeController::class,
+            'method' => 'index',
+            'middlewares' => [AdminMiddleware::class],
+        ],
+        '/admin/elementType/create' => [
+            'controller' => ElementTypeController::class,
+            'method' => 'create',
+            'middlewares' => [AdminMiddleware::class],
+        ],
+        '/admin/elementType/:id/edit' => [
+            'controller' => ElementTypeController::class,
+            'method' => 'edit',
+            'middlewares' => [AdminMiddleware::class],
+        ],
+        '/admin/elementType/:id/delete' => [
+            'controller' => ElementTypeController::class,
+            'method' => 'destroy',
+            'middlewares' => [AdminMiddleware::class],
+        ],
         // === TaskTypes GET Routes
         '/admin/task-types' => [
             'controller' => TaskTypeController::class,
@@ -202,6 +224,17 @@
             'method' => 'update',
             'middlewares' => [AdminMiddleware::class],
         ],
+        // === Element-Types POST Routes
+        '/admin/elementType/store' => [
+            'controller' => ElementTypeController::class,
+            'method' => 'store',
+            'middlewares' => [AdminMiddleware::class],
+        ],
+        '/admin/elementType/:id/update' => [
+            'controller' => ElementTypeController::class,
+            'method' => 'update',
+            'middlewares' => [AdminMiddleware::class],
+        ],
         // === WorkOrders POST Routes
         '/admin/work-order/store' => [
             'controller' => WorkOrderController::class,

From 00492f810978520ec3bdfcf35e68cd4c35e20dcb Mon Sep 17 00:00:00 2001
From: albert1413 <albertjovani@iesmontsia.org>
Date: Tue, 10 Dec 2024 21:21:15 +0100
Subject: [PATCH 2/4] feat: update ElementType

---
 .../app/Views/Admin/ElementType/Create.php    |  8 ++--
 app/src/app/Views/Admin/ElementType/Edit.php  | 41 ++++---------------
 app/src/app/Views/Admin/ElementTypes.php      |  6 +--
 3 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/app/src/app/Views/Admin/ElementType/Create.php b/app/src/app/Views/Admin/ElementType/Create.php
index e9a1cb57..2bbe93ee 100644
--- a/app/src/app/Views/Admin/ElementType/Create.php
+++ b/app/src/app/Views/Admin/ElementType/Create.php
@@ -1,5 +1,5 @@
 <div class="mb-4 flex justify-end">
-    <a href="/elementTypes"
+    <a href="/admin/elementTypes"
         class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500 flex items-center space-x-2">
         <!-- Heroicon for return/back (chevron-left) -->
         <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
@@ -11,7 +11,7 @@ class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg
 
 <div class="bg-white p-8 border border-gray-300 rounded-lg shadow-md">
     <h2 class="text-2xl font-semibold text-gray-800 mb-6">Create Element Type</h2>
-    <form action="/elementType/store" method="POST" class="space-y-6">
+    <form action="/admin/elementType/store" method="POST" class="space-y-6">
 
         <!-- Name -->
         <div>
@@ -23,8 +23,8 @@ class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none foc
 
         <!-- Description -->
         <div>
-            <label for="name" class="block text-sm font-medium text-gray-700 mb-1">Name</label>
-            <input type="text" id="name" name="name"
+            <label for="description" class="block text-sm font-medium text-gray-700 mb-1">Description</label>
+            <input type="text" id="description" name="description"
                    class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500"
                    required>
         </div>
diff --git a/app/src/app/Views/Admin/ElementType/Edit.php b/app/src/app/Views/Admin/ElementType/Edit.php
index 52ab9183..1d0278e8 100644
--- a/app/src/app/Views/Admin/ElementType/Edit.php
+++ b/app/src/app/Views/Admin/ElementType/Edit.php
@@ -1,5 +1,5 @@
 <div class="mb-4 flex justify-end">
-    <a href="/elements"
+    <a href="/admin/elementTypes"
         class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500 flex items-center space-x-2">
         <!-- Heroicon for return/back (chevron-left) -->
         <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
@@ -10,51 +10,28 @@ class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg
 </div>
 
 <div class="bg-white p-8 border border-gray-300 rounded-lg shadow-md">
-    <h2 class="text-2xl font-semibold text-gray-800 mb-6">Edit Element</h2>
+    <h2 class="text-2xl font-semibold text-gray-800 mb-6">Edit Element Type</h2>
     <form
-        action="/element/<?php echo htmlspecialchars($element->getId()); ?>/update"
+        action="/admin/elementType/<?php echo htmlspecialchars($elementType->getId()); ?>/update"
         method="POST" class="space-y-6">
 
         <!-- Name -->
         <div>
             <label for="name" class="block text-sm font-medium text-gray-700 mb-1">Name</label>
             <input type="text" id="name" name="name"
-                value="<?php echo htmlspecialchars($element->name); ?>"
+                value="<?php echo htmlspecialchars($elementType->name); ?>"
                 class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
         </div>
 
-        <!-- Zone Name -->
+        <!-- Description -->
         <div>
-            <label for="zone_id" class="block text-sm font-medium text-gray-700 mb-1">Zone</label>
-            <input type="text" id="zone_id" name="zone_id"
-                value="<?php echo htmlspecialchars($element->zone_id); ?>"
-                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
-        </div>
-
-        <!-- Tree Type -->
-        <div>
-            <label for="tree_type_id" class="block text-sm font-medium text-gray-700 mb-1">Tree Type</label>
-            <input type="tree_type_id" id="tree_type_id" name="tree_type_id"
-                value="<?php echo htmlspecialchars($element->tree_type_id); ?>"
-                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
-        </div>
-
-        <!-- Latitude -->
-        <div>
-            <label for="latitude" class="block text-sm font-medium text-gray-700 mb-1">Latitude</label>
-            <input type="latitude" id="latitude" name="latitude"
-                value="<?php echo htmlspecialchars($element->latitude); ?>"
-                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
-        </div>
-
-        <!-- Longitude -->
-        <div>
-            <label for="longitude" class="block text-sm font-medium text-gray-700 mb-1">Longitude</label>
-            <input type="longitude" id="longitude" name="longitude"
-                value="<?php echo htmlspecialchars($element->longitude); ?>"
+            <label for="description" class="block text-sm font-medium text-gray-700 mb-1">Description</label>
+            <input type="description" id="description" name="description"
+                value="<?php echo htmlspecialchars($elementType->description); ?>"
                 class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
         </div>
 
+        
         <!-- Submit Button -->
         <div class="flex items-center">
             <button type="submit"
diff --git a/app/src/app/Views/Admin/ElementTypes.php b/app/src/app/Views/Admin/ElementTypes.php
index 0ee80015..73f02f90 100644
--- a/app/src/app/Views/Admin/ElementTypes.php
+++ b/app/src/app/Views/Admin/ElementTypes.php
@@ -12,7 +12,7 @@
 <?php } ?>
 
 <div class="mb-4 flex justify-end">
-    <a href="/elementType/create"
+    <a href="/admin/elementType/create"
         class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500">
         Create Element Type
     </a>
@@ -40,14 +40,14 @@ class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg
                     <?php echo $elementType->description; ?></td>
                 <td class="px-4 py-3 border-b text-center flex space-x-4">
                     <!-- Edit Button (Pencil Icon) -->
-                    <a href="/elementType/<?php echo htmlspecialchars($elementType->getId()); ?>/edit"
+                    <a href="/admin/elementType/<?php echo htmlspecialchars($elementType->getId()); ?>/edit"
                         class="text-blue-500 hover:text-blue-700" title="Edit">
                         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
                             <path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
                         </svg>
                     </a>
                     <!-- Delete Button (Trash Icon) -->
-                    <a href="/elementType/<?php echo htmlspecialchars($elementType->getId()); ?>/delete"
+                    <a href="/admin/elementType/<?php echo htmlspecialchars($elementType->getId()); ?>/delete"
                         onclick="return confirm('Are you sure you want to delete this element?');"
                         class="text-red-500 hover:text-red-700" title="Delete">
                         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">

From 5128e76896f140d71d4f7332abf6bc65787bd9af Mon Sep 17 00:00:00 2001
From: 0x1026 <69076992+0x1026@users.noreply.github.com>
Date: Tue, 10 Dec 2024 22:57:34 +0100
Subject: [PATCH 3/4] feat: add updated_at and deleted_at fields to model
 mapping

---
 app/src/app/Models/BaseModel.php      | 43 +++++++++++++++++----------
 app/src/app/Models/Contract.php       |  2 ++
 app/src/app/Models/Element.php        |  2 ++
 app/src/app/Models/ElementType.php    | 16 +++++-----
 app/src/app/Models/Incidence.php      |  2 ++
 app/src/app/Models/Machine.php        |  2 ++
 app/src/app/Models/Photo.php          |  2 ++
 app/src/app/Models/Point.php          |  2 ++
 app/src/app/Models/PruningType.php    |  2 ++
 app/src/app/Models/Role.php           |  2 ++
 app/src/app/Models/Route.php          |  2 ++
 app/src/app/Models/Sensor.php         |  4 ++-
 app/src/app/Models/SensorHistory.php  |  2 ++
 app/src/app/Models/Task.php           |  2 ++
 app/src/app/Models/TaskType.php       | 14 +++++----
 app/src/app/Models/TreeType.php       |  3 ++
 app/src/app/Models/User.php           |  2 ++
 app/src/app/Models/WorkOrder.php      | 14 +++++----
 app/src/app/Models/WorkReport.php     | 18 ++++++-----
 app/src/app/Models/Zone.php           |  4 +++
 app/src/app/Models/ZonePredefined.php | 18 ++++++-----
 21 files changed, 107 insertions(+), 51 deletions(-)

diff --git a/app/src/app/Models/BaseModel.php b/app/src/app/Models/BaseModel.php
index cc58c913..8df0f65c 100644
--- a/app/src/app/Models/BaseModel.php
+++ b/app/src/app/Models/BaseModel.php
@@ -10,6 +10,10 @@ abstract class BaseModel
 
     protected ?string $created_at;
 
+    protected ?string $updated_at;
+
+    protected ?string $deleted_at;
+
     // Insert multiple records into the table
     public static function bulkInsert(array $records): void
     {
@@ -21,8 +25,7 @@ public static function bulkInsert(array $records): void
         $query .= implode(", ", array_fill(0, count($records), "(" . implode(", ", $placeholders) . ")"));
 
         $params = [];
-        foreach ($records as $index => $record)
-            foreach ($record as $key => $value)
+        foreach ($records as $index => $record) foreach ($record as $key => $value)
                 $params["{$key}_{$index}"] = $value;
 
         Database::prepareAndExecute($query, $params);
@@ -40,7 +43,7 @@ public function belongsTo(string $relatedModel, string $foreignKey, string $owne
         $query = "SELECT * FROM {$relatedTable} WHERE {$ownerKey} = :foreignKeyValue LIMIT 1";
         $results = Database::prepareAndExecute($query, ['foreignKeyValue' => $foreignKeyValue]);
 
-        return ! empty($results) ? $relatedModel::mapDataToModel($results[0]) : null;
+        return !empty($results) ? $relatedModel::mapDataToModel($results[0]) : null;
     }
 
     // Many-to-Many relationship
@@ -75,7 +78,7 @@ public function belongsToMany(
 
         $results = Database::prepareAndExecute($query, ['localKeyValue' => $localKeyValue]);
 
-        if (! is_array($results))
+        if (!is_array($results))
             $results = [];
 
         // Process results
@@ -85,7 +88,7 @@ public function belongsToMany(
             if ($withPivot) {
                 // Attach pivot data as a property
                 $relatedInstance->pivot = array_filter($row, function ($key) use ($relatedModel) {
-                    return ! property_exists($relatedModel, $key);
+                    return !property_exists($relatedModel, $key);
                 }, ARRAY_FILTER_USE_KEY);
             }
 
@@ -99,7 +102,7 @@ public static function count(array $conditions = []): ?int
         $query = "SELECT COUNT(*) as count FROM " . static::getTableName();
         $params = [];
 
-        if (! empty($conditions)) {
+        if (!empty($conditions)) {
             $query .= " WHERE ";
             $query .= implode(' AND ', array_map(function ($key) {
                 return "$key = :$key";
@@ -156,7 +159,7 @@ public static function find(string $id): ?object
 
         $results = Database::prepareAndExecute($query, ['id' => $id]);
 
-        return ! empty($results) ? static::mapDataToModel($results[0]) : null;
+        return !empty($results) ? static::mapDataToModel($results[0]) : null;
     }
 
     // Fetch all records from the table
@@ -206,7 +209,7 @@ public static function findBy(array $conditions, bool $single = false): array|ob
         $results = Database::prepareAndExecute($query, $parameters);
 
         if ($single)
-            return ! empty($results) ? static::mapDataToModel($results[0]) : null;
+            return !empty($results) ? static::mapDataToModel($results[0]) : null;
 
         if (empty($results))
             return [];
@@ -217,7 +220,7 @@ public static function findBy(array $conditions, bool $single = false): array|ob
     // Fetch all soft deleted records
     public static function findSoftDeleted(): array
     {
-        if (! static::hasSoftDelete())
+        if (!static::hasSoftDelete())
             return [];
 
         $table = static::getTableName();
@@ -236,7 +239,7 @@ public function hasOne(string $relatedModel, string $foreignKey, string $localKe
         $query = "SELECT * FROM $relatedTable WHERE $foreignKey = :localKeyValue LIMIT 1";
         $results = Database::prepareAndExecute($query, ['localKeyValue' => $localKeyValue]);
 
-        return ! empty($results) ? $relatedModel::mapDataToModel($results[0]) : null;
+        return !empty($results) ? $relatedModel::mapDataToModel($results[0]) : null;
     }
 
     // One-to-Many relationship
@@ -249,7 +252,7 @@ public function hasMany(string $relatedModel, string $foreignKey, string $localK
         $results = Database::prepareAndExecute($query, ['localKeyValue' => $localKeyValue]);
 
         // Ensure $results is an array
-        if (! is_array($results))
+        if (!is_array($results))
             $results = [];
 
         return array_map(fn($row) => $relatedModel::mapDataToModel($row), $results);
@@ -261,10 +264,10 @@ protected static function hasSoftDelete(): bool
         static $softDeleteCache = [];
         $table = static::getTableName();
 
-        if (! isset($softDeleteCache[$table])) {
+        if (!isset($softDeleteCache[$table])) {
             $query = "SHOW COLUMNS FROM {$table} LIKE 'deleted_at'";
             $result = Database::prepareAndExecute($query);
-            $softDeleteCache[$table] = ! empty($result); // Cache the result
+            $softDeleteCache[$table] = !empty($result); // Cache the result
         }
 
         return $softDeleteCache[$table];
@@ -277,7 +280,7 @@ public static function paginate(int $page = 1, int $perPage = 10, array $conditi
         $query = "SELECT * FROM " . static::getTableName();
         $params = [];
 
-        if (! empty($conditions)) {
+        if (!empty($conditions)) {
             $query .= " WHERE " . implode(' AND ', array_map(fn($key) => "{$key} = :{$key}", array_keys($conditions)));
             $params = $conditions;
         }
@@ -326,7 +329,7 @@ public function save(): void
 
         Database::prepareAndExecute($query, $properties);
 
-        if (! isset($this->id))
+        if (!isset($this->id))
             $this->id = Database::connect()->lastInsertId();
     }
 
@@ -344,4 +347,14 @@ public function getCreatedAt(): ?string
     {
         return $this->created_at;
     }
+
+    public function getUpdatedAt(): ?string
+    {
+        return $this->updated_at;
+    }
+
+    public function getDeletedAt(): ?string
+    {
+        return $this->deleted_at;
+    }
 }
diff --git a/app/src/app/Models/Contract.php b/app/src/app/Models/Contract.php
index e89eb9d1..600d6a79 100644
--- a/app/src/app/Models/Contract.php
+++ b/app/src/app/Models/Contract.php
@@ -32,6 +32,8 @@ protected static function mapDataToModel($data): Contract
         $contract->invoice_agreed = $data['invoice_agreed'];
         $contract->invoice_paid = $data['invoice_paid'];
         $contract->created_at = $data['created_at'];
+        $contract->updated_at = $data['updated_at'];
+        $contract->deleted_at = $data['deleted_at'];
 
         return $contract;
     }
diff --git a/app/src/app/Models/Element.php b/app/src/app/Models/Element.php
index 582c1dd3..35c20d5d 100644
--- a/app/src/app/Models/Element.php
+++ b/app/src/app/Models/Element.php
@@ -29,6 +29,8 @@ protected static function mapDataToModel($data): Element
         // $element->point_id = $data['point_id'];
         $element->tree_type_id = $data['tree_type_id'];
         $element->created_at = $data['created_at'];
+        $element->updated_at = $data['updated_at'];
+        $element->deleted_at = $data['deleted_at'];
 
         return $element;
     }
diff --git a/app/src/app/Models/ElementType.php b/app/src/app/Models/ElementType.php
index c5071c4f..4912cada 100644
--- a/app/src/app/Models/ElementType.php
+++ b/app/src/app/Models/ElementType.php
@@ -15,13 +15,15 @@ protected static function getTableName(): string
 
     protected static function mapDataToModel($data): ElementType
     {
-        $elementType = new self();
-        $elementType->id = $data['id'];
-        $elementType->name = $data['name'];
-        $elementType->description = $data['description'];
-        $elementType->created_at = $data['created_at'];
-
-        return $elementType;
+        $element_type = new self();
+        $element_type->id = $data['id'];
+        $element_type->name = $data['name'];
+        $element_type->description = $data['description'];
+        $element_type->created_at = $data['created_at'];
+        $element_type->updated_at = $data['updated_at'];
+        $element_type->deleted_at = $data['deleted_at'];
+
+        return $element_type;
     }
 
     //public function element(): Element
diff --git a/app/src/app/Models/Incidence.php b/app/src/app/Models/Incidence.php
index 6d360988..f33cc6be 100644
--- a/app/src/app/Models/Incidence.php
+++ b/app/src/app/Models/Incidence.php
@@ -26,6 +26,8 @@ public static function mapDataToModel($data): Incidence
         $incidence->description = $data['description'];
         $incidence->photo_id = $data['photo_id'];
         $incidence->created_at = $data['created_at'];
+        $incidence->updated_at = $data['updated_at'];
+        $incidence->deleted_at = $data['deleted_at'];
 
         return $incidence;
     }
diff --git a/app/src/app/Models/Machine.php b/app/src/app/Models/Machine.php
index 28a988e6..fa801de8 100644
--- a/app/src/app/Models/Machine.php
+++ b/app/src/app/Models/Machine.php
@@ -23,6 +23,8 @@ protected static function mapDataToModel($data): Machine
         $machine->max_basket_size = $data['max_basket_size'];
         $machine->photo_id = $data['photo_id'];
         $machine->created_at = $data['created_at'];
+        $machine->updated_at = $data['updated_at'];
+        $machine->deleted_at = $data['deleted_at'];
 
         return $machine;
     }
diff --git a/app/src/app/Models/Photo.php b/app/src/app/Models/Photo.php
index effccefb..bc5dfa2f 100644
--- a/app/src/app/Models/Photo.php
+++ b/app/src/app/Models/Photo.php
@@ -20,6 +20,8 @@ protected static function mapDataToModel($data): Photo
         $photo->name = $data['name'];
         $photo->path = $data['path'];
         $photo->created_at = $data['created_at'];
+        $photo->updated_at = $data['updated_at'];
+        $photo->deleted_at = $data['deleted_at'];
 
         return $photo;
     }
diff --git a/app/src/app/Models/Point.php b/app/src/app/Models/Point.php
index f434b472..843251bc 100644
--- a/app/src/app/Models/Point.php
+++ b/app/src/app/Models/Point.php
@@ -20,6 +20,8 @@ protected static function mapDataToModel($data): Point
         $point->latitude = $data['latitude'];
         $point->longitude = $data['longitude'];
         $point->created_at = $data['created_at'];
+        $point->updated_at = $data['updated_at'];
+        $point->deleted_at = $data['deleted_at'];
 
         return $point;
     }
diff --git a/app/src/app/Models/PruningType.php b/app/src/app/Models/PruningType.php
index b53f9634..a2a6866e 100644
--- a/app/src/app/Models/PruningType.php
+++ b/app/src/app/Models/PruningType.php
@@ -23,6 +23,8 @@ protected static function mapDataToModel($data): PruningType
         $pruning_type->description = $data['description'];
         $pruning_type->photo_id = $data['photo_id'];
         $pruning_type->created_at = $data['created_at'];
+        $pruning_type->updated_at = $data['updated_at'];
+        $pruning_type->deleted_at = $data['deleted_at'];
 
         return $pruning_type;
     }
diff --git a/app/src/app/Models/Role.php b/app/src/app/Models/Role.php
index 016ece72..6841339b 100644
--- a/app/src/app/Models/Role.php
+++ b/app/src/app/Models/Role.php
@@ -17,6 +17,8 @@ protected static function mapDataToModel($data): Role
         $role->id = $data['id'];
         $role->name = $data['name'];
         $role->created_at = $data['created_at'];
+        $role->updated_at = $data['updated_at'];
+        $role->deleted_at = $data['deleted_at'];
 
         return $role;
     }
diff --git a/app/src/app/Models/Route.php b/app/src/app/Models/Route.php
index 386e74ee..b958350c 100644
--- a/app/src/app/Models/Route.php
+++ b/app/src/app/Models/Route.php
@@ -20,6 +20,8 @@ protected static function mapDataToModel($data): Route
         $route->distance = $data['distance'];
         $route->travel_time = $data['travel_time'];
         $route->created_at = $data['created_at'];
+        $route->updated_at = $data['updated_at'];
+        $route->deleted_at = $data['deleted_at'];
 
         return $route;
     }
diff --git a/app/src/app/Models/Sensor.php b/app/src/app/Models/Sensor.php
index 8929281d..dc322a50 100644
--- a/app/src/app/Models/Sensor.php
+++ b/app/src/app/Models/Sensor.php
@@ -21,7 +21,9 @@ protected static function mapDataToModel($data): Sensor
         $sensor->model = $data["model"];
         $sensor->class = $data["class"];
         $sensor->is_active = $data["is_active"];
-        $sensor->created_at = $data["created_at"];
+        $sensor->created_at = $data['created_at'];
+        $sensor->updated_at = $data['updated_at'];
+        $sensor->deleted_at = $data['deleted_at'];
 
         return $sensor;
     }
diff --git a/app/src/app/Models/SensorHistory.php b/app/src/app/Models/SensorHistory.php
index 0b1e1d47..03ca55e2 100644
--- a/app/src/app/Models/SensorHistory.php
+++ b/app/src/app/Models/SensorHistory.php
@@ -22,6 +22,8 @@ protected static function mapDataToModel($data): SensorHistory
         $sensor_history->humidity = $data['humidity'];
         $sensor_history->inclination = $data['inclination'];
         $sensor_history->created_at = $data['created_at'];
+        $sensor_history->updated_at = $data['updated_at'];
+        $sensor_history->deleted_at = $data['deleted_at'];
 
         return $sensor_history;
     }
diff --git a/app/src/app/Models/Task.php b/app/src/app/Models/Task.php
index d3bf9f5a..d458d80b 100644
--- a/app/src/app/Models/Task.php
+++ b/app/src/app/Models/Task.php
@@ -26,6 +26,8 @@ protected static function mapDataToModel($data): Task
         $task->notes = $data['notes'];
         $task->route_id = $data['route_id'];
         $task->created_at = $data['created_at'];
+        $task->updated_at = $data['updated_at'];
+        $task->deleted_at = $data['deleted_at'];
 
         return $task;
     }
diff --git a/app/src/app/Models/TaskType.php b/app/src/app/Models/TaskType.php
index 3b3d172d..b4b15890 100644
--- a/app/src/app/Models/TaskType.php
+++ b/app/src/app/Models/TaskType.php
@@ -15,13 +15,15 @@ protected static function getTableName(): string
 
     protected static function mapDataToModel($data): TaskType
     {
-        $task = new self();
-        $task->id = $data['id'];
-        $task->name = $data['name'];
-        $task->photo_id = $data['photo_id'];
-        $task->created_at = $data['created_at'];
+        $task_type = new self();
+        $task_type->id = $data['id'];
+        $task_type->name = $data['name'];
+        $task_type->photo_id = $data['photo_id'];
+        $task_type->created_at = $data['created_at'];
+        $task_type->updated_at = $data['updated_at'];
+        $task_type->deleted_at = $data['deleted_at'];
 
-        return $task;
+        return $task_type;
     }
 
     public function photo(): ?Photo
diff --git a/app/src/app/Models/TreeType.php b/app/src/app/Models/TreeType.php
index da153408..c27b0140 100644
--- a/app/src/app/Models/TreeType.php
+++ b/app/src/app/Models/TreeType.php
@@ -22,6 +22,9 @@ protected static function mapDataToModel($data): TreeType
         $tree_type->family = $data['family'];
         $tree_type->genus = $data['genus'];
         $tree_type->species = $data['species'];
+        $tree_type->created_at = $data['created_at'];
+        $tree_type->updated_at = $data['updated_at'];
+        $tree_type->deleted_at = $data['deleted_at'];
 
         return $tree_type;
     }
diff --git a/app/src/app/Models/User.php b/app/src/app/Models/User.php
index 5f36594b..f6b11e27 100644
--- a/app/src/app/Models/User.php
+++ b/app/src/app/Models/User.php
@@ -43,6 +43,8 @@ protected static function mapDataToModel($data): User
         $user->role = $data['role'];
         $user->photo_id = $data['photo_id'];
         $user->created_at = $data['created_at'];
+        $user->updated_at = $data['updated_at'];
+        $user->deleted_at = $data['deleted_at'];
 
         return $user;
     }
diff --git a/app/src/app/Models/WorkOrder.php b/app/src/app/Models/WorkOrder.php
index abf14a12..ef86b4bc 100644
--- a/app/src/app/Models/WorkOrder.php
+++ b/app/src/app/Models/WorkOrder.php
@@ -13,12 +13,14 @@ protected static function getTableName(): string
 
     protected static function mapDataToModel($data): WorkOrder
     {
-        $order = new self();
-        $order->id = $data['id'];
-        $order->contract_id = $data['contract_id'];
-        $order->created_at = $data['created_at'];
-
-        return $order;
+        $work_order = new self();
+        $work_order->id = $data['id'];
+        $work_order->contract_id = $data['contract_id'];
+        $work_order->created_at = $data['created_at'];
+        $work_order->updated_at = $data['updated_at'];
+        $work_order->deleted_at = $data['deleted_at'];
+
+        return $work_order;
     }
 
     public function report(): WorkReport
diff --git a/app/src/app/Models/WorkReport.php b/app/src/app/Models/WorkReport.php
index 9e105ed4..5f349ae7 100644
--- a/app/src/app/Models/WorkReport.php
+++ b/app/src/app/Models/WorkReport.php
@@ -17,14 +17,16 @@ protected static function getTableName(): string
 
     protected static function mapDataToModel($data): WorkReport
     {
-        $workReport = new self();
-        $workReport->id = $data['id'];
-        $workReport->work_order_id = $data['work_order_id'];
-        $workReport->observation = $data['observation'];
-        $workReport->spent_fuel = $data['spent_fuel'];
-        $workReport->created_at = $data['created_at'];
-
-        return $workReport;
+        $work_report = new self();
+        $work_report->id = $data['id'];
+        $work_report->work_order_id = $data['work_order_id'];
+        $work_report->observation = $data['observation'];
+        $work_report->spent_fuel = $data['spent_fuel'];
+        $work_report->created_at = $data['created_at'];
+        $work_report->updated_at = $data['updated_at'];
+        $work_report->deleted_at = $data['deleted_at'];
+
+        return $work_report;
     }
 
     public function workOrder(): WorkOrder
diff --git a/app/src/app/Models/Zone.php b/app/src/app/Models/Zone.php
index f528b110..53397b41 100644
--- a/app/src/app/Models/Zone.php
+++ b/app/src/app/Models/Zone.php
@@ -21,6 +21,8 @@ protected static function mapDataToModel($data): Zone
         $zone->id = $data['id'];
         $zone->point_id = $data['point_id'];
         $zone->created_at = $data['created_at'];
+        $zone->updated_at = $data['updated_at'];
+        $zone->deleted_at = $data['deleted_at'];
 
         return $zone;
     }
@@ -75,6 +77,8 @@ public static function getPredefinedZonesWithElements(): array
                 $zone->predefined->name = $row['predefined_name'];
                 $zone->predefined->photo_id = $row['predefined_photo_id'];
                 $zone->predefined->created_at = $row['created_at'];
+                $zone->predefined->updated_at = $row['updated_at'];
+                $zone->predefined->deleted_at = $row['deleted_at'];
 
                 $groupedZones[$row['id']] = $zone;
             }
diff --git a/app/src/app/Models/ZonePredefined.php b/app/src/app/Models/ZonePredefined.php
index 3ae4b5e5..e67bd4a9 100644
--- a/app/src/app/Models/ZonePredefined.php
+++ b/app/src/app/Models/ZonePredefined.php
@@ -17,14 +17,16 @@ protected static function getTableName(): string
 
     protected static function mapDataToModel($data): ZonePredefined
     {
-        $predefined = new self();
-        $predefined->id = $data['id'];
-        $predefined->zone_id = $data['zone_id'];
-        $predefined->name = $data['name'];
-        $predefined->photo_id = $data['photo_id'];
-        $predefined->created_at = $data['created_at'];
-
-        return $predefined;
+        $zone_predefined = new self();
+        $zone_predefined->id = $data['id'];
+        $zone_predefined->zone_id = $data['zone_id'];
+        $zone_predefined->name = $data['name'];
+        $zone_predefined->photo_id = $data['photo_id'];
+        $zone_predefined->created_at = $data['created_at'];
+        $zone_predefined->updated_at = $data['updated_at'];
+        $zone_predefined->deleted_at = $data['deleted_at'];
+
+        return $zone_predefined;
     }
 
     public function photo(): ?Photo

From d4eb8bb3ee6656bde92eeaaf36bea73ff4d231bc Mon Sep 17 00:00:00 2001
From: albert1413 <145456779+albert1413@users.noreply.github.com>
Date: Wed, 11 Dec 2024 15:30:46 +0100
Subject: [PATCH 4/4] refactor: change routes and fix input type

Co-authored-by: Hugoo <69076992+0x1026@users.noreply.github.com>
Signed-off-by: albert1413 <145456779+albert1413@users.noreply.github.com>
---
 .../app/Controllers/Admin/ElementTypeController.php  | 12 ++++++------
 app/src/app/Views/Admin/ElementType/Create.php       |  4 ++--
 app/src/app/Views/Admin/ElementType/Edit.php         |  6 +++---
 app/src/app/Views/Admin/ElementTypes.php             |  6 +++---
 app/src/routes/admin.php                             | 12 ++++++------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/src/app/Controllers/Admin/ElementTypeController.php b/app/src/app/Controllers/Admin/ElementTypeController.php
index 2cba192b..e4eae631 100644
--- a/app/src/app/Controllers/Admin/ElementTypeController.php
+++ b/app/src/app/Controllers/Admin/ElementTypeController.php
@@ -41,9 +41,9 @@ public function store($postData)
 
         $elementType->save();
 
-        Session::set('success', 'Element-Type created successfully');
+        Session::set('success', 'Type of Element created successfully');
 
-        header('Location: /admin/elementTypes');
+        header('Location: /admin/element-types');
     }
 
     public function edit($id, $queryParams)
@@ -64,9 +64,9 @@ public function update($id, $postData)
         $elementType->description = $postData['description'];
         $elementType->save();
 
-        Session::set('success', 'Element-Type updated successfully');
+        Session::set('success', 'Type of Element updated successfully');
 
-        header('Location: /admin/elementTypes');
+        header('Location: /admin/element-types');
     }
 
     public function destroy($id, $queryParams)
@@ -74,8 +74,8 @@ public function destroy($id, $queryParams)
         $elementType = ElementType::find($id);
         $elementType->delete();
 
-        Session::set('success', 'Element-Type deleted successfully');
+        Session::set('success', 'Type of Element deleted successfully');
 
-        header('Location: /admin/elementTypes');
+        header('Location: /admin/element-types');
     }
 }
diff --git a/app/src/app/Views/Admin/ElementType/Create.php b/app/src/app/Views/Admin/ElementType/Create.php
index 2bbe93ee..b3398489 100644
--- a/app/src/app/Views/Admin/ElementType/Create.php
+++ b/app/src/app/Views/Admin/ElementType/Create.php
@@ -1,5 +1,5 @@
 <div class="mb-4 flex justify-end">
-    <a href="/admin/elementTypes"
+    <a href="/admin/element-types"
         class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500 flex items-center space-x-2">
         <!-- Heroicon for return/back (chevron-left) -->
         <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
@@ -11,7 +11,7 @@ class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg
 
 <div class="bg-white p-8 border border-gray-300 rounded-lg shadow-md">
     <h2 class="text-2xl font-semibold text-gray-800 mb-6">Create Element Type</h2>
-    <form action="/admin/elementType/store" method="POST" class="space-y-6">
+    <form action="/admin/element-type/store" method="POST" class="space-y-6">
 
         <!-- Name -->
         <div>
diff --git a/app/src/app/Views/Admin/ElementType/Edit.php b/app/src/app/Views/Admin/ElementType/Edit.php
index 1d0278e8..111f7f9d 100644
--- a/app/src/app/Views/Admin/ElementType/Edit.php
+++ b/app/src/app/Views/Admin/ElementType/Edit.php
@@ -1,5 +1,5 @@
 <div class="mb-4 flex justify-end">
-    <a href="/admin/elementTypes"
+    <a href="/admin/element-types"
         class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500 flex items-center space-x-2">
         <!-- Heroicon for return/back (chevron-left) -->
         <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
@@ -12,7 +12,7 @@ class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg
 <div class="bg-white p-8 border border-gray-300 rounded-lg shadow-md">
     <h2 class="text-2xl font-semibold text-gray-800 mb-6">Edit Element Type</h2>
     <form
-        action="/admin/elementType/<?php echo htmlspecialchars($elementType->getId()); ?>/update"
+        action="/admin/element-type/<?php echo htmlspecialchars($elementType->getId()); ?>/update"
         method="POST" class="space-y-6">
 
         <!-- Name -->
@@ -26,7 +26,7 @@ class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none foc
         <!-- Description -->
         <div>
             <label for="description" class="block text-sm font-medium text-gray-700 mb-1">Description</label>
-            <input type="description" id="description" name="description"
+            <input type="text" id="description" name="description"
                 value="<?php echo htmlspecialchars($elementType->description); ?>"
                 class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
         </div>
diff --git a/app/src/app/Views/Admin/ElementTypes.php b/app/src/app/Views/Admin/ElementTypes.php
index 73f02f90..a9d94c33 100644
--- a/app/src/app/Views/Admin/ElementTypes.php
+++ b/app/src/app/Views/Admin/ElementTypes.php
@@ -12,7 +12,7 @@
 <?php } ?>
 
 <div class="mb-4 flex justify-end">
-    <a href="/admin/elementType/create"
+    <a href="/admin/element-type/create"
         class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500">
         Create Element Type
     </a>
@@ -40,14 +40,14 @@ class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg
                     <?php echo $elementType->description; ?></td>
                 <td class="px-4 py-3 border-b text-center flex space-x-4">
                     <!-- Edit Button (Pencil Icon) -->
-                    <a href="/admin/elementType/<?php echo htmlspecialchars($elementType->getId()); ?>/edit"
+                    <a href="/admin/element-type/<?php echo htmlspecialchars($elementType->getId()); ?>/edit"
                         class="text-blue-500 hover:text-blue-700" title="Edit">
                         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
                             <path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
                         </svg>
                     </a>
                     <!-- Delete Button (Trash Icon) -->
-                    <a href="/admin/elementType/<?php echo htmlspecialchars($elementType->getId()); ?>/delete"
+                    <a href="/admin/element-type/<?php echo htmlspecialchars($elementType->getId()); ?>/delete"
                         onclick="return confirm('Are you sure you want to delete this element?');"
                         class="text-red-500 hover:text-red-700" title="Delete">
                         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
diff --git a/app/src/routes/admin.php b/app/src/routes/admin.php
index a6062126..29fe0b6a 100644
--- a/app/src/routes/admin.php
+++ b/app/src/routes/admin.php
@@ -139,22 +139,22 @@
             'middlewares' => [AdminMiddleware::class],
         ],
         // ElementType
-        '/admin/elementTypes' => [
+        '/admin/element-types' => [
             'controller' => ElementTypeController::class,
             'method' => 'index',
             'middlewares' => [AdminMiddleware::class],
         ],
-        '/admin/elementType/create' => [
+        '/admin/element-type/create' => [
             'controller' => ElementTypeController::class,
             'method' => 'create',
             'middlewares' => [AdminMiddleware::class],
         ],
-        '/admin/elementType/:id/edit' => [
+        '/admin/element-type/:id/edit' => [
             'controller' => ElementTypeController::class,
             'method' => 'edit',
             'middlewares' => [AdminMiddleware::class],
         ],
-        '/admin/elementType/:id/delete' => [
+        '/admin/element-type/:id/delete' => [
             'controller' => ElementTypeController::class,
             'method' => 'destroy',
             'middlewares' => [AdminMiddleware::class],
@@ -225,12 +225,12 @@
             'middlewares' => [AdminMiddleware::class],
         ],
         // === Element-Types POST Routes
-        '/admin/elementType/store' => [
+        '/admin/element-type/store' => [
             'controller' => ElementTypeController::class,
             'method' => 'store',
             'middlewares' => [AdminMiddleware::class],
         ],
-        '/admin/elementType/:id/update' => [
+        '/admin/element-type/:id/update' => [
             'controller' => ElementTypeController::class,
             'method' => 'update',
             'middlewares' => [AdminMiddleware::class],