backlog 0.19.0 → 0.20.0

data/History.txt

@@ -1,4 +1,17 @@
-== 0.19.0 2008-01-23
+== 0.20.0 2008-01-29
+
+=== Features
+
+* Added option to invite associates to monitor time sheets.
+* Divided user actions for changing password and deleting a user into separate views
+  to make each view simpler. 
+ 
+=== Fixes
+
+* Fixed Excel export to print work account ids and work account names.
+* Fixed application error when trying to register a work record without a work account.
+
+== 0.19.0 2008-01-28
 
 === Features
 

data/app/controllers/user_controller.rb

@@ -157,16 +157,32 @@ class UserController < ApplicationController
 
   def toggle_work_lock_monitoring
     @user = User.find(params[:id])
-    already_monitoring = @user.work_lock_subscribers.include? current_user
+    @subscriber = params[:subscriber_id] ? User.find(params[:subscriber_id]) : current_user
+    already_monitoring = @user.work_lock_subscribers.include? @subscriber
     if already_monitoring
-      @user.work_lock_subscribers.delete current_user
+      @user.work_lock_subscribers.delete @subscriber
       action = 'stopped'
     else
-      @user.work_lock_subscribers << current_user
+      @user.work_lock_subscribers << @subscriber
       action = 'started'
     end
     flash[:notice] = "Monitoring #{action}"
-    UserNotify.deliver_monitoring(@user, current_user, action)
+    UserNotify.deliver_monitoring(@user, @subscriber, action)
+    redirect_to :action => :edit, :id => @user.id unless request.xhr?
+  end
+  
+  def invite_work_lock_subscriber
+    @user = current_user
+    @subscriber = User.find(params[:id])
+    already_monitoring = @user.work_lock_subscribers.include? @subscriber
+    if already_monitoring
+      flash[:notice] = "#{@subscriber.name} is already monitoring your work sheets."
+    else
+      flash[:notice] = "Invitation sent to #{@subscriber.name}"
+      monitoring_url = url_for :action => :toggle_work_lock_monitoring, :id => @user
+      UserNotify.deliver_monitoring_invitation(@user, @subscriber, monitoring_url)
+    end
+    render :template => '/display_notice', :layout => false
   end
   
   protected
@@ -201,6 +217,7 @@ class UserController < ApplicationController
     @user = User.find_by_id(params[:id]) || current_user || User.find_by_id(session[:user_id])
     @groups = Group.find(:all, :order => 'name')
     @periods = @user.periods
+    @associates = User.find(:all) - @user.work_lock_subscribers - [current_user]
     case request.method
     when :get
       render

data/app/models/user_notify.rb

@@ -53,6 +53,17 @@ class UserNotify < ActionMailer::Base
     @body["action"] = action
   end
 
+  def monitoring_invitation(user, monitoring_user, monitor_url)
+    setup_email(user)
+
+    @subject += "#{user.name} has invited you to monitor his/her time sheets."
+
+    @body["app_name"] = UserSystem::CONFIG[:app_name].to_s
+    @body["user"] = user
+    @body["monitoring_user"] = monitoring_user
+    @body["monitor_url"] = monitor_url
+  end
+
   private
   
   def setup_email(user)

data/app/models/work.rb

@@ -7,8 +7,8 @@ class Work < ActiveRecord::Base
   belongs_to :work_account
   
   validates_associated :task
-  validates_presence_of :started_at, :if => :track_times?
   validates_presence_of :work_account
+  validates_presence_of :started_at, :if => :track_times?
   
   def validate
     errors.add(:work, "Work account is missing") unless work_account
@@ -20,7 +20,7 @@ class Work < ActiveRecord::Base
   end
   
   def track_times?
-    work_account.track_times?
+    work_account && work_account.track_times?
   end
   
   # Return an array with an array of works per day:

data/app/views/user/change_password.rhtml

@@ -1,7 +1,9 @@
 <% @page_title = l(:change_password) %>
 
-<div id="spotlight">
-<div title="<%= title_helper %>" class="form">
+<div id="spotlight" title="<%= title_helper %>" class="form">
+  <div class="btitle">
+    <h4><%=l :password %></h4>
+  </div>
 
   <div class="form-padding">
     Enter your new password in the fields below and click 'Change Password' to have a new password sent to your email inbox.
