backlog 0.20.1 → 0.21.0

data/History.txt

@@ -1,3 +1,15 @@
+== 0.21.0 2008-02-02
+
+=== Features
+
+* Notification of delayed time sheets.
+  Backlog is now dependent on the 'slave' gem.
+
+=== Fixes
+
+* Fixed switched users in time sheet monitoring invitation.
+* Filled in week number when notifying subscribers of a time sheet lock.
+
 == 0.20.1 2008-01-29
 
 === Fixes

data/Rakefile

@@ -32,7 +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']]
+  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 = "-av --delete --exclude=wiki*"
 end
 

data/app/models/user.rb

@@ -9,6 +9,7 @@ class User < Party
   # even if they follow the defaults since ClassTableInheritanceInRails breaks it.
   has_and_belongs_to_many :groups, :join_table => "groups_users", :foreign_key => "user_id", :association_foreign_key => 'group_id'
   has_and_belongs_to_many :work_lock_subscribers, :class_name => 'User', :join_table => "user_work_lock_subscriptions", :foreign_key => "user_id", :association_foreign_key => 'subscriber_user_id'
+  has_many :work_locks, :foreign_key => :user_id, :order => :end_on
 
   attr_accessor :password_needs_confirmation
 

data/app/models/work_lock_nagger.rb

@@ -0,0 +1,40 @@
+class WorkLockNagger
+  include ActionController::UrlWriter
+  
+  puts "Loading class"
+  
+  def initialize
+    puts "Worker initialized"
+  end
+  
+  def nag
+    puts "Nag called"
+    begin
+      url = url_for(:host => 'localhost', :port => 3000, :controller => 'works', :action => :weekly_work_sheet_by_work_account)
+    rescue Exception => e
+      puts e.message
+      puts e.backtrace
+    end
+    
+    loop do
+      puts "Nagging"
+      begin
+        p 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 ])
+        late_users = late_work_locks.map{|wl| wl.user}.uniq
+        late_users.each do |u|
+          missing_date = (u.work_locks.last.end_on + 7)
+          year = missing_date.year
+          week = missing_date.cweek
+          WorkLockNotify.deliver_nag(u, week, url + "/#{year}/#{week}")
+        end
+      rescue Exception => e
+        p e
+      end
+      puts "Nag ends"
+      sleep 24.hours
+    end
+  end
+  
+end

data/app/models/work_lock_notify.rb

@@ -10,11 +10,27 @@ class WorkLockNotify < ActionMailer::Base
     @body["app_url"] = UserSystem::CONFIG[:app_url].to_s
     @body["name"] = "#{user.first_name} #{user.last_name}"
     @body["login"] = user.login
+    @body["week"] = week
     @body["lock_user"] = lock_user
     @body["week_url"] = week_url
     @body["spreadsheet_url"] = spreadsheet_url
   end
 
+  def nag(user, week, week_url)
+    setup_email(user)
+
+    # Email header info
+    @subject += "Time sheet reminder"
+
+    # Email body substitutions
+    @body["app_name"] = UserSystem::CONFIG[:app_name].to_s
+    @body["app_url"] = UserSystem::CONFIG[:app_url].to_s
+    @body["name"] = "#{user.first_name} #{user.last_name}"
+    @body["login"] = user.login
+    @body["week"] = week
+    @body["week_url"] = week_url
+  end
+
   private
   
   def setup_email(user)

data/app/views/user_notify/monitoring_invitation_en.rhtml

@@ -1,6 +1,6 @@
-Regarding your account at <%=@app_name %>, <%=@user.name %>:
+Regarding your account at <%=@app_name %>, <%=@monitoring_user.name %>:
 
-<%=@monitoring_user.name%> has invited you to monitor his/her time sheets.
+<%=@user.name%> has invited you to monitor his/her time sheets.
 
 Click the link below to start monitoring:
 

data/app/views/work_lock_notify/lock_en.rhtml

@@ -1,7 +1,7 @@
 <%=@name %>
 
-<%=@lock_user.name%> har godkjent timeliste for uke <%=@week%>.
+<%=@lock_user.name%> has marked week <%=@week%> as complete.
 
-Klikk på linken under for en ukeoversikt:
+Please click on the following link to go to the week overview:
 
-<%=@week_url%>
+<%=@week_url%>

data/app/views/work_lock_notify/lock_no.rhtml

@@ -1,7 +1,7 @@
 <%=@name %>
 
-<%=@lock_user.name%> has marked week <%=@week%> as complete.
+<%=@lock_user.name%> har godkjent timeliste for uke <%=@week%>.
 
-Please click on the following link to go to the week overview:
+Klikk på linken under for en ukeoversikt:
 
-<%=@week_url%>
+<%=@week_url%>

data/app/views/work_lock_notify/nag_en.rhtml

@@ -0,0 +1,6 @@
+<%=@name %>
+
+This is to remind you to lock your time sheet for week <%=@week%>.
+Follow the link below to get to your weekly work sheet.
+
+<%=@week_url%>

data/app/views/work_lock_notify/nag_no.rhtml

@@ -0,0 +1,7 @@
+<%=@name %>
+
+Dette er en påmindelse om å godkjenne timeliste for uke <%=@week%>.
+
+Klikk på linken under for ukeoversikten:
+
+<%=@week_url%>

data/config/environment.rb

@@ -98,3 +98,8 @@ 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/etc/backlog.conf

@@ -1,4 +1,5 @@
-# Uncomment the followinf section to override the database connection settings.
+# Uncomment the following line to override the network port to listen on.
+# Default port is 3000.
 
 # port: 3000
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-29 00:00:00 +01:00
+date: 2008-02-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.7.9
     version: 
+- !ruby/object:Gem::Dependency 
+  name: slave
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   version_requirement: 
@@ -186,6 +195,8 @@ files:
 - app/views/user/_password.rhtml
 - app/views/user/forgot_password.rhtml
 - app/views/work_lock_notify
+- app/views/work_lock_notify/nag_no.rhtml
+- app/views/work_lock_notify/nag_en.rhtml
 - app/views/work_lock_notify/lock_en.rhtml
 - app/views/work_lock_notify/lock_no.rhtml
 - app/controllers
@@ -223,6 +234,7 @@ files:
 - app/models
 - app/models/work_lock_notify.rb
 - app/models/work.rb
+- app/models/work_lock_nagger.rb
 - app/models/customer.rb
 - app/models/period.rb
 - app/models/task.rb
@@ -598,7 +610,6 @@ files:
 - config/mime_types.yaml
 - config/war.rb
 - config/boot.rb
-- config/deploy.rb
 - cruise_config.rb
 - db
 - db/test.db

data/config/deploy.rb

@@ -1,20 +0,0 @@
-set :application, "backlog"
-set :repository, "svn://rubyforge.org/var/svn/#{application}/trunk"
-
-role :app, "sandra"
-role :db,  "sandra", :primary => true
-
-set :deploy_to, "/usr/local/#{application}"
-set :user, "capistrano"
-
-set :use_sudo, false
-
-desc "The spinner task is used by :cold_deploy to start the application up"
-task :spinner, :roles => :app do
-send(run_method, "/sbin/service #{application} start")
-end
-
-desc "Restart the mongrel server"
-task :restart, :roles => :app do
-send(run_method, "/sbin/service #{application} restart")
-end