backlog 0.33.1 → 0.34

data/History.txt

@@ -1,3 +1,15 @@
+== 0.34 2008-07-18
+
+== Features
+
+* Added dashboard controller and view, showing summary of hours for users you're currently monitoring
+
+=== Fixes
+
+* Fixed exception in WorkLogNagger when no config file is present.
+* Made link from period to daily work sheet a detour.
+* Fixed bug when assigning a subtask from a backlog to a sprint.
+
 == 0.33.1 2008-05-28
 
 === Fixes
@@ -10,6 +22,7 @@
 * Fixed filtering on works list and excel export to use work record start date instead of completetion date.
 * Fixed bug where a display of a weekly work sheet for a non-existing user would produce an application error.
 
+
 == 0.33.0 2008-05-09
 
 == Features
@@ -31,6 +44,7 @@
 * Fixed migrations to work with PostgreSQL 8.3
 * Removed automatic setting of "completed at" time for works.
 
+
 == 0.32.0 2008-05-08
 
 == Features

data/app/controllers/dashboard_controller.rb

@@ -0,0 +1,17 @@
+class DashboardController < ApplicationController
+  def show
+    date = Date.today
+    year = date.year
+    week = date.cweek
+    last_week = 1.week.ago.to_date.cweek
+    last_year = week == 1 ? year - 1 : year
+    month = Date.today.month
+    last_month = month == 1 ? 12 : month - 1
+    last_months_year = month == 1 ? year - 1 : year
+    @week_day = Date.today.wday
+    @users = []
+    for user in current_user.work_lock_subscriptions
+      @users<<[user, Work.work_sum_per_week(last_year, last_week, user), Work.work_sum_per_week(year, week, user), Work.work_sum_per_day(date, user), Work.work_sum_per_month(year, month, user), Work.work_sum_per_month(last_months_year, last_month, user), Work.invoice_work_sum_per_week(last_year, last_week, user), Work.invoice_work_sum_per_week(year, week, user), Work.invoice_work_sum_per_day(date, user), Work.invoice_work_sum_per_month(year, month, user), Work.invoice_work_sum_per_month(last_months_year, last_month, user)]    
+    end
+  end
+end

data/app/helpers/dashboard_helper.rb

@@ -0,0 +1,2 @@
+module DashboardHelper
+end

data/app/models/work.rb

@@ -107,6 +107,45 @@ class Work < ActiveRecord::Base
     Work.find(:all, :conditions => "started_on = '#{date}' AND user_id = #{user.id}",
     :order => 'start_time, completed_at')
   end
+
+  def self.work_sum_per_month(year, month_no, user = current_user)
+    first = Date.new(year, month_no, 1)
+    last = Date.new(year, month_no, -1)
+    count = find_by_sql("select sum(hours) from works where completed_at IS NOT NULL AND started_on BETWEEN '#{first}' AND '#{last}' AND user_id = #{user.id}")[0]['sum']
+    count ? count : 0
+  end
+  
+  def self.invoice_work_sum_per_month(year, month_no, user = current_user)
+    first = Date.new(year, month_no, 1)
+    last = Date.new(year, month_no, -1)
+    count = find_by_sql("select sum(hours) from works where invoice = true AND completed_at IS NOT NULL AND started_on BETWEEN '#{first}' AND '#{last}' AND user_id = #{user.id}")[0]['sum']
+    count ? count : 0
+  end  
+  
+  def self.work_sum_per_week(year, week_no, user = current_user)
+    first = Date.commercial(year, week_no, 1)
+    last = first + 6
+    count = find_by_sql("select sum(hours) from works where completed_at IS NOT NULL AND started_on BETWEEN '#{first}' AND '#{last}' AND user_id = #{user.id}")[0]['sum']
+    count ? count : 0
+  end
+
+  def self.invoice_work_sum_per_week(year, week_no, user = current_user)
+    first = Date.commercial(year, week_no, 1)
+    last = first + 6
+    count = find_by_sql("select sum(hours) from works where invoice = true AND completed_at IS NOT NULL AND started_on BETWEEN '#{first}' AND '#{last}' AND user_id = #{user.id}")[0]['sum']
+    count ? count : 0
+  end
+  
+  def self.work_sum_per_day(date, user = current_user)
+    count = find_by_sql("select sum(hours) from works where completed_at IS NOT NULL AND started_on = '#{date}' AND user_id = #{user.id}")[0]['sum']
+    count ? count : 0
+  end
+  
+  def self.invoice_work_sum_per_day(date, user = current_user)
+    count = find_by_sql("select sum(hours) from works where invoice = true AND completed_at IS NOT NULL AND started_on = '#{date}' AND user_id = #{user.id}")[0]['sum']
+    count ? count : 0
+  end
+
   
   def started?
     completed_at.nil?

data/app/models/work_lock_nagger.rb

@@ -1,11 +1,12 @@
 class WorkLockNagger
   include ActionController::UrlWriter
   
-  def initialize
+  def initialize(start_delay = 1)
+    @start_delay = start_delay
   end
   
   def nag
