Dashboard filterring

baangt/base/CliAndInteractive.py

@@ -87,8 +87,8 @@ def run():
 
     # Reports
     elif args_read("name") or args_read("stage"):
-        if args_read("name") == 'all':
-            name = None
+        name = args_read("name")
+        name = None if name == 'all' else name 
         
         try:
             r = Dashboard(name=name, stage=args_read("stage"))

baangt/reports.py

@@ -354,7 +354,7 @@ class Dashboard(Report):
 		if self.name and self.stage:
 			logs = db.query(TestrunLog).order_by(TestrunLog.startTime).filter_by(testrunName=self.name)\
 				.filter(TestrunLog.globalVars.any(and_(GlobalAttribute.name==GC.EXECUTION_STAGE, GlobalAttribute.value==self.stage))).all()
-			return [self.build_charts(logs)]
+			return {'records': [self.build_charts(logs)]}
 		
 		elif self.name:
 			# get Testrun stages
@@ -367,7 +367,7 @@ class Dashboard(Report):
 					.filter(TestrunLog.globalVars.any(and_(GlobalAttribute.name==GC.EXECUTION_STAGE, GlobalAttribute.value==stage))).all()
 				records.append(self.build_charts(logs, stage=stage))
 
-			return records
+			return {'records': records}
 
 		elif self.stage:
 			# get Testrun names
@@ -381,7 +381,7 @@ class Dashboard(Report):
 					.filter(TestrunLog.globalVars.any(and_(GlobalAttribute.name==GC.EXECUTION_STAGE, GlobalAttribute.value==self.stage))).all()
 				records.append(self.build_charts(logs, name=name))
 
-			return records
+			return {'records': records}
 
 		else:
 			# get Testrun names
@@ -404,7 +404,7 @@ class Dashboard(Report):
 
 			return {
 				'names': names,
-				'stages': stage_set,
+				'stages': list(stage_set),
 				'records': records,
 			}
 

baangt/reports/templates/dashboard.html

@@ -13,6 +13,7 @@
 <div class="container-fluid mt-2">
 
     <!-- filters -->
+    {% if data.names %}
     <div class="row mx-2 pt-3 rounded shadow">
         <div class="col-md-1 h4">Filters:</div>
         <div class="col-md-3 mb-3 input-group">
@@ -38,6 +39,7 @@
             </select>
         </div>
     </div>
+    {% endif %}
 
     <!-- header -->
     <div class="row mx-2 mb-2 mt-3">