@@ -15,4 +17,3 @@
     </form>
   </div>
 </div>
-</div>

data/app/views/user/delete.rhtml

@@ -0,0 +1,14 @@
+<% @page_title = l(:delete_user) %>
+
+<div id="spotlight" title="<%= title_helper %>" class="form">
+  <div class="btitle">
+    <h4><%=l :delete %></h4>
+  </div>
+
+  <%= start_form_tag_helper %>
+    <div class="user_delete">
+      <%= hidden_field 'user', 'form', :value => 'delete' %>
+      <%= submit_tag l(:delete) %>
+    </div>
+  </form>
+</div>

data/app/views/user/edit.rhtml

@@ -1,41 +1,43 @@
 <% @page_title = "#{l :editing} #{l :user}" %>
 
-<div id="spotlight" title="<%= title_helper %>" class="form">
+<div id="spotlight" title="<%= title_helper %>" class="form">  
+  <div class="btitle">
+  <div style="float: right">
+  	<%=link_to l(:change_password), :action => :change_password%>
+  	<%=link_to l(:delete), :action => :delete%>
+  </div>
+    <h4><%=l :edit %></h4>
+  </div>
+
 	<% if @user == current_user %>
-		<% unless @user.work_lock_subscribers.empty? %>
 		<table align="right">
-			<tr><th>Subscribers</th></tr>
-			<% for subscriber in @user.work_lock_subscribers %>
-				<tr><td><%=detour_to subscriber.name, :action => :edit%></td></tr>
+			<% unless @user.work_lock_subscribers.empty? %>
+				<tr><th>Subscribers</th></tr>
+				<% for subscriber in @user.work_lock_subscribers %>
+					<tr>
+						<td align="right"><%=detour_to subscriber.name, :action => :edit%></td>
+						<td align="left"><%=image_link_to_remote 'email.png', "#{l :stop} #{l :monitoring}", {:action => :toggle_work_lock_monitoring, :id => current_user.id, :subscriber_id => subscriber.id}, :id => "work_lock_monitor_icon_#{subscriber.id}"%></td>
+					</tr>
+				<% end %>
+			<% end %>
+			<% unless @associates.empty? %>
+			<tr><td>
+				<% remote_form_for :user, :url => {:action => :invite_work_lock_subscriber} do |f| %>
+					<%=select :id, nil, @associates.map{|u| [u.name, u.id]}, {}, :name => 'id'%>
+				<td align="left"><%=submit_tag l(:invite)%></td>
+				<% end %>
+			</td></tr>
 			<% end %>
 		</table>
-		<% end %>
 	<% else %>
 		<% monitoring = @user.work_lock_subscribers.include? current_user %>
-		<%=image_link_to_remote "email#{'_grey' unless monitoring}.png", "#{l(monitoring ? :stop : :start)} #{l(:monitoring)}", {:action => :toggle_work_lock_monitoring, :id => @user.id}, {:id => :work_lock_monitor_icon, :style => 'float: right'} %>
+		<%=image_link_to_remote "email#{'_grey' unless monitoring}.png", "#{l(monitoring ? :stop : :start)} #{l(:monitoring)}", {:action => :toggle_work_lock_monitoring, :id => @user.id}, {:id => "work_lock_monitor_icon_#{current_user.id}", :style => 'float: right'} %>
 	<% end %>
     <%= start_form_tag_helper %>
       <%= render_partial 'edit', :user => @user, :submit => true %>
     </form>
 </div>
 
-<div id="rfeature">
-  <div class="btitle">
-    <h4><%=l :password %></h4>
-  </div>
-
-  <%= start_form_tag_helper %>
-    <%= render_partial 'password', :submit => true %>
-  </form>
-
-  <%= start_form_tag_helper %>
-    <div class="user_delete">
-      <%= hidden_field 'user', 'form', :value => 'delete' %>
-      <%= submit_tag l(:delete) %>
-    </div>
-  </form>
-</div>
-
 <div id="lfeature">
   <div class="btitle">
     <h4><%=l :groups %></h4>
@@ -56,8 +58,6 @@
   </table>
 </div>
 
