Icones paramètrables

NextDom · May 3, 2020 · fccefc3 · fccefc3
1 parent e3533ad
commit fccefc3
Show file tree

Hide file tree

Showing 85 changed files with 112 additions and 73 deletions.
diff --git a/src/dash/src/assets/buttons/var/fan-0.png → assets/data/pictures/level/fan-0.png b/src/dash/src/assets/buttons/var/fan-0.png → assets/data/pictures/level/fan-0.png
diff --git a/src/dash/src/assets/buttons/var/fan-100.png → assets/data/pictures/level/fan-100.png b/src/dash/src/assets/buttons/var/fan-100.png → assets/data/pictures/level/fan-100.png
diff --git a/src/dash/src/assets/buttons/var/fan-50.png → assets/data/pictures/level/fan-50.png b/src/dash/src/assets/buttons/var/fan-50.png → assets/data/pictures/level/fan-50.png
diff --git a/...dash/src/assets/buttons/var/shutter-0.png → assets/data/pictures/level/shutter-0.png b/...dash/src/assets/buttons/var/shutter-0.png → assets/data/pictures/level/shutter-0.png
diff --git a/...ash/src/assets/buttons/var/shutter-10.png → assets/data/pictures/level/shutter-10.png b/...ash/src/assets/buttons/var/shutter-10.png → assets/data/pictures/level/shutter-10.png
diff --git a/...sh/src/assets/buttons/var/shutter-100.png → assets/data/pictures/level/shutter-100.png b/...sh/src/assets/buttons/var/shutter-100.png → assets/data/pictures/level/shutter-100.png
diff --git a/...ash/src/assets/buttons/var/shutter-20.png → assets/data/pictures/level/shutter-20.png b/...ash/src/assets/buttons/var/shutter-20.png → assets/data/pictures/level/shutter-20.png
diff --git a/...ash/src/assets/buttons/var/shutter-30.png → assets/data/pictures/level/shutter-30.png b/...ash/src/assets/buttons/var/shutter-30.png → assets/data/pictures/level/shutter-30.png
diff --git a/...ash/src/assets/buttons/var/shutter-40.png → assets/data/pictures/level/shutter-40.png b/...ash/src/assets/buttons/var/shutter-40.png → assets/data/pictures/level/shutter-40.png
diff --git a/...ash/src/assets/buttons/var/shutter-50.png → assets/data/pictures/level/shutter-50.png b/...ash/src/assets/buttons/var/shutter-50.png → assets/data/pictures/level/shutter-50.png
diff --git a/...ash/src/assets/buttons/var/shutter-60.png → assets/data/pictures/level/shutter-60.png b/...ash/src/assets/buttons/var/shutter-60.png → assets/data/pictures/level/shutter-60.png
diff --git a/...ash/src/assets/buttons/var/shutter-70.png → assets/data/pictures/level/shutter-70.png b/...ash/src/assets/buttons/var/shutter-70.png → assets/data/pictures/level/shutter-70.png
diff --git a/...ash/src/assets/buttons/var/shutter-80.png → assets/data/pictures/level/shutter-80.png b/...ash/src/assets/buttons/var/shutter-80.png → assets/data/pictures/level/shutter-80.png
diff --git a/...sh/src/assets/buttons/on-off/door-off.png → assets/data/pictures/on-off/door-off.png b/...sh/src/assets/buttons/on-off/door-off.png → assets/data/pictures/on-off/door-off.png
diff --git a/...ash/src/assets/buttons/on-off/door-on.png → assets/data/pictures/on-off/door-on.png b/...ash/src/assets/buttons/on-off/door-on.png → assets/data/pictures/on-off/door-on.png
diff --git a/...h/src/assets/buttons/on-off/light-off.png → assets/data/pictures/on-off/light-off.png b/...h/src/assets/buttons/on-off/light-off.png → assets/data/pictures/on-off/light-off.png
diff --git a/...sh/src/assets/buttons/on-off/light-on.png → assets/data/pictures/on-off/light-on.png b/...sh/src/assets/buttons/on-off/light-on.png → assets/data/pictures/on-off/light-on.png
diff --git a/...sh/src/assets/buttons/on-off/play-off.png → assets/data/pictures/on-off/play-off.png b/...sh/src/assets/buttons/on-off/play-off.png → assets/data/pictures/on-off/play-off.png
diff --git a/...ash/src/assets/buttons/on-off/play-on.png → assets/data/pictures/on-off/play-on.png b/...ash/src/assets/buttons/on-off/play-on.png → assets/data/pictures/on-off/play-on.png
diff --git a/...sh/src/assets/buttons/on-off/pump-off.png → assets/data/pictures/on-off/pump-off.png b/...sh/src/assets/buttons/on-off/pump-off.png → assets/data/pictures/on-off/pump-off.png
diff --git a/...ash/src/assets/buttons/on-off/pump-on.png → assets/data/pictures/on-off/pump-on.png b/...ash/src/assets/buttons/on-off/pump-on.png → assets/data/pictures/on-off/pump-on.png
diff --git a/...src/assets/buttons/on-off/switch1-off.png → assets/data/pictures/on-off/switch1-off.png b/...src/assets/buttons/on-off/switch1-off.png → assets/data/pictures/on-off/switch1-off.png
diff --git a/.../src/assets/buttons/on-off/switch1-on.png → assets/data/pictures/on-off/switch1-on.png b/.../src/assets/buttons/on-off/switch1-on.png → assets/data/pictures/on-off/switch1-on.png
diff --git a/...src/assets/buttons/on-off/switch2-off.png → assets/data/pictures/on-off/switch2-off.png b/...src/assets/buttons/on-off/switch2-off.png → assets/data/pictures/on-off/switch2-off.png
diff --git a/.../src/assets/buttons/on-off/switch2-on.png → assets/data/pictures/on-off/switch2-on.png b/.../src/assets/buttons/on-off/switch2-on.png → assets/data/pictures/on-off/switch2-on.png
diff --git a/.../src/assets/buttons/on-off/thermo-off.png → assets/data/pictures/on-off/thermo-off.png b/.../src/assets/buttons/on-off/thermo-off.png → assets/data/pictures/on-off/thermo-off.png
diff --git a/...h/src/assets/buttons/on-off/thermo-on.png → assets/data/pictures/on-off/thermo-on.png b/...h/src/assets/buttons/on-off/thermo-on.png → assets/data/pictures/on-off/thermo-on.png
diff --git a/...dash/src/assets/buttons/on-off/v1-off.png → assets/data/pictures/on-off/v1-off.png b/...dash/src/assets/buttons/on-off/v1-off.png → assets/data/pictures/on-off/v1-off.png
diff --git a/src/dash/src/assets/buttons/on-off/v1-on.png → assets/data/pictures/on-off/v1-on.png b/src/dash/src/assets/buttons/on-off/v1-on.png → assets/data/pictures/on-off/v1-on.png
diff --git a/...dash/src/assets/buttons/on-off/v2-off.png → assets/data/pictures/on-off/v2-off.png b/...dash/src/assets/buttons/on-off/v2-off.png → assets/data/pictures/on-off/v2-off.png
diff --git a/src/dash/src/assets/buttons/on-off/v2-on.png → assets/data/pictures/on-off/v2-on.png b/src/dash/src/assets/buttons/on-off/v2-on.png → assets/data/pictures/on-off/v2-on.png
diff --git a/.../src/assets/buttons/on-off/window-off.png → assets/data/pictures/on-off/window-off.png b/.../src/assets/buttons/on-off/window-off.png → assets/data/pictures/on-off/window-off.png
diff --git a/...h/src/assets/buttons/on-off/window-on.png → assets/data/pictures/on-off/window-on.png b/...h/src/assets/buttons/on-off/window-on.png → assets/data/pictures/on-off/window-on.png
diff --git a/dash/css/app.448fa9de.css → dash/css/app.161a255e.css b/dash/css/app.448fa9de.css → dash/css/app.161a255e.css
diff --git a/dash/img/door-off.849f629c.png b/dash/img/door-off.849f629c.png
diff --git a/dash/img/door-on.7a4e8176.png b/dash/img/door-on.7a4e8176.png
diff --git a/dash/img/fan-0.3fa3dbe2.png b/dash/img/fan-0.3fa3dbe2.png
diff --git a/dash/img/fan-100.ec6fe551.png b/dash/img/fan-100.ec6fe551.png
diff --git a/dash/img/fan-50.7a6efdd0.png b/dash/img/fan-50.7a6efdd0.png
diff --git a/dash/img/light-off.0d39c1fe.png b/dash/img/light-off.0d39c1fe.png
diff --git a/dash/img/light-on.a035c773.png b/dash/img/light-on.a035c773.png
diff --git a/dash/img/play-off.44c57fc8.png b/dash/img/play-off.44c57fc8.png
diff --git a/dash/img/play-on.8f622009.png b/dash/img/play-on.8f622009.png
diff --git a/dash/img/pump-off.5d91d1a3.png b/dash/img/pump-off.5d91d1a3.png
diff --git a/dash/img/pump-on.5fa26c75.png b/dash/img/pump-on.5fa26c75.png
diff --git a/dash/img/shutter-0.c8b261d4.png b/dash/img/shutter-0.c8b261d4.png
diff --git a/dash/img/shutter-10.718dfa21.png b/dash/img/shutter-10.718dfa21.png
diff --git a/dash/img/shutter-100.667a287c.png b/dash/img/shutter-100.667a287c.png
diff --git a/dash/img/shutter-20.c6fadfce.png b/dash/img/shutter-20.c6fadfce.png
diff --git a/dash/img/shutter-30.638eabfb.png b/dash/img/shutter-30.638eabfb.png
diff --git a/dash/img/shutter-40.b14d8bf1.png b/dash/img/shutter-40.b14d8bf1.png
diff --git a/dash/img/shutter-50.f7f69192.png b/dash/img/shutter-50.f7f69192.png
diff --git a/dash/img/shutter-60.69f34cc0.png b/dash/img/shutter-60.69f34cc0.png
diff --git a/dash/img/shutter-70.f7137e1f.png b/dash/img/shutter-70.f7137e1f.png
diff --git a/dash/img/shutter-80.9caa43b3.png b/dash/img/shutter-80.9caa43b3.png
diff --git a/dash/img/switch1-off.1c3ea2e1.png b/dash/img/switch1-off.1c3ea2e1.png
diff --git a/dash/img/switch1-on.0efda217.png b/dash/img/switch1-on.0efda217.png
diff --git a/dash/img/switch2-off.a93e03d4.png b/dash/img/switch2-off.a93e03d4.png
diff --git a/dash/img/switch2-on.5e859eb4.png b/dash/img/switch2-on.5e859eb4.png
diff --git a/dash/img/thermo-off.774245ff.png b/dash/img/thermo-off.774245ff.png
diff --git a/dash/img/thermo-on.358a99eb.png b/dash/img/thermo-on.358a99eb.png
diff --git a/dash/img/v1-off.734362bf.png b/dash/img/v1-off.734362bf.png
diff --git a/dash/img/v1-on.427dc6d1.png b/dash/img/v1-on.427dc6d1.png
diff --git a/dash/img/v2-off.84bf76d8.png b/dash/img/v2-off.84bf76d8.png
diff --git a/dash/img/v2-on.1674941c.png b/dash/img/v2-on.1674941c.png
diff --git a/dash/img/window-off.32205b12.png b/dash/img/window-off.32205b12.png
diff --git a/dash/img/window-on.57150857.png b/dash/img/window-on.57150857.png
diff --git a/dash/index.html b/dash/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/dash/favicon.ico><title>dash</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link href=/dash/css/app.448fa9de.css rel=preload as=style><link href=/dash/css/chunk-vendors.7469a8f1.css rel=preload as=style><link href=/dash/js/app.5a81bcfc.js rel=preload as=script><link href=/dash/js/chunk-vendors.8cc3cdae.js rel=preload as=script><link href=/dash/css/chunk-vendors.7469a8f1.css rel=stylesheet><link href=/dash/css/app.448fa9de.css rel=stylesheet></head><body><noscript><strong>We're sorry but dash doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/dash/js/chunk-vendors.8cc3cdae.js></script><script src=/dash/js/app.5a81bcfc.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/dash/favicon.ico><title>dash</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link href=/dash/css/app.161a255e.css rel=preload as=style><link href=/dash/css/chunk-vendors.7469a8f1.css rel=preload as=style><link href=/dash/js/app.e62f6579.js rel=preload as=script><link href=/dash/js/chunk-vendors.ab6a1ffc.js rel=preload as=script><link href=/dash/css/chunk-vendors.7469a8f1.css rel=stylesheet><link href=/dash/css/app.161a255e.css rel=stylesheet></head><body><noscript><strong>We're sorry but dash doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/dash/js/chunk-vendors.ab6a1ffc.js></script><script src=/dash/js/app.e62f6579.js></script></body></html>
diff --git a/dash/js/app.5a81bcfc.js b/dash/js/app.5a81bcfc.js
diff --git a/dash/js/app.5a81bcfc.js.map b/dash/js/app.5a81bcfc.js.map
diff --git a/dash/js/app.e62f6579.js b/dash/js/app.e62f6579.js
diff --git a/dash/js/app.e62f6579.js.map b/dash/js/app.e62f6579.js.map
diff --git a/dash/js/chunk-vendors.8cc3cdae.js b/dash/js/chunk-vendors.8cc3cdae.js
diff --git a/dash/js/chunk-vendors.8cc3cdae.js.map b/dash/js/chunk-vendors.8cc3cdae.js.map
diff --git a/dash/js/chunk-vendors.ab6a1ffc.js b/dash/js/chunk-vendors.ab6a1ffc.js
diff --git a/dash/js/chunk-vendors.ab6a1ffc.js.map b/dash/js/chunk-vendors.ab6a1ffc.js.map
diff --git a/src/Rest/DashRest.php b/src/Rest/DashRest.php
@@ -22,6 +22,7 @@
 use Exception;
 use NextDom\Exceptions\CoreException;
 use NextDom\Helpers\DBHelper;
