branston 0.4.5 → 0.4.6

data/lib/branston/app/controllers/stories_controller.rb

@@ -13,44 +13,42 @@
 #    along with Branston.  If not, see <http://www.gnu.org/licenses/>.
 
 class StoriesController < ApplicationController
-
+  
   layout 'main'
   before_filter :login_required, :except => [:show, :generate_feature]
-  before_filter :retrieve_iterations, :except => [:generate_feature]
+  before_filter :retrieve_iterations, :except => [:generate_feature, :show]
   before_filter :load_iteration, :except => [:generate_feature, :show]
-
   in_place_edit_for :story, :title
   in_place_edit_for :story, :description
   in_place_edit_for :story, :points
-
+  
   def generate_feature
     @story = Story.find_by_slug(params[:id])
     if @story.nil?
-      @story = Story.find(:first, :include => :scenarios,
-        :conditions => ['slug LIKE ?', "%#{id}%"] )
+      @story = Story.find(:first, :include => :scenarios, :conditions => ['slug LIKE ?', "%#{id}%"] )
     end
     @story.generate(@story)
     render :text => 'done'
   end
-
+  
   # GET /stories
   # GET /stories.xml
   def index
     @current_stories = Story.for_iteration(@iteration.id).in_progress
     @backlog_stories = Story.for_iteration(@iteration.id).unassigned
     @completed_stories = Story.for_iteration(@iteration.id).completed
-
+    
     respond_to do |format|
       format.html # index.html.erb
       format.xml  { render :xml => @stories }
     end
   end
-
+  
   # GET /stories/1
   # GET /stories/1.xml
   def show
     @story = Story.find_by_slug(params[:id])
-
+    
     respond_to do |format|
       if @story
         format.html {
@@ -60,86 +58,102 @@ class StoriesController < ApplicationController
           render :xml => (@story.to_xml :include => { :scenarios => {
         :include => [:preconditions, :outcomes] } } ) }
           format.js { @active = true }
-      else
-          format.html { render_optional_error_file 404 }
+        else
+          format.html {
+            @iteration = load_iteration
+            render_optional_error_file 404 
+          } 
           format.all  { render :nothing => true, :status => 404 }
+        end
       end
     end
-  end
-
-  # GET /stories/new
-  # GET /stories/new.xml
-  def new
-    @story = Story.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.xml  { render :xml => @story }
+    
+    # GET /stories/new
+    # GET /stories/new.xml
+    def new
+      @story = Story.new(:iteration => @iteration)
+      
+      respond_to do |format|
+        format.html # new.html.erb
+        format.xml  { render :xml => @story }
+      end
     end
-  end
-
-  # GET /stories/1/edit
-  def edit
-    @story = Story.find_by_slug(params[:id])
-  end
-
-  # POST /stories
-  # POST /stories.xml
-  def create
-    @story = Story.new(params[:story])
-    @story.author = current_user
-    @story.iteration = @iteration
-
-    respond_to do |format|
-      if @story.save
-        flash[:notice] = 'Story was successfully created.'
-        format.html { redirect_to iteration_stories_url(@iteration) }
-        format.xml  { render :xml => @story, :status => :created, :location => @story }
-      else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @story.errors, :status => :unprocessable_entity }
+    
+    # GET /stories/1/edit
+    def edit
+      @story = Story.find_by_slug(params[:id])
+    end
+    
+    # POST /stories
+    # POST /stories.xml
+    def create
+      @story = Story.new(params[:story])
+      @story.author = current_user
+      @story.iteration = @iteration
+      
+      respond_to do |format|
+        if @story.save
+          flash[:notice] = 'Story was successfully created.'
+          format.html { redirect_to iteration_stories_path(@iteration) }
+          format.xml  { render :xml => @story, :status => :created, :location => @story }
+        else
+          format.html { render :action => "new" }
+          format.xml  { render :xml => @story.errors, :status => :unprocessable_entity }
+        end
       end
     end
