Modification de ENGINE en InnoDB de la table interactQuery en v…

assets/config/Jeedom_version

@@ -1 +1 @@
-3.3.41
+4.0.45

assets/config/Nextdom_version

@@ -1 +1 @@
-0.7.0
+0.8.0

assets/config/nextdom.config.php

@@ -345,6 +345,86 @@
                 ),
             ),
         ),
+        'widget' => array(
+            'action' => array(
+                'other' => array(
+                    'light' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_yellow icon jeedom-lumiere-on\'></i>', '#_icon_off_#' => '<i class=\'icon jeedom-lumiere-off\'></i>')),
+                    'circle' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'fas fa-circle\'></i>', '#_icon_off_#' => '<i class=\'far fa-circle\'></i>')),
+                    'fan' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon jeedom-ventilo\'></i>', '#_icon_off_#' => '<i class=\'fas fa-times\'></i>')),
+                    'garage' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_green icon jeedom-garage-ferme\'></i>', '#_icon_off_#' => '<i class=\'icon_red icon jeedom-garage-ouvert\'></i>')),
+                    'lock' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_green icon jeedom-lock-ferme\'></i>', '#_icon_off_#' => '<i class=\'icon_orange icon jeedom-lock-ouvert\'></i>')),
+                    'prise' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon jeedom-prise\'></i>', '#_icon_off_#' => '<i class=\'fas fa-times\'></i>')),
+                    'sprinkle' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_blue icon nature-watering1\'></i>', '#_icon_off_#' => '<i class=\'fas fa-times\'></i>')),
+                    'timeLight' => array('template' => 'tmplicon', 'replace' => array('#_time_widget_#' => '1', '#_icon_on_#' => '<i class=\'icon_yellow icon jeedom-lumiere-on\'></i>', '#_icon_off_#' => '<i class=\'icon jeedom-lumiere-off\'></i>')),
+                    'timeCircle' => array('template' => 'tmplicon', 'replace' => array('#_time_widget_#' => '1', '#_icon_on_#' => '<i class=\'fas fa-circle\'></i>', '#_icon_off_#' => '<i class=\'fas fa-circle-thin\'></i>')),
+                    'timeFan' => array('template' => 'tmplicon', 'replace' => array('#_time_widget_#' => '1', '#_icon_on_#' => '<i class=\'icon jeedom-ventilo\'></i>', '#_icon_off_#' => '<i class=\'fas fa-times\'></i>')),
+                    'timeGarage' => array('template' => 'tmplicon', 'replace' => array('#_time_widget_#' => '1', '#_icon_on_#' => '<i class=\'icon_green icon jeedom-garage-ferme\'></i>', '#_icon_off_#' => '<i class=\'icon_red icon jeedom-garage-ouvert\'></i>')),
+                    'timeLock' => array('template' => 'tmplicon', 'replace' => array('#_time_widget_#' => '1', '#_icon_on_#' => '<i class=\'icon jeedom-lock-ferme\'></i>', '#_icon_off_#' => '<i class=\'icon jeedom-lock-ouvert\'></i>')),
+                    'timePrise' => array('template' => 'tmplicon', 'replace' => array('#_time_widget_#' => '1', '#_icon_on_#' => '<i class=\'icon jeedom-prise\'></i>', '#_icon_off_#' => '<i class=\'fas fa-times\'></i>')),
+                    'timeSprinkle' => array('template' => 'tmplicon', 'replace' => array('#_time_widget_#' => '1', '#_icon_on_#' => '<i class=\'icon_blue icon nature-watering1\'></i>', '#_icon_off_#' => '<i class=\'fas fa-times\'></i>')),
+                ),
+                'slider' => array(
+                    'light' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_yellow icon jeedom-lumiere-on\'></i>', '#_icon_off_#' => '<i class=\'icon jeedom-lumiere-off\'></i>')),
+                    'timeLight' => array('template' => 'tmplicon', 'replace' => array('#_time_widget_#' => '1', '#_icon_on_#' => '<i class=\'icon_yellow icon jeedom-lumiere-on\'></i>', '#_icon_off_#' => '<i class=\'icon jeedom-lumiere-off\'></i>')),
+                )
+            ),
+            'info' => array(
+                'binary' => array(
+                    'default' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_green fas fa-check\'></i>', '#_icon_off_#' => '<i class=\'icon_red fas fa-times\'></i>')),
+                    'line' => array('template' => 'tmpliconline', 'replace' => array('#_icon_on_#' => '<i class=\'icon_green fas fa-check\'></i>', '#_icon_off_#' => '<i class=\'icon_red fas fa-times\'></i>')),
+                    'alert' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_green fas fa-check\'></i>', '#_icon_off_#' => '<i class=\'icon_red icon jeedom-alerte2\'></i>')),
+                    'door' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_green icon jeedom-porte-ferme\'></i>', '#_icon_off_#' => '<i class=\'icon_red icon jeedom-porte-ouverte\'></i>')),
+                    'heat' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_red icon jeedom-feu\'></i>', '#_icon_off_#' => '<i class=\'fas fa-times\'></i>')),
+                    'light' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_yellow icon jeedom-lumiere-on\'></i>', '#_icon_off_#' => '<i class=\'icon jeedom-lumiere-off\'></i>')),
+                    'lock' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon jeedom-lock-ferme\'></i>', '#_icon_off_#' => '<i class=\'icon_red icon jeedom-lock-ouvert\'></i>')),
+                    'presence' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_green fas fa-check\'></i>', '#_icon_off_#' => '<i class=\'icon_red icon jeedom-mouvement\'></i>')),
+                    'prise' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon jeedom-prise\'></i>', '#_icon_off_#' => '<i class=\'fas fa-times\'></i>')),
+                    'window' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_green icon jeedom-fenetre-ferme\'></i>', '#_icon_off_#' => '<i class=\'icon_red icon jeedom-fenetre-ouverte\'></i>')),
+                    'flood' => array('template' => 'tmplicon', 'replace' => array('#_icon_on_#' => '<i class=\'icon_green fas fa-tint-slash\'></i>', '#_icon_off_#' => '<i class=\'icon_blue fas fa-tint\'></i>')),
+                    'timeDoor' => array('template' => 'tmplicon', 'replace' => array('#_time_widget_#' => '1', '#_icon_on_#' => '<i class=\'icon_green icon jeedom-porte-ferme\'></i>', '#_icon_off_#' => '<i class=\'icon_red icon jeedom-porte-ouverte\'></i>')),
+                    'timePresence' => array('template' => 'tmplicon', 'replace' => array('#_time_widget_#' => '1', '#_icon_on_#' => '<i class=\'icon_green fas fa-check\'></i>', '#_icon_off_#' => '<i class=\'icon_red icon jeedom-mouvement\'></i>')),
+                    'timeWindow' => array('template' => 'tmplicon', 'replace' => array('#_time_widget_#' => '1', '#_icon_on_#' => '<i class=\'icon_green icon jeedom-fenetre-ferme\'></i>', '#_icon_off_#' => '<i class=\'icon_red icon jeedom-fenetre-ouverte\'></i>')),
+                    'timeAlert' => array('template' => 'tmplicon', 'replace' => array('#_time_widget_#' => '1', '#_icon_on_#' => '<i class=\'icon_green fas fa-check\'></i>', '#_icon_off_#' => '<i class=\'icon_red icon jeedom-alerte2\'></i>')),
+                ),
+                'numeric' => array(
+                    'heatPiloteWire' => array('template' => 'tmplmultistate',
+                        'test' => array(
+                            array('operation' => '#value# == 3', 'state_light' => '<i class=\'icon jeedom-pilote-eco\'></i>'),
+                            array('operation' => '#value# == 2', 'state_light' => '<i class=\'icon jeedom-pilote-off\'></i>'),
+                            array('operation' => '#value# == 1', 'state_light' => '<i class=\'icon jeedom-pilote-hg\'></i>'),
+                            array('operation' => '#value# == 0', 'state_light' => '<i class=\'icon jeedom-pilote-conf\'></i>')
+                        )),
+                    'timeHeatPiloteWire' => array('template' => 'tmplmultistate',
+                        'replace' => array('#_time_widget_#' => '1'),
+                        'test' => array(
+                            array('operation' => '#value# == 3', 'state_light' => '<i class=\'icon jeedom-pilote-eco\'></i>'),
+                            array('operation' => '#value# == 2', 'state_light' => '<i class=\'icon jeedom-pilote-off\'></i>'),
+                            array('operation' => '#value# == 1', 'state_light' => '<i class=\'icon jeedom-pilote-hg\'></i>'),
+                            array('operation' => '#value# == 0', 'state_light' => '<i class=\'icon jeedom-pilote-conf\'></i>')
+                        )),
+                    'heatPiloteWireQubino' => array('template' => 'tmplmultistate',
+                        'test' => array(
+                            array('operation' => '#value# >= 51 && #value# <= 99', 'state_light' => '<i class=\'icon jeedom-pilote-conf\'></i>'),
+                            array('operation' => '#value# >= 41 && #value# <= 50', 'state_light' => '<i class=\'icon jeedom-pilote-conf\'></i><sup style=\'font-size: 0.3em; margin-left: 1px\'>-1</sup>'),
+                            array('operation' => '#value# >= 31 && #value# <= 40', 'state_light' => '<i class=\'icon jeedom-pilote-conf\'></i><sup style=\'font-size: 0.3em; margin-left: 1px\'>-2</sup>'),
+                            array('operation' => '#value# >= 21 && #value# <= 30', 'state_light' => '<i class=\'icon jeedom-pilote-eco\'></i>'),
+                            array('operation' => '#value# >= 11 && #value# <= 20', 'state_light' => '<i class=\'icon jeedom-pilote-hg\'></i>'),
+                            array('operation' => '#value# >= 0 && #value# <= 10', 'state_light' => '<i class=\'icon jeedom-pilote-off\'></i>'),
+                        )),
+                    'timeHeatPiloteWireQubino' => array('template' => 'tmplmultistate',
+                        'replace' => array('#_time_widget_#' => '1'),
+                        'test' => array(
+                            array('operation' => '#value# >= 51 && #value# <= 99', 'state_light' => '<i class=\'icon jeedom-pilote-conf\'></i>'),
+                            array('operation' => '#value# >= 41 && #value# <= 50', 'state_light' => '<i class=\'icon jeedom-pilote-conf\'></i><sup style=\'font-size: 0.3em; margin-left: 1px\'>-1</sup>'),
+                            array('operation' => '#value# >= 31 && #value# <= 40', 'state_light' => '<i class=\'icon jeedom-pilote-conf\'></i><sup style=\'font-size: 0.3em; margin-left: 1px\'>-2</sup>'),
+                            array('operation' => '#value# >= 21 && #value# <= 30', 'state_light' => '<i class=\'icon jeedom-pilote-eco\'></i>'),
+                            array('operation' => '#value# >= 11 && #value# <= 20', 'state_light' => '<i class=\'icon jeedom-pilote-hg\'></i>'),
+                            array('operation' => '#value# >= 0 && #value# <= 10', 'state_light' => '<i class=\'icon jeedom-pilote-off\'></i>'),
+                        )
+                    )
+                )
+            )
+        )
     )
 );
 global $JEEDOM_INTERNAL_CONFIG;