+use NextDom\Helpers\FileSystemHelper;
 use NextDom\Helpers\Utils;
 use NextDom\Managers\DashManager;
 use NextDom\Managers\JeeObjectManager;
@@ -67,4 +68,10 @@ public static function save(Request $request)
         $dash->save();
         return true;
     }
+
+    public static function pictures($path = '')
+    {
+        $path = Utils::sanitizeString($path);
+        return FileSystemHelper::ls(NEXTDOM_DATA . '/data/pictures/' . $path, '*', true);
+    }
 }
diff --git a/src/Rest/rest.yml b/src/Rest/rest.yml
@@ -136,3 +136,9 @@ dash_save:
   path: '/dash/save'
   controller: NextDom\Rest\DashRest::save
   methods: POST
+dash_pictures:
+  path: '/dash/pictures/{path}'
+  controller: NextDom\Rest\DashRest::pictures
+  methods: GET
+  requirements:
+    path: "[a-zA-Z0-9\\-_]+"
diff --git a/src/dash/src/components/Widgets/InfoBinaryImg.vue b/src/dash/src/components/Widgets/InfoBinaryImg.vue
@@ -28,7 +28,7 @@ export default {
       } else {
         picture += "-off";
       }
-      return require("../../assets/buttons/on-off/" + picture + ".png");
+      return "/data/pictures/on-off/" + picture + ".png";
     }
   }
 };

