@@ -2,7 +2,7 @@ class RemoteProjectRenderer < RemoteSiteRenderer constructor :page, :project def draw_current_iteration_velocity_marker - @page.call "Strac.Iteration.drawCurrentIterationVelocityMarker" + @page.call "Strac.Iteration.drawWorkspaceVelocityMarkers" end def update_project_summary app/renderers/remote_project_renderer.rb @@ -1,5 +1,4 @@ -<div class="section"> - +<div class="section workspace"> <table width="100%"> <tr> <td><b>Workspace</b></td> @@ -10,14 +9,10 @@ <div id="iteration_nil" class="story_list"> <%= render :partial => 'stories/list', :locals => { :stories => @stories } %> </div> - <% javascript_tag do %> - Strac.Iteration.drawCurrentIterationVelocityMarker(); - <% end %> - <%= sortable_element "iteration_nil", :url => reorder_stories_path(@project), :method => :put, :tag => 'div', :handle => 'draggable', :dropOnEmpty => true, - :onChange => "Strac.Iteration.drawCurrentIterationVelocityMarker" + :onChange => "Strac.Iteration.drawWorkspaceVelocityMarkers" -%> </div> \ No newline at end of file app/views/projects/workspace.html.erb @@ -13,4 +13,4 @@ page.sortable bucket_id, :url => reorder_stories_path(@project), :method => :put @story = Story.new :bucket_id => @story.bucket_id # we want a fresh form page["#{bucket_id}_story_new"].replace_html :partial => 'stories/new', :locals => { :story => @story } -page.call "Strac.Iteration.drawCurrentIterationVelocityMarker" +page.call "Strac.Iteration.drawWorkspaceVelocityMarkers" app/views/stories/create.js.rjs @@ -5,4 +5,4 @@ page.visual_effect :appear, :notice page.delay( 5 ) { page.visual_effect :fade, :notice } page["story_#{@story.id}"].remove -page.call "Strac.Iteration.drawCurrentIterationVelocityMarker" \ No newline at end of file +page.call "Strac.Iteration.drawWorkspaceVelocityMarkers" \ No newline at end of file app/views/stories/destroy.js.rjs @@ -30,4 +30,4 @@ end page[:project_summary].replace :partial => "projects/summary", :locals => { :project => @project } page[:project_summary].replace :partial => "projects/summary", :locals => { :project => @project } -page.call "Strac.Iteration.drawCurrentIterationVelocityMarker" +page.call "Strac.Iteration.drawWorkspaceVelocityMarkers" app/views/stories/update.js.rjs public/images/arrow_down.png public/images/arrow_up.png @@ -62,42 +62,57 @@ Object.extend(Strac.ProjectStats, { /* Iteration */ Strac.Iteration = Class.create(); Object.extend(Strac.Iteration, { - drawCurrentIterationVelocityMarker: function(){ - Strac.Iteration.removeCurrentIterationVelocityMarker(); - new Strac.Iteration($$(".section .story_list:first")[0]).drawEstimatedCompletionLine(Strac.ProjectStats.averageVelocity()); + drawWorkspaceVelocityMarkers: function(){ + Strac.Iteration.removeVelocityMarkers(); + new Strac.Iteration( + $$(".section .story_list:first")[0] + ).drawEstimatedVelocityMarkers(Strac.ProjectStats.averageVelocity()); }, - removeCurrentIterationVelocityMarker: function(){ - $$('.story_list .velocity_marker').each(function(el){ - el.remove(); - }); + removeVelocityMarkers: function(){ + $$('.story_list .velocity_marker').invoke("remove"); } }); Strac.Iteration.prototype = { initialize: function(story_list_element) { this.story_list_element = story_list_element; }, - // Number($$('.average_velocity')[0].textContent) - drawEstimatedCompletionLine: function(velocity){ + + drawCurrentIterationEstimationLine: function(story){ + story.element().insert({ + before: '<div class="velocity_marker">' + + '<div class="right">Next Iteration</div><div class="left">Expected this iteration</div>' + + '</div>' + }); + }, + + drawFutureIterationEstimationLine: function(story){ + story.element().insert({ + before: '<div class="future velocity_marker">' + + '<div class="left">Future Iteration</div><br class="clearfix"/></div>' + }); + }, + + drawEstimatedVelocityMarkers: function(velocity){ var points = 0; - var stories = this.stories(); - var story; - for(var i=0, story=stories[i] ; i<stories.size() ; i++, story=stories[i]){ + var drawn_current = false; + this.stories().each(function(story){ points += story.points(); - if(points > velocity){ - story.element().insert({ - before: '<div class="velocity_marker">' + - '<div class="right">Backlog</div><div class="left">Expected this iteration</div>' + - '</div>' - }); - break; + if(points > velocity && !drawn_current){ + this.drawCurrentIterationEstimationLine(story); + points = story.points(); + drawn_current = true; + } else if(drawn_current && points > velocity) { + this.drawFutureIterationEstimationLine(story); + points = story.points(); } - } + }.bind(this)); }, stories: function(){ return this.story_list_element.select(".story_card").map(function(el){ return new Strac.Story(el); + Object.extend(el, Strac.Story); }); } }; @@ -125,7 +140,8 @@ Strac.Story.prototype = { }; /* Window Load Events */ -Event.observe(window, 'load', function(){ +document.observe('dom:loaded', function(){ Strac.setupCloseButtonForElement($('notice')); Strac.setupCloseButtonForElement($('error')); + Strac.Iteration.drawWorkspaceVelocityMarkers(); }); public/javascripts/strac.js @@ -675,18 +675,27 @@ span.logged_in a{ .story_list .velocity_marker .left{ text-align: left; width: 50%; - background: url(/images/arrow_up.png) no-repeat; - padding-left: 15px; + background: url(/images/arrow_up.png) no-repeat center left; + padding-left: 13px; } .story_list .velocity_marker .right{ text-align: right; width: 50%; float: right; - background: url(/images/arrow_down.png) no-repeat right; + background: url(/images/arrow_down.png) no-repeat center right; padding-right: 15px; } +.story_list .future.velocity_marker { + background-color: #999; + color: #FFF; +} + +.story_list .future.velocity_marker .left{ + background: url(/images/arrow_down.png) no-repeat center left; +} + fieldset.search { border: 1px solid #ccc; padding: 0 1em; public/stylesheets/screen.css @@ -21,7 +21,7 @@ describe RemoteProjectRenderer do end it "tells the page to draw the current iteration velocity marker" do - @page.should_receive(:call).with("Strac.Iteration.drawCurrentIterationVelocityMarker") + @page.should_receive(:call).with("Strac.Iteration.drawWorkspaceVelocityMarkers") draw_current_iteration_velocity_marker end end spec/renderers/remote_project_renderer_spec.rb @@ -33,7 +33,7 @@ describe "/projects/workspace.html.erb" do :tag => 'div', :handle => 'draggable', :dropOnEmpty => true, - :onChange => "Strac.Iteration.drawCurrentIterationVelocityMarker" + :onChange => "Strac.Iteration.drawWorkspaceVelocityMarkers" ) end end spec/views/projects/workspace.html.erb_spec.rb ad2fc5e1f72add91352e8f66bd576aebfc30211e Zach Dennis zach.dennis@gmail.com http://github.com/zdennis/strac/commit/ed01777aaf731688406cc6258ef35fa894542610 ed01777aaf731688406cc6258ef35fa894542610 2008-03-15T20:19:14-07:00 2008-03-15T20:19:14-07:00 Starter implementatino for drawing future velocity markers dce9518d2895a2a68d6de3a700809cd9dce124f5 Zach Dennis zach.dennis@gmail.com