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

[svn at svn.open-ils.org]

Author: erickson
Date: 2010-04-12 10:50:09 -0400 (Mon, 12 Apr 2010)
New Revision: 16202

Modified:
   trunk/Open-ILS/web/js/ui/default/acq/po/view_po.js
   trunk/Open-ILS/web/templates/default/acq/po/view.tt2
Log:
added a total-estimated value to the PO view.  format prices with 2 decimals in PO summary

Modified: trunk/Open-ILS/web/js/ui/default/acq/po/view_po.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/po/view_po.js	2010-04-12 14:20:56 UTC (rev 16201)
+++ trunk/Open-ILS/web/js/ui/default/acq/po/view_po.js	2010-04-12 14:50:09 UTC (rev 16202)
@@ -305,8 +305,8 @@
         PO.provider()
     );
     dojo.byId("acq-po-view-total-li").innerHTML = PO.lineitem_count();
-    dojo.byId("acq-po-view-total-enc").innerHTML = PO.amount_encumbered();
-    dojo.byId("acq-po-view-total-spent").innerHTML = PO.amount_spent();
+    dojo.byId("acq-po-view-total-enc").innerHTML = PO.amount_encumbered().toFixed(2);
+    dojo.byId("acq-po-view-total-spent").innerHTML = PO.amount_spent().toFixed(2);
     dojo.byId("acq-po-view-state").innerHTML = PO.state(); // TODO i18n
     makePrepayWidget(
         dojo.byId("acq-po-view-prepay"),
@@ -356,13 +356,20 @@
         }
     );
 
+    var totalEstimated = 0;
     fieldmapper.standardRequest(
         ['open-ils.acq', 'open-ils.acq.lineitem.search'],
         {   async: true,
 params: [openils.User.authtoken, {purchase_order:poId}, {flesh_attrs:true, flesh_notes:true, flesh_cancel_reason:true}],
             onresponse: function(r) {
                 liTable.show('list');
-                liTable.addLineitem(openils.Util.readResponse(r));
+                var li = openils.Util.readResponse(r);
+                totalEstimated += (Number(li.item_count() || 0) * Number(li.estimated_unit_price() || 0));
+                liTable.addLineitem(li);
+            },
+
+            oncomplete : function() {
+                dojo.byId("acq-po-view-total-estimated").innerHTML = totalEstimated.toFixed(2);
             }
         }
     );

Modified: trunk/Open-ILS/web/templates/default/acq/po/view.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/po/view.tt2	2010-04-12 14:20:56 UTC (rev 16201)
+++ trunk/Open-ILS/web/templates/default/acq/po/view.tt2	2010-04-12 14:50:09 UTC (rev 16202)
@@ -12,6 +12,7 @@
                 <tr><td>Name</td><td><a id='acq-po-view-name' href='javascript:void(0);' onclick='updatePoName()'></a></td></tr>
                 <tr><td>Provider</td><td><span id="acq-po-view-provider"/></td></tr>
                 <tr><td>Total Lineitems</td><td><span id='acq-po-view-total-li'/></td></tr>
+                <tr><td>Total Estimated</td><td>$<span id='acq-po-view-total-estimated'/></td></tr>
                 <tr><td>Total Encumbered</td><td>$<span id='acq-po-view-total-enc'/></td></tr>
                 <tr><td>Total Spent</td><td>$<span id='acq-po-view-total-spent'/></td></tr>
                 <tr><td>Status</td><td><span id='acq-po-view-state'/></td></tr>