diff --git a/src/dash/src/components/Widgets/InfoNumericImg.vue b/src/dash/src/components/Widgets/InfoNumericImg.vue
@@ -10,15 +10,14 @@
 </template>
 
 <script>
-import Data from "@/libs/Data";
-
 export default {
   name: "InfoNumericImg",
   props: {
     widgetData: {}
   },
   data: () => ({
-    mult: 1
+    mult: 1,
+    pictureCode: ""
   }),
   mounted() {
     if (!this.widgetData.percent) {
@@ -27,16 +26,16 @@ export default {
   },
   computed: {
     icon() {
-      let picture = this.widgetData.picture;
-
-      return require("../../assets/buttons/var/" +
-        picture +
+      return (
+        "/data/pictures/level/" +
+        this.widgetData.picture.name +
         "-" +
         this.getClosest(
           this.widgetData.state * this.mult,
-          Data.assets.var.list[picture]
+          this.widgetData.picture.values
         ) +
-        ".png");
+        ".png"
+      );
     }
   },
   methods: {

diff --git a/src/dash/src/components/Wizards/Helpers/LevelImgStyle.vue b/src/dash/src/components/Wizards/Helpers/LevelImgStyle.vue
@@ -1,41 +1,62 @@
 <template>
   <v-radio-group v-model="picture" row>
-    <v-radio v-for="(pictures, name, index) in picturesList" v-bind:key="`pictures-${index}`" v-bind:value="name">
+    <v-radio v-for="(pictureData, index) in picturesList" v-bind:key="`pictures-${index}`" v-bind:value="index">
       <template v-slot:label>
-        <img v-bind:src="pictures.min" />/
-        <img v-bind:src="pictures.max" />
+        <img v-bind:src="'/data/pictures/level/' + pictureData.name + '-0.png'" />/
+        <img v-bind:src="'/data/pictures/level/' + pictureData.name + '-100.png'" />/
       </template>
     </v-radio>
   </v-radio-group>
 </template>
 
 <script>
-import Data from "@/libs/Data";
+import Communication from "@/libs/Communication";
 
 export default {
   name: "LevelImgStyle",
   props: {
-    value: String
+    value: Object
+  },
+  data: () => ({
+    basePath: "/data/pictures/level/",
+    picturesListCache: {},
+    picturesList: []
+  }),
+  mounted() {
+    if (Object.keys(this.picturesListCache).length === 0) {
+      Communication.get("/api/dash/pictures/level", files => {
+        const codeExtract = /(.*)-(\d+)\.png/;
+        let indexes = {};
+        for (let pictureIndex in files) {
+          const code = files[pictureIndex].match(codeExtract);
+          // Objet pour retrouver l'index des images
+          if (code.length > 2) {
+            if (code[1] in indexes) {
+              this.picturesList[indexes[code[1]]].values.push(code[2]);
+            } else {
+              // Créer l'info si un fichier avec ce code n'a jamais été trouvé
+              indexes[code[1]] = this.picturesList.length;
+              this.picturesList.push({
+                name: code[1],
+                values: [code[2]]
+              });
+            }
+          }
+        }
+        // Définir les valeurs par défaut
+        if (this.value.name in indexes) {
+          this.$emit("input", this.picturesList[indexes[this.value.name]]);
+        }
+      });
+    }
   },
   computed: {
-    picturesList() {
-      let result = {};
-      for (let pictureCode in Data.assets.var.list) {
-        result[pictureCode] = {
-          min: require("../../../assets/buttons/var/" + pictureCode + "-0.png"),
-          max: require("../../../assets/buttons/var/" +
-            pictureCode +
-            "-100.png")
-        };
-      }
-      return result;
-    },
     picture: {
       get() {
-        return this.value;
+        return this.picturesList[this.value.name];
       },
       set(newValue) {
-        this.$emit("input", newValue);
+        this.$emit("input", this.picturesList[newValue]);
       }
     }
   }

diff --git a/src/dash/src/components/Wizards/Helpers/OnOffImgStyle.vue b/src/dash/src/components/Wizards/Helpers/OnOffImgStyle.vue
@@ -1,38 +1,40 @@
 <template>
   <v-radio-group v-model="picture" row>
-    <v-radio
-      v-for="(pictures, name, index) in picturesList"
-      v-bind:key="`pictures-${index}`"
-      v-bind:value="name"
-    >
+    <v-radio v-for="(picture, index) in picturesList" v-bind:key="`pictures-${index}`" v-bind:value="picture">
       <template v-slot:label>
-        <img v-bind:src="pictures.on" />/
-        <img v-bind:src="pictures.off" />
+        <img v-bind:src="basePath + picture + '-on.png'" />/
+        <img v-bind:src="basePath + picture + '-off.png'" />/
       </template>
     </v-radio>
   </v-radio-group>
 </template>
 
 <script>
-import Data from "@/libs/Data";
+import Communication from "@/libs/Communication";
 
 export default {
   name: "OnOffImgStyle",
   props: {
     value: String
   },
-  computed: {
-    picturesList() {
-      let result = {};
-      for (let pictureIndex in Data.assets.buttons.list) {
-        const code = Data.assets.buttons.list[pictureIndex];
-        result[code] = {
-          on: require("../../../assets/buttons/on-off/" + code + "-on.png"),
-          off: require("../../../assets/buttons/on-off/" + code + "-off.png")
-        };
+  data: () => ({
+    picturesList: [],
+    basePath: "/data/pictures/on-off/"
+  }),
+  created() {
+    Communication.get("/api/dash/pictures/on-off", files => {
+      let result = [];
+      const codeExtract = /(.*)-o(?:n|ff)\.png/;
+      for (let pictureIndex in files) {
+        const code = files[pictureIndex].match(codeExtract);
+        if (code.length > 1) {
+          result.push(code[1]);
+        }
       }
-      return result;
-    },
+      this.picturesList = Array.from(new Set(result));
+    });
+  },
+  computed: {
     picture: {
       get() {
         return this.value;

diff --git a/src/dash/src/components/Wizards/Items/InfoNumericImgWizard.vue b/src/dash/src/components/Wizards/Items/InfoNumericImgWizard.vue
@@ -44,9 +44,13 @@ export default {
     WidgetPreview
   },
   data: () => ({
-    command: []
+    command: [],
+    previewData: {}
   }),
   watch: {
+    previewData: function(newData) {
+      console.log(newData);
+    },
     step: function(newStep) {
       switch (newStep) {
         case 1:
@@ -93,7 +97,7 @@ export default {
           type: "InfoNumericImg",
           cmdId: -1,
           pos: { top: 0, left: 0 },
-          picture: "shutter",
+          picture: { name: "shutter", values: [0, 100] },
           title: "",
           unit: "%",
           percent: false,

diff --git a/src/dash/src/components/Wizards/SelectItemToAddWizard.vue b/src/dash/src/components/Wizards/SelectItemToAddWizard.vue
@@ -115,10 +115,10 @@ export default {
           data: {
             title: "Information",
             hideBorder: true,
-            state: 0,
+            state: 20,
             percent: true,
             unit: "%",
-            picture: "shutter",
+            picture: { name: "shutter", values: [0, 20, 100] },
             style: {
               titleSize: 20,
               contentSize: 52

diff --git a/views/commons/AdminLTE_sidebar.html.twig b/views/commons/AdminLTE_sidebar.html.twig
@@ -50,7 +50,7 @@
                 </ul>
             </li>
             <li id="side2">
-                <a href="/dash/index.html"><i class="fas fa-picture-o spacing-right"></i><span>{{ 'Dash'|trans }}</span><span class="pull-right-container"><i class="fas fa-angle-left pull-right"></i></span></a>
+                <a href="/dash/index.html" target="_blank"><i class="fas fa-picture-o spacing-right"></i><span>{{ 'Dash'|trans }}</span><span class="pull-right-container"><i class="fas fa-angle-left pull-right"></i></span></a>
             </li>
             <li class="treeview" id="side2">
                 <a href="#"><i class="fas fa-picture-o spacing-right"></i><span>{{ 'sidebar.view'|trans }}</span><span class="pull-right-container"><i class="fas fa-angle-left pull-right"></i></span></a>