backlog 0.18.0 → 0.19.0

data/app/views/works/_row.rhtml

@@ -1,19 +1,15 @@
-  <tr id="work_<%=@work.id%>">
+  <tr id="work_<%=@work.id%>" style="border: 1px solid black">
     <td>
-      <%=image_detour_to('period.png', l(:period), :controller => 'periods', :action => :show, :id => @work.task.period) if @work.task %>
-    </td>
-    <td>
-      <% if @work.task %>
-      <%=link_to(@work.task.root_task.backlog.name, :controller => 'backlogs', :action => :show)%> /
-      <%=link_to(@work.task.description, :controller => 'tasks', :action => :edit)%>
-	  <% end %>
-    </td>
-    <td>
-      <%=link_to(@work.work_account.name, :controller => 'work_accounts', :action => :show, :id => @work.work_account.id) if @work.work_account%>
+	  <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :field => :description}, :html => {:id => "work_#{@work.id}_form"} do |f|%>
+        <%=f.select :work_account_id, @work_accounts.map {|wa| [wa.name, wa.id]}, {}, :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?field=description', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
+      <% end %>
     </td>
     <td>
-      <%=in_place_editor_field :work, :description, :id => "work_#{@work.id}_description", :size => 16, :class => :task_description%>
-    </td>
+<!--
+      <%=text_field :work, :description, :id => "work_#{@work.id}_description", :size => 16, :class => :task_description%>
+-->
+		<%=render :partial => 'row_field', :locals => {:field => 'description'} %>
+    </span>
     <td align="right">
 		<%=render :partial => 'row_field', :locals => {:field => 'started_at_time'} %>
     </td>
@@ -25,9 +21,10 @@
       	<%=f.text_field :hours_time, :value => t(@work.hours), :class => 'task_hours'%>
       <% end %>
     </td>
-    <td align="right">
-      <form>
-      <%=image_detour_to('ernes_stop.png', l(:delete), {:controller => 'works', :action => :destroy, :id => @work, :confirm => true}, nil, true)%>
-      </form>
+    <td>
+      <%=image_detour_to('delete.png', l(:delete), {:controller => 'works', :action => :destroy, :id => @work, :confirm => true}, nil, true)%>
+	  <% if @work.task %>
+      	<%=image_detour_to('task.png', "#{l :task}: #{@work.task.description}", {:controller => 'tasks', :action => :edit, :id => @work.task.id})%>
+	  <% end %>
     </td>
   </tr>

data/app/views/works/_row_field.rhtml

@@ -1,3 +1,3 @@
       <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :field => field} do |f|%>
-	    <%=text_field :work, field, :class => ('task_time' if field=~/_at_time$/) %>
+	    <%=text_field :work, field, :id => "work_#{@work.id}_#{field}", :class => ('task_time' if field=~/_at_time$/) %>
       <% end %>

data/app/views/works/daily_work_sheet.rhtml

@@ -2,17 +2,15 @@
 
 <div id="spotlight">
 
-<div style="float: left"><%=link_to(image_tag('arrow_left.png'), :id => (@date - 7))%></div>
-<div style="float: left"><%=link_to(image_tag('arrow_left.png'), :id => @date-1)%></div>
-<div style="float: right"><%=link_to(image_tag('arrow_right.png'), :id => (@date + 7))%></div>
-<div style="float: right"><%=link_to(image_tag('arrow_right.png'), :id => @date+1)%></div>
+<div style="float: left"><%=image_link_to('arrow_left.png', l(:previous_week), {:id => @date - 7}, :class => nil)%></div>
+<div style="float: left"><%=image_link_to('arrow_left.png', l(:previous_day), {:id => @date-1}, :class => nil)%></div>
+<div style="float: right"><%=image_link_to('arrow_right.png', l(:next_week), {:id => @date + 7}, :class => nil)%></div>
+<div style="float: right"><%=image_link_to('arrow_right.png', l(:next_day), {:id => @date+1}, :class => nil)%></div>
 
 <br clear="all" />
 
 <table sstyle="width: 100%" border="0">
   <tr>