-    sleep 1.minute
+    sleep @start_delay.minute
     puts "Work Lock Nagger started"
     begin
       if File.exists? APP_CONFIG_FILE
@@ -16,7 +17,7 @@ class WorkLockNagger
         url = app_url + 'works/weekly_work_sheet'
       else      
         host = Socket::gethostname
-        port = config[:port] || 3000
+        port = config && config[:port] || 3000
         url = url_for(:host => host, :port => port, :controller => 'works', :action => :weekly_work_sheet)
       end
     rescue Exception => e

data/app/views/dashboard/show.rhtml

@@ -0,0 +1,24 @@
+<% @page_title = "#{l :dashboard}" %>
+
+<h1>Dashboard</h1>
+
+<div style="background-color: white;">
+<% for user, hours_last_week, hours_this_week, hours_today, hours_this_month, hours_last_month, invoice_hours_last_week, invoice_hours_this_week, invoice_hours_today, invoice_hours_this_month, invoice_hours_last_month in @users %>
+  <div class="user_box">
+  	<dl>
+  	  <dt><img src="/images/user.png" height="20px" /><%=h user.name %></dt>
+	  <dd>
+        <table>
+          <tr><td><%= l :hours_last_week %>:</td><td><%=hours_last_week%>/<%=invoice_hours_last_week%></td><td><%= hours_last_week.nil? || hours_last_week <= 0 ? '<img src="/images/flag_red.png" height="20px" />' : '' %><%= hours_last_week.nil? == false && hours_last_week > 0 && hours_last_week < 30 ? '<img src="/images/flag_yellow.png" height="20px" />' : '' %></td></tr>
+          <tr><td><%= l :hours_this_week %>:</td><td><%=hours_this_week%>/<%=invoice_hours_this_week%></td><td><%= @week_day > 1 && (hours_this_week.nil? || hours_this_week <= 0) ? '<img src="/images/flag_red.png" height="20px" />' : '' %></td></tr>
+          <tr><td><%= l :hours_today %>:</td><td><%=hours_today%>/<%=invoice_hours_today%></td><td></td></tr>
+		  <tr><td><%= l :hours_last_month %>:</td><td><%=hours_last_month%>/<%=invoice_hours_last_month%></td><td></td></tr>
+          <tr><td><%= l :hours_this_month %>:</td><td><%=hours_this_month%>/<%=invoice_hours_this_month%></td><td></tr>		  
+        </table>
+	  </dd>
+	</dl>
+  </div>
+<% end %>
+</div>
+
+<br />

data/app/views/tasks/edit.rhtml

@@ -34,7 +34,7 @@
               <%=l :started_at%> <%=f.text_field 'start_time', :id => "work_#{@task.started_work.id}_start_time", :value => @task.started_work.started_at ? @task.started_work.started_at.strftime('%H:%M') : '',
                   :class => :task_time, :maxlength => 5 %>
             <% end %>
-          <% elsif @task.track_times? && (@task.period_id.nil? || @task.period.active?) %>
+          <% elsif @task.track_times? && (@task.period.nil? || @task.period.active?) %>
             <%=image_link_to_remote 'hammer.png', l(:start_work), {:controller => 'tasks', :action => :start_work, :id => @task.id}, nil, true %>
           <% end -%>
       <% end -%>

data/app/views/works/_buttons.rhtml

@@ -1,8 +1,2 @@
         <%=image_detour_to('hammer.png', l(:weekly_work_sheet), :controller => 'works', :action => :weekly_work_sheet)%>
-<!--
-        <%=image_detour_to('hammer.png', l(:weekly_work_sheet), :controller => 'works', :action => :weekly_work_sheet_details)%>
--->
-        <%=link_to(image_tag(url_for("hammer.png"), :alt => l(:daily_work_sheet), :title => l(:daily_work_sheet), :class => 'image-submit'), :controller => 'works', :action => :daily_work_sheet)%>
-<!--
-        <%=link_to(image_tag(url_for("hammer.png"), :alt => l(:edit_works), :title => l(:edit_works), :class => 'image-submit'), :controller => 'periods', :action => 'list_work', :id => (@period ? @period.id : (@backlog && @backlog.periods.first ? @backlog.periods.first.id : nil))) if @period || @backlog%>
--->
+        <%=image_detour_to('hammer.png', l(:daily_work_sheet),  :controller => 'works', :action => :daily_work_sheet)%>

data/lang/en.yaml

@@ -24,6 +24,7 @@ confirmation: Are you sure?
 created_by: Created by
 customer: Customer
 daily_work_sheet: Daily work sheet
+dashboard: Dashboard
 delete: Delete
 description: Description
 details: Details
@@ -51,6 +52,11 @@ holiday: Holiday
 holidays_used: Holidays used
 home: Home
 hours: Hours
+hours_last_month: Hours last month
+hours_last_week: Hours last week
+hours_this_month: Hours this month
+hours_this_week: Hours this week
+hours_today: Hours today
 invite: Invite
 invoice: Invoice
 invoice_code: Invoice Code

data/lang/no.yaml

