Merge pull request #163 from chinyihan/getIconType

Modified part of the codes in bora_save to retrieve icon type

Author: nicolaisi

blueprint/designer.html

@@ -141,10 +141,9 @@
 {% end %}
 
 {% if data['style'][key]['type'] == "icon" %}
-<div id='{{ key }}' class='varbox' data-type="{{ data['style'][key]['type'] }}" data-onCondition="{{ data['style'][key]['div']['data-onCondition'] }}" data-link-adei="{{ data['style'][key]['div']['data-link-adei'] }}" data-trend="{{ data['style'][key]['div']['data-trend'] }}"
-    style='position: absolute; top:{{ data['style'][key]['top'] }}; left:{{ data['style'][key]['left'] }}; 
-    icon-type:{{ data['style'][key]['icon-type'] }}; rotate:{{ data['style'][key]['div']['rotate'] }};'>
-    <img width='{{ data['style'][key]['width'] }}' height='{{ data['style'][key]['height'] }}' src="{{ static_url( data['style'][key]['icon-type'] + '_inactive.png' ) }}"></img>
+<div id='{{ key }}' class='varbox' data-type="{{ data['style'][key]['type'] }}" data-icon-type="{{ data['style'][key]['div']['data-icon-type'] }}" data-onCondition="{{ data['style'][key]['div']['data-onCondition'] }}" data-link-adei="{{ data['style'][key]['div']['data-link-adei'] }}" data-trend="{{ data['style'][key]['div']['data-trend'] }}"
+    style='position: absolute; top:{{ data['style'][key]['top'] }}; left:{{ data['style'][key]['left'] }}; rotate:{{ data['style'][key]['div']['rotate'] }};'>
+    <img width='{{ data['style'][key]['width'] }}' height='{{ data['style'][key]['height'] }}' src="{{ static_url( data['style'][key]['div']['data-icon-type'] + '_inactive.png' ) }}"></img>
 </div>
 {% else %}
 {% end %}
@@ -1290,7 +1289,7 @@
 
     if (item_array[item_array.length -1] == "nodata") {
 
-        if (["name", "text_name", "unit_name", "int_to_str", "icon_type"].indexOf(item_array[2]) === -1) {
+        if (["name", "text_name", "unit_name", "int_to_str"].indexOf(item_array[2]) === -1) {
             css_property = item_array[2].replace(/_/g, '-');
             div_style += css_property + ":" + params[item] + "; ";
         }
@@ -1347,7 +1346,7 @@
             break;
         case "icon":
                 // TODO: NTJ -> Bug
-                var icon_src = window.location.origin + "/static/" + params["icon-div-icon_type-must-nodata"]  + "_inactive.png";
+                var icon_src = window.location.origin + "/static/" + params["icon-div-icon_type-must-data"]  + "_inactive.png";
                 //var icon_src = "/static/" + params["icon-div-icon_type-must-nodata"]  + "_inactive.png";
                 html_element += "<img src='" + icon_src + "' width='100%' height='100%'></img>";
             break;
@@ -1389,7 +1388,7 @@
     var div_text = "";
     var div_data = "";
     var div_style = " style='position: absolute; top:200px; left:200px; ";
-    
+
     for (item in params) {
         if (item.startsWith(prefix)) {
             if (!verifyRequiredFields(item, prefix)) { return; }
@@ -1732,8 +1731,8 @@
     };
 }
 
-// Helper Function: gets the css style properties of an element
-function collectCssStyles(element_id, category) {
+// Helper Function: gets the div attributes properties of an element
+function collectDivAttributes(element_id, category) {
     let mydiv = {};
     mycat = category.replace(/-/g, '_'); 
 
@@ -1742,7 +1741,7 @@
             var item_array = item.split("-");
             var css_property = item_array[2].replace(/_/g, '-');
 
-            if (item_array[1] == "div" && item_array[2] !== "icon_type") {
+            if (item_array[1] == "div") {
                 switch (item_array[2]) {
                 case "text_name":
                     mydiv[css_property] = $("#" + element_id + "> .text_name").text().trim();
@@ -1795,12 +1794,7 @@
         $('*[data-type="' + mycategory + '"]').each(function() {
             var element_id = $(this).attr('id');
             var attributes = extractElementAttributes(element_id);
-            var styles = collectCssStyles(element_id, mycategory);
-
-            if (attributes["type"] == "icon") {
-                // TODO: NTJ: This is a hard code, need to be fixed!!!
-                attributes["icon-type"] = "valve"; // hard code
-            }
+            var styles = collectDivAttributes(element_id, mycategory);
 
             attributes["widget"] = mycategory;
             attributes["div"] = styles;

template/icon.html

@@ -1,8 +1,7 @@
 {% if data['style'][key]['type'] == "icon" %}
-<div id='{{ key }}' onclick="open_adei_page('{{ key }}')" class="databox" tooltip="" data-icon-type="{{ data['style'][key]['icon-type'] }}" data-query="{{ data['varname'][key]['url'] }}" data-type="{{ data['style'][key]['type'] }}" data-onCondition="{{ data['style'][key]['div']['data-onCondition'] }}" data-link-adei="{{ data['style'][key]['div']['data-link-adei'] }}" data-trend="{{ data['style'][key]['div']['data-trend'] }}"
-    style='position: absolute; top:{{ data['style'][key]['top'] }}; left:{{ data['style'][key]['left'] }};
-    icon-type:{{ data['style'][key]['icon-type'] }};'>
-    <img width='{{ data['style'][key]['width'] }}' height='{{ data['style'][key]['height'] }}' style='rotate:{{ data['style'][key]['div']['rotate'] }}' src="{{ static_url( data['style'][key]['icon-type'] + '_inactive.png' ) }}"></img>
+<div id='{{ key }}' onclick="open_adei_page('{{ key }}')" class="databox" tooltip="" data-query="{{ data['varname'][key]['url'] }}" data-type="{{ data['style'][key]['type'] }}" data-icon-type="{{ data['style'][key]['div']['data-icon-type'] }}" data-onCondition="{{ data['style'][key]['div']['data-onCondition'] }}" data-link-adei="{{ data['style'][key]['div']['data-link-adei'] }}" data-trend="{{ data['style'][key]['div']['data-trend'] }}"
+    style='position: absolute; top:{{ data['style'][key]['top'] }}; left:{{ data['style'][key]['left'] }};'>
+    <img width='{{ data['style'][key]['width'] }}' height='{{ data['style'][key]['height'] }}' style='rotate:{{ data['style'][key]['div']['rotate'] }}' src="{{ static_url( data['style'][key]['div']['data-icon-type'] + '_inactive.png' ) }}"></img>
 </div>
 {% else %}
 {% end %}

typedef/icon.yaml

@@ -10,7 +10,7 @@
             - "switch"
         "type": "select"
         "optional": "No"
-        "data": "No"
+        "data": "Yes"
     "onCondition":
         "value": ""
         "type": "string"