From 25e6fc8a5bc2cae8a062076ca460348835846d0a Mon Sep 17 00:00:00 2001
From: grakiss <grakiss.wanglei@huawei.com>
Date: Thu, 16 Nov 2017 09:18:14 +0000
Subject: [cvp-web] Bugfix: Total num of test cases should be fixed

JIRA: DOVETAIL-552

The total num of test cases is decided by the number of the test cases
users uploaded to the Web now.
The total num should be fixed. For example, the total num of mandatory
test cases should be 215. The total num of optional test cases should be
63.

Change-Id: I6f7055bbeceb80f831af7d800b1a5aca4e165c45
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
---
 .../components/results-report/resultsReport.html   | 37 ++++++++++------------
 1 file changed, 16 insertions(+), 21 deletions(-)

(limited to 'cvp/3rd_party/static/testapi-ui/components/results-report/resultsReport.html')

diff --git a/cvp/3rd_party/static/testapi-ui/components/results-report/resultsReport.html b/cvp/3rd_party/static/testapi-ui/components/results-report/resultsReport.html
index 537a3460..a9753c3c 100644
--- a/cvp/3rd_party/static/testapi-ui/components/results-report/resultsReport.html
+++ b/cvp/3rd_party/static/testapi-ui/components/results-report/resultsReport.html
@@ -10,27 +10,22 @@
     </div>
 </div>
 
-<strong>Total: {{ctrl.total}}, Pass: {{ ctrl.mandatory_pass + ctrl.optional_pass }}, Rate: {{ (ctrl.mandatory_pass + ctrl.optional_pass) / ctrl.total * 100 | number:2 }}%</strong></br>
-<strong>Mandatory Total: {{ctrl.mandatory_total}}, Pass: {{ ctrl.mandatory_pass }}, Rate: {{ ctrl.mandatory_pass / ctrl.mandatory_total * 100 | number:2 }}%</strong></br>
-<strong>Optional Total: {{ctrl.optional_total}}, Pass: {{ ctrl.optional_pass }}, Rate: {{ ctrl.optional_pass / ctrl.optional_total * 100 | number:2 }}%</strong></br>
-
-<div ng-show="ctrl.cases">
-    <hr >
-
-    <div ng-show="ctrl.cases">
-
-        <hr>
-        <h4>Test Result Overview</h4>
-
-        <uib-accordion close-others=false>
-            <!-- The ng-repeat is used to pass in a local variable to the template. -->
-            <ng-include
-                src="ctrl.detailsTemplate"
-                onload="isOpen = true">
-            </ng-include>
-            <br />
-        </uib-accordion>
-    </div>
+<strong>Total: {{ctrl.statistics.total}}, Pass: {{ ctrl.statistics.pass}}, Rate: {{ ctrl.statistics.pass / ctrl.statistics.total * 100 | number:2 }}%</strong></br>
+<strong>Mandatory Total: {{ctrl.statistics.mandatory.total}}, Pass: {{ ctrl.statistics.mandatory.pass }}, Rate: {{ ctrl.statistics.mandatory.pass / ctrl.statistics.mandatory.total * 100 | number:2 }}%</strong></br>
+<strong>Optional Total: {{ctrl.statistics.optional.total}}, Pass: {{ ctrl.statistics.optional.pass }}, Rate: {{ ctrl.statistics.optional.pass / ctrl.statistics.optional.total * 100 | number:2 }}%</strong></br>
+
+<div>
+    <hr>
+    <h4>Test Result Overview</h4>
+
+    <uib-accordion close-others=false>
+        <!-- The ng-repeat is used to pass in a local variable to the template. -->
+        <ng-include
+            src="ctrl.detailsTemplate"
+            onload="isOpen = true">
+        </ng-include>
+        <br />
+    </uib-accordion>
 </div>
 
 <!--
-- 
cgit 1.2.3-korg