From 427e5e8db8c781409945406f289f8ca8393a8617 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Apr 2012 16:45:05 +0200
Subject: [PATCH] Show new and removed jobs

---
 src/lib/Hydra/Controller/JobsetEval.pm | 17 +++++++--------
 src/root/jobset-eval.tt                | 30 ++++++++++++++++++++------
 src/root/jobset-evals.tt               |  2 +-
 src/root/static/css/hydra.css          |  2 +-
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/lib/Hydra/Controller/JobsetEval.pm b/src/lib/Hydra/Controller/JobsetEval.pm
index 23980e9e..824f01e2 100644
--- a/src/lib/Hydra/Controller/JobsetEval.pm
+++ b/src/lib/Hydra/Controller/JobsetEval.pm
@@ -33,14 +33,12 @@ sub view : Chained('eval') PathPart('') Args(0) {
     my @builds = $eval->builds->search({}, { order_by => ["job", "system", "id"], columns => [@buildListColumns] });
     my @builds2 = $eval2->builds->search({}, { order_by => ["job", "system", "id"], columns => [@buildListColumns] });
 
-    print STDERR "EVAL IS ", $eval2->id, "\n";
-    print STDERR scalar(@builds), "\n";
-    print STDERR scalar(@builds2), "\n";
-
     $c->stash->{stillSucceed} = [];
     $c->stash->{stillFail} = [];
     $c->stash->{nowSucceed} = [];
     $c->stash->{nowFail} = [];
+    $c->stash->{new} = [];
+    $c->stash->{removed} = [];
 
     my $n = 0;
     foreach my $build (@builds) {
@@ -49,11 +47,8 @@ sub view : Chained('eval') PathPart('') Args(0) {
             my $build2 = $builds2[$n];
             my $d = $build->get_column('job') cmp $build2->get_column('job')
                 || $build->get_column('system') cmp $build2->get_column('system');
-            #print STDERR $build->id, " ", $build->get_column('job'), " ",  $build->system, " ", $d, "\n";
-            last if $d == -1;
             if ($d == 0) {
-                #print STDERR $build->buildstatus, "\n";
-                #print STDERR $build2->buildstatus, "\n";
+                $n++;
                 if ($build->buildstatus == 0 && $build2->buildstatus == 0) {
                     push @{$c->stash->{stillSucceed}}, $build;
                 } elsif ($build->buildstatus != 0 && $build2->buildstatus != 0) {
@@ -62,9 +57,13 @@ sub view : Chained('eval') PathPart('') Args(0) {
                     push @{$c->stash->{nowSucceed}}, $build;
                 } elsif ($build->buildstatus != 0 && $build2->buildstatus == 0) {
                     push @{$c->stash->{nowFail}}, $build;
-                }
+                } else { die; }
+                last;
+            } elsif ($d == -1) {
+                push @{$c->stash->{new}}, $build;
                 last;
             }
+            push @{$c->stash->{removed}}, { job => $build2->get_column('job'), system => $build2->get_column('system') };
             $n++;
         }
     }
diff --git a/src/root/jobset-eval.tt b/src/root/jobset-eval.tt
index 9e97b7ed..eab0788d 100644
--- a/src/root/jobset-eval.tt
+++ b/src/root/jobset-eval.tt
@@ -1,7 +1,7 @@
-[% WRAPPER layout.tt title="Bla" %]
+[% WRAPPER layout.tt title="Jobset $project.name:$jobset.name evaluation $eval.id" %]
 [% PROCESS common.tt %]
 
-<h1>Jobset <tt>[% project.name %]:[% jobset.name %]</tt> Evaluation [% eval.id %]</h1>
+<h1>Jobset <tt>[% project.name %]:[% jobset.name %]</tt> evaluation [% eval.id %]</h1>
 
 <!-- <p>Info on evaluation [% eval.id %]...<p> -->
 
@@ -16,23 +16,41 @@
 
 [% INCLUDE renderBuildListHeader unsortable=1 %]
 
+[% IF new.size > 0 %]
+  <tr><th class="subheader" colspan="0"><strong>New</strong> jobs</th></tr>
+  [% INCLUDE renderSome builds=new %]
+[% END %]
+
+[% IF removed.size > 0 %]
+  <tr><th class="subheader" colspan="0"><strong>Removed</strong> jobs</th></tr>
+  [%- FOREACH j IN removed -%]
+    <tr>
+      <td colspan=2></td>
+      <td>[% INCLUDE renderJobName project=project.name jobset=jobset.name job=j.job %]</td>
+      <td></td>
+      <td><tt>[% j.system %]</tt></td>
+      <td></td>
+    </tr>
+  [%- END -%]
+[% END %]
+
 [% IF nowFail.size > 0 %]
-  <tr><th class="subheader" colspan="0">Builds that now <strong>fail</strong></th></tr>
+  <tr><th class="subheader" colspan="0">Jobs that now <strong>fail</strong></th></tr>
   [% INCLUDE renderSome builds=nowFail %]
 [% END %]
 
 [% IF nowSucceed.size > 0 %]
-  <tr><th class="subheader" colspan="0">Builds that now <strong>succeed</strong></th></tr>
+  <tr><th class="subheader" colspan="0">Jobs that now <strong>succeed</strong></th></tr>
   [% INCLUDE renderSome builds=nowSucceed %]
 [% END %]
   
 [% IF stillFail.size > 0 %]
-  <tr><th class="subheader" colspan="0">Builds that still <strong>fail</strong></th></tr>
+  <tr><th class="subheader" colspan="0">Jobs that still <strong>fail</strong></th></tr>
   [% INCLUDE renderSome builds=stillFail %]
 [% END %]
 
 [% IF stillSucceed.size > 0 %]
-  <tr><th class="subheader" colspan="0">Builds that still <strong>succeed</strong></th></tr>
+  <tr><th class="subheader" colspan="0">Jobs that still <strong>succeed</strong></th></tr>
   [% INCLUDE renderSome builds=stillSucceed %]
 [% END %]
 
diff --git a/src/root/jobset-evals.tt b/src/root/jobset-evals.tt
index bd75daba..1b38f6ba 100644
--- a/src/root/jobset-evals.tt
+++ b/src/root/jobset-evals.tt
@@ -1,4 +1,4 @@
-[% WRAPPER layout.tt title="Jobset ‘$project.name:$jobset.name’ evaluations" %]
+[% WRAPPER layout.tt title="Jobset ‘$project.name:$jobset.name’ Evaluations" %]
 [% PROCESS common.tt %]
 
 <h1>Evaluations of Jobset <tt>[% INCLUDE renderLink
diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css
index 9df9f5b5..3a3bb4cc 100644
--- a/src/root/static/css/hydra.css
+++ b/src/root/static/css/hydra.css
@@ -28,7 +28,7 @@ a#error-link {
 
 table {
     empty-cells: show;
-    border-spacing: 1px;
+    border-collapse: collapse;
     text-align: left;
 }