Merge branch 'devbyspi' into 'master'

Devbyspi

See merge request fronk/thetool!5

Layout/default/Device/Detail.php

@@ -2,7 +2,7 @@
 
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css" rel="stylesheet" type="text/css"/>
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?=date('U')?>" rel="stylesheet" type="text/css"/>
     <style>
         .card-border {
 
@@ -25,7 +25,8 @@
                         <li class="breadcrumb-item active">Device Detail</li>
                     </ol>
                 </div>
-                <h4 class="page-title">Device: <span class="font-weight-normal ml-1"><?= $devices->data->name ?></span> <span class="ml-2">
+                <h4 class="page-title">Device: <span class="font-weight-normal ml-1"><?= $devices->data->name ?></span>
+                    <span class="ml-2">
                         <a href="<?= self::getUrl("Device", "edit", ["id" => $devices->id, 'returnto' => "device-detail"]) ?>">
                         <button class="btn btn-primary">Bearbeiten</button>
                             </a>
@@ -270,5 +271,4 @@ if ($devices->power != "0.0") {
 
     </script>
 
-
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>

Layout/default/Device/Form.php

@@ -1,13 +1,27 @@
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
 <?php
 foreach ($devicetypes as $devicetype) {
-    $deviceTypes[$devicetype->id]=$devicetype->devicemanufactor->name . " " . $devicetype->name;
+    $deviceTypes[$devicetype->id] = $devicetype->devicemanufactor->name . " " . $devicetype->name;
 }
 asort($deviceTypes);
 
-
+if ($device->price == "0.00") {
+    $price = "";
+} else {
+    $price = $device->price;
+}
+if ($device->power == "0.0") {
+    $power = "";
+} else {
+    $power = $device->power;
+}
+if (isset($_GET['returnto']) && $_GET['returnto'] == "device-detail") {
+    $cancelUrl = self::getUrl("Device", "Detail", ["id" => $device->id]);
+} else {
+    $cancelUrl = self::getUrl("Device");
+}
 ?>
-    <link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css" rel="stylesheet" type="text/css"/>
+    <link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css?<?=date('U')?>" rel="stylesheet" type="text/css"/>
     <!-- start page title -->
     <div class="row">
         <div class="col-12">

Layout/default/Device/Index.php

@@ -4,10 +4,7 @@ $pagination_baseurl_params = ["filter" => $filter];
 $pagination_entity_name = "Device";
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?=self::getResourcePath()?>assets/css/datatables-std.css" rel="stylesheet" type="text/css" />
-    <style>
-
-    </style>
+    <link href="<?=self::getResourcePath()?>assets/css/datatables-std.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
@@ -135,7 +132,7 @@ $pagination_entity_name = "Device";
 
         });
     </script>
-    <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/datatables-std.js"></script>
+    <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/datatables-std.js?<?=date('U')?>"></script>
 
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>

Layout/default/Devicemanufactor/Form.php

@@ -1,5 +1,4 @@
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-
     <!-- start page title -->
     <div class="row">
         <div class="col-12">

Layout/default/Devicemanufactor/Index.php

@@ -4,7 +4,7 @@ $pagination_baseurl_params = ["filter" => $filter];
 $pagination_entity_name = "Devicemanufactor";
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css" rel="stylesheet" type="text/css"/>
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?=date('U')?>" rel="stylesheet" type="text/css"/>
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
@@ -22,7 +22,6 @@ $pagination_entity_name = "Devicemanufactor";
     </div>
     <!-- end page title -->
 
-
     <div class="card">
         <div class="card-body mb-3">
             <div class="row">
@@ -88,7 +87,7 @@ $pagination_entity_name = "Devicemanufactor";
 
         });
     </script>
-    <script type="text/javascript" src="<?= self::getResourcePath() ?>assets/js/datatables-std.js"></script>
+    <script type="text/javascript" src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?=date('U')?>"></script>
 
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>

Layout/default/Devicetype/Form.php

@@ -1,5 +1,5 @@
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?=self::getResourcePath()?>assets/css/select2-cstm.css" rel="stylesheet" type="text/css" />
+    <link href="<?=self::getResourcePath()?>assets/css/select2-cstm.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
     <!-- start page title -->
     <div class="row">
         <div class="col-12">

Layout/default/Devicetype/Index.php

@@ -4,7 +4,7 @@ $pagination_baseurl_params = ["filter" => $filter];
 $pagination_entity_name = "Devicetype";
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?=self::getResourcePath()?>assets/css/datatables-std.css" rel="stylesheet" type="text/css" />
+    <link href="<?=self::getResourcePath()?>assets/css/datatables-std.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
@@ -106,7 +106,7 @@ $pagination_entity_name = "Devicetype";
 
         });
     </script>
-    <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/datatables-std.js"></script>
+    <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/datatables-std.js?<?=date('U')?>"></script>
 
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>

application/Device/DeviceController.php

