added ADEI link and a tooltip.

https://github.com/kit-ipe/bora/issues/3

Signed-off-by: nicolaisi <nicholas.jerome@kit.edu>

cache.yaml

@@ -1,5 +1,2 @@
 320-MOD-0-0001: '2'
-320-RTP-3-1101: '79.79348754882812'
-320-RTY-3-2101: '113.3070297241211'
-320-RTY-3-3101: '112.0582504272461'
-411-REI-1-1110-0030: '0'
+320-RTY-3-3101: '109.419075012207'

core.py

@@ -87,7 +87,7 @@ def fetchDataADEI():
     for param in varname:
         print param
         dest = config['server'] + config['script']
-        url = dest + "?" + varname[param]
+        url = dest + "?" + varname[param] + "&window=-1"
         print url
         data = requests.get(url,
                             auth=(config['username'],
@@ -232,8 +232,20 @@ class StatusHandler(tornado.web.RequestHandler):
         if style_data == None:
             print("Error: Empty style data file.")
             return
-        data = {
-            "style": style_data
+        
+	with open("varname.yaml", 'r') as vstream:
+            try:
+                #print(yaml.load(stream))
+                varname_data = yaml.load(vstream)
+            except yaml.YAMLError as exc:
+                print(exc)
+        if varname_data == None:
+            print("Error: Empty varname data file.")
+            return
+        
+	data = {
+            "style": style_data,
+            "varname": varname_data
         }
         self.render('status.html', data=data)
 
@@ -261,8 +273,10 @@ class AdeiKatrinHandler(tornado.web.RequestHandler):
         query_cmds.append("db_server="+str(params['db_server']))
         query_cmds.append("db_name="+str(params['db_name']))
         query_cmds.append("db_group="+str(params['db_group']))
+        
         query_cmds.append("db_mask=all")
         query_cmds.append("window=-1")
+        
         query = "&".join(query_cmds)
         url = dest + "?" + query
 
@@ -293,6 +307,11 @@ class AdeiKatrinHandler(tornado.web.RequestHandler):
             response = {"Error": "Cannot find variable on ADEI server."}
             self.write(response)
             return
+        
+        query_cmds = []
+        query_cmds.append("db_server="+str(params['db_server']))
+        query_cmds.append("db_name="+str(params['db_name']))
+        query_cmds.append("db_group="+str(params['db_group']))
             
         query_cmds.append("db_mask="+str(db_mask))
         query = "&".join(query_cmds)

static/style.css

@@ -93,5 +93,33 @@ span,
     border-color: red;
 }
 
+[tooltip]:before {
+    /* needed - do not touch */
+    content: attr(tooltip);
+    position: absolute;
+    opacity: 0;
+    
+    /* customizable */
+    transition: all 0.15s ease;
+    padding: 10px;
+    color: #fff;
+    border-radius: 10px;
+    box-shadow: 2px 2px 1px silver;    
+}
+
+[tooltip]:hover:before {
+    /* needed - do not touch */
+    opacity: 1;
+    
+    /* customizable */
+    background: black;
+    margin-top: -50px;
+    margin-left: 20px;    
+}
+
+[tooltip]:not([tooltip-persistent]):before {
+    pointer-events: none;
+}
+
 
 

status.html

@@ -21,12 +21,12 @@
 {% for key in data['style'] %}
 
 {% if data['style'][key]['type'] == "data" %}
-<div class="databox" style='position: absolute; top: {{ data['style'][key]['top'] }}; left:{{ data['style'][key]['left'] }}; width:{{ data['style'][key]['width'] }}px; height:{{ data['style'][key]['height'] }}px;' 
+<div tooltip="{{ key }}" class="databox" style='position: absolute; top: {{ data['style'][key]['top'] }}; left:{{ data['style'][key]['left'] }}; width:{{ data['style'][key]['width'] }}px; height:{{ data['style'][key]['height'] }}px;' 
 {% if data['style'][key]['condition'] %}
 data-cond="{{ data['style'][key]['condition'] }}"
 {% else%}
 {% end%}
-data-type="{{ data['style'][key]['type'] }}" data-lesser="{{ data['style'][key]['lesser'] }}" data-larger="{{ data['style'][key]['larger'] }}" id="{{ key }}">
+data-type="{{ data['style'][key]['type'] }}" data-lesser="{{ data['style'][key]['lesser'] }}" data-larger="{{ data['style'][key]['larger'] }}" onclick="window.open('http://katrin.kit.edu/adei-katrin/#module=graph&{{ data['varname'][key]}}&experiment=-&window=0&module=graph&virtual=srctree&srctree=&infomod=legend', '_blank');" id="{{ key }}">
 <p><span style="color: #000; font-size: {{ data['style'][key]['header']['size'] }}; font-weight: {{ data['style'][key]['header']['weight'] }};" class="title">{{ data['style'][key]['header']['title'] }} </span><span style="color: #000; font-size: {{ data['style'][key]['unit']['size'] }}; font-weight: {{ data['style'][key]['unit']['weight'] }};" class="varval"> XXX.XX </span><span class='unit_title'> {{ data['style'][key]['unit']['title'] }}</span></p>
 </div>
 {% else %}

style.yaml

@@ -1,23 +1,17 @@
-320-MOD-0-0001:
-  dict: '{"0": "zero mode", "2": "two mode"}'
+320-RTY-3-3101:
+  condition: ''
   header:
     size: 28px
-    title: 'Operation Mode '
+    title: ' '
     weight: '400'
-  height: 131.99099999999999
-  left: 170px
-  top: 71px
-  type: integer-to-string
+  height: 98
+  larger: '70'
+  left: 747px
+  lesser: '0'
+  top: 263px
+  type: data
   unit:
     size: 28px
-    title: ''
+    title: K
     weight: '400'
-  width: 301.991
-411-REI-1-1110-0030:
-  height: 50.991
-  left: 778px
-  'off': '1'
-  'on': '0'
-  top: 283px
-  type: ventil
-  width: 49.991
+  width: 160

varname.yaml

@@ -1,5 +1,2 @@
-320-MOD-0-0001: db_server=cscps&db_name=ControlSystem_CPS&db_group=320_SYS&db_mask=all&window=-1&db_mask=0
-320-RTP-3-1101: db_server=cscps&db_name=ControlSystem_CPS&db_group=320_STR_Strahlrohr&db_mask=all&window=-1&db_mask=180
-320-RTY-3-2101: db_server=cscps&db_name=ControlSystem_CPS&db_group=320_STR_Strahlrohr&db_mask=all&window=-1&db_mask=213
-320-RTY-3-3101: db_server=cscps&db_name=ControlSystem_CPS&db_group=320_STR_Strahlrohr&db_mask=all&window=-1&db_mask=222
-411-REI-1-1110-0030: db_server=aircoils&db_name=aircoils_rep&db_group=0&db_mask=all&window=-1&db_mask=84
+320-MOD-0-0001: db_server=cscps&db_name=ControlSystem_CPS&db_group=320_SYS&db_mask=0
+320-RTY-3-3101: db_server=cscps&db_name=ControlSystem_CPS&db_group=320_STR_Strahlrohr&db_mask=222