[open-ils-commits] r17462 - in branches/rel_2_0/Open-ILS/web: js/dojo/openils/acq/nls js/ui/default/acq/po templates/default/acq/po (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2010-09-02 17:14:06 -0400 (Thu, 02 Sep 2010)
New Revision: 17462

Modified:
   branches/rel_2_0/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
   branches/rel_2_0/Open-ILS/web/js/ui/default/acq/po/view_po.js
   branches/rel_2_0/Open-ILS/web/templates/default/acq/po/view.tt2
Log:
back-porting: 17446 => display PO order (activation) date in PO page

Modified: branches/rel_2_0/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/js/dojo/openils/acq/nls/acq.js	2010-09-02 21:12:58 UTC (rev 17461)
+++ branches/rel_2_0/Open-ILS/web/js/dojo/openils/acq/nls/acq.js	2010-09-02 21:14:06 UTC (rev 17462)
@@ -49,6 +49,7 @@
     "FUND_LIST_ROLLOVER_SUMMARY_ROLLOVER_AMOUNT" : "<b>$${1}</b> unspent money rolled over to fiscal year ${0} for the selected locations",
     "FUND_XFER_SAME_SOURCE_AND_DEST" : "Cannot transfer. The source and destination funds are the same.",
     "FUND_XFER_CONFIRM" : "Are you sure you're ready to commit this transfer?",
+    "PO_ACTIVATED_ON" : "Activated ${0}",
     "PO_CHECKING" : "[One moment...]",
     "PO_COULD_ACTIVATE" : "Yes.",
     "PO_WARNING_NO_BLOCK_ACTIVATION" : "Yes; fund ${0} (${1}) would be encumbered beyond its warning level.",

Modified: branches/rel_2_0/Open-ILS/web/js/ui/default/acq/po/view_po.js
===================================================================
--- branches/rel_2_0/Open-ILS/web/js/ui/default/acq/po/view_po.js	2010-09-02 21:12:58 UTC (rev 17461)
+++ branches/rel_2_0/Open-ILS/web/js/ui/default/acq/po/view_po.js	2010-09-02 21:14:06 UTC (rev 17462)
@@ -312,6 +312,21 @@
     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
+
+    if(PO.order_date()) {
+        openils.Util.show('acq-po-activated-on', 'inline');
+        dojo.byId('acq-po-activated-on').innerHTML = 
+            dojo.string.substitute(
+                localeStrings.PO_ACTIVATED_ON, [
+                    dojo.date.locale.format(
+                        dojo.date.stamp.fromISOString(PO.order_date()), 
+                        {formatLength:'short'}
+                    )
+                ]
+            );
+
+    }
+
     makePrepayWidget(
         dojo.byId("acq-po-view-prepay"),
         openils.Util.isTrue(PO.prepayment_required())

Modified: branches/rel_2_0/Open-ILS/web/templates/default/acq/po/view.tt2
===================================================================
--- branches/rel_2_0/Open-ILS/web/templates/default/acq/po/view.tt2	2010-09-02 21:12:58 UTC (rev 17461)
+++ branches/rel_2_0/Open-ILS/web/templates/default/acq/po/view.tt2	2010-09-02 21:14:06 UTC (rev 17462)
@@ -5,7 +5,10 @@
 <div dojoType="dijit.layout.ContentPane" style="height:100%">
     <div>
         <div id='oils-acq-picklist-header'>
-            <big>Purchase Order (<span id="acq-po-view-state"></span>)</big>
+            <big>
+                Purchase Order (<span id="acq-po-view-state"></span>) 
+            </big>
+            <span id='acq-po-activated-on' class='hidden'></span>
             <table class="oils-generic-table acq-po-info">
                 <tr>
                     <th>ID</th><td><a id="acq-po-view-id"/></td>