support to filter experiment instances by state

the first commit only supports to filter for error states
AlexanderFroemmgen · Mar 9, 2018 · 1d687bf · 1d687bf
1 parent d150a42
commit 1d687bf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/maci_backend/Controllers/ExperimentController.cs b/maci_backend/Controllers/ExperimentController.cs
@@ -119,8 +119,8 @@ public IActionResult GetExperimentParameters(int id)
             return new ObjectResult(result.Parameters);
         }
 
-        [HttpGet("{id}/{pageIndex}")]
-        public IActionResult GetExperimentInstances(int id, int pageIndex)
+        [HttpGet("{id}/{pageIndex}/{withStatus}")]
+        public IActionResult GetExperimentInstances(int id, int pageIndex, string withStatus)
         {
             var experimentInstances =
                 _context.Experiments
@@ -140,7 +140,7 @@ public IActionResult GetExperimentInstances(int id, int pageIndex)
                 return NotFound();
             }
 
-            var result = experimentInstances.MapTo<ExperimentInstanceDto>(_mapper);
+            var result = experimentInstances.Where(ei => withStatus == "all" || ei.Status.ToString() == withStatus).MapTo<ExperimentInstanceDto>(_mapper);
 
             /* Do not transfer log messages, but generate aggregated HasWarning info */
             foreach (var si in result)

diff --git a/maci_backend/webcontent/js/controllers/ExperimentViewController.js b/maci_backend/webcontent/js/controllers/ExperimentViewController.js
@@ -7,7 +7,8 @@ angular.module("frontend").controller("ExperimentViewController", function ($sco
     $scope.getExperimentInstances = function (pageId) {
         pageId = pageId || 1;
 
-        $http.get("experiments/" + $routeParams.id + "/" + pageId).then(function (r) {
+        var experimentStatus = $scope.showJustErrors ? "Error" : "all";
+        $http.get("experiments/" + $routeParams.id + "/" + pageId + "/" + experimentStatus).then(function (r) {
             $scope.experimentInstancesData = r.data;
         }, Utils.handleApiError);
     };

diff --git a/maci_backend/webcontent/views/experiment/experiment_view.html b/maci_backend/webcontent/views/experiment/experiment_view.html
@@ -78,6 +78,7 @@ <h4>Instances</h4>
                     <div class="input-group-addon"><i class="fa fa-search"></i></div>
                     <input type="text" class="form-control" placeholder="Filter" ng-model="searchFilter">
                 </div>
+                <label>Just errors</label><input type="checkbox" ng-model="showJustErrors" ng-click="getExperimentInstances(0)">
             </div>
 
             <div class="form-group">