brisk-bills 0.7.0 → 0.8.1

data/public/javascripts/active_scaffold/default/dhtml_history.js

@@ -858,7 +858,7 @@ var handleHistoryChange = function(pageId, pageData) {
   var info = pageId.split(':');
   var id = info[0];
   pageData += '&_method=get';
-  new Ajax.Updater(id+'-content', pageData, {asynchronous:true, evalScripts:true, onLoading:function(request){Element.show(id+'-pagination-loading-indicator');}});
+  new Ajax.Request(pageData, {asynchronous:true, evalScripts:true, method: 'get', onLoading:function(request){Element.show(id+'-pagination-loading-indicator');}});
 }
 
 window.onload = function() {

data/public/javascripts/active_scaffold/default/form_enhancements.js

@@ -10,7 +10,12 @@ TextFieldWithExample.prototype = {
 		this.defaultText = defaultText;
 		this.createHiddenInput();
 
+		if (options.focus) this.input.focus();
 		this.checkAndShowExample();
+		if (options.focus) {
+			this.input.selectionStart = 0;
+			this.input.selectionEnd = 0;
+		}
 
 		Event.observe(this.input, "blur", this.onBlur.bindAsEventListener(this));
 		Event.observe(this.input, "focus", this.onFocus.bindAsEventListener(this));
@@ -39,9 +44,7 @@ TextFieldWithExample.prototype = {
 		this.checkAndShowExample();
 	},
 	onFocus: function(event) {
-		if (this.exampleShown()) {
-		    this.removeExample();
-	  	}
+		this.removeExample();
 	},
 	onClick: function(event) {
 		this.removeExample();
@@ -57,7 +60,7 @@ TextFieldWithExample.prototype = {
 			Element.addClassName(this.input, this.options.exampleClassName);
 		}
 	},
-  removeExample: function() {
+	removeExample: function() {
 		if (this.exampleShown()) {
 			this.input.value = '';
 			this.input.name = this.name;

data/public/stylesheets/active_scaffold/default/stylesheet-ie.css

@@ -11,14 +11,14 @@ zoom: 1;
 border-top: solid 1px #DAFFCD;
 }
 
-.active-scaffold-header div.actions a.show_search {
+* html .active-scaffold-header div.actions a.show_search {
 background-image: none;
-filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/active_scaffold/default/magnifier.png', sizingMethod='crop');
+filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../../../images/active_scaffold/default/magnifier.png', sizingMethod='crop');
 }
 
-.active-scaffold .sub-form .association-record a.destroy {
+* html .active-scaffold .sub-form .association-record a.destroy {
 background-image: none;
-filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/active_scaffold/default/cross.png', sizingMethod='crop');
+filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../../../images/active_scaffold/default/cross.png', sizingMethod='crop');
 }
 
 .active-scaffold-header div.actions a.disabled {
@@ -32,4 +32,4 @@ float: none;
 
 .active-scaffold li.form-element dt {
 padding: 4px 0;
-}
+}

data/public/stylesheets/active_scaffold/default/stylesheet.css

@@ -52,6 +52,10 @@ padding: 5px 20px 5px 5px;
 color: #333;
 }
 
+.active-scaffold .mark_record_column {
+  width: 1px;
+}
+
 /* Header
    ======================== */
 
@@ -87,10 +91,6 @@ background-position: 1px 50%;
 background-repeat: no-repeat;
 }
 
-.view .active-scaffold-header div.actions a {
-float: left;
-}
-
 .blue-theme .active-scaffold-header div.actions a {
 color: #fff;
 }
@@ -153,7 +153,7 @@ display: block;
 background-color: #555;
 }
 
-.active-scaffold th a {
+.active-scaffold th a, .active-scaffold th a:visited {
 color: #fff;
 padding: 2px 15px 2px 5px;
 }
@@ -190,29 +190,33 @@ background: #333 url(../../../images/active_scaffold/default/indicator-small.gif
 /* Table :: Record Rows
    ============================= */
 
+.active-scaffold tr.record {
+  background-color: #E6F2FF;
+}
 .active-scaffold tr.record td {
 padding: 5px 4px;
 color: #333;
 font-family: Verdana, sans-serif;
 font-size: 11px;
-background-color: #E6F2FF;
 border-bottom: solid 1px #C5DBF7;
 border-left: solid 1px #C5DBF7;
 }
 
-.active-scaffold tr.even-record td {
+.active-scaffold tr.even-record {
 background-color: #fff;
-border-left: solid 1px #ddd;
+}
+.active-scaffold tr.even-record td {
+border-left-color: #ddd;
 }
 
 .active-scaffold tr.record td.sorted {
 background-color: #B9DCFF;
-border-bottom: solid 1px #AFD0F5;
+border-bottom-color: #AFD0F5;
 }
 
 .active-scaffold tr.even-record td.sorted {
 background-color: #E6F2FF;
-border-bottom: solid 1px #AFD0F5;
+border-bottom-color: #AFD0F5;
 }
 
 .active-scaffold tbody.records td.empty {
@@ -290,6 +294,10 @@ background-color: #1F7F00;
 background: transparent;
 }
 
+.active-scaffold .active-scaffold .active-scaffold-header {
+margin-right: 25px;
+}
+
 .active-scaffold .active-scaffold .active-scaffold-header h2 {
 font-size: 12px;
 font-weight: bold;
@@ -300,12 +308,17 @@ font-weight: bold;
 color: #444;
 }
 
+.active-scaffold .active-scaffold .active-scaffold-header div.actions {
+top: 0px;
+right: 0px;
+}
+
 .active-scaffold .active-scaffold .active-scaffold-header div.actions a {
 font: bold 11px verdana, sans-serif;
-padding: 0 2px 1px 17px;
 }
 
-.blue-theme .active-scaffold .active-scaffold-header div.actions a {
+.blue-theme .active-scaffold .active-scaffold-header div.actions a,
+.blue-theme .active-scaffold .active-scaffold-header div.actions a:visited {
 color: #06c;
 }
 
@@ -313,6 +326,12 @@ color: #06c;
 background-color: #ff8;
 }
 
+.active-scaffold .active-scaffold .view {
+background-color: transparent;
+padding: 0px;
+border: none;
+}
+
 .active-scaffold .active-scaffold  td {
 background-color: #ECFFE7;
 border-bottom: solid 1px #CDF7C5;
@@ -326,6 +345,13 @@ border: solid 1px #DDDF37;
 border-top: none;
 }
 
+.active-scaffold .active-scaffold .active-scaffold td.inline-adapter-cell {
+background-color: #DAFFCD;
+padding: 4px;
+border: solid 1px #7FcF00;
+border-top: none;
+}
+
 .active-scaffold .active-scaffold .active-scaffold-footer {
 font-size: 11px;
 }
@@ -368,7 +394,8 @@ margin: 0 -2px;
 font: bold 12px arial, sans-serif;
 }
 
-.blue-theme .active-scaffold-footer a {
+.blue-theme .active-scaffold-footer a,
+.blue-theme .active-scaffold-footer a:visited {
 color: #fff;
 }
 
@@ -491,13 +518,13 @@ background-color: transparent;
    ============================== */
 
 .active-scaffold .loading-indicator {
-vertical-align: bottom;
+vertical-align: text-bottom;
 width: 16px;
 margin: 0;
 }
 
 .active-scaffold .active-scaffold-header .loading-indicator {
-margin-bottom: 3px;
+margin-top: 3px;
 }
 
 /* Show
@@ -506,6 +533,9 @@ margin-bottom: 3px;
 .active-scaffold .show-view dl {
 margin-left: 5px;
 }
+.active-scaffold .show-view dl dl {
+margin-left: 0px;
+}
 
 .active-scaffold .show-view dt {
 width: 12em;
@@ -526,6 +556,10 @@ margin-bottom: 5px;
 /* Form
    ============================== */
 
+.active-scaffold dl {
+margin: 0;
+}
+
 .active-scaffold .submit {
 font-weight: bold;
 font-size: 14px;
@@ -633,7 +667,8 @@ border: solid 1px #1F7F00;
 padding: 2px;
 }
 
-.active-scaffold .fieldWithErrors input.text-input,
+.active-scaffold .fieldWithErrors input,
+.active-scaffold .fieldWithErrors textarea,
 .active-scaffold .fieldWithErrors select {
 border: solid 1px #f00;
 }
@@ -732,7 +767,7 @@ padding: 0 5px 0 1px;
 background: none;
 }
 
-.active-scaffold .sub-form label {
+.active-scaffold .horizontal-sub-form td label {
 display: none;
 }
 
@@ -754,9 +789,10 @@ vertical-align: top;
 color: #999;
 }
 
-.active-scaffold .sub-form table td.actions {
+.active-scaffold .sub-form .actions {
 vertical-align: middle;
 background-color: transparent;
+clear: left;
 }
 
 .active-scaffold .sub-form .association-record a.destroy {

data/public/stylesheets/admin/global.css

@@ -148,5 +148,5 @@ color:#555555;
 font-family:verdana,sans-serif;
 font-size:11px;
 padding:8px 0;
-display: block;
+display:inline-block;
 }

data/public/stylesheets/admin/pages.css

@@ -135,3 +135,32 @@
 .label-input {
 	width: 590px;
 }
+
+.invoice_assignment_inputs{
+	margin: 0;
+	padding :0;
+	display: block;
+	position: relative;
+	font-size:11px;
+	color:#555555;
+	font-family:verdana,sans-serif;
+}
+
+.invoice_assignment_inputs li {
+	margin:0;
+	padding:0 0 8px 0; 
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	float: left;
+	clear:both;
+}
+
+.active-scaffold-header div.actions a.batch_create {
+  background-image: url(../../images/page-new.gif);
+
+  padding-left: 19px;
+  background-position: 1px 50%;
+  background-repeat: no-repeat;
+}
+}

data/test/unit/activity/adjustment_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require 'test_helper'
 
 class Activity::AdjustmentTest < ActiveSupport::TestCase
   # Replace this with your real tests.

data/test/unit/activity/labor_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require 'test_helper'
 
 module ActivityTypeTestHelper
   

data/test/unit/activity/material_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require 'test_helper'
 
 class Activity::MaterialTest < ActiveSupport::TestCase
   # Replace this with your real tests.

data/test/unit/activity/proposal_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require 'test_helper'
 
 class Activity::ProposalTest < ActiveSupport::TestCase
   # Replace this with your real tests.

data/test/unit/activity_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ActivityTest < ActiveSupport::TestCase
   fixtures :activities, :clients

data/test/unit/activity_type_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ActivityTypeTest < ActiveSupport::TestCase
   # Replace this with your real tests.

data/test/unit/client_eventlog_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ClientEventlogTest < ActiveSupport::TestCase
   fixtures :client_eventlogs

data/test/unit/client_financial_transaction_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ClientFinancialTransactionTest < ActiveSupport::TestCase
   # Replace this with your real tests.

data/test/unit/client_representative_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ClientRepresentativesTest < ActiveSupport::TestCase
   fixtures :client_representatives

data/test/unit/client_test.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../test_unit_factory_helper.rb'
+require 'test_helper'
+require 'test_unit_factory_helper'
 
 class ClientTest < ActiveSupport::TestCase
   fixtures :clients
@@ -308,13 +308,44 @@ class ClientTest < ActiveSupport::TestCase
     payments << Factory.generate_payment( client, 500.00 )
     
     # Now we test all the invoice_payment mappings to be sure they make sense ..
-    assert_equal true, invoices[0].is_paid?
+    assert_equal true, invoices[0].is_paid?(true)
     assert_equal [payments[3].id], invoices[0].payment_assignments(true).collect(&:payment_id)
 
-    assert_equal true, invoices[1].is_paid?
+    assert_equal true, invoices[1].is_paid?(true)
     assert_equal [payments[1].id, payments[2].id], invoices[1].payment_assignments(true).collect(&:payment_id)
     
-    assert_equal true, invoices[2].is_paid?
+    assert_equal true, invoices[2].is_paid?(true)
     assert_equal [payments[0].id], invoices[2].payment_assignments(true).collect(&:payment_id)
   end
-end
+
+  def test_find_invoiceable_clients_at
+
+    # Because we're using fixtures - we have some pre-existing clients and activities here . 
+    # I really don't want 'em for this test though:
+    Client.find(:all).each{|c| c.destroy}
+    Activity.find(:all).each{|a| a.destroy}
+
+    # OK - time to get started:
+    
+    Factory.generate_payment Factory.create_client(:company_name => "All Paid Up, Inc."), Money.new(10000)
+
+    
+    clientA = Factory.create_client :company_name => "Client A"
+    clientB = Factory.create_client :company_name => "Client B"
+    clientC = Factory.create_client :company_name => "Client C"
+    clientD = Factory.create_client :company_name => "Client D"
+
+    Factory.create_labor( {}, {:client => clientA, :occurred_on => (DateTime.now << 1)} )
+    Factory.create_labor( {}, {:client => clientA, :occurred_on => (DateTime.now << 2)} )
+    Factory.create_labor( {}, {:client => clientA, :occurred_on => (DateTime.now >> 1)} )
+    Factory.create_labor( {}, {:client => clientB, :occurred_on => (DateTime.now << 1)} )
+    Factory.create_labor( {}, {:client => clientC, :occurred_on => (DateTime.now >> 1)} )
+    Factory.create_labor( {}, {:client => clientD, :occurred_on => (DateTime.now << 1), :is_published => false} )
+    Factory.create_labor( {}, {:client_id => nil, :occurred_on => (DateTime.now << 1)} )
+
+    invoiceable_clients = Client.find_invoiceable_clients_at(DateTime.now)
+
+    assert_equal 2, invoiceable_clients.length
+    assert_equal [clientA.id, clientB.id], invoiceable_clients.collect(&:id)
+  end
+end

data/test/unit/credential_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class CredentialTest < ActiveSupport::TestCase
 

data/test/unit/employee/slimtimer_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require 'test_helper'
 
 class Employee::SlimTimerTest < ActiveSupport::TestCase
 #  fixtures :employee_slim_timers

data/test/unit/employee_client_labor_rate_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class EmployeeClientLaborRateTest < ActiveSupport::TestCase
   # Replace this with your real tests.