[open-ils-commits] r16225 - in trunk/Open-ILS/web: js/ui/default/acq/invoice templates/default/acq/invoice (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2010-04-13 12:17:59 -0400 (Tue, 13 Apr 2010)
New Revision: 16225

Modified:
   trunk/Open-ILS/web/js/ui/default/acq/invoice/view.js
   trunk/Open-ILS/web/templates/default/acq/invoice/view.tt2
Log:
moved money summary boxes to regular in-markup dijits

Modified: trunk/Open-ILS/web/js/ui/default/acq/invoice/view.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/invoice/view.js	2010-04-13 15:18:12 UTC (rev 16224)
+++ trunk/Open-ILS/web/js/ui/default/acq/invoice/view.js	2010-04-13 16:17:59 UTC (rev 16225)
@@ -167,10 +167,6 @@
 function updateTotalCost() {
 
     var totalCost = 0;    
-    if(!totalInvoicedBox) {
-        totalInvoicedBox = new dijit.form.CurrencyTextBox(
-            {style : 'width: 6em'}, dojo.byId('acq-invoice-total-invoiced'));
-    }
     for(var id in widgetRegistry.acqii) 
         if(!widgetRegistry.acqii[id]._object.isdeleted())
             totalCost += widgetRegistry.acqii[id].cost_billed.getFormattedValue();
@@ -180,10 +176,6 @@
     totalInvoicedBox.attr('value', totalCost);
 
     totalPaid = 0;    
-    if(!totalPaidBox) {
-        totalPaidBox = new dijit.form.CurrencyTextBox(
-            {style : 'width: 6em'}, dojo.byId('acq-invoice-total-paid'));
-    }
     for(var id in widgetRegistry.acqii) 
         if(!widgetRegistry.acqii[id]._object.isdeleted())
             totalPaid += widgetRegistry.acqii[id].amount_paid.getFormattedValue();
@@ -216,10 +208,6 @@
         }
     }
 
-    if(!balanceOwedBox) {
-        balanceOwedBox = new dijit.form.CurrencyTextBox(
-            {style : 'width: 6em'}, dojo.byId('acq-invoice-balance-owed'));
-    }
     balanceOwedBox.attr('value', (totalCost - totalPaid));
 }
 

Modified: trunk/Open-ILS/web/templates/default/acq/invoice/view.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/invoice/view.tt2	2010-04-13 15:18:12 UTC (rev 16224)
+++ trunk/Open-ILS/web/templates/default/acq/invoice/view.tt2	2010-04-13 16:17:59 UTC (rev 16225)
@@ -104,9 +104,9 @@
                         <button jsId='invoiceProrateButton' 
                             dojoType='dijit.form.Button' onclick='saveChanges(true);'>Save &amp; Prorate Charges</button>
                     </td>
-                    <td><div id='acq-invoice-total-invoiced'/></td>
-                    <td><div id='acq-invoice-total-paid'/></td>
-                    <td><div id='acq-invoice-balance-owed'/></td>
+                    <td><div jsId='totalInvoicedBox' dojoType='dijit.form.CurrencyTextBox' style='width:6em;'/></td>
+                    <td><div jsId='totalPaidBox' dojoType='dijit.form.CurrencyTextBox' style='width:6em;'/></td>
+                    <td><div jsId='balanceOwedBox' dojoType='dijit.form.CurrencyTextBox' style='width:6em;'/></td>
                 </tr>
             </tbody>
         </table>