-    <td/>
-    <th><%=l :backlog %> / <%=l :task %></th>
     <th><%=l :account %></th>
     <th><%=l :description %></th>
     <th><%=l :started_at %></th>
@@ -26,24 +24,15 @@
   <% day_total += @work.hours if @work %>
   <%=render :partial => 'row'%>
 <% end %>
+<% last_work = @work %>
+<% @work = nil %>
 
-
+<% if last_work.completed_at %>
 <% form_tag with_detour(:controller => 'works', :action => 'create') do %>
 <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
-<%=hidden_field :work, :completed_at, :value => Time.now %>
+<%=hidden_field :work, :completed_at, :value => @date %>
 
   <tr>
-    <td width="22"/>
-    <td>
-<script type="text/javascript">
-function set_backlog_for_task() {
-	work_task_description_auto_completer.url = '<%=url_for(:action => :auto_complete_for_work_task_description)%>?backlog_name=' + $('work_backlog_name').value;
-}
-
-</script>
-      <%=text_field_with_auto_complete :work, :backlog_name, {:value => '', :size => 16}, {:after_update_element => "function(element, value) {set_backlog_for_task()}"} %>
-      <%=text_field_with_auto_complete(:work, :task_description, {:value => '', :size => 16, :class => :task_description}, :url => url_for({:action => :auto_complete_for_work_task_description, :backlog_name => "' + $('work_backlog_name').value + '", :escape => false}), :after_update_element => "function(element,value) {if ($('work_backlog_name').value == '') { $('work_backlog_name').value = element.value.split(/: /)[0];element.value = element.value.split(/: /)[1]};set_backlog_for_task();return true; }") %>
-    </td>
     <td valign="bottom">
       <%=text_field_with_auto_complete :work, :work_account_name, {:value => '', :size => 16, :class => :task_description} %>
     </td>
