Merge lp:~mabac/launchpad-work-items-tracker/linaro-roadmap-layout-fixes into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[Mattias Backman]

Hi,

Here's a leftover change that didn't get merged. It changes the roadmap card view to hide the blueprint table and progress bar when there are no linked blueprints.

Thanks,

Mattias

[Guilherme Salgado (salgado)]

Wow, it felt like I was reviewing PHP with all this code included within the html. ;)

I suppose blueprints.itervalues() would return a sequence of lists (or other sequences) and there's no way a None can end up there, right?

review: Needs Information

[lp:~mabac/launchpad-work-items-tracker/linaro-roadmap-layout-fixes]

320. By Mattias Backman on 2011-11-30

Determine if card has blueprints outside of html template.

[Mattias Backman (mabac)]

On Wed, Nov 30, 2011 at 9:15 PM, Guilherme Salgado
<email address hidden> wrote:
> Review: Needs Information
>
> Wow, it felt like I was reviewing PHP with all this code included within the html. ;)

Hehe sorry about that. I'm not too happy with the results when trying
to do smart things in the templates. I have pushed an update to make
it a little less cluttered.

>
> I suppose blueprints.itervalues() would return a sequence of lists (or other sequences) and there's no way a None can end up there, right?

Famous last words: nope, that shouldn't happen. :) They're all
initialized to [] in report_tools.card_blueprints_by_status().

> --
> https://code.launchpad.net/~mabac/launchpad-work-items-tracker/linaro-roadmap-layout-fixes/+merge/83903
> You are the owner of lp:~mabac/launchpad-work-items-tracker/linaro-roadmap-layout-fixes.

[Guilherme Salgado (salgado)]

review: Approve

=== modified file 'html-report'
--- html-report	2011-11-24 10:39:35 +0000
+++ html-report	2011-11-30 20:41:24 +0000
@@ -517,6 +517,11 @@
         blueprint_status_count.inprogress = len(blueprints['In Progress'])
         blueprint_status_count.postponed = 0
         blueprint_status_count.done = len(blueprints['Completed'])
+        card_has_blueprints = (blueprint_status_count.todo +
+                               blueprint_status_count.blocked +
+                               blueprint_status_count.inprogress +
+                               blueprint_status_count.postponed +
+                               blueprint_status_count.done) > 0
 
         data.update(dict(page_type="roadmap_card"))
         data.update(dict(card_title=title))
@@ -525,6 +530,7 @@
         data.update(dict(lane=lane.name))
         data.update(dict(blueprints=blueprints))
         data.update(dict(blueprint_status_count=blueprint_status_count))
+        data.update(dict(card_has_blueprints=card_has_blueprints))
 
         print report_tools.fill_template(
             "roadmap_card.html", data, theme=opts.theme)

=== modified file 'templates/roadmap_card.html'
--- templates/roadmap_card.html	2011-11-21 15:06:06 +0000
+++ templates/roadmap_card.html	2011-11-30 20:41:24 +0000
@@ -22,14 +22,14 @@
 </ul>
 
 <div style="text-align: center">Overall blueprint completion</div>
-${util.progress_bar(blueprint_status_count)}
+${util.progress_bar(blueprint_status_count) if card_has_blueprints else '<center><i>Progress graph pending linked blueprints.</i></center>'}
 
 <h3>Description</h3> ${card.description if card.description is not None else '<i>No description could be found.</i>'}
 <p><a href="${card.url}">Read the full description</a>.
 <h3>Acceptance criteria</h3> ${card.acceptance_criteria if card.acceptance_criteria is not None else '<i>No acceptance criteria could be found.</i>'}
 <p><a href="${card.url}">Read the full acceptance criteria</a>.
 <p>
-% if card.status in ['Ready', 'Delivered'] or blueprints.keys() > 0:
+% if card_has_blueprints:
 <table>
 <thead>
     <tr><th>Title</th>