Merge branch 'spidev' into 'master'

Spidev

See merge request fronk/thetool!1698

application/Device/DeviceController.php

@@ -44,6 +44,8 @@ class DeviceController extends mfBaseController
                 "manufacturer" => $deviceType->devicemanufactor->name,
                 "price" => $deviceType->price,
                 "power" => $deviceType->power,
+                "temp_warning" => $deviceType->temp_warning,
+                "temp_critical" => $deviceType->temp_critical,
                 "creator" => $deviceType->creator->name,
                 "created" => $deviceType->create,
             ];

application/Devicetype/DevicetypeController.php

@@ -76,6 +76,17 @@ class DevicetypeController extends mfBaseController
         } else {
             $power = $r->power;
         }
+        if (!$r->temp_warning) {
+            $temp_warning = "80";
+        } else {
+            $temp_warning = $r->temp_warning;
+        }
+
+        if (!$r->temp_critical) {
+            $temp_critical = "90";
+        } else {
+            $temp_critical = $r->temp_critical;
+        }
 
 
         if ($r->olt) {
@@ -88,6 +99,8 @@ class DevicetypeController extends mfBaseController
         $data['price'] = $price;
         $data['power'] = $power;
         $data['olt'] = $olt;
+        $data['temp_warning'] = $temp_warning;
+        $data['temp_critical'] = $temp_critical;
 
         if (!$data['name']) {
             $this->layout()->setFlash("Name darf nicht leer sein", "error");

application/Devicetype/DevicetypeModel.php

@@ -7,6 +7,8 @@ class DevicetypeModel
     public $price = null;
     public $olt = null;
     public $devicemanufactor_id = null;
+    public $temp_warning = 80;
+    public $temp_critical = 90;
 
 
     public $create_by = null;