From: Serge Rehbinder <serge.rehbinder@cea.fr>
Date: Thu, 20 Oct 2016 09:57:37 +0000 (+0200)
Subject: jobs report, display error when jobs are missing somewhere in the week
X-Git-Tag: 5.0.0a1~67
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d0af985239882d85f2b5d8ef75ed230102e78ed8;p=tools%2Fsat.git

jobs report, display error when jobs are missing somewhere in the week
---

diff --git a/commands/jobs.py b/commands/jobs.py
index 601a049..371c5e6 100644
--- a/commands/jobs.py
+++ b/commands/jobs.py
@@ -1213,6 +1213,7 @@ class Gui(object):
         # input csv files but that are not covered by a today job
         for board in self.d_input_boards.keys():
             xml_root_board = self.d_xml_board_files[board].xmlroot
+            # Find the missing jobs for today
             xml_missing = src.xmlManager.add_simple_node(xml_root_board,
                                                  "missing_jobs")
             for row, column in self.d_input_boards[board]["jobs"]:
@@ -1227,6 +1228,22 @@ class Gui(object):
                                             "job",
                                             attrib={"distribution" : row,
                                                     "application" : column })
+            # Find the missing jobs not today
+            xml_missing_not_today = src.xmlManager.add_simple_node(
+                                                 xml_root_board,
+                                                 "missing_jobs_not_today")
+            for row, column in self.d_input_boards[board]["jobs_not_today"]:
+                found = False
+                for job in l_jobs_not_today:
+                    if (job.application == column and 
+                        job.machine.distribution == row):
+                        found = True
+                        break
+                if not found:
+                    src.xmlManager.add_simple_node(xml_missing_not_today,
+                                            "job",
+                                            attrib={"distribution" : row,
+                                                    "application" : column })
 
     def find_history(self, l_jobs, l_jobs_not_today):
         """find, for each job, in the existent xml boards the results for the 
@@ -1329,6 +1346,7 @@ class Gui(object):
             
             rows = []
             jobs = []
+            jobs_not_today = []
             for line in input_board[1:]:
                 row = line[0]
                 rows.append(row)
@@ -1337,13 +1355,16 @@ class Gui(object):
                         continue
                     days = square.split(DAYS_SEPARATOR)
                     days = [int(day) for day in days]
+                    job = (row, columns[i])
                     if today in days:                           
-                        job = (row, columns[i])
                         jobs.append(job)
+                    else:
+                        jobs_not_today.append(job)
 
             d_boards[board_name] = {"rows" : rows,
                                     "columns" : columns,
-                                    "jobs" : jobs}
+                                    "jobs" : jobs,
+                                    "jobs_not_today" : jobs_not_today}
         
         self.d_input_boards = d_boards
 
diff --git a/src/xsl/jobs_board_report.xsl b/src/xsl/jobs_board_report.xsl
index e33abe4..326eddd 100644
--- a/src/xsl/jobs_board_report.xsl
+++ b/src/xsl/jobs_board_report.xsl
@@ -246,6 +246,12 @@
 			<xsl:attribute name="bgcolor">FFCCCC</xsl:attribute>
 		    </xsl:if>
 	      </xsl:for-each>
+	      <!-- get the missing jobs not today -->
+	      <xsl:for-each select="//JobsReport/missing_jobs_not_today/job">    
+		    <xsl:if test="@distribution=$curr_distname and @application=$curr_appli">
+			<xsl:attribute name="bgcolor">FFEFEF</xsl:attribute>
+		    </xsl:if>
+	      </xsl:for-each>
 	      
 	  </td>
 	</xsl:for-each>
@@ -280,26 +286,28 @@
 		  <br/>
 		  <h4>User : </h4><xsl:value-of select="//JobsReport/jobs/job[@name=$curr_job_name]/user"/>
 		  <br/>
-		  <!-- Display history -->
-		  <h4>History : </h4>
-		  <br/>
-		  <xsl:for-each select="//JobsReport/jobs/job[@name=$curr_job_name]/history/link">
-		    <xsl:sort select="@date" order="descending" />
-		    <h4>
-		      <a>
-		        <xsl:attribute name="title">remote log</xsl:attribute>
-		        <xsl:attribute name="href"><xsl:value-of select="."/></xsl:attribute>
-			<xsl:if test="@res='0'">
-			    <xsl:attribute name="class">OK2</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="@res!='0'">
-			    <xsl:attribute name="class">KO2</xsl:attribute>
-			</xsl:if>
-			<xsl:value-of select="@date"/>
-		      </a>
-		    </h4>
-		    <br/>
-		  </xsl:for-each>
+          </xsl:if>
+	  <!-- Display history -->
+	  <h4>History : </h4>
+	  <br/>
+	  <xsl:for-each select="//JobsReport/jobs/job[@name=$curr_job_name]/history/link">
+	    <xsl:sort select="@date" order="descending" />
+	    <h4>
+	      <a>
+		<xsl:attribute name="title">remote log</xsl:attribute>
+		<xsl:attribute name="href"><xsl:value-of select="."/></xsl:attribute>
+		<xsl:if test="@res='0'">
+		    <xsl:attribute name="class">OK2</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="@res!='0'">
+		    <xsl:attribute name="class">KO2</xsl:attribute>
+		</xsl:if>
+		<xsl:value-of select="@date"/>
+	      </a>
+	    </h4>
+	    <br/>
+	  </xsl:for-each>
+	  <xsl:if test="//JobsReport/jobs/job[@name=$curr_job_name]/state!='Not today'">
 		  <h4>salomeTools path : </h4><xsl:value-of select="//JobsReport/jobs/job[@name=$curr_job_name]/sat_path"/>
 		  <br/>
 		  <h4>After : </h4>