Added blocking of run search button while streaming data.

Author: coderdj

api/api/resources.py

@@ -12,7 +12,7 @@
 import codecs
 from bson.json_util import dumps
 from bson.objectid import ObjectId
-
+import sys
 import logging
 logger = logging.getLogger('emo')
 
@@ -638,7 +638,7 @@ def _create_obj(self, req):
         return ret_obj
 
     def obj_create(self, bundle, **kwargs):
-        return self.obj_update(bundle, kwargs)
+        return self.obj_update(bundle)
 
 
 
@@ -658,28 +658,38 @@ def obj_update(self, bundle, **kwargs):
         elif 'name' in request and 'detector' in request:
             searchDict['name'] = request['name']
             searchDict['detector'] = request['detector']
+        else:
+            doc = self._default(
+                "ERROR",
+                        "Bad request. You must define a query of either id, number, or name/detector."
+            )
+            bundle.obj = rundoc(initial=doc)
+            bundle = self.full_hydrate(bundle)
+            return bundle.obj
 
         # We REQUIRE the following format
         # {
-        #     "qname": a unique name for this check
+        #     "checkname": a unique name for this check
         #     "version": the version info for this check 
         #     "checks": [] a list of string/bool pairs i.e. {"deadtime": true}
         #     "extracted": a dictionary of any format of size < 100kB
         # }
 
 
         updateDict = {}
-        if ( 'qname' not in request or 'checks' not in request 
+        if ( 'checkname' not in request or 'checks' not in request 
              or 'version' not in request):
             doc = self._default(
-            "ERROR",
-                        "Bad request. Require status, host, location, and type"
-                    )
+                "ERROR",
+                "Bad request. Require name, checks, and version."
+            )
             bundle.obj = rundoc(initial=doc)
             bundle = self.full_hydrate(bundle)
             return bundle.obj
 
-        updateDict['qname'] = request['qname']
+        updateDict['name'] = request['checkname']
+        updateDict['user'] = bundle.request.user.username
+        updateDict['date'] = datetime.datetime.now()
         updateDict['checks'] = request['checks']
         updateDict['version'] = request['version']
 
@@ -696,46 +706,43 @@ def obj_update(self, bundle, **kwargs):
                 updateDict['extracted'] = request['extracted']
 
         # Enforce string/bool types for checks array
-        for key, value in updateDict['checks']:
+        for key, value in updateDict['checks'].items():
             extre = "test"
-        if type(key) != type(extre) or type(value) != type(True):
-                pass
-        elif request['status'] == 'processed':
-            if 'pax_version' not in request:
-                return {"number": doc['number'],
-                        "ERROR": "pax_version must be provided for processed data"}
-            updateDict['pax_version'] = request['pax_version']
+            if type(key) != type(extre) or type(value) != type(True):
+                doc = self._default(
+                    "ERROR",
+                        "Bad request. Checks field must be string/bool pairs."
+                )
+                bundle.obj = rundoc(initial=doc)
+                bundle = self.full_hydrate(bundle)
+                return bundle.obj
 
-            # Status needed for new entry                                                                    
-            updateDict['status'] = request['status']
-            updateDict['creation_time'] = datetime.datetime.utcnow(),
 
-            # Now add a new entry                                                                            
+                
         res = self._db()[settings.RUNS_DB_COLLECTION].update_one(
                 searchDict,
-                {"$push": {"data": updateDict}})
+                {"$set": {"quality."+str(request['checkname']): updateDict}})
         doc = self._default(
             "Success",
             "Document updated",
             res
-            )
+        )
         bundle.obj = rundoc(initial=doc)
         bundle = self.full_hydrate(bundle)
-
         return rundoc(initial=doc)
 
     def _default(self, message, longer, return_value):
         doc = {
             "number": -1,
-                "_id": -1,
+            "_id": -1,
             "detector": "ret",
-                "name": message,
+            "name": message,
             "doc": {
                 "message": longer,
-                        "success": message,
-                        "ret": return_value
-                        }
+                "success": message,
+                "ret": return_value
             }