-<br clear="right"/>
-
 <div id="rfeature">
   <div class="btitle">
     <h4><%=l :periods %></h4>
@@ -72,3 +72,5 @@
   </table>
 </div>
 
+<br clear="right"/>
+

data/app/views/user/toggle_work_lock_monitoring.rjs

@@ -1,2 +1,2 @@
 display_notice(page)
-page['work_lock_monitor_icon'].src = image_path("email#{'_grey' unless @user.work_lock_subscribers.include? current_user}.png")
+page["work_lock_monitor_icon_#{@subscriber.id}"].src = image_path("email#{'_grey' unless @user.work_lock_subscribers.include? @subscriber}.png")

data/app/views/user_notify/monitoring_invitation_en.rhtml

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

data/app/views/user_notify/monitoring_invitation_no.rhtml

@@ -0,0 +1,7 @@
+Angående din konto på <%=@app_name %>, <%=@user.name %>:
+
+<%=@monitoring_user.name%> har invitert deg til å monitorere dine timelister.
+
+Klick på linken under for å starte monitorering:
+
+<%=@monitor_url%>

data/app/views/works/daily_work_sheet.rhtml

@@ -56,7 +56,7 @@
     <th><%=l :totals %></th>
     <th/>
     <th/>
-    <th class="hours"><%='%.2f' % day_total %></th>
+    <th class="hours"><%='%d:%02d' % [day_total.to_i, 60 * (day_total % 1)] %></th>
   </tr>
 <% end %>
 </table>

data/app/views/works/timeliste.rhtml

@@ -81,6 +81,7 @@
    <Font x:Family="Swiss" ss:Size="14" ss:Bold="1"/>
   </Style>
   <Style ss:ID="s24">
+   <Alignment ss:Horizontal="Center"/>
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="3"/>
@@ -471,8 +472,8 @@
   <% internal_works_per_day = @work_totals_per_work_account[work_account_id][1]%>
   <% if internal_works_per_day.find{|total| total > 0} %>
    <Row>
-    <Cell ss:StyleID="s24"><Data ss:Type="String"><%=WorkAccount.find(work_account_id).name %></Data></Cell>
-    <Cell ss:StyleID="s25"><Data ss:Type="String">Mesta2</Data></Cell>
+    <Cell ss:StyleID="s24"><Data ss:Type="String"><%=work_account_id%></Data></Cell>
+    <Cell ss:StyleID="s25"><Data ss:Type="String"><%=WorkAccount.find(work_account_id).name %></Data></Cell>
     <Cell ss:StyleID="s25"/>
     <Cell ss:StyleID="s25"/>
     <Cell ss:StyleID="s25"/>

data/lang/en.yaml

@@ -40,6 +40,7 @@ group: Group
 groups: Groups
 home: Home
 hours: Hours
+invite: Invite
 invoice: Invoice
 invoice_code: Invoice Code
 invoice_short: Inv.
@@ -113,3 +114,4 @@ weekly_work_sheet: Weekly work sheet
 welcome_link: Start getting things done.
 work: Work
 work_account: Work Account
+work_accounts: Work Accounts

data/lang/no.yaml

@@ -40,6 +40,7 @@ group: Gruppe
 groups: Grupper
 home: Hjem
 hours: Timer
+invite: Invitèr
 invoice: Fakturerbart
 invoice_code: Faktureringskode
 invoice_short: Fakt
@@ -112,3 +113,4 @@ weekly_work_sheet: Timeoversikt for uke
 welcome_link: Få ting gjort.
 work: Arbeid
 work_account: Timeføringskonto
+work_accounts: Timeføringskonti

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backlog
 version: !ruby/object:Gem::Version 
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -161,7 +161,9 @@ files:
 - app/views/user_notify/change_password_no.rhtml
 - app/views/user_notify/forgot_password_en.rhtml
 - app/views/user_notify/monitoring_en.rhtml
+- app/views/user_notify/monitoring_invitation_en.rhtml
 - app/views/user_notify/change_password_en.rhtml
+- app/views/user_notify/monitoring_invitation_no.rhtml
 - app/views/user_notify/signup_en.rhtml
 - app/views/user_notify/monitoring_no.rhtml
 - app/views/customers
