Reworked Device Module and Vue Components

application/Device/DeviceController.php

@@ -17,21 +17,28 @@ class DeviceController extends mfBaseController
 
     protected function indexAction()
     {
-        $deviceManufacturers = array_map(function($manufacturer) {
+        $deviceManufacturers = array_map(function($deviceManufacturer) {
             return [
-                "text" => $manufacturer->name,
-                "value" => $manufacturer->name,
+                "id" => $deviceManufacturer->id,
+                "name" => $deviceManufacturer->name,
+                "creator" => $deviceManufacturer->creator->name,
+                "created" => $deviceManufacturer->create,
             ];
         }, DevicemanufactorModel::getAll());
 
         $deviceTypes = array_map(function($deviceType) {
             return [
-                "text" => $deviceType->name,
-                "value" => $deviceType->name,
+                "id" => $deviceType->id,
+                "name" => $deviceType->name,
+                "manufacturer" => $deviceType->devicemanufactor->name,
+                "price" => $deviceType->price,
+                "power" => $deviceType->power,
+                "creator" => $deviceType->creator->name,
+                "created" => $deviceType->create,
             ];
         }, DevicetypeModel::getAll());
 
-        $JSGlobals = ["BASE_URL" => self::getUrl("Device"),
+        $JSGlobals = ["BASE_URL" => self::getUrl(""),
             "DASHBOARD_URL" => self::getUrl("Dashboard"),
             "MFAPPNAME" => MFAPPNAME_SLUG,
             "PAGE_TITLE" => "Devices",
@@ -41,7 +48,7 @@ class DeviceController extends mfBaseController
             ],
             "DEVICE_MANUFACTURERS" => $deviceManufacturers,
             "DEVICE_TYPES" => $deviceTypes,
-            "DEVICE_API_URL" => self::getUrl("Device/api"),
+            "DEVICES" => $this->getDevices(),
         ];
 
         $this->layout()->set("vueViewName", "Device");

application/Devicemanufactor/DevicemanufactorController.php

@@ -17,11 +17,7 @@ class DevicemanufactorController extends mfBaseController
 
     protected function indexAction()
     {
-
-        $this->layout()->setTemplate("Devicemanufactor/Index");
-        $devicemanufactors = DevicemanufactorModel::getAll();
-        $this->layout()->set("devicemanufactors", $devicemanufactors);
-
+        $this->redirect("Device");
     }
 
     protected function addAction()
@@ -36,17 +32,17 @@ class DevicemanufactorController extends mfBaseController
 
         if (!is_numeric($id) || !$id) {
             $this->layout()->setFlash("Gerätehersteller nicht gefunden", "error");
-            $this->redirect("Devicemanufactor");
+            $this->redirect("Device");
         }
 
         $devicemanufactors = new Devicemanufactor($id);
         if ($devicemanufactors->id != $id) {
             $this->layout()->setFlash("Gerätehersteller nicht gefunden", "error");
-            $this->redirect("Devicemanufactor");
+            $this->redirect("Device");
         }
 
         $this->layout()->set("devicemanufactors", $devicemanufactors);
-        return $this->addAction();
+        $this->addAction();
     }
 
     protected function saveAction()
@@ -59,7 +55,7 @@ class DevicemanufactorController extends mfBaseController
             $devicemanufactor = new Devicemanufactor($id);
             if (!$devicemanufactor->id) {
                 $this->layout()->setFlash("Gerätehersteller nicht gefunden", "error");
-                $this->redirect("Devicemanufactor");
+                $this->redirect("Device");;
             }
         } else {
             $mode = "add";
@@ -72,7 +68,7 @@ class DevicemanufactorController extends mfBaseController
 
         if (!$data['name']) {
             $this->layout()->setFlash("Name darf nicht leer sein", "error");
-            $this->redirect("Devicemanufactor");
+            $this->redirect("Device");;
         }
 
 
@@ -93,9 +89,9 @@ class DevicemanufactorController extends mfBaseController
 
         if (!$id) {
             $this->layout()->setFlash("Gerätehersteller konnte nicht angelegt werden", "error");
-            $this->redirect("Devicemanufactor");
+            $this->redirect("Device");
         }
-        if ($fsh) {
+        if (isset($fsh) && $fsh) {
             $fsh->save();
         }
         if ($mode == "edit") {
@@ -103,7 +99,7 @@ class DevicemanufactorController extends mfBaseController
         } else if ($mode = "add") {
             $this->layout()->setFlash("Gerätehersteller erfolgreich angelegt", "success");
         }
-        $this->redirect("Devicemanufactor");
+        $this->redirect("Device");
     }
 
     protected function deleteAction()
@@ -112,11 +108,12 @@ class DevicemanufactorController extends mfBaseController
         $devicemanufactor = new Devicemanufactor($id);
         if (!$devicemanufactor->id || $devicemanufactor->id != $id) {
             $this->layout()->setFlash("Gerätehersteller nicht gefunden.", "error");
-            $this->redirect("Devicemanufactor");
+            $this->redirect("Device");
         }
 
         $devicemanufactor->delete();
-        $this->redirect("Devicemanufactor");
+        $this->layout()->setFlash("Gerätehersteller erfolgreich gelöscht", "success");
+        $this->redirect("Device");
     }
 
 }

