backlog 0.22.0 → 0.22.1

data/History.txt

@@ -1,9 +1,21 @@
+== 0.22.1 2008-02-15
+
+=== Features
+
+* Added Excel export of work list for backlog.
+
+=== Fixes
+
+* Fixed so that you are redirected to the originally requested page after a login.
+* Fixed so that the work log nagger stops nagging when you lock the previous week.
+* Fixed so that we get patcxh level updates for rmagick.
+
 == 0.22.0 2008-02-14
 
 === Features
 
 * Added report for displaying all work records relating to tasks in a backlog for a given time period.
-* Aded ability to look at other users weekly work sheets.
+* Added ability to look at other users weekly work sheets.
   Used in the Work Lock Notification mail.
 
 === Fixes

data/Rakefile

@@ -32,8 +32,8 @@ Hoe.new("backlog", APP::VERSION) do |p|
   }
   p.need_zip = true
   p.url = 'http://rubyforge.org/projects/backlog/'
-  p.extra_deps = [['rails', '>= 1.2.4'], ['gruff', '>= 0.2.9'], ['rmagick', '= 1.15.12'],
-  ['postgres', '>= 0.7.9'], ['slave', '>= 1.2.1']]
+  p.extra_deps = [['rails', '= 1.2.4'], ['gruff', '~> 0.2.9'], ['rmagick', '~> 1.15.12'],
+  ['postgres', '~> 0.7.9'], ['slave', '~> 1.2.1']]
   p.rsync_args = "-acv --delete --exclude=wiki*"
 end
 

data/app/controllers/backlogs_controller.rb

@@ -177,8 +177,13 @@ class BacklogsController < ApplicationController
   def works
     backlog = Backlog.find(params[:id])
     @report_filter = ReportFilter.new(params[:report_filter])
-    @works = Work.paginate :conditions => ["completed_at BETWEEN ? AND ? AND task_id IN (SELECT id FROM tasks t where t.backlog_id = ?)", @report_filter.start_on, @report_filter.end_on, backlog.id], :page => params[:page]
-    render :template => '/works/list'
+    @report_filter.title = "#{l :hours} for #{backlog.name} #{@report_filter.start_on && @report_filter.start_on.strftime('%Y-%m-%d - ')}#{@report_filter.end_on && @report_filter.end_on.strftime('%Y-%m-%d')}"
+    @works = Work.paginate :conditions => ["completed_at BETWEEN ? AND ? AND task_id IN (SELECT id FROM tasks t where t.backlog_id = ?)", @report_filter.start_on, @report_filter.end_on, backlog.id], :page => params[:page], :per_page => @report_filter.page_size
+    if params[:export] == 'excel'
+      render :template => '/works/list_excel', :layout => false
+    else
+      render :template => '/works/list'
+    end
   end
   
   private

data/app/models/report_filter.rb

@@ -1,13 +1,22 @@
 class ReportFilter
+  attr_accessor :title
   attr_reader :start_on
   attr_reader :end_on
+  attr_reader :page_size
   
   def initialize(attributes)
     if attributes
       attributes = attributes.clone
-      @start_on = Date.parse attributes.delete(:start_on) || Date.local(2007, 01, 01)
+      
+      start_on_param = attributes.delete(:start_on)
+      @start_on = start_on_param && start_on_param.size > 0 ? Date.parse(start_on_param) : Date.civil(2007, 01, 01)
+      
       end_on_param = attributes.delete(:end_on)
       @end_on = end_on_param && end_on_param.size > 0 ? Date.parse(end_on_param) : Date.today
+      
+      page_size_param = attributes.delete(:page_size)
+      @page_size = page_size_param.to_i > 0 ? page_size_param.to_i : 1000
+      
       raise "Unknown parameters: #{attributes.inspect}" unless attributes.empty?
     end
   end

data/app/models/work_lock_nagger.rb

@@ -26,7 +26,8 @@ class WorkLockNagger
       begin
         late_work_locks = WorkLock.find(
                                         :all, 
-                                        :conditions => ["end_on < ? and not exists (select id from work_locks wl2 where wl2.user_id = work_locks.user_id and wl2.end_on > work_locks.end_on)", Date.today ])
+                                        :conditions => ["end_on < ? and not exists (select id from work_locks wl2 where wl2.user_id = work_locks.user_id and wl2.end_on > work_locks.end_on)", 1.week.ago.monday ])
+        
         late_users = late_work_locks.map{|wl| wl.user}.uniq
         late_users.each do |u|
           missing_date = (u.work_locks.last.end_on + 7)

data/app/views/works/list.rhtml

@@ -5,7 +5,7 @@
   <% end %>
 
 <% if @report_filter %>
-	<% form_for :report_filter do |f| %>
+	<% form_for :report_filter, :html => {:method => :get} do |f| %>
 	<p><label for="report_filter_start_on"><%=l :start_on%></label>
 <%=f.text_field 'start_on', :size => 16, :value => @report_filter.start_on ? @report_filter.start_on.strftime('%Y-%m-%d') : nil %>
     <button id="trigger1">...</button>
@@ -41,6 +41,10 @@
         timeInterval          : 15
       });
     //]]></script>
+
+<label for="report_filter_page_size"><%=l :paging%></label>
+<%=f.check_box :page_size, {:checked => @report_filter.page_size == 10, :onchange => 'form.submit()'}, 10, nil %>
+
 	<%=submit_tag l(:search) %>
 </p>
 
@@ -48,6 +52,18 @@
 <% end %>
 
 
+
+<table id="summary">
+	<tr>
+		<th><%=l :total%></th>
+		<td><%=@works.inject(BigDecimal('0')){|total, work| total += work.hours}%> <%=l(:hours).downcase%></td>
+		<td><%=link_to l(:spreadsheet), {:export => :excel}.update(params) %></td>
+	</tr>
+</table>
+
+
+
+
 <table>
   <tr>
     <th><%=l :task %></th>