assets/css/compiled/pages/widget.scss

@@ -0,0 +1,72 @@
+/* This file is part of Jeedom.
+*
+* Jeedom is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Jeedom is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Jeedom. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* This file is part of NextDom.
+*
+* NextDom is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* NextDom is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with NextDom. If not, see <http://www.gnu.org/licenses/>.
+*
+* @Support <https://www.nextdom.org>
+* @Email   <admin@nextdom.org>
+* @Authors/Contributors: Sylvaner, Byackee, cyrilphoenix71, ColonelMoutarde, edgd1er, slobberbone, Astral0, DanoneKiD
+*/
+/* Need to be first */
+@import "../../graphics/_colors.scss";
+
+/* Tuiles widget */
+.displayCard {
+    >.title {
+        margin: 0;
+    }
+    span.widget-icon {
+        font-size: 4em;
+        line-height: 88px;
+        border-radius: 10px;
+        padding: 10px;
+        vertical-align: middle;
+        padding-bottom: 2px;
+    }
+    img {
+        height: 80px;
+        width: auto;
+    }
+}
+
+/* Element */
+#div_display_config {
+    input[type=text]{
+        width: 400px;
+    }
+}
+
+.fieldset_display_preview {
+    background-color: #16329110;
+}
+
+/* Element */
+#div_display_preview {
+    margin-bottom: 20px;
+}