application/Devicetype/DevicetypeController.php

@@ -18,11 +18,7 @@ class DevicetypeController extends mfBaseController
 
     protected function indexAction()
     {
-
-        $this->layout()->setTemplate("Devicetype/Index");
-        $devicetypes = DevicetypeModel::getAll();
-        $this->layout()->set("devicetypes", $devicetypes);
-
+        $this->redirect("Device");
     }
 
     protected function addAction()
@@ -38,17 +34,17 @@ class DevicetypeController extends mfBaseController
 
         if (!is_numeric($id) || !$id) {
             $this->layout()->setFlash("Gerätetyp nicht gefunden", "error");
-            $this->redirect("Devicetype");
+            $this->redirect("Device");
         }
 
         $devicetypes = new Devicetype($id);
         if ($devicetypes->id != $id) {
             $this->layout()->setFlash("Gerätetyp nicht gefunden", "error");
-            $this->redirect("Devicetype");
+            $this->redirect("Device");
         }
 
         $this->layout()->set("devicetypes", $devicetypes);
-        return $this->addAction();
+        $this->addAction();
     }
 
     protected function saveAction()
@@ -61,7 +57,7 @@ class DevicetypeController extends mfBaseController
             $devicetype = new Devicetype($id);
             if (!$devicetype->id) {
                 $this->layout()->setFlash("Gerätetyp nicht gefunden", "error");
-                $this->redirect("Devicetype");
+                $this->redirect("Device");
             }
         } else {
             $mode = "add";
@@ -95,7 +91,7 @@ class DevicetypeController extends mfBaseController
 
         if (!$data['name']) {
             $this->layout()->setFlash("Name darf nicht leer sein", "error");
-            $this->redirect("Devicetype");
+            $this->redirect("Device");
         }
 
 
@@ -116,7 +112,7 @@ class DevicetypeController extends mfBaseController
 
         if (!$id) {
             $this->layout()->setFlash("Gerätetyp konnte nicht angelegt werden", "error");
-            $this->redirect("Devicetype");
+            $this->redirect("Device");
         }
 
         if ($mode == "edit") {
@@ -124,7 +120,7 @@ class DevicetypeController extends mfBaseController
         } else if ($mode = "add") {
             $this->layout()->setFlash("Gerätetyp erfolgreich angelegt", "success");
         }
-        $this->redirect("Devicetype");
+        $this->redirect("Device");
     }
 
 
@@ -134,11 +130,12 @@ class DevicetypeController extends mfBaseController
         $devicetype = new Devicetype($id);
         if (!$devicetype->id || $devicetype->id != $id) {
             $this->layout()->setFlash("Gerätetyp nicht gefunden.", "error");
-            $this->redirect("Devicetype");
+            $this->redirect("Device");
         }
 
         $devicetype->delete();
-        $this->redirect("Devicetype");
+        $this->layout()->setFlash("Gerätetyp erfolgreich gelöscht", "success");
+        $this->redirect("Device");
     }
 
 }