-  end
-
-  # PUT /stories/1
-  # PUT /stories/1.xml
-  def update
-    @story = Story.find_by_slug(params[:id])
-    respond_to do |format|
-      if @story.update_attributes(params[:story])
-        flash[:notice] = 'Story was successfully updated.'
-        format.html { redirect_to iteration_story_path(@iteration, @story) }
+    
+    # PUT /stories/"1
+    # PUT /stories/1.xml
+    def update
+      @story = Story.find_by_slug(params[:id])
+      
+      if params[:story] and params[:story][:status]
+        if params[:story][:status] == 'in_progress'
+          @story.assign
+        end
+        
+        if params[:story][:status] == 'completed'
+          @story.finish
+        end
+      end
+      
+      respond_to do |format|
+        if @story.update_attributes(params[:story])
+          flash[:notice] = 'Story was successfully updated.'
+          format.html { redirect_to iteration_story_path(@iteration, @story) }
+          format.xml  { head :ok }
+          format.js { redirect_to iteration_stories_path(@iteration) }
+        else
+          format.html { render :action => "edit" }
+          format.xml  { render :xml => @story.errors, :status => :unprocessable_entity }
+        end
+      end
+      
+      
+    end
+    
+    # DELETE /stories/1
+    # DELETE /stories/1.xml
+    def destroy
+      @story = Story.find_by_slug(params[:id])
+      @story.destroy
+      
+      respond_to do |format|
+        format.html { redirect_to iteration_stories_path(@iteration) }
         format.xml  { head :ok }
-        format.js { redirect_to iteration_stories_path(@iteration) }
-      else
-        format.html { render :action => "edit" }
-        format.xml  { render :xml => @story.errors, :status => :unprocessable_entity }
       end
     end
-  end
-
-  # DELETE /stories/1
-  # DELETE /stories/1.xml
-  def destroy
-    @story = Story.find_by_slug(params[:id])
-    @story.destroy
-
-    respond_to do |format|
-      format.html { redirect_to iteration_stories_path(@iteration) }
-      format.xml  { head :ok }
+    
+    
+    private
+    
+    def retrieve_iterations
+      @iterations = Iteration.all
     end
+    
+    def load_iteration
+      @iteration = Iteration.find(params[:iteration_id])
+    end    
   end
 
-
-  private
-
-  def retrieve_iterations
-    @iterations = Iteration.all
-  end
-
-  def load_iteration
-    @iteration = Iteration.find(params[:iteration_id])
-  end
-end
-

data/lib/branston/app/helpers/iterations_helper.rb

@@ -1,40 +1,46 @@
 module IterationsHelper
-
+  
   # TODO: Untested!
   #
   def burndown_chart(iteration, data)
-
-    total_points = 0
-    points_data = []
-
+    
+    total_points = iteration.velocity
+    running_total = 0
+    
     unless data.nil? or data.empty?
-      total_points = data[0].total_points.to_i
-      points_data = data.collect{|d| d.points.to_i}
-    end
-
-    work_days = []
-    (iteration.start_date.to_date..iteration.end_date.to_date).to_a.each do |date|
-      work_days.push date.strftime('%d/%m') unless date.wday == 0 or date.wday == 6
-    end
-
-    # Keep adding the last value to flatline the chart
-    while work_days.length > data.length
-      data.push data[data.length - 1]
-    end
-
-    # Make some gradations for the y axis labels
-    y_scale = [0]
-    [4, 2, 1.5, 1.25, 1].each do |n|
-      unit = (total_points / n).floor
-      y_scale.push unit if unit > 0
+      points_data = data.map { |d|
+        running_total += d.points.to_i
+        total_points - running_total
+      }
+      
+      
+      points_data = [total_points] + points_data unless points_data.nil?
+      
+      work_days = [nil]
+      (iteration.start_date.to_date..iteration.end_date.to_date).to_a.each do |date|
+        work_days.push date.strftime('%d/%m') unless date.wday == 0 or date.wday == 6
+      end
+      
+      # Keep adding the last value to flatline the chart
+      while work_days.length > points_data.length
+        points_data.push points_data.last
+      end
+      
+      # Make some gradations for the y axis labels
+      y_scale = [0]
+      [4, 2, 1.5, 1.25, 1].each do |n|
+        unit = (total_points / n).floor
+        y_scale.push unit if unit > 0
+      end
+      
+      image_tag Gchart.line(:size => '800x360',
+        :title => "Iteration #{iteration.name} burndown",
+        :data => points_data, :axis_with_labels => 'x,y',
+        :axis_labels => [work_days, y_scale])
+      
+      end
+      
     end