@@ -178,6 +180,7 @@ files:
 - app/views/user/welcome.rhtml
 - app/views/user/_edit.rhtml
 - app/views/user/edit.rhtml
+- app/views/user/delete.rhtml
 - app/views/user/change_password.rhtml
 - app/views/user/login.rhtml
 - app/views/user/_password.rhtml
@@ -586,19 +589,13 @@ files:
 - config/database.yml
 - config/routes.rb
 - config/environments
-- config/environments/kubosch_production.rb
 - config/environments/test.rb
 - config/environments/localization_environment.rb
-- config/environments/datek_production.rb
 - config/environments/user_environment.rb
-- config/environments/development_mysql.rb
-- config/environments/kubosch_production_mysql.rb
 - config/environments/production.rb
 - config/environments/development.rb
-- config/deploy_datek.rb
 - config/environment.rb
 - config/mime_types.yaml
-- config/deploy_kubosch.rb
 - config/war.rb
 - config/boot.rb
 - config/deploy.rb

data/config/deploy_datek.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

data/config/deploy_kubosch.rb

@@ -1,20 +0,0 @@
-set :application, "backlog"
-set :repository, "svn://rubyforge.org/var/svn/#{application}/trunk"
-set :rails_env, :production
-
-role :web, "www.kubosch.no"
-role :app, "www.kubosch.no"
-role :db,  "www.kubosch.no", :primary => true
-
-set :user, "donv"
-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

data/config/environments/datek_production.rb

@@ -1,26 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# The production environment is meant for finished, "live" apps.
-# Code is not reloaded between requests
-config.cache_classes = true
-
-# Use a different logger for distributed setups
-# config.logger = SyslogLogger.new
-
-# Full error reports are disabled and caching is turned on
-config.action_controller.consider_all_requests_local = false
-config.action_controller.perform_caching             = true
-
-# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host                  = "http://assets.example.com"
-
-# Disable delivery errors if you bad email addresses should just be ignored
-config.action_mailer.raise_delivery_errors = false
-
-#ActionMailer::Base.delivery_method = :sendmail
-ActionMailer::Base.delivery_method = :smtp
-
-ActionMailer::Base.smtp_settings = {
-  :address => "mail.datek.no",
-  :port => 25
-}

data/config/environments/development_mysql.rb

@@ -1,27 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# In the development environment your application's code is reloaded on
-# every request.  This slows down response time but is perfect for development
-# since you don't have to restart the webserver when you make code changes.
-config.cache_classes = false
-
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
-
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
-config.action_view.cache_template_extensions         = false
-config.action_view.debug_rjs                         = true
-
-# Raise exceptions when mailer fails
-config.action_mailer.raise_delivery_errors = true
-
-#ActionMailer::Base.delivery_method = :sendmail
-ActionMailer::Base.delivery_method = :smtp
-
-ActionMailer::Base.smtp_settings = {
-  :address => "mail.datek.no",
-  :port => 25
-}
-

data/config/environments/kubosch_production.rb

@@ -1,21 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# The production environment is meant for finished, "live" apps.
-# Code is not reloaded between requests
-config.cache_classes = true
-
-# Use a different logger for distributed setups
-# config.logger = SyslogLogger.new
-
-# Full error reports are disabled and caching is turned on
-config.action_controller.consider_all_requests_local = false
-config.action_controller.perform_caching             = true
-
-# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host                  = "http://assets.example.com"
-
-# Disable delivery errors if you bad email addresses should just be ignored
-config.action_mailer.raise_delivery_errors = false
-
-ActionMailer::Base.delivery_method = :sendmail
-

data/config/environments/kubosch_production_mysql.rb

@@ -1,21 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# The production environment is meant for finished, "live" apps.
-# Code is not reloaded between requests
-config.cache_classes = true
-
-# Use a different logger for distributed setups
-# config.logger = SyslogLogger.new
-
-# Full error reports are disabled and caching is turned on
-config.action_controller.consider_all_requests_local = false
-config.action_controller.perform_caching             = true
-
-# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host                  = "http://assets.example.com"
-
-# Disable delivery errors if you bad email addresses should just be ignored
-config.action_mailer.raise_delivery_errors = false
-
-ActionMailer::Base.delivery_method = :sendmail
-