brisk-bills 0.7.0 → 0.8.1

data/app/controllers/authentication_controller.rb

@@ -26,7 +26,7 @@ class AuthenticationController < ApplicationController
         if @active_credential
           redirect_to @active_credential.default_post_login_url_to
         else     
-          render :action => 'login.rhtml'
+          render :action => :login
         end
       end
       format.js do
@@ -72,7 +72,7 @@ class AuthenticationController < ApplicationController
         rescue
           @flash_error = $!
         ensure
-          render :action => "#{@button_press}.rjs"
+          render :action => @button_press
         end
       end
     end
@@ -108,7 +108,7 @@ class AuthenticationController < ApplicationController
         rescue
           @flash_error = $!
         ensure
-          render :action => "reset_password_via_token.rjs"
+          render :action => :reset_password_via_token
         end
       end
     end

data/app/helpers/admin/activities_helper.rb

@@ -1,6 +1,9 @@
 module Admin::ActivitiesHelper
   include ::Admin::ActivityTaxFieldHelper
   include ExtensibleObjectHelper
+  
+  alias :activity_apply_tax_form_column :apply_tax_form_column
+  alias :activity_tax_form_column :tax_form_column
 
   def active_scaffold_observe_field(col_name, observation)
     # This is slightly hackish - but it should work
@@ -21,7 +24,7 @@ module Admin::ActivitiesHelper
     
     activity_partial = "#{record.activity_type}_column"
     
-    if FileTest.exists? "#{activity_partial_path}/_#{activity_partial}.rhtml"
+    if FileTest.exists? "#{activity_partial_path}/_#{activity_partial}.html.erb"
       render :partial => activity_partial, :locals => { :record => record }
     else
       '-'
@@ -40,11 +43,11 @@ module Admin::ActivitiesHelper
     "#{column.name}-column"
   end
 
-  def cost_column(record)
+  def activity_cost_column(record)
     h_money record.cost
   end
 
-  def tax_column(record)
+  def activity_tax_column(record)
     h_money record.tax
   end
     
@@ -54,20 +57,20 @@ module Admin::ActivitiesHelper
   end
   
   def override_form_field(column)
-    subtype_override_method = "#{@record.activity_type}_#{column.name}_form_column"
+    subtype_override_method = "activity_#{@record.activity_type}_#{column.name}_form_column"
     
-    respond_to?(subtype_override_method) ? subtype_override_method : "#{column.name}_form_column"
+    respond_to?(subtype_override_method) ? subtype_override_method : "activity_#{column.name}_form_column"
   end
 
   # Generic helpers:
   
-  def cost_form_column(record, input_name)
-    text_field_tag input_name, money_for_input(@record.cost), options_for_column('cost').merge({:size => 10 })
+  def activity_cost_form_column(record, options)
+    text_field_tag options[:name], money_for_input(@record.cost), options_for_column('cost').merge({:size => 10 })
   end
   