@@ -24,6 +24,7 @@ confirmation: Er du sikker?
 created_by: Opprettet av
 customer: Kunde
 daily_work_sheet: Timeføringsskjema
+dashboard: Dashboard
 delete: Slett
 description: Beskrivelse
 details: Detaljer
@@ -51,6 +52,11 @@ holiday: Ferie
 holidays_used: Brukte feriedager
 home: Hjem
 hours: Timer
+hours_last_month: Timer forrige måned
+hours_last_week: Timer forrige uke
+hours_this_month: Timer denne måned
+hours_this_week: Timer denne uke
+hours_today: Timer i dag
 invite: Invitèr
 invoice: Fakturerbart
 invoice_code: Faktureringskode

data/lib/version_from_history.rb

@@ -1,4 +1,4 @@
 module APP
   first_history_line = File.readlines(RAILS_ROOT + '/History.txt')[0].chomp
-  VERSION = (/^== (\d+.\d+.\d+) .*$/.match first_history_line)[1]
+  VERSION = (/^== (\d+\.\d+(?:\.\d+)?) .*$/.match first_history_line)[1]
 end

data/public/stylesheets/backlog.css

@@ -96,3 +96,40 @@ div.progressBar div.background {
   height: 18px;
   width: 0%;
 }
+
+.user_box {
+  float:left;
+  width:250px;
+  height: 150px;
+  padding: 10px;
+}
+
+.user_box dt {
+  background-color: #FFFFFF;
+  color:#444444;
+  display:inline;
+  font-family:Verdana,sans-serif;
+  font-size:1.1em;
+  font-weight:bold;
+  margin-left:10px;
+  padding-left:1px;
+  padding-right:5px;
+  position:relative;
+  top:-1em;
+}
+
+.user_box dl {
+  background:#FFFFFF none repeat scroll 0% 0%;
+  border:1px solid #D0D0D0;
+  display:block;
+  margin:0px;
+  padding:0px;
+}
+
+.user_box dd {
+  background:#FFFFFF none repeat scroll 0% 0%;
+  color:#444444;
+  margin:0px;
+  padding:5px 10px;
+  text-align:left;
+}

data/test/functional/dashboard_controller_test.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'dashboard_controller'
+
+# Re-raise errors caught by the controller.
+class DashboardController; def rescue_action(e) raise e end; end
+
+class DashboardControllerTest < Test::Unit::TestCase
+  def setup
+    @controller = DashboardController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.33.1
+  version: "0.34"
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-15 00:00:00 +02:00
+date: 2008-09-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: gruff
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: postgres
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: slave
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -50,12 +54,13 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.3
+        version: 1.7.0
     version: 
 description: Welcome to Backlog!  Backlog is a tool to help you collect and organize all your tasks, whether you are a single person or a small or large group.
 email: uwe@kubosch.no
@@ -109,6 +114,8 @@ files:
 - app/views/work_locks/edit.rhtml
 - app/views/work_locks/_form.rhtml
 - app/views/work_locks/show.rhtml
+- app/views/dashboard
+- app/views/dashboard/show.rhtml
 - app/views/absences
 - app/views/absences/new.rhtml
 - app/views/absences/list.rhtml
@@ -224,6 +231,7 @@ files:
 - app/controllers/user_controller.rb
 - app/controllers/customers_controller.rb
 - app/controllers/welcome_controller.rb
+- app/controllers/dashboard_controller.rb
 - app/controllers/backlogs_controller.rb
 - app/controllers/estimates_controller.rb
 - app/controllers/application.rb~
@@ -239,6 +247,7 @@ files:
 - app/helpers
 - app/helpers/estimates_helper.rb
 - app/helpers/application_helper.rb
+- app/helpers/dashboard_helper.rb
 - app/helpers/groups_helper.rb
 - app/helpers/work_locks_helper.rb
 - app/helpers/customers_helper.rb
@@ -323,6 +332,7 @@ files:
 - test/functional/periods_controller_test.rb
 - test/functional/estimates_controller_test.rb
 - test/functional/task_files_controller_test.rb
+- test/functional/dashboard_controller_test.rb
 - test/functional/works_controller_test.rb
 - test/functional/tasks_controller_test.rb
 - test/functional/welcome_controller_test.rb
@@ -602,9 +612,11 @@ files:
 - public/images/grab_gray.png
 - public/images/arrow07_4.png
 - public/images/checkmark.png
+- public/images/flag_red.png
 - public/images/appunti_architetto_franc_01.svg
 - public/images/group.png
 - public/images/ernes_stop_org.png
+- public/images/flag_yellow.png
 - public/images/user.png
 - public/images/period.png
 - public/images/clipboard.svg
@@ -628,6 +640,7 @@ files:
 - public/images/work_account.png
 - public/images/ernes_stop.png
 - public/images/cestino_pieno_architetto_01.svg
+- public/images/user group.png
 - public/images/eraser_org.png
 - public/images/person.org.png
 - public/stylesheets
@@ -758,7 +771,7 @@ requirements:
 - ImageMagick
 - PostgreSQL
 rubyforge_project: backlog
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Application to aid collecting, processing, organizing, reviewing and doing tasks.