@@ -95,7 +95,7 @@ class DeviceController extends mfBaseController
         $data = [];
         $data['name'] = trim($r->name);
         $data['devicetype_id'] = $r->devicetype_id;
-        if (trim($r->pop_id)=="0") {
+        if (trim($r->pop_id) == "0") {
             $data['pop_id'] = NULL;
         } else {
             $data['pop_id'] = $r->pop_id;
@@ -181,32 +181,6 @@ class DeviceController extends mfBaseController
             }
             $this->redirect($returnUrl, $returnAction, $returnVariables, $returnAnker);
         }
-        $returnUrl="Device";
-        $returnAction = "Index";
-        $returnVariables = array();
-        $returnAnker = "";
-        if ($this->request->returnto) {
-
-            if (strpos($this->request->returnto, "-") !== false) {
-                $urls = explode('-', $this->request->returnto);
-                $urlCounter = 0;
-                $returnUrlGen = "";
-                foreach ($urls as $url) {
-                    if ($urlCounter > 0) {
-                        $returnUrlGen .= "/";
-                    }
-                    $returnUrlGen .= ucfirst($url);
-                    $urlCounter++;
-                }
-                $returnAction = "";
-                $returnVariables['id'] = $id;
-                $returnUrl = $returnUrlGen;
-            } else {
-                $returnUrl = ucfirst($this->request->returnto);
-
-            }
-        }
-
 
         if ($mode == "edit") {
             $this->layout()->setFlash("Device erfolgreich geändert", "success");
@@ -216,4 +190,62 @@ class DeviceController extends mfBaseController
         $this->redirect($returnUrl, $returnAction, $returnVariables, $returnAnker);
     }
 
+    protected function apiAction()
+    {
+        if (!$this->me->is(["Admin"])) {
+            $this->redirect("Dashboard");
+        }
+        $do = $this->request->do;
+        $format = $this->request->format;
+        $filename = $this->request->filename;
+        $id = $this->request->id;
+        $ip = $this->request->ip;
+
+        $data = [];
+
+        switch ($do) {
+            case "getconfig":
+                $return = $this->getConfig($id, $format, $filename);
+                break;
+            case "createconfig":
+                $return = $this->createConfig($ip);
+                break;
+            default:
+                $return = false;
+        }
+
+    }
+
+    private function getConfig($id, $format, $filename)
+    {
+        $configDownload = DeviceModel::getconifgdownload($id, $format);
+//
+
+//        header('Content-Type: application/octet-stream');
+        header('Content-Type: text/plain');
+        header('Content-disposition: attachment; filename="' . $filename . '"');
+        echo $configDownload;
+
+        exit;
+    }
+
+    private function createConfig($ip)
+    {
+        $r = $this->request;
+        $id = $r->id;
+        $createConfig = DeviceModel::configcreate($ip);
+        if ($createConfig->success==="true")
+        {
+            $this->layout()->setFlash("Backup wurde erfolgreich erstellt", "success");
+        }
+        else
+        {
+            $this->layout()->setFlash("Backup konnte nicht erstellt werden. <b>Fehler</b>: ".$createConfig->error, "error");
+        }
+        $returnUrl = "Device";
+        $returnAction = "Detail";
+        $returnVariables['id'] = $id;
+        return $this->redirect($returnUrl, $returnAction, $returnVariables, $returnAnker);
+    }
+
 }

application/Device/DeviceModel.php

@@ -108,8 +108,8 @@ class DeviceModel
         $db = FronkDB::singleton();
         $where = self::getSqlFilter($filter);
         $res = $db->select("Device", "*", "$where ORDER BY name");
-        if($db->num_rows($res)) {
-            while($data = $db->fetch_object($res)) {
+        if ($db->num_rows($res)) {
+            while ($data = $db->fetch_object($res)) {
                 $items[] = new Device($data);
             }
         }
@@ -121,9 +121,9 @@ class DeviceModel
         $where = "1=1 ";
 
         //var_dump($filter);exit;
-        if(array_key_exists("pop_id", $filter)) {
+        if (array_key_exists("pop_id", $filter)) {
             $popid = $filter['pop_id'];
-            if(is_numeric($popid)) {
+            if (is_numeric($popid)) {
                 $where .= " AND pop_id=$popid";
             }
         }

application/Devicemanufactor/Devicemanufactor.php

@@ -1,5 +1,4 @@
 <?php
-
 class Devicemanufactor extends mfBaseModel
 {
     private $editor;

application/Devicemanufactor/DevicemanufactorController.php

@@ -1,5 +1,4 @@
 <?php
-
 class DevicemanufactorController extends mfBaseController
 {
 

application/Devicemanufactor/DevicemanufactorModel.php

@@ -1,5 +1,4 @@
 <?php
-
 class DevicemanufactorModel {
     public $name = null;
 

public/assets/css/datatables-std.css

@@ -32,6 +32,10 @@
     width: 50px;
 }
 
+.edit-width-large {
+    width: 100px;
+}
+
 .order-date-pill {
     margin: 2px;
     white-space: nowrap;