@@ -51,16 +40,15 @@ function set_backlog_for_task() {
       <%=text_field_with_auto_complete :work, :description, {:size => 16, :class => :task_description} %>
     </td>
     <td align="right" valign="bottom">
-      <%=text_field :work, :started_at_time, :value => @work.started_at.strftime('%H:%M'), :class => 'task_time' %>
+      <%=text_field :work, :started_at_time, :value => last_work && last_work.completed_at.strftime('%H:%M'), :class => 'task_time' %>
     </td>
     <td align="right" valign="bottom">
-      <%=text_field :work, :completed_at_time, :class => 'task_time', :value => @work.completed_at.strftime('%H:%M') %>
+      <%=text_field :work, :completed_at_time, :class => 'task_time', :value => @work && @work.completed_at.strftime('%H:%M') %>
 	</td>
     <td align="right" valign="bottom">
       <%=text_field :work, :hours_time, :value => '', :class => 'task_hours' %>
     </td>
 	<td valign="bottom">
-      <%=image_button_to('arrow_left.png', l(:calculate), :controller => 'backlogs', :action => :show) %>
     </td>
   </tr>
   <tr>
@@ -68,10 +56,9 @@ function set_backlog_for_task() {
     <th><%=l :totals %></th>
     <th/>
     <th/>
-    <th/>
-    <th/>
     <th class="hours"><%='%.2f' % day_total %></th>
   </tr>
+<% end %>
 </table>
   <%= submit_tag l(:save) %>
   <%= back_or_link_to l(:back), '' %>
@@ -89,7 +76,11 @@ function set_backlog_for_task() {
 
 <script type="text/JavaScript">
 //<!--
-start_field = $('work_description')
+<% if last_work.completed_at %>
+  start_field = $('work_work_account_name')
+<% else %>
+  start_field = $('work_<%=last_work.id%>_completed_at_time')
+<% end %>
 start_field.focus();
 start_field.select();
 //-->

data/app/views/works/timeliste.rhtml

@@ -449,11 +449,11 @@
     <Cell ss:StyleID="s37"><Data ss:Type="String">Merknad</Data></Cell>
    </Row>
    
-<% for backlog_id in @backlogs.keys %>
-  <% invoice_works_per_day = @backlogs[backlog_id][0]%>
+<% for work_account_id in @work_totals_per_work_account.keys %>
+  <% invoice_works_per_day = @work_totals_per_work_account[work_account_id][0]%>
   <% if invoice_works_per_day.find{|total| total > 0} %>
    <Row>
-    <Cell ss:StyleID="s24"><Data ss:Type="Number"><%=Backlog.find(backlog_id).invoice_code %></Data></Cell>
+    <Cell ss:StyleID="s24"><Data ss:Type="Number"><%=Backlog.find(work_account_id).invoice_code %></Data></Cell>
     <Cell ss:StyleID="s25"/>
     <Cell ss:StyleID="s25"><Data ss:Type="String">  X</Data></Cell>
     <Cell ss:StyleID="s25"/>
@@ -468,10 +468,10 @@
    </Row>
   <% end %>
 
-  <% internal_works_per_day = @backlogs[backlog_id][1]%>
+  <% 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"><%=Backlog.find(backlog_id).name %></Data></Cell>
+    <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="s25"/>
     <Cell ss:StyleID="s25"/>
@@ -527,25 +527,25 @@
     <Cell ss:StyleID="s46"/>
     <Cell ss:StyleID="s46"/>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),SUM(R[-<%=@backlogs.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s47"/>
    </Row>

data/app/views/works/update_row.rjs

@@ -1,6 +1,4 @@
 page.replace "work_#{@work.id}", :partial => 'row', :object => @work
 page.replace "notice", :partial => '/layouts/notice'
-page.select("tr#work_#{@work.id} td input#work_#{@field}").each do |elem|  
-  elem.select
-#  elem.focus
-end 
+page["work_#{@work.id}_#{@field}"].select
+page["work_#{@work.id}_#{@field}"].focus

data/app/views/works/weekly_work_sheet.rhtml

@@ -3,7 +3,7 @@
 <div id="spotlight">
 <% track_times = @rows.find {|r| r.find {|w| w && w.work_account.track_times?}} %>
 <% invoicing = @rows.find {|r| r.find {|w| w && w.work_account.enable_invoicing?}} %>
-<% columns = 2 + (track_times ? 2 : 0) + (invoicing ? 1 : 0) %>
+<% columns = 2 + (track_times ? 1 : 0) + (invoicing ? 1 : 0) %>
 
 <div style="float: left"><%=link_to(image_tag('arrow_left.png'), :year => (@week > 1 ? @year : @year - 1), :week => (@week > 1 ? @week - 1 : 52))%></div>
 <div style="float: right"><%=link_to(image_tag('arrow_right.png'), :year => (@week < 52 ? @year : @year + 1), :week => (@week < 52 ? @week + 1 : 1))%></div>
@@ -11,6 +11,8 @@
 <h1>Work for week <%=@week%><%=user? ? " for #{user.login}" : ''%></h1>
 
 <div align="right">
+<% lock_action = @lock ? :unlock : :lock %>
+[<%=link_to l(lock_action), :controller => 'work_locks', :action => lock_action %>]
 [<%=detour_to l(:new_work), :controller => 'works', :action => :new %>]
 [<%=link_to 'Timeliste', :action => :timeliste, :id => @week %>]
 [<%= if params[:with_empty]
@@ -22,24 +24,19 @@ end %>]
 
 <table border="1">
   <tr>
-    <th colspan="<%=columns%>" align="center"><%=l :monday %> <%=week_date(1)%></th>
-    <th colspan="<%=columns%>" align="center"><%=l :tuesday %> <%=week_date(2)%></th>
-    <th colspan="<%=columns%>" align="center"><%=l :wednesday %> <%=week_date(3)%></th>
-    <th colspan="<%=columns%>" align="center"><%=l :thursday %> <%=week_date(4)%></th>
-    <th colspan="<%=columns%>" align="center"><%=l :friday %> <%=week_date(5)%></th>
-    <th colspan="<%=columns%>" align="center"><%=l :saturday %> <%=week_date(6)%></th>
-    <th colspan="<%=columns%>" align="center"><%=l :sunday %> <%=week_date(7)%></th>
+  	<% [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday].each_with_index do |day, i| %>
+    <th colspan="<%=columns%>" align="center"><%=detour_to "#{l(day)} #{week_date(i+1)}", :action => :daily_work_sheet, :id => (@first_date + i).strftime('%Y-%m-%d') %></th>
+	<% end %>
     <th align="center" nowrap="true"><%=l :week %> <%=@week%></th>
   </tr>
   <tr>
 <% (1..7).each do %>
-    <th><%=l :task %></th>
+    <th><%=l :work_account %></th>
     <% if invoicing %>
     <th><%=l :invoice_short %></th>
     <% end %>
     <% if track_times %>
-    <th><%=l(:start) if track_times %></th>
-    <th><%=l(:stop) if track_times %></th>
+    <th><%=l(:start) if track_times %> - <%=l(:stop) if track_times %></th>
     <% end %>
     <th><%=l :done %></th>
 <% end %>
@@ -55,28 +52,31 @@ end %>]
       <% day_totals[day] += @work.hours %>
       <% week_total += @work.hours %>
     <td valign="top">
-      <%=image_detour_to('hammer.png', l(:edit), {:controller => 'works', :action => :edit, :id => @work.id}, {:style => "float: right;"}) %>
+      <%=image_detour_to('hammer.png', l(:edit), {:controller => 'works', :action => :edit, :id => @work.id}, {:style => "float: left; border: 1px solid black"}) %>
+<!--
       <%=detour_to(h(@work.task.period.name), :controller => 'periods', :action => :show, :id => @work.task.period) if @work.task && @work.task.period %>
+-->
       <%=detour_to(h(@work.work_account.name), :controller => 'work_accounts', :action => :show, :id => @work.work_account_id) %>:
+<!--
       <%=detour_to(h(@work.task.description), :controller => 'tasks', :action => :edit, :id => @work.task_id) if @work.task_id%>
+-->
     </td>
       <% if invoicing %>
     <td id="invoice_<%=@work.id%>" valign="top">
-      <%=check_box(:work, :invoice, :onchange => "new Ajax.Updater('invoice_#{@work}', '#{url_for(:action => :set_work_invoice, :id => @work)}' + '?value=' + this.checked);") if @work.work_account.enable_invoicing? %>
+      <%=check_box(:work, :invoice, :onchange => "new Ajax.Updater('invoice_#{@work}', '#{url_for(:action => :set_work_invoice, :id => @work)}' + '?value=' + this.checked);", :disabled => @lock) if @work.work_account.enable_invoicing? %>
     </td>
       <% end %>
       <% if track_times %>
-    <td align="right" valign="top"><%=in_place_editor_field(:work, :started_at_time, :class => :task_time) %></td>
-    <td align="right" valign="top"><%=in_place_editor_field(:work, :completed_at_time, :class => :task_time) %></td>
+    <td align="left" valign="top"><%=text_field(:work, :started_at_time, :class => :task_time, :disabled => @lock) %> -
+    	<%=text_field(:work, :completed_at_time, :class => :task_time, :disabled => @lock) %></td>
       <% end %>
-    <td align="right" valign="top"><%=in_place_editor_field(:work, :hours, {}, :value => '%.2f' % @work.hours) %></td>
+    <td align="right" valign="top"><%=text_field(:work, :hours, :value => '%.2f' % @work.hours, :class => 'task_hours') %></td>
     <% else %>
     <td/>
       <% if invoicing %>
     <td/>
       <% end %>
       <% if track_times %>
-    <td/>
     <td/>
       <% end %>
     <td/>

data/app/views/works/weekly_work_sheet_by_work_account.rhtml

@@ -0,0 +1,57 @@
+<% @page_title = l(:weekly_work_sheet) + " " + @week.to_s + (user? ? " for #{user.login}" : '')%>
+
+<div id="spotlight">
+<% columns = 2 %>
+
+<div style="float: left"><%=link_to(image_tag('arrow_left.png'), :year => (@week > 1 ? @year : @year - 1), :week => (@week > 1 ? @week - 1 : 52))%></div>
+<div style="float: right"><%=link_to(image_tag('arrow_right.png'), :year => (@week < 52 ? @year : @year + 1), :week => (@week < 52 ? @week + 1 : 1))%></div>
+
+<div align="right">
+<% lock_action = @lock ? :unlock : :lock %>
+[<%=link_to l(lock_action), with_detour(:controller => 'work_locks', :action => lock_action, :year => @year, :week => @week) %>]
+<% if @lock %>
+[<%=link_to l(:spreadsheet), :action => :timeliste, :year => @year, :week => @week %>]
+<% else %>
+[<%=detour_to l(:new_work), :controller => 'works', :action => :new %>]
+<% end %>
+</div>
+
+<br clear="all" />
+
+<table border="1">
+  <tr>
+    <th><%=l :work_account %></th>
+  	<% [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday].each_with_index do |day, i| %>
+    <th align="center"><%=detour_to "#{l(day)} #{week_date(i+1)}", :action => :daily_work_sheet, :id => (@first_date + i).strftime('%Y-%m-%d') %></th>
+	<% end %>
+    <th align="center" nowrap="true"><%=l :week %> <%=@week%></th>
+  </tr>
+
+<% week_totals = Hash.new(0) %>
+<% day_totals = Array.new(7, 0) %>
+<% for work_account, totals in @work_accounts %>
+  <tr>
+    <td valign="top">
+      <%=detour_to(h(work_account.name), :controller => 'work_accounts', :action => :show, :id => work_account.id) %>
+    </td>
+    <% totals.each_with_index do |total, day| %>
+      <% if total %>
+        <% day_totals[day] += total %>
+        <% week_totals[work_account] += total %>
+        <td align="right" valign="top"><%='%.2f' % total%></td>
+      <% else %>
+        <td/>
+      <% end %>
+    <% end %>
+    <td align="right"><%=week_totals[work_account]%></td>
+  </tr>
+<% end %>
+  <tr>
+  	<th><%=l :totals%></th>
+<% (0..6).each do |day| %>
+    <th class="hours"><%='%.2f' % day_totals[day] if day_totals[day] > 0%></th>
+<% end %>
+    <th class="hours"><%= '%.2f' % week_totals.values.inject(0) {|total, work_account_total| total + work_account_total} %></th>
+  </tr>
+</table>
+</div>

data/db/migrate/027_create_work_locks.rb

@@ -0,0 +1,25 @@
+class CreateWorkLocks < ActiveRecord::Migration
+  def self.up
+    create_table :work_locks do |t|
+      t.column :user_id, :integer, :null => false, :references => [:users, :party_id]
+      t.column :start_on, :date, :null => false
+      t.column :end_on, :date, :null => false
+    end
+    
+    create_table :work_lock_subscriptions, :id => false do |t|
+      t.column :subscriber_user_id, :integer, :null => false, :references => [:users, :party_id]
+      t.column :work_account_id, :integer, :null => false
+    end
+
+    create_table :user_work_lock_subscriptions, :id => false do |t|
+      t.column :subscriber_user_id, :integer, :null => false, :references => [:users, :party_id]
+      t.column :user_id, :integer, :null => false, :references => [:users, :party_id]
+    end
+  end
+
+  def self.down
+    drop_table :user_work_lock_subscriptions
+    drop_table :work_lock_subscriptions
+    drop_table :work_locks
+  end
+end

data/db/schema.rb

@@ -2,7 +2,7 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 26) do
+ActiveRecord::Schema.define(:version => 27) do
 
   create_table "backlogs", :force => true do |t|
     t.column "name",            :string,  :limit => 64,                    :null => false
@@ -87,6 +87,11 @@ ActiveRecord::Schema.define(:version => 26) do
     t.column "user_id", :integer, :null => false
   end
 
+  create_table "user_work_lock_subscriptions", :id => false, :force => true do |t|
+    t.column "subscriber_user_id", :integer, :null => false
+    t.column "user_id",            :integer, :null => false
+  end
+
   create_table "users", :primary_key => "party_id", :force => true do |t|
     t.column "login",           :string,   :limit => 80,                    :null => false
     t.column "salted_password", :string,   :limit => 40,                    :null => false
@@ -107,6 +112,17 @@ ActiveRecord::Schema.define(:version => 26) do
     t.column "invoice_code", :string
   end
 
+  create_table "work_lock_subscriptions", :id => false, :force => true do |t|
+    t.column "subscriber_user_id", :integer, :null => false
+    t.column "work_account_id",    :integer, :null => false
+  end
+
+  create_table "work_locks", :force => true do |t|
+    t.column "user_id",  :integer, :null => false
+    t.column "start_on", :date,    :null => false
+    t.column "end_on",   :date,    :null => false
+  end
+
   create_table "works", :force => true do |t|
     t.column "task_id",         :integer
     t.column "hours",           :decimal,  :precision => 6, :scale => 2, :default => 0.0, :null => false
@@ -148,8 +164,16 @@ ActiveRecord::Schema.define(:version => 26) do
   add_foreign_key "tasks_users", ["task_id"], "tasks", ["id"], :name => "tasks_users_task_id_fkey"
   add_foreign_key "tasks_users", ["user_id"], "users", ["party_id"], :name => "tasks_users_user_id_fkey"
 
+  add_foreign_key "user_work_lock_subscriptions", ["subscriber_user_id"], "users", ["party_id"], :name => "user_work_lock_subscriptions_subscriber_user_id_fkey"
+  add_foreign_key "user_work_lock_subscriptions", ["user_id"], "users", ["party_id"], :name => "user_work_lock_subscriptions_user_id_fkey"
+
   add_foreign_key "users", ["party_id"], "parties", ["id"], :name => "users_party_id_fkey"
 
+  add_foreign_key "work_lock_subscriptions", ["subscriber_user_id"], "users", ["party_id"], :name => "work_lock_subscriptions_subscriber_user_id_fkey"
+  add_foreign_key "work_lock_subscriptions", ["work_account_id"], "work_accounts", ["id"], :name => "work_lock_subscriptions_work_account_id_fkey"
+
+  add_foreign_key "work_locks", ["user_id"], "users", ["party_id"], :name => "work_locks_user_id_fkey"
+
   add_foreign_key "works", ["work_account_id"], "work_accounts", ["id"], :name => "works_work_account_id_fkey"
   add_foreign_key "works", ["customer_id"], "customers", ["id"], :name => "works_customer_id_fkey"
   add_foreign_key "works", ["user_id"], "users", ["party_id"], :name => "works_user_id_fkey"

data/test/fixtures/work_lock_subscriptions.yml

@@ -0,0 +1,7 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  subscriber_user_id: 1000001
+  work_account_id: 1
+two:
+  subscriber_user_id: 1000001
+  work_account_id: 2

data/test/fixtures/work_locks.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+  user_id: 1000001
+  start_on: 2008-01-28
+  end_on: 2008-01-28
+two:
+  id: 2
+  user_id: 1000001
+  start_on: 2008-01-29
+  end_on: 2008-01-29

data/test/functional/estimates_controller_test.rb

@@ -4,7 +4,7 @@ require 'estimates_controller'
 class EstimatesController; def rescue_action(e) raise e end; end
 
 class EstimatesControllerTest < Test::Unit::TestCase
-  fixtures :parties, :users, :groups, :groups_users, :backlogs, :periods, :tasks, :task_files, :works, :estimates
+  main_scenario
 
   def setup
     @controller = EstimatesController.new

data/test/functional/groups_controller_test.rb

@@ -4,7 +4,7 @@ require 'groups_controller'
 class GroupsController; def rescue_action(e) raise e end; end
 
 class GroupsControllerTest < Test::Unit::TestCase
-  fixtures :parties, :users, :groups, :groups_users, :periods, :tasks, :task_files, :estimates, :works
+  main_scenario
 
   def setup
     @controller = GroupsController.new

data/test/functional/user_controller_test.rb

@@ -33,7 +33,7 @@ class UserControllerTest < Test::Unit::TestCase
     post :login, :user => { :login => "tesla", :password => "atest" }
     assert_logged_in users(:tesla)
     assert_response :redirect
-    assert_equal @controller.url_for(:controller => 'backlogs', :action => :index), @response.redirect_url
+    assert_equal @controller.url_for(:controller => 'welcome', :action => :index), @response.redirect_url
   end
   
   def test_login__wrong_password
@@ -219,7 +219,7 @@ class UserControllerTest < Test::Unit::TestCase
     
     assert_logged_in users(:tesla)
     assert_response :redirect
-    assert_equal @controller.url_for(:controller => 'backlogs', :action => :index), @response.redirect_url
+    assert_equal @controller.url_for(:controller => 'welcome', :action => :index), @response.redirect_url
     assert_cookie :autologin, :value => '1000001'
     assert_cookie :token
     assert_not_equal 'random_token_string', cookies['token'].value

data/test/functional/work_locks_controller_test.rb

@@ -0,0 +1,93 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'work_locks_controller'
+
+# Re-raise errors caught by the controller.
+class WorkLocksController; def rescue_action(e) raise e end; end
+
+class WorkLocksControllerTest < Test::Unit::TestCase
+  fixtures :work_locks
+
+  def setup
+    @controller = WorkLocksController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @request.session[:user_id] = 1000001
+
+    @first_id = work_locks(:one).id
+  end
+
+  def test_index
+    get :index
+    assert_response :success
+    assert_template 'list'
+  end
+
+  def test_list
+    get :list
+
+    assert_response :success
+    assert_template 'list'
+
+    assert_not_nil assigns(:work_locks)
+  end
+
+  def test_show
+    get :show, :id => @first_id
+
+    assert_response :success
+    assert_template 'show'
+
+    assert_not_nil assigns(:work_lock)
+    assert assigns(:work_lock).valid?
+  end
+
+  def test_new
+    get :new
+
+    assert_response :success
+    assert_template 'new'
+
+    assert_not_nil assigns(:work_lock)
+  end
+
+  def test_create
+    num_work_locks = WorkLock.count
+
+    post :create, :work_lock => {:user_id => '1000001', :start_on => '2008-01-28', :end_on => '2008-01-28'}
+
+    assert_response :redirect
+    assert_redirected_to :action => 'list'
+
+    assert_equal num_work_locks + 1, WorkLock.count
+  end
+
+  def test_edit
+    get :edit, :id => @first_id
+
+    assert_response :success
+    assert_template 'edit'
+
+    assert_not_nil assigns(:work_lock)
+    assert assigns(:work_lock).valid?
+  end
+
+  def test_update
+    post :update, :id => @first_id
+    assert_response :redirect
+    assert_redirected_to :action => 'show', :id => @first_id
+  end
+
+  def test_destroy
+    assert_nothing_raised {
+      WorkLock.find(@first_id)
+    }
+
+    post :destroy, :id => @first_id
+    assert_response :redirect
+    assert_redirected_to :action => 'list'
+
+    assert_raise(ActiveRecord::RecordNotFound) {
+      WorkLock.find(@first_id)
+    }
+  end
+end

data/test/integration/user_system_test.rb

@@ -4,7 +4,7 @@ require 'user_notify'
 
 class UserSystemTest < ActionController::IntegrationTest
   self.use_transactional_fixtures = false
-  fixtures :parties, :users, :groups, :groups_users, :work_accounts, :backlogs, :periods, :tasks, :estimates, :works, :task_files
+  main_scenario
 
   def setup
     ActionMailer::Base.inject_one_error = false

data/test/test_helper.rb

@@ -5,7 +5,7 @@ require 'user_notify'
 
 class Test::Unit::TestCase
   def self.main_scenario
-    fixtures :parties, :users, :groups, :groups_users, :work_accounts, :backlogs, :periods, :tasks, :task_files, :works, :estimates
+    fixtures :parties, :users, :groups, :groups_users, :work_accounts, :backlogs, :periods, :tasks, :task_files, :works, :estimates, :work_lock_subscriptions, :work_locks
   end
   
   # Transactional fixtures accelerate your tests by wrapping each test method

data/test/unit/estimate_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class EstimateTest < Test::Unit::TestCase
-  fixtures :parties, :users, :groups, :groups_users, :work_accounts, :backlogs, :periods, :tasks, :task_files, :works, :estimates
+  main_scenario
 
   # Replace this with your real tests.
   def test_truth