X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=ui%2Fsrc%2Fmain%2Fwebapp%2Fapp%2FBluvalUI%2FValidationResults%2FValidationResultsTemplate.html;fp=ui%2Fsrc%2Fmain%2Fwebapp%2Fapp%2FBluvalUI%2FValidationResults%2FValidationResultsTemplate.html;h=8ae3109138cff5e0cfbd481f4e3e45b5d94bca06;hp=a327ca0627d414b688d972d0e620f5b24231f718;hb=147ecf7bf79ea9967a121d0038103151a38ebef2;hpb=e6b82a7ccd840c8b089ae4d5e69930fd0dd5ef35

diff --git a/ui/src/main/webapp/app/BluvalUI/ValidationResults/ValidationResultsTemplate.html b/ui/src/main/webapp/app/BluvalUI/ValidationResults/ValidationResultsTemplate.html
index a327ca0..8ae3109 100644
--- a/ui/src/main/webapp/app/BluvalUI/ValidationResults/ValidationResultsTemplate.html
+++ b/ui/src/main/webapp/app/BluvalUI/ValidationResults/ValidationResultsTemplate.html
@@ -188,46 +188,48 @@ table {
             </thead>
             <tbody>
                 <tr class="border_bottom"
-                    ng-repeat="validationNexusTestResult in filterWithResult(filterWithLayer(validationNexusTestResults,filterLayer), filterResult) | filter:filtertimestamp | orderBy:dateTimeSort:descending"
-                    ng-class="{success: (validationNexusTestResult.result===true), warning: (validationNexusTestResult.result===false)}">
+                    ng-repeat="validationDbTestResult in filterWithResult(filterWithLayer(filterWithTimestamp(validationDbTestResults,filtertimestamp.timestamp),filterLayer), filterResult) | orderBy:dateTimeSort:descending"
+                    ng-class="{'success': validationDbTestResult.result===true, 'warning': validationDbTestResult.result===false || !validationDbTestResult.dateStorage}">
                     <td class
                         style="padding-left: 10px; font-size: 15px; width: 13%;">
-                        {{ getLab(validationNexusTestResult.silo, silos)
-                        }}</td>
+                        {{ validationDbTestResult.lab.lab }}</td>
                     <td class
                         style="padding-left: 10px; font-size: 15px; width: 13%;">{{
-                        validationNexusTestResult.blueprintName }}</td>
+                        validationDbTestResult.blueprintInstance.blueprint.blueprintName
+                        }}</td>
                     <td class
                         style="padding-left: 10px; font-size: 15px; width: 13%;">{{
-                        validationNexusTestResult.version }}</td>
+                        validationDbTestResult.blueprintInstance.version
+                        }}</td>
                     <td class
                         style="padding-left: 10px; font-size: 15px; width: 13%;">{{
-                        validationNexusTestResult.timestamp }}</td>
+                        validationDbTestResult.timestamp }}</td>
                     <td class
                         style="padding-left: 10px; font-size: 15px; width: 13%;">{{
-                        validationNexusTestResult.dateOfStorage }}</td>
+                        validationDbTestResult.dateStorage }}</td>
                     <td class
                         style="padding-left: 10px; font-size: 15px; width: 13%;">{{
-                        validationNexusTestResult.optional }}</td>
+                        validationDbTestResult.optional }}</td>
                     <td class
                         style="padding-left: 10px; font-size: 15px; width: 13%;">{{
-                        validationNexusTestResult.allLayers }}</td>
+                        validationDbTestResult.allLayers }}</td>
                     <td class
                         style="padding-left: 10px; font-size: 15px; width: 13%;">
                         <div
-                            ng-repeat="layer in  getBlueprintLayers(validationNexusTestResult.wRobotNexusTestResults)">
+                            ng-repeat="layer in  getBlueprintLayers(validationDbTestResult.wrobotDbTestResults)">
                             {{layer}}</div>
                     </td>
                     <td class
                         style="padding-left: 10px; font-size: 15px; width: 13%;">{{
-                        validationNexusTestResult.submissionId }}</td>
+                        validationDbTestResult.submission.submissionId
+                        }}</td>
                     <td class
                         style="padding-left: 10px; font-size: 15px; width: 13%;">
                         <button
                             style="margin-left: 25px; margin-top: 4px;"
                             type="submit" class="btn btn-alt btn-small"
-                            ng-click="getTestSuiteResults(validationNexusTestResult);">{{
-                            mapResult(validationNexusTestResult)}}</button>
+                            ng-click="getTestSuiteResults(validationDbTestResult);">{{
+                            mapResult(validationDbTestResult)}}</button>
                         </button>
                     </td>
                 </tr>