Optimisation

Suite demande Kiboost
jeedom · Mar 1, 2020 · 66b0b33 · 66b0b33
1 parent a044604
commit 66b0b33
Showing 1 changed file with 26 additions and 23 deletions.
diff --git a/core/template/dashboard/cmd.info.numeric.rain.html b/core/template/dashboard/cmd.info.numeric.rain.html
@@ -3,7 +3,7 @@
     <div class="widget-rain-container">
       <div class="widget-rain-title">
         <span class="#hide_name#">#name_display#</span><br/>
-        <span class="value widget-rain-title-value"></span>
+        <span class="value"></span>
         <span class="unite">#unite#</span>
         <span class="plage"></span>
       </div>
@@ -17,7 +17,17 @@
   </div>
   <script>
     var scale#id# = ('#scale#' !='#'+'scale#') ? parseFloat('#scale#') : 1;
-    $('.cmd[data-cmd_id=#id#] .widget-rain-water').css('max-height',(45*scale#id#)+'px')
+    var cmd#id# = $('.cmd[data-cmd_id=#id#]');
+    cmd#id#.find('.widget-rain-water').css('max-height',(45*scale#id#)+'px')
+    if(scale#id# != 1) {
+      let el = cmd#id#.find('.widget-rain-main');
+      el.width(el.width() * scale#id#);
+      el.height(el.height() * scale#id#)
+    }
+    if('#animate#' == '0') {
+      cmd#id#.find('.widget-rain-water').css('animation','none')
+    }
+
     jeedom.cmd.update['#id#'] = function(_options){
       var value = parseFloat(_options.display_value);
       var valMini,bMini;
@@ -27,30 +37,23 @@
       if('#valMaxi#' !='#'+'valMaxi#') valMaxi =bMaxi = parseFloat('#valMaxi#');
       else { valMaxi = 20; bMaxi = '-' }
       var scaledValue = (value-valMini)*35*scale#id#/(valMaxi-valMini);
-      let cmd = $('.cmd[data-cmd_id=#id#]');
-      cmd.attr('title','Date de valeur : '+_options.valueDate+'<br/>Date de collecte : '+_options.collectDate+'<br/>Valeur : '+value+'#unite#')
-      cmd.find('.value').empty().append(value);
-      cmd.find('.plage').empty().append('('+bMini+'/'+bMaxi+')');
-      if(bMini != '-' || bMaxi != '-') cmd.find('.plage').empty().append('('+bMini+'/'+bMaxi+')');
-      else cmd.find('.plage').empty();
-      cmd.find('.widget-rain-water').delay(0).animate({height:(scaledValue)+"pt"},1000)
-      if(value > valMaxi)
-        $('.cmd[data-cmd_id=#id#] .widget-rain-title-value').css('color','red')
-      else if(value < valMini)
-        $('.cmd[data-cmd_id=#id#] .widget-rain-title-value').css('color','cyan')
+      cmd#id#.attr('title','Date de valeur : '+_options.valueDate+'<br/>Date de collecte : '+_options.collectDate+'<br/>Valeur : '+value+'#unite#')
+      cmd#id#.find('.value').empty().append(value);
+      cmd#id#.find('.plage').empty().append('('+bMini+'/'+bMaxi+')');
+      if(bMini != '-' || bMaxi != '-') cmd#id#.find('.plage').empty().append('('+bMini+'/'+bMaxi+')');
+      else cmd#id#.find('.plage').empty();
+      cmd#id#.find('.widget-rain-water').delay(0).animate({height:(scaledValue)+"pt"},1000)
+      if(value > valMaxi) {
+        cmd#id#.find('.value').css('color','var(--al-danger-color)');
+      }
+      else if(value < valMini) {
+        cmd#id#.find('.value').css('color','var(--al-info-color)');
+      }
       else {
-        var col = $('.cmd[data-cmd_id=#id#] .plage').css('color')
-        $('.cmd[data-cmd_id=#id#] .widget-rain-title-value').css('color','var(--link-color)')
+        cmd#id#.find('.value').css('color','var(--link-color)');
       }
     }
-    if(scale#id# != 1) {
-      let el = $('.cmd[data-cmd_id=#id#] .widget-rain-main');
-      el.width(el.width() * scale#id#);
-      el.height(el.height() * scale#id#)
-    }
-    if ('#animate#' == '0') {
-      $('.cmd[data-cmd_id=#id#] .widget-rain-water').css('animation','none')
-    }
+
     jeedom.cmd.update['#id#']({display_value:'#state#',valueDate:'#valueDate#',collectDate:'#collectDate#',alertLevel:'#alertLevel#'});
   </script>
 </div>