-  def client_id_form_column(record, input_name)
+  def activity_client_id_form_column(record, options)
     select_tag(
-      input_name, 
+      options[:name], 
       options_for_select(
         # NOTE: We don't do a find_active here, but see the conditions...
         [ ['(Unknown)', nil] ]+Client.find(
@@ -82,16 +85,16 @@ module Admin::ActivitiesHelper
     )
   end
   
-  def label_form_column(record, input_name)
+  def activity_label_form_column(record, options)
     label_value = (@record.respond_to?(@record.activity_type)) ? @record.send("#{@record.activity_type}").label : nil
     
-    text_field_tag input_name, label_value, options_for_column('label').merge({:size => 30 })
+    text_field_tag options[:name], label_value, options_for_column('label').merge({:size => 30 })
   end
   
-  def comments_form_column(record, input_name)
+  def activity_comments_form_column(record, options)
     comments_value = (@record.respond_to?(@record.activity_type)) ? @record.send("#{@record.activity_type}").comments : nil
     
-    text_area_tag input_name, comments_value, options_for_column('comments').merge({:cols => 72, :rows => 20})
+    text_area_tag options[:name], comments_value, options_for_column('comments').merge({:cols => 72, :rows => 20})
   end
   
   def submit_tag(*args)

data/app/helpers/admin/activities_helper/labor_helper.rb

@@ -1,6 +1,6 @@
 module Admin::ActivitiesHelper
 
-  def labor_employee_id_form_column(record, input_name)
+  def activity_employee_id_form_column(record, input_name)
     select_tag(
       input_name, 
       options_for_select(
@@ -17,12 +17,12 @@ module Admin::ActivitiesHelper
     )
   end
   
-  def labor_duration_form_column(record, input_name)
+  def activity_duration_form_column(record, input_name)
     text_field_tag input_name, @record.labor.clock_duration, options_for_column('duration').merge({:size => 10})
   end
   
-  def labor_comments_form_column(record, input_name)
-    text_area_tag input_name, @record.labor.comments, options_for_column('comments').merge({:cols => 72, :rows => 20})
+  def activity_comments_form_column(record, input_name)
+    text_area_tag input_name, @record.sub_activity.comments, options_for_column('comments').merge({:cols => 72, :rows => 20})
   end
   
 end

data/app/helpers/admin/activities_helper/proposal_helper.rb

@@ -1,6 +1,6 @@
 module Admin::ActivitiesHelper
     
-  def proposal_proposed_on_form_column(record, input_name)
+  def activity_proposed_on_form_column(record, options)
     # Super-ghetto hack
     @proposal = record.proposal
 

data/app/helpers/admin/activities_helper/slimtimer_helper.rb

@@ -1,6 +1,6 @@
 module Admin::ActivitiesHelper
   
-  def labor_slimtimer_task_form_column(record, input_name)
+  def activity_slimtimer_task_form_column(record, input_name)
     begin
       slimtimer_task_name = @record.labor.slimtimer_time_entry.slimtimer_task.name
     rescue

data/app/helpers/admin/activities_with_prices_helper.rb

@@ -1,7 +1,7 @@
 module Admin::ActivitiesWithPricesHelper
 
-  def render_action_link(link, url_options)
-    return super(link, url_options) unless link.action == 'move_to_invoice'
+  def render_action_link(link, url_options, record)
+    return super(link, url_options, record) unless link.action == 'move_to_invoice'
 
     url_for_dialog = url_for( 
       :controller => url_options[:controller],

data/app/helpers/admin/activity_type_controller_helper.rb

@@ -76,6 +76,12 @@ module Admin::ActivityTypeControllerHelper
         record.activity.is_published = true if params[:action] == 'create'
       end
       
+      # override_form_field_partial in the helper gets buggered out b/c our controller name doesn't match
+      # the model name. This fixes that:
+      def self.active_scaffold_controller_for(klass)
+        self
+      end
+      
     end
     
   end

data/app/helpers/admin/activity_type_field_helper.rb

@@ -2,9 +2,9 @@ module Admin::ActivityTypeFieldHelper
   
   include Admin::IsActiveColumnHelper
 
-  def client_form_column(record, input_name) 
+  def client_form_column(record, options) 
     select_tag(
-      input_name, 
+      options[:name], 
       options_for_select(
         (Client.find(
           :all, 
@@ -17,7 +17,7 @@ module Admin::ActivityTypeFieldHelper
     )
   end
   
-  def occurred_on_form_column(record, input_name)
+  def occurred_on_form_column(record, options)
     datetime_select "record", "occurred_on"
   end
   
@@ -29,17 +29,17 @@ module Admin::ActivityTypeFieldHelper
     h_money (record.tax) ? record.tax : Money.new(0)
   end
 
-  def cost_form_column(record,input_name)
-    text_field_tag input_name, (@record.cost.nil?) ? nil : ("%.2f" % @record.cost), :size => 10, :id => "record_cost_#{record.id}"
+  def cost_form_column(record,options)
+    text_field_tag options[:name], (@record.cost.nil?) ? nil : ("%.2f" % @record.cost), :size => 10, :id => "record_cost_#{record.id}"
   end
   
-  def tax_form_column(record,input_name)
-    text_field_tag input_name, (@record.tax.nil?) ? nil : ("%.2f" % @record.tax), :size => 10, :id => "record_tax_#{record.id}"
+  def tax_form_column(record,options)
+    text_field_tag options[:name], (@record.tax.nil?) ? nil : ("%.2f" % @record.tax), :size => 10, :id => "record_tax_#{record.id}"
   end
   
   # Not all the activities have this, but many do:
-  def comments_form_column(record,input_name)
-    text_area_tag input_name, record.comments, :cols => 80, :rows => 22, :id => "record_comments_#{record.id}"
+  def comments_form_column(record,options)
+    text_area_tag options[:name], record.comments, :cols => 80, :rows => 22, :id => "record_comments_#{record.id}"
   end
 
 end

data/app/helpers/admin/adjustments_helper.rb

@@ -1,5 +1,13 @@
 module Admin::AdjustmentsHelper
   include Admin::ActivityTypeFieldHelper
   
-
+  alias :activity_adjustment_tax_column :tax_column
+  alias :activity_adjustment_cost_column :cost_column
+  
+  alias :activity_adjustment_occurred_on_form_column :occurred_on_form_column
+  alias :activity_adjustment_client_form_column :client_form_column
+  alias :activity_adjustment_cost_form_column :cost_form_column
+  
+  alias :activity_adjustment_tax_form_column :tax_form_column
+  alias :activity_adjustment_comments_form_column :comments_form_column 
 end

data/app/helpers/admin/client_accounting_helper.rb

@@ -1,11 +1,11 @@
 module Admin::ClientAccountingHelper
   include ExtensibleObjectHelper
   
-  def balance_column(record)
+  def client_balance_column(record)
     h_money record.balance, true
   end
   
-  def uninvoiced_activities_balance_column(record)
+  def client_uninvoiced_activities_balance_column(record)
     h_money record.uninvoiced_activities_balance, true
   end
  

data/app/helpers/admin/client_financial_transactions_helper.rb

@@ -1,7 +1,7 @@
 module Admin::ClientFinancialTransactionsHelper
   include ExtensibleObjectHelper
   
-  def amount_column(record)
+  def client_financial_transaction_amount_column(record)
     h_money record.amount, false
   end
   

data/app/helpers/admin/client_representatives_helper.rb

@@ -1,26 +1,30 @@
 module Admin::ClientRepresentativesHelper
   include Admin::HasCredentialColumnHelper
-    
-  def clients_form_column(record, input_name)
+
+  alias :client_representative_password_form_column :password_form_column
+  alias :client_representative_login_enabled_form_column :login_enabled_form_column
+
+  def client_representative_clients_form_column(record, options)
     list_i = nil
+
+    # Keeps our queries down by 'caching' it here:
+    client_ids = record.client_ids
     
     Client.find(:all, :order => 'company_name ASC').in_groups_of((Client.count(:all).to_f/3).ceil, false).collect{ |group|
       '<ul class="checkbox-list">'+
         group.collect{ |client|
           list_i = (list_i) ? list_i+1 : 0
-          chk_name = "%s[%d][id]" % [input_name, client.id]
-          
-          '<li>%s<label for="%s[%d][id]">%s</label></li>' % [ 
-            check_box_tag(chk_name, client.id, record.client_ids.include?(client.id) ), 
-            chk_name,
-            list_i,
-            client.company_name
+          chk_name = "%s[%d][id]" % [options[:name], client.id]
+          chk_id = "%s_client_%d" % [options[:id], client.id]
+
+          '<li>%s<label for="%s">%s</label></li>' % [ 
+            check_box_tag(chk_name, client.id, client_ids.include?(client.id), :id => chk_id ), 
+            chk_id,
+            h(client.company_name)
           ]
         }.join+
       '</ul>'
     }.join
   end
-  
-  
-  
+
 end

data/app/helpers/admin/clients_helper.rb

@@ -2,5 +2,7 @@ module Admin::ClientsHelper
   include ExtensibleObjectHelper
   include Admin::IsActiveColumnHelper
     
+  alias :client_is_active_form_column :is_active_form_column
+  
   handle_extensions
 end

data/app/helpers/admin/draft_invoices_helper.rb

@@ -0,0 +1,24 @@
+module Admin::DraftInvoicesHelper
+  # This isn't actually used by active scaffold, hence our non-standard argument list
+  def batch_create_clients_form_column(invoice_date_at, checked_client_ids = nil)
+    clients = Client.find_invoiceable_clients_at invoice_date_at
+
+
+    (clients.length > 0) ?
+      '<div id="batch_invoice_clients_list">%s</div>' % clients.in_groups_of((clients.length.to_f/3).ceil, false).collect{ |group|
+        '<ul class="checkbox-list">%s</ul>' % group.collect{ |client|
+            list_i = (list_i) ? list_i+1 : 0
+            chk_name = "%s[%d][id]" % ['batch_client', client.id]
+            chk_id = "%s_client_%d" % ['batch_client', client.id]
+
+            '<li>%s<label for="%s">%s</label></li>' % [ 
+              check_box_tag(chk_name, client.id, (checked_client_ids.nil? || checked_client_ids.include?(client.id)), :id => chk_id ), 
+              chk_id,
+              h(client.company_name)
+            ]
+        }.join
+      }.join :
+      '<span class="active-scaffold_detail_value">No invoiceable clients are available for this date.</span>'
+   
+  end
+end

data/app/helpers/admin/{employee_client_labor_rate_helper.rb → employee_client_labor_rates_helper.rb}

@@ -1,14 +1,14 @@
-module Admin::EmployeeClientLaborRateHelper
+module Admin::EmployeeClientLaborRatesHelper
 
-  def hourly_rate_column(record)
+  def employee_client_labor_rate_hourly_rate_column(record)
     h "$%0.2f" % record.hourly_rate
   end
   
-  def hourly_rate_form_column(record, input_name)
-    text_field_tag input_name, "%0.2f" % ((@record.hourly_rate) ? @record.hourly_rate : 0), :size => 10, :id => 'record_hourly_rate'
+  def employee_client_labor_rate_hourly_rate_form_column(record, options)
+    text_field_tag options[:name], "%0.2f" % ((@record.hourly_rate) ? @record.hourly_rate : 0), :size => 10, :id => 'record_hourly_rate'
   end
   
-  def employee_form_column(record, input_name)
+  def employee_client_labor_rate_employee_form_column(record, options)
     unavail_clients = nil
     
     if record.client_id
@@ -27,7 +27,7 @@ module Admin::EmployeeClientLaborRateHelper
     end
   
     select_tag(
-      input_name, 
+      options[:name], 
       options_for_select(
         (Employee.find_active(
           :all, 
@@ -41,7 +41,7 @@ module Admin::EmployeeClientLaborRateHelper
     )
   end
   
-  def client_form_column(record, input_name)
+  def employee_client_labor_rate_client_form_column(record, options)
     unavail_emps = nil
     
     if record.employee_id
@@ -60,7 +60,7 @@ module Admin::EmployeeClientLaborRateHelper
     end
   
     select_tag(
-      input_name, 
+      options[:name], 
       options_for_select(
         (Client.find(
           :all, 

data/app/helpers/admin/employees_helper.rb

@@ -3,7 +3,13 @@ module Admin::EmployeesHelper
   include ExtensibleObjectHelper
   
   include Admin::IsActiveColumnHelper
+  
+  alias :employee_is_active_form_column :is_active_form_column
+   
   include Admin::HasCredentialColumnHelper
+  
+  alias :employee_password_form_column :password_form_column
+  alias :employee_login_enabled_form_column :login_enabled_form_column
 
   handle_extensions
 end

data/app/helpers/admin/has_credential_column_helper.rb

@@ -12,27 +12,27 @@ module Admin::HasCredentialColumnHelper
   "});"
   
   def form_remote_tag(*args)
-    post_script = ''
-
     if @record and !@record.new_record? and @record.password_hash
       args[0][:before] = "if (password_has_changed[%d] == false) { $('%s').value = ''; }" % [ 
         @record.id, 
         password_input_id 
       ]
 
-      post_script = 
+      concat(
         ('<script>'+
           'if (typeof(password_has_changed) == "undefined"){password_has_changed = [];old_password_values = [];};'+
           'password_has_changed[%d] = false;'+
         '</script>')  % @record.id
+      )
     end
 
-    super(*args)+post_script
+    super(*args)
   end
 
-  def password_form_column(record, input_name)
+  def password_form_column(record, options)
+
     password_field_tag(
-      input_name, 
+      options[:name], 
       ( record.password_hash ) ? 'secretsecret' : '', 
       :id => password_input_id,
       :size => 20
@@ -41,9 +41,9 @@ module Admin::HasCredentialColumnHelper
     )
   end
 
-  def login_enabled_form_column(record, input_name)
+  def login_enabled_form_column(record, options)
     select_tag(
-      input_name, 
+      options[:name], 
       options_for_select( 
         [ ["Yes", 'true'], ["No", 'false'] ], 
         (record.login_enabled.nil?) ? 'false' : record.login_enabled.to_s

data/app/helpers/admin/invoices_helper.rb

@@ -1,43 +1,98 @@
 module Admin::InvoicesHelper
   
-  include Admin::IsActiveColumnHelper
-  
-  def active_scaffold_input_options(column, scope)
-    options = super(column, scope)
+  def active_scaffold_input_options(column, scope = nil, options = {})
+    options = super(column, scope, options)
     options.merge! :include_seconds => true if column.name == :issued_on        
     options
   end
   
-  def is_published_form_column(column, input_name)
-    select_tag input_name, options_for_select([['Yes', 1],['No',0]], (column.is_published) ? 1 : 0 ) 
+  def invoice_is_published_form_column(column, options)
+    select_tag options[:name], options_for_select([['Yes', 1],['No',0]], (column.is_published) ? 1 : 0 ) 
   end
 
-  def is_published_column(record)
+  def invoice_is_published_column(record)
     record.is_published ? 'Yes' : 'No'
   end
   
-  def is_paid_column(record)
-    record.is_paid? ? 'Yes' : 'No'
+  def invoice_is_paid_column(record)
+    record.is_published ? (record.is_paid? ? 'Yes' : 'No') : '-'
   end
 
-  def sub_total_column(record)
+  def invoice_sub_total_column(record)
     h_money record.sub_total
   end
 
-  def taxes_total_column(record)
+  def invoice_taxes_total_column(record)
     h_money record.taxes_total
   end
 
-  def amount_column(record)
+  def invoice_amount_column(record)
     h_money record.amount
   end
   
-  def issued_on_column(record)
+  def invoice_issued_on_column(record)
     h record.issued_on.strftime((params[:action] == 'show') ? '%m/%d/%y %I:%M %p' : '%m/%d/%y')
   end
+  
+  def invoice_payment_assignments_column(record)
+    record.payment_assignments.collect{ |asgn|
+      '%s from (Payment %d)' % [asgn.amount.format, asgn.payment_id  ]
+    }.join ', '
+  end
+ 
+  def toggle_published_indicator
+    loading_indicator_tag :action => :toggle_published, :id => @record.id
+  end
+   
+  def toggle_published_submit( label, is_focused, url_options = {} )
+    loading_indicator_id = loading_indicator_id(:action => :toggle_published, :id => @record.id)
+
+    button_to_remote( 
+      label,
+      { 
+        :url => {
+          :action        => :toggle_published, 
+          :id            => @record.id, 
+          :is_confirmed  => 1
+        }.merge(url_options),
+        :loaded  => [
+          'Modalbox.hide()',
+          "$(%s).style.visibility = 'visible'"  % loading_indicator_id.to_json
+        ].join(';'),
+        :before  => [
+          "$(%s).style.visibility = 'visible'" % loading_indicator_id.to_json,
+          "$$('#MB_content input[type=button]').each(function(i){i.disable();} )",
+          "$('cancel_box').style.display = 'none'"
+        ].join(";"),
+      },
+      (is_focused) ? {:class => "MB_focusable"} : {}
+    ) 
+  end
+
+  # This let's us hook into the action_link names, so we can dynamically generate a label 
+  # for the publish/unpublish row action
+  def render_action_link(link, url_options, record = nil, html_options = {})
+    # We don't want to modify the config itself, so we dup it before we start 
+    # on changes
+    our_options = url_options.dup 
+    
+    if link.action == 'toggle_published'
+      our_options[:link] = (record.is_published) ? 'Un-Publish' : 'Publish'
+      
+      html_options[:onclick] = "Modalbox.show(%s,%s); return false;" % [
+        url_for(:action => :toggle_published, :id => record.id).to_json,
+        {
+        :title => '%s confirmation' %  [(record.is_published) ? 'Un-publish' : 'Publish'], 
+        :width => 700
+        }.to_json
+      ]
+    end
+    
+    super(link, our_options, record, html_options)
+  end
 
-  # Shameless copy-paste:
-  def activity_types_form_column(column, input_name)
+  # Shameless activescaffold copy-pasta:
+  def invoice_activity_types_form_column(column, options)
     available_types = ActivityType.find(:all)
     
     associated_ids = ( (@record.new_record?) ? available_types : @record.activity_types ).collect(&:id)
@@ -46,7 +101,7 @@ module Admin::InvoicesHelper
 
     html = '<ul class="checkbox-list">'
     available_types.each_with_index do |type, i|
-      this_name = "#{input_name}[#{i}][id]"
+      this_name = "#{options[:name]}[#{i}][id]"
       html << "<li>"
       html << check_box_tag(this_name, type.id, associated_ids.include?(type.id))
       html << "<label for='#{this_name}'>"+type.to_label+"</label>"