X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ui%2Fsrc%2Fmain%2Fwebapp%2Fapp%2FBluvalUI%2FValidationResults%2FValidationResults.Services.js;h=46d154374a4a7748923b30fc0b4958f61f91d5db;hb=ca3ea7d1c8ddbdc60adb7f51426c2c6509158097;hp=bfda0b1495566b2c78a44b347619844e4cf18afe;hpb=e27d588d5911a8f401583630a2521c78cdc16013;p=validation.git

diff --git a/ui/src/main/webapp/app/BluvalUI/ValidationResults/ValidationResults.Services.js b/ui/src/main/webapp/app/BluvalUI/ValidationResults/ValidationResults.Services.js
index bfda0b1..46d1543 100644
--- a/ui/src/main/webapp/app/BluvalUI/ValidationResults/ValidationResults.Services.js
+++ b/ui/src/main/webapp/app/BluvalUI/ValidationResults/ValidationResults.Services.js
@@ -16,86 +16,113 @@
 
 var app = angular.module('ValidationResults');
 
-app.factory('generalValidationResultsSvc', [ function() {
-    var svc = [];
-    svc.getBlueprintLayers = function(wRobotNexusTestResults) {
-        var layers = [];
-        angular.forEach(wRobotNexusTestResults,
-                function(wRobotNexusTestResult) {
-                    if (wRobotNexusTestResult.blueprintLayer !== undefined) {
-                        layers.push(wRobotNexusTestResult.blueprintLayer);
+app
+        .factory(
+                'generalValidationResultsSvc',
+                [ function() {
+                    var svc = [];
+                    svc.getBlueprintLayers = function(wrobotDbTestResults) {
+                        if (!wrobotDbTestResults
+                                || wrobotDbTestResults.length === 0) {
+                            return null;
+                        }
+                        var layers = [];
+                        angular
+                                .forEach(
+                                        angular.fromJson(wrobotDbTestResults),
+                                        function(wrobotDbTestResult) {
+                                            if (wrobotDbTestResult.layer !== undefined) {
+                                                layers
+                                                        .push(wrobotDbTestResult.layer);
+                                            }
+                                        });
+                        return layers;
+                    };
+                    svc.mapResult = function(validationDbTestResult) {
+                        if (validationDbTestResult
+                                && validationDbTestResult.dateStorage) {
+                            if (validationDbTestResult.result === true) {
+                                return 'SUCCESS';
+                            }
+                            return 'FAILURE'
+                        }
+                        return null;
+                    };
+                    svc.filterWithLayer = function(validationDbTestResults,
+                            filterLayer) {
+                        if (filterLayer === undefined || filterLayer === '') {
+                            return validationDbTestResults;
+                        }
+                        var filteredResults = [];
+                        angular
+                                .forEach(
+                                        validationDbTestResults,
+                                        function(validationDbTestResult) {
+                                            angular
+                                                    .forEach(
+                                                            angular
+                                                                    .fromJson(validationDbTestResult.wrobotDbTestResults),
+                                                            function(
+                                                                    wrobotDbTestResult) {
+                                                                if (wrobotDbTestResult.layer
+                                                                        .toLowerCase()
+                                                                        .includes(
+                                                                                filterLayer
+                                                                                        .toLowerCase())) {
+                                                                    filteredResults
+                                                                            .push(validationDbTestResult);
+                                                                }
+                                                            });
+                                        });
+                        return filteredResults;
                     }
-                });
-        return layers;
-    };
-    svc.mapResult = function(validationNexusTestResult) {
-        if (!validationNexusTestResult.timestamp) {
-            return null;
-        }
-        if (!validationNexusTestResult.wRobotNexusTestResults) {
-            return null;
-        }
-        if (validationNexusTestResult.wRobotNexusTestResults.length === 0) {
-            return null;
-        }
-        var resultExistence = false;
-        angular.forEach(validationNexusTestResult.wRobotNexusTestResults,
-                function(result) {
-                    if (result.robotTestResults
-                            && result.robotTestResults.length > 0) {
-                        resultExistence = true;
+                    svc.filterWithResult = function(validationDbTestResults,
+                            filterResult) {
+                        var validationDbTestResultsWithNoErrors = [];
+                        angular
+                                .forEach(
+                                        validationDbTestResults,
+                                        function(validationDbTestResult) {
+                                            if (validationDbTestResult.submission || (validationDbTestResult.wrobotDbTestResults && validationDbTestResult.wrobotDbTestResults.length > 0)) {
+                                                validationDbTestResultsWithNoErrors.push(validationDbTestResult);
+                                            }
+                                        });
+                        if (filterResult === undefined || filterResult === '') {
+                            return validationDbTestResultsWithNoErrors;
+                        }
+                        var filteredResults = [];
+                        angular.forEach(validationDbTestResultsWithNoErrors, function(
+                                validationDbTestResult) {
+                            if (validationDbTestResult.result === true
+                                    && 'success'.includes(filterResult
+                                            .toLowerCase())) {
+                                filteredResults.push(validationDbTestResult);
+                            } else if (validationDbTestResult.result === false
+                                    && 'failure'.includes(filterResult
+                                            .toLowerCase())) {
+                                filteredResults.push(validationDbTestResult);
+                            }
+                        });
+                        return filteredResults;
                     }
-                });
-        if (resultExistence) {
-            if (validationNexusTestResult.result === true) {
-                return 'SUCCESS';
-            }
-            return 'FAILURE'
-        }
-        return null;
-    };
-    svc.filterWithLayer = function(validationNexusTestResults, filterLayer) {
-        if (filterLayer === undefined || filterLayer === '') {
-            return validationNexusTestResults;
-        }
-        var filteredResults = [];
-        angular.forEach(validationNexusTestResults, function(
-                validationNexusTestResult) {
-            angular.forEach(validationNexusTestResult.wRobotNexusTestResults,
-                    function(wRobotNexusTestResult) {
-                        if (wRobotNexusTestResult.blueprintLayer.toLowerCase()
-                                .includes(filterLayer.toLowerCase())) {
-                            filteredResults.push(validationNexusTestResult);
+                    svc.filterWithTimestamp = function(validationDbTestResults,
+                            filterTimestamp) {
+                        if (filterTimestamp === undefined
+                                || filterTimestamp === '') {
+                            return validationDbTestResults;
                         }
-                    });
-        });
-        return filteredResults;
-    }
-    svc.filterWithResult = function(validationNexusTestResults, filterResult) {
-        if (filterResult === undefined || filterResult === '') {
-            return validationNexusTestResults;
-        }
-        var filteredResults = [];
-        angular.forEach(validationNexusTestResults, function(
-                validationNexusTestResult) {
-            if (validationNexusTestResult.result === true
-                    && 'success'.includes(filterResult.toLowerCase())) {
-                filteredResults.push(validationNexusTestResult);
-            } else if (validationNexusTestResult.result === false
-                    && 'failure'.includes(filterResult.toLowerCase())) {
-                filteredResults.push(validationNexusTestResult);
-            }
-        });
-        return filteredResults;
-    }
-    svc.getLab = function(silo, silos) {
-        var lab = null;
-        angular.forEach(silos, function(siloData) {
-            if (silo === siloData.silo) {
-                lab = siloData.lab.lab;
-            }
-        });
-        return lab;
-    }
-    return svc;
-} ]);
\ No newline at end of file
+                        var filteredResults = [];
+                        angular.forEach(validationDbTestResults, function(
+                                validationDbTestResult) {
+                            if (validationDbTestResult.timestamp
+                                    && validationDbTestResult.timestamp
+                                            .toLowerCase().includes(
+                                                    filterTimestamp
+                                                            .toLowerCase())) {
+                                filteredResults.push(validationDbTestResult);
+                            }
+                        });
+                        return filteredResults;
+                    }
+                    return svc;
+                } ]);
\ No newline at end of file