+        }
         return doc
 
     def obj_delete_list(self, bundle, **kwargs):

components/emo/js/daqcontrol.js

@@ -766,9 +766,9 @@ function GetHealth(pctarray, static_dir, update_time){
     image += " style='width:50px' class='center-block'>";
 
     if(largest>.9)
-	health="<strong style='color:red'>He's dead Jim</strong>";
+	health="<strong style='color:red'>Dead</strong>";
     else if(largest > .7)
-	health="<strong style='color:orange'>Danger</strong>";
+	health="<strong style='color:orange'>Nearly dead</strong>";
     else if(largest > .5)
 	health="<strong style='color:yellow;background-color:black;'>Warning</strong>";
     else if(largest > .2)

components/emo/js/emo_runs_streamer.js

@@ -1,5 +1,8 @@
 // REQUIRES SteamTable.js Mustache.js
 function MakeRunsTable(div, url, templatediv, counterdiv){
+    
+    // Don't allow further searches during this one
+    $(".btn-search-runs").prop("disabled", true);
 
     // The view describes how to make each row
     //var template = $.trim($("#"+templatediv).html());
@@ -78,7 +81,10 @@ function MakeRunsTable(div, url, templatediv, counterdiv){
 	"after_add": function(){
             //console.log(counterdiv);
             document.getElementById(counterdiv).innerHTML=this.data.length;
-	}
+	},
+	"stop_streaming": function(){
+	    $(".btn-search-runs").prop("disabled", false);
+	},
     };
     var options = {
 	view: view,                  //View function to render table rows.

control/templates/control/controlPanelNew.html

@@ -487,6 +487,10 @@ <h3>Muon Veto</h3>
   function UpdatePage( thechart ){
          $.getJSON(currentShifterUrl, function(data){
              document.superman = data['starting_user'];
+	     document.canstartruns = false;
+             username = "{{ request.user.username }}";
+             if(username == document.superman)
+                 document.canstartruns=true;
           });
   update_graphic(function(){				   
     DrawLogWindow( "message_panel", logUrl, function(){

emo/urls.py

@@ -21,13 +21,15 @@
 from django.contrib.auth.decorators import login_required
 
 from tastypie.api import Api
-from api.api.resources import StatusResource, SlowControlResource, RunsResource
+from api.api.resources import StatusResource, SlowControlResource, RunsResource, QualityResource
 daqapi = Api(api_name="daq")
 daqapi.register(StatusResource())
 scapi = Api(api_name="history")
 scapi.register(SlowControlResource())
 runapi = Api(api_name="runs")
 runapi.register(RunsResource())
+qualityapi = Api(api_name="ui")
+qualityapi.register(QualityResource())
 
 urlpatterns = [
 
@@ -64,5 +66,7 @@
     url(r'^api/', include(daqapi.urls)),
     url(r'^sc_api/', include(scapi.urls)),
     url(r'^runs_api/',include(runapi.urls)),
+    url(r'^qapi/', include(qualityapi.urls)),
     url(r'^online_monitor/', include('online_monitor.urls')),
+    
 ]

runs/templates/runs/runs_new.html

@@ -65,8 +65,8 @@
       <div class="col-xs-8 col-sm-7" style="padding-left:130px;">Query: 
 	<input type="text" id="form_query"></input> </div>
       <div class="col-xs-1">
-        <button class="btn btn-info btn-sm" onclick="RefreshTable()" style="height:30%;padding-left:50px;padding-right:50px;margin:8px;">Search</button>
-	<button class="btn btn-warning btn-sm" 
+        <button class="btn btn-info btn-sm btn-search-runs" onclick="RefreshTable()" style="height:30%;padding-left:50px;padding-right:50px;margin:8px;">Search</button>
+	<button class="btn btn-warning btn-sm btn-search-runs" 
 		onclick="ShowTransferErrors()">Show transfer errors</button>
 
       </div>