From 70e38d07f681b165291406cc4e010377c6202041 Mon Sep 17 00:00:00 2001
From: Morgan Richomme <morgan.richomme@orange.com>
Date: Thu, 24 Mar 2016 16:51:32 +0100
Subject: Complete reporting status, process the scenario and get success
 criteria

Change-Id: Iaf5292293aec877f94e9cdec80519a680fef6718
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
---
 utils/test/reporting/index-status-tmpl.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'utils/test/reporting/index-status-tmpl.html')

diff --git a/utils/test/reporting/index-status-tmpl.html b/utils/test/reporting/index-status-tmpl.html
index 130ecd5c1..0fd470d6f 100644
--- a/utils/test/reporting/index-status-tmpl.html
+++ b/utils/test/reporting/index-status-tmpl.html
@@ -37,7 +37,7 @@
         </div>
 
         <div class="scenario-overview">
-            <div class="panel-heading"><h4><b>List of last scenarios run over the last 7 days </b></h4></div>
+            <div class="panel-heading"><h4><b>List of last scenarios run over the last {{period}} days </b></h4></div>
                 <table class="table">
                     <tr>
                         <th width="80%">Scenario</th>
@@ -72,11 +72,13 @@
                         </tr>
                         <tr class="tr-weather-weather">
                             {% for test in items[scenario] -%}
-                            {% if test.getCriteria() > 3 -%}
+                            {% if test.isRunnable is sameas false -%}
+                                <td>N.R</td>
+                            {% elif test.getCriteria() > 2 -%}
                                 <td><img src="./img/weather-clear.png"></td>
-                            {%- elif test.getCriteria() > 2 -%}
-                                <td><img src="./img/weather-few-clouds.png"></td>
                             {%- elif test.getCriteria() > 1 -%}
+                                <td><img src="./img/weather-few-clouds.png"></td>
+                            {%- elif test.getCriteria() > 0 -%}
                                 <td><img src="./img/weather-overcast.png"></td>
                             {%- else -%}
                                 <td><img src="./img/weather-storm.png"></td>
-- 
cgit 1.2.3-korg