'sat jobs' : minor changes

[tools/sat.git] / src / xsl / jobs_board_report.xsl

diff --git a/src/xsl/jobs_board_report.xsl b/src/xsl/jobs_board_report.xsl
index aaaf6887c15ba34afc7d607ddaab7dfc915859a9..0f8bef9a0a87e71a08a9af1ce922d5d2cac66817 100644 (file)
--- a/src/xsl/jobs_board_report.xsl
+++ b/src/xsl/jobs_board_report.xsl
@@ -118,21 +118,14 @@
        </tr>
     </table>
 
-    Legend :
-    <table class="legend">
-       <tr><td>job</td><td>result</td></tr>
-       <tr><td> <xsl:attribute name="class">OK2day</xsl:attribute>success today</td><td> <xsl:attribute name="class">OK2day</xsl:attribute>success today</td></tr>
-       <tr><td> <xsl:attribute name="class">OK2</xsl:attribute>success not today</td><td> <xsl:attribute name="class">OK2</xsl:attribute>success not today</td></tr>
-       <tr><td> <xsl:attribute name="class">KO2day</xsl:attribute>fail today</td><td> <xsl:attribute name="class">KO2day</xsl:attribute>fail today</td></tr>
-       <tr><td> <xsl:attribute name="class">KO2</xsl:attribute>fail not today</td><td> <xsl:attribute name="class">KO2</xsl:attribute>fail not today</td></tr>
-       <tr><td> <xsl:attribute name="class">TO2day</xsl:attribute>timeout today</td><td> <xsl:attribute name="class">KF2day</xsl:attribute>known failure today</td></tr>
-       <tr><td> <xsl:attribute name="class">RUNNING2</xsl:attribute>running</td><td> <xsl:attribute name="class">KF2</xsl:attribute>known failure not today</td></tr>
-       <tr><td> <xsl:attribute name="class">NA2day</xsl:attribute>To be launched</td></tr>
-       <tr><td> <xsl:attribute name="class">NA2</xsl:attribute>Not today</td></tr>
-    </table>
-    
+    <a href="#">
+       <xsl:attribute name="onclick">javascript:Toggle('legend')</xsl:attribute>
+       <xsl:attribute name="title">legend</xsl:attribute>
+       legend
+    </a>
     <br/>
-
+    <br/>
+    
     <div id="matrix">
     <table class="summary">
       <!-- header -->
@@ -157,8 +150,15 @@
          <td align="center" class="small">
              <!-- get the job for current host and current appli -->
              <xsl:for-each select="//JobsReport/jobs/job">
+             
                  <xsl:sort select="@name" />
+                 
                  <xsl:if test="application/.=$curr_appli and distribution/.=$curr_distname and board/.=//JobsReport/board/.">
+                     <!-- Change background color if it is an extra job (not defined in the input csv files) -->
+                     <xsl:if test="extra_job/.='yes'">
+                         <xsl:attribute name="bgcolor">FFCCCC</xsl:attribute>
+                     </xsl:if>
+                     <!-- Get job status and put a link -->
                      <xsl:choose>
                            <xsl:when test="state/.='SSH connection KO' or state/.='Cancelled'">
                              <a href="#">
@@ -189,7 +189,7 @@
                                    <xsl:attribute name="onclick">javascript:Toggle('<xsl:value-of select="@name"/>')</xsl:attribute>
                                    <xsl:attribute name="title"><xsl:value-of select="state/."/></xsl:attribute>
                                    <xsl:attribute name="class">OK2day</xsl:attribute>
-                                   <xsl:value-of select="@name"/>
+                                   job
                              </a>
                            </xsl:when>
                            <xsl:when test="contains(state/., 'Timeout')">
@@ -211,23 +211,36 @@
                      </xsl:choose>
                      <!--<xsl:value-of select="state/." />-->
                      <xsl:if test="not(remote_log_file_path/.='nothing') and state/.!='Not today'">
-                            : 
+                            - 
                            <a>
                                <xsl:attribute name="title">remote log</xsl:attribute>
                                <xsl:attribute name="href"><xsl:value-of select="remote_log_file_path/."/></xsl:attribute>
                                <xsl:if test="res/.='0'">
                                   <xsl:attribute name="class">OK2day</xsl:attribute>
                                </xsl:if>
-                               <xsl:if test="res/.='1'">
+                               <xsl:if test="res/.!='0'">
                                   <xsl:attribute name="class">KO2day</xsl:attribute>
                                </xsl:if>
-                               <xsl:value-of select="host/."/>/<xsl:value-of select="port/."/>
+                               <xsl:value-of select="host/."/>
+                               <xsl:if test="port/.!='22'">
+                                / <xsl:value-of select="port/."/>
+                               </xsl:if>
                            </a>
                      </xsl:if> 
                      <br/>
-                 </xsl:if> 
+                     
+
+                 </xsl:if>
                  
              </xsl:for-each>
+             
+             <!-- get the missing jobs -->
+             <xsl:for-each select="//JobsReport/missing_jobs/job">    
+                   <xsl:if test="@distribution=$curr_distname and @application=$curr_appli">
+                       <xsl:attribute name="bgcolor">FFCCCC</xsl:attribute>
+                   </xsl:if>
+             </xsl:for-each>
+             
          </td>
        </xsl:for-each>
        </tr>
@@ -288,6 +301,22 @@
       </div>
     </xsl:for-each>
 
+    <div style="display:none"><xsl:attribute name="id">legend</xsl:attribute>
+      <td border="0"> 
+           <tr><td>job</td><td>result</td></tr>
+           <tr><td> <xsl:attribute name="class">OK2day</xsl:attribute>success today</td><td> <xsl:attribute name="class">OK2day</xsl:attribute>success today</td></tr>
+           <tr><td> <xsl:attribute name="class">OK2</xsl:attribute>success not today</td><td> <xsl:attribute name="class">OK2</xsl:attribute>success not today</td></tr>
+           <tr><td> <xsl:attribute name="class">KO2day</xsl:attribute>fail today</td><td> <xsl:attribute name="class">KO2day</xsl:attribute>fail today</td></tr>
+           <tr><td> <xsl:attribute name="class">KO2</xsl:attribute>fail not today</td><td> <xsl:attribute name="class">KO2</xsl:attribute>fail not today</td></tr>
+           <tr><td> <xsl:attribute name="class">TO2day</xsl:attribute>timeout today</td><td> <xsl:attribute name="class">KF2day</xsl:attribute>known failure today</td></tr>
+           <tr><td> <xsl:attribute name="class">RUNNING2</xsl:attribute>running</td><td> <xsl:attribute name="class">KF2</xsl:attribute>known failure not today</td></tr>
+           <tr><td> <xsl:attribute name="class">NA2day</xsl:attribute>To be launched</td></tr>
+           <tr><td> <xsl:attribute name="class">NA2</xsl:attribute>Not today</td></tr>
+           <tr>Missing job: <td> <xsl:attribute name="bgcolor">FFCCCC</xsl:attribute> </td></tr>
+           <tr>Extra job: <td> <xsl:attribute name="bgcolor">FFCCCC</xsl:attribute> Job name </td></tr>
+       </td>
+    </div>
+    
 </body>
 
 </html>