data/app/views/works/list_excel.rhtml

@@ -0,0 +1,103 @@
+<%  headers["Content-Type"] = "application/vnd.ms-excel"
+    headers["Content-Disposition"] = 'attachment; filename="export.xml"'
+-%>
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Author><%=current_user.name%></Author>
+<% if user? %>
+  <LastAuthor><%=user.first_name%> <%=user.last_name%></LastAuthor>
+<% end %>
+  <LastPrinted>2005-11-14T13:31:53Z</LastPrinted>
+  <Created><%=Time.now.iso8601%></Created>
+  <LastSaved><%=Time.now.iso8601%></LastSaved>
+  <Version>11.5606</Version>
+ </DocumentProperties>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>9075</WindowHeight>
+  <WindowWidth>12390</WindowWidth>
+  <WindowTopX>90</WindowTopX>
+  <WindowTopY>45</WindowTopY>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+  <Style ss:ID="Default" ss:Name="Normal">
+   <Alignment ss:Vertical="Top"/>
+   <Borders/>
+   <Font/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
+  <Style ss:ID="title">
+   <Font x:Family="Swiss" ss:Size="24" ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="header">
+   <Font x:Family="Swiss" ss:Size="14" ss:Bold="1"/>
+  </Style>
+ </Styles>
+ <Worksheet ss:Name="<%=l(:done)%>">
+  <Table ss:ExpandedColumnCount="256" ss:ExpandedRowCount="35" x:FullColumns="1"
+   x:FullRows="1">
+   <Column ss:AutoFitWidth="1" ss:Width="10cm"/>
+   <Column ss:AutoFitWidth="2" ss:Width="4cm"/>
+   <Column ss:AutoFitWidth="4" ss:Width="5cm"/>
+   <Column ss:AutoFitWidth="5" ss:Width="5cm"/>
+   <Column ss:AutoFitWidth="3" ss:Width="1.5cm"/>
+   <Row>
+    <Cell ss:StyleID="title" ss:MergeAcross="4"><Data ss:Type="String"><%=@report_filter.title%></Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="6.5625">
+    <Cell ss:MergeAcross="4"><Data ss:Type="String"></Data></Cell>
+   </Row>
+
+   <Row ss:AutoFitHeight="0" ss:Height="19.875">
+    <Cell ss:StyleID="header"><Data ss:Type="String">Aktivitet</Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String">Person</Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String">Start</Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String">Stopp</Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String">Timer</Data></Cell>
+   </Row>
+   
+<% for work in @works %>
+   <Row>
+    <Cell><Data ss:Type="String"><%=[work.task && work.task.description, work.description].compact.join('&#10;') %></Data></Cell>
+    <Cell><Data ss:Type="String"><%=work.user && work.user.name %></Data></Cell>
+    <Cell><Data ss:Type="Date"><%=work.started_at && work.started_at.strftime('%Y-%m-%d %H:%M:%S') %></Data></Cell>
+    <Cell><Data ss:Type="Date"><%=work.completed_at && work.completed_at.strftime('%Y-%m-%d %H:%M:%S') %></Data></Cell>
+    <Cell><Data ss:Type="Number"><%=work.hours %> %></Data></Cell>
+   </Row>
+  <% end %>
+
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Layout x:Orientation="Landscape"/>
+   </PageSetup>
+   <FitToPage/>
+   <Print>
+    <ValidPrinterInfo/>
+    <PaperSizeIndex>9</PaperSizeIndex>
+    <Scale>97</Scale>
+    <HorizontalResolution>600</HorizontalResolution>
+    <VerticalResolution>600</VerticalResolution>
+   </Print>
+   <Selected/>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <ActiveRow>3</ActiveRow>
+     <ActiveCol>1</ActiveCol>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+  </WorksheetOptions>
+ </Worksheet>
+</Workbook>

data/config/environment.rb

@@ -98,8 +98,6 @@ require 'version_from_history'
 require 'user_system'
 require 'url_for_fix'
 
-puts "Starting Work Lock Nagger..."
 gem 'slave'
 require 'slave'
 work_lock_nagger_thread = Slave.object(:async=>true) {WorkLockNagger.new.nag}
-puts "\nWork Lock Nagger started."

data/lang/en.yaml

@@ -102,6 +102,7 @@ task: Task
 tasks: Tasks
 thursday: Thursday
 todo: Todo
+total: Total
 totals: Totals
 track_todo: Estimates
 track_done: Track work done

data/lang/no.yaml

@@ -101,6 +101,7 @@ task: Oppgave
 tasks: Oppgaver
 thursday: Torsdag
 todo: Igjen
+total: Totalt
 totals: Totalt
 track_todo: Estimater
 track_done: Spor utført arbeid

data/lib/user_system.rb

@@ -13,7 +13,7 @@ module UserSystem
     end
     session[:user_id] = nil
     Thread.current[:user] = nil
-    store_detour_from_params
+    store_detour(params)
     access_denied
     return false 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-14 00:00:00 +01:00
+date: 2008-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -17,7 +17,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.2.4
     version: 
@@ -26,7 +26,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.2.9
     version: 
@@ -35,7 +35,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 1.15.12
     version: 
@@ -44,7 +44,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.7.9
     version: 
@@ -53,7 +53,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 1.2.1
     version: 
@@ -148,6 +148,7 @@ files:
 - app/views/works/update_row.rjs
 - app/views/works/list.rhtml
 - app/views/works/_row.rhtml
+- app/views/works/list_excel.rhtml
 - app/views/works/_buttons.rhtml
 - app/views/works/timeliste.rhtml
 - app/views/works/_description_list.rhtml