assets/css/graphics/_colors.scss

@@ -23,7 +23,7 @@
 /* Basic colors */
 $white:#FFF;
 $black:#000;
-$yellow:#BFFF00;
+$yellow:#FFFF00;
 $blue:#337ab7;
 $purple:#563d7c;
 $red:#c9302c;

assets/css/themes/_base.scss

@@ -159,6 +159,7 @@ html {
 /* Icones */
 .iconSelected {
   border: 1px dashed map_get($color_theme, 'color1') !important;
+  background-color: map_get($color_theme, 'color8') !important;
 }
 
 /* Sliders */
@@ -441,6 +442,11 @@ html {
   background-color: map_get($color_theme, 'color7') !important;
 }
 
+/* Widget */
+.widget-icon {
+  background-color: map_get($color_theme, 'color7') !important;
+}
+
 /* fond des timeline */
 .timeline-item,
 .timeline-header,
@@ -939,7 +945,7 @@ pre:not(.mobile-pre) {
 /* ################################# */
 .btn-app,
 .btn-selector {
-  background-color: map_get($color_theme, 'color15') !important;
+  background-color: map_get($color_theme, 'color15');
 }
 
 

assets/icon/nextdomapp/style.css

@@ -453,19 +453,19 @@
   content: "\e949";
 }
 .nextdomapp-home-nextdom:before,
-.jeedomapp-home-nextdom:before {
+.jeedomapp-home-jeedom:before {
   content: "\e90b";
 }
 .nextdomapp-piece-nextdom:before,
-.jeedomapp-piece-nextdom:before {
+.jeedomapp-piece-jeedom:before {
   content: "\e90c";
 }
 .nextdomapp-scenario-nextdom:before,
-.jeedomapp-scenario-nextdom:before {
+.jeedomapp-scenario-jeedom:before {
   content: "\e90d";
 }
 .nextdomapp-design-nextdom:before,
-.jeedomapp-design-nextdom:before {
+.jeedomapp-design-jeedom:before {
   content: "\e90e";
 }
 .nextdomapp-alerte2:before,

assets/js/core/log.class.js

@@ -125,7 +125,7 @@ nextdom.log.autoupdate = function(queryParams) {
     },
     error: function () {
       if (nextdom.log.timeout !== null) {
-        clearTimeout(jeedom.log.timeout);
+        clearTimeout(nextdom.log.timeout);
       }
       nextdom.log.timeout = setTimeout(function () {
         nextdom.log.autoupdate(queryParams)

assets/js/core/nextdom.class.js

@@ -395,3 +395,7 @@ nextdom.cleanFileSystemRight = function(queryParams) {
 nextdom.consistency = function(queryParams) {
   nextdom.private.ajax('NextDom', 'consistency', queryParams);
 };
+
+nextdom.version = function(queryParams) {
+  nextdom.private.ajax('NextDom', 'version', queryParams);
+};

assets/js/core/widget.class.js

@@ -0,0 +1,49 @@
+/* This file is part of Jeedom.
+ *
+ * Jeedom is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Jeedom is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jeedom. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+nextdom.widget = function () {
+};
+
+nextdom.widget.remove = function (queryParams) {
+  nextdom.private.ajax('Widget', 'remove', queryParams, ['id']);
+};
+
+nextdom.widget.get = function (queryParams) {
+  nextdom.private.ajax('Widget', 'byId', queryParams, ['id']);
+};
+
+nextdom.widget.loadConfig = function (queryParams) {
+  nextdom.private.ajax('Widget', 'loadConfig', queryParams, ['template']);
+};
+
+nextdom.widget.getThemeImg = function (queryParams) {
+  nextdom.private.ajax('Widget', 'getThemeImg', queryParams);
+};
+
+nextdom.widget.getPreview = function (queryParams) {
+  nextdom.private.ajax('Widget', 'getPreview', queryParams, ['id']);
+};
+
+nextdom.widget.save = function (queryParams) {
+  nextdom.private.ajax('Widget', 'save', queryParams, ['widget'], true);
+};
+
+//Modal de Remplacement bouton dans le menu de configuration
+nextdom.widget.replacement = function(queryParams) {
+  nextdom.private.ajax('Widget', 'replacement', queryParams, ['version','replace','by']);
+}
+
+nextdom.widgets = nextdom.widget;

assets/js/desktop/admin/network.js

@@ -100,13 +100,13 @@ function initEvents() {
 
     // BDNS restart button
     $('#bt_restartDns').on('click', function () {
-        jeedom.config.save({
+        nextdom.config.save({
             configuration: $('#network').getValues('.configKey')[0],
             error: function (error) {
                 notify('Core',error.message,"error");
                 },
             success: function () {
-                jeedom.network.restartDns({
+                nextdom.network.restartDns({
                     error: function (error) {
                         notify('Core',error.message,"error");
                         },
@@ -122,13 +122,13 @@ function initEvents() {
 
     // DNS halt button
     $('#bt_haltDns').on('click', function () {
-        jeedom.config.save({
+        nextdom.config.save({
             configuration: $('#network').getValues('.configKey')[0],
             error: function (error) {
                 notify('Core',error.message,"error");
                 },
             success: function () {
-                jeedom.network.stopDns({
+                nextdom.network.stopDns({
                     error: function (error) {
                         notify('Core',error.message,"error");
                         },