-
-    image_tag Gchart.line(:size => '500x300',
-            :title => "#{iteration.name} burndown",
-            :data => points_data, :axis_with_labels => 'x,y',
-            :axis_labels => [work_days, y_scale])
-
+    
   end
 
-end
-

data/lib/branston/app/models/iteration.rb

@@ -28,14 +28,14 @@ class Iteration < ActiveRecord::Base
   belongs_to :release
 
   def burndown_data
-    Iteration.find_by_sql [
-      "SELECT SUM(points) AS total_points,
-        COUNT(points) AS points,
+    Story.find_by_sql [
+      "SELECT SUM(points) AS points,
         completed_date
       FROM stories
       WHERE iteration_id = ?
       AND status = 'completed'
-      GROUP BY completed_date", id
+      GROUP BY completed_date
+      ORDER bY completed_date", id
     ]
   end
 

data/lib/branston/app/models/story.rb

@@ -62,6 +62,8 @@ class Story < ActiveRecord::Base
       story.completed_date = Date.today
     end
   end
+  
+  attr_protected :status
 
   def to_param
     title.parameterize

data/lib/branston/app/views/iterations/show.html.erb

@@ -1,44 +1,50 @@
-<div style="width:38%;float:left">
-<p>
-  <b>Velocity:</b>
-  <%=h @iteration.velocity %>
-</p>
-
-<p>
-  <b>Name:</b>
-  <%=h @iteration.name %>
-</p>
-
-<p>
-  <b>Start date:</b>
-  <%=h @iteration.start_date %>
-</p>
-
-<p>
-  <b>End date:</b>
-  <%=h @iteration.end_date %>
-</p>
-
-<p>
-  <b>Release:</b>
-  <%=h @iteration.release.release_date if @iteration.release %>
-</p>
-
-<% unless @iteration.stories.empty? %>
-    <b>Stories</b>
-    <ul>
-    <% @iteration.stories.each do |story| %>
-
-      <li><%= story.description %> | <%= story.points %></li>
-
-    <% end %>
-    </ul>
-<% end %>
-<%= link_to 'Edit', edit_iteration_path(@iteration) %> |
-<%= link_to 'Back', iterations_path %>
+<div id="burndown_chart">
+  <%= burndown_chart @iteration, @iteration_data %>
 </div>
 
-<div style="width:58%;float:right">
-<%= burndown_chart @iteration, @iteration_data %>
+<div id="iteration_stats">
+  <h3>Iteration Stats</h3>
+  
+  <p>
+    <b>Velocity:</b>
+    <%=h @iteration.velocity %>
+  </p>
+  
+  <p>
+    <b>Name:</b>
+    <%=h @iteration.name %>
+  </p>
+  
+  <p>
+    <b>Start date:</b>
+    <%=h @iteration.start_date %>
+  </p>
+  
+  <p>
+    <b>End date:</b>
+    <%=h @iteration.end_date %>
+  </p>
+  
+  <p>
+    <b>Release:</b>
+    <%=h @iteration.release.release_date if @iteration.release %>
+  </p>
+  
+  <% unless @iteration.stories.empty? %>
+      <b>Stories</b>
+      <ul>
+      <% @iteration.stories.each do |story| %>
+  
+        <li><%= story.description %> | <%= story.points %></li>
+  
+      <% end %>
+      </ul>
+  <% end %>
 </div>
+  
+  <%= link_to 'Edit', edit_iteration_path(@iteration) %> |
+  <%= link_to 'Back', iterations_path %> | 
+  <%=link_to 'Stories', iteration_stories_path(@iteration) %>
+  
+  
 

data/lib/branston/public/stylesheets/application.css

@@ -72,3 +72,5 @@ div.preconditions ol li, div.outcomes ol li { margin:2px; font-size:0.95em;}
 div.story-props {display:block;height:30px;border-bottom:1px dotted grey;padding-top:4px;}
 div.story-props div {display:inline-block;float:left;margin-left:20px;line-height:25px;}
 
+#burndown_chart { margin-left:auto; margin-right:auto; width:800px; }
+#iteration_stats { margin-top : 30px; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: branston
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - dave.hrycyszyn@headlondon.com
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 +00:00
+date: 2010-01-13 00:00:00 +00:00
 default_executable: branston
 dependencies: 
 - !ruby/object:Gem::Dependency