rudimentary support for showing pending addrs

git-svn-id: svn://svn.open-ils.org/ILS/trunk@11711 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/locale/en-US/opac.dtd b/Open-ILS/web/opac/locale/en-US/opac.dtd
index 0d663cb..57c3784 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/opac.dtd
+++ b/Open-ILS/web/opac/locale/en-US/opac.dtd
@@ -272,6 +272,7 @@ Please see a librarian to renew your account.">
 <!ENTITY myopac.summary.home "Home Library">
 <!ENTITY myopac.summary.genesis "Account Creation Date">
 <!ENTITY myopac.summary.addresses "Addresses">
+<!ENTITY myopac.summary.addresses.pending "Pending Addresses">
 <!ENTITY myopac.summary.address.type "Address Type">
 <!ENTITY myopac.summary.address.street "Street">
 <!ENTITY myopac.summary.address.city "City">

diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index 7533bf2..cb5f506 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -426,7 +426,7 @@ function myOShowHoldStatus(r) {
     if(false) {
         var node = $n(row, 'hold_qstats');
         // XXX best way to display this info + dojo i18n
-        node.appendChild(text(qstats.queue_position+' of '+qstats.queue_position+' with '+qstats.potential_copies+' copies'));
+        node.appendChild(text('hold #' + qstats.queue_position+' of '+qstats.queue_position+' and '+qstats.potential_copies+' item(s)'));
         unHideMe(node);
 
     } else {
@@ -833,9 +833,12 @@ function _myOPACSummaryShowUer(r) {
        }
        removeChildren(tbody);
 
-       for( var a in user.addresses() ) {
+    var addrs = user.addresses();
+       for( var a in addrs ) {
+        var addr = addrs[a];
+        if(addr.replaces() != null) continue;
                var row = template.cloneNode(true);
-               myOPACDrawAddr(row, user.addresses()[a]);
+               myOPACDrawAddr(row, addr, addrs);
                tbody.appendChild(row);
        }
 }
@@ -861,15 +864,33 @@ function myopacDrawNotes(r) {
 
 
 
-function myOPACDrawAddr(row, addr) {
-
-       appendClear($n(row, 'myopac_addr_type'),text(addr.address_type()));
-       var street = (addr.street2()) ? addr.street1() + ", " + addr.street2() : addr.street1();
-       appendClear($n(row, 'myopac_addr_street'),text(street));
-       appendClear($n(row, 'myopac_addr_city'),text(addr.city()));
-       appendClear($n(row, 'myopac_addr_county'),text(addr.county()));
-       appendClear($n(row, 'myopac_addr_state'),text(addr.state()));
-       appendClear($n(row, 'myopac_addr_zip'),text(addr.post_code()));
+function myOPACDrawAddr(row, addr, addrs) {
+    appendClear($n(row, 'myopac_addr_type'),text(addr.address_type()));
+    var street = (addr.street2()) ? addr.street1() + ", " + addr.street2() : addr.street1();
+    appendClear($n(row, 'myopac_addr_street'),text(street));
+    appendClear($n(row, 'myopac_addr_city'),text(addr.city()));
+    appendClear($n(row, 'myopac_addr_county'),text(addr.county()));
+    appendClear($n(row, 'myopac_addr_state'),text(addr.state()));
+    appendClear($n(row, 'myopac_addr_zip'),text(addr.post_code()));
+
+    /* if we have a replacement address, plop it into the table next to this addr */
+    var repl = grep(addrs,
+        function(a) { 
+            return a.replaces() == addr.id(); 
+        } 
+    );
+
+    if(repl) {
+        repl = repl[0];
+        unHideMe($n(row, 'myopac_pending_addr_td'));
+        $n(row, 'myopac_pending_addr_type').value = repl.address_type();
+        var street = (repl.street2()) ? repl.street1() + ", " + repl.street2() : repl.street1();
+        $n(row, 'myopac_pending_addr_street').value = street;
+        $n(row, 'myopac_pending_addr_city').value = repl.city();
+        $n(row, 'myopac_pending_addr_county').value = repl.county();
+        $n(row, 'myopac_pending_addr_state').value = repl.state();
+        $n(row, 'myopac_pending_addr_zip').value = repl.post_code();
+    }
 }
 
 

diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml
index a6e6742..1584021 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml
@@ -169,32 +169,72 @@
 
        <br/><hr/><br/>
 
-
-       <!--
-       <br/><br/><br/>
-       -->
        <table width='100%' class='light_border data_grid'>
-               <thead class='color_4'>
-                       <tr><td style='background: none; border-bottom: none' align='center' colspan='7'><b>&myopac.summary.addresses;</b></td></tr>
-                       <tr>
-                               <td width='16%'>&myopac.summary.address.type;</td>
-                               <td width='16%'>&myopac.summary.address.street;</td>
-                               <td width='16%'>&myopac.summary.address.city;</td>
-                               <td width='16%'>&myopac.summary.address.county;</td>
-                               <td width='16%'>&myopac.summary.address.state;</td>
-                               <td width='16%'>&myopac.summary.address.zip;</td>
-                       </tr>
-               </thead>
-
+        <thead>
+            <tr>
+                <td>&myopac.summary.addresses;</td>
+                <td>&myopac.summary.addresses.pending;</td>
+            </tr>
+        </thead>
                <tbody id='myopac_addr_tbody'>
                        <tr id='myopac_addr_row' class='light_border'>
-                               <td name='myopac_addr_type'> </td>
-                               <td name='myopac_addr_street'> </td>
-                               <td name='myopac_addr_city'> </td>
-                               <td name='myopac_addr_county'> </td>
-                               <td name='myopac_addr_state'> </td>
-                               <td name='myopac_addr_zip'> </td>
-                       </tr>
+                <td>
+                    <table>
+                        <tr>
+                            <td>&myopac.summary.address.type;</td>
+                            <td name='myopac_addr_type'> </td>
+                        </tr>
+                        <tr>
+                            <td>&myopac.summary.address.street;</td>
+                            <td name='myopac_addr_street'> </td>
+                        </tr>
+                        <tr>
+                            <td>&myopac.summary.address.city;</td>
+                            <td name='myopac_addr_city'> </td>
+                        </tr>
+                        <tr>
+                            <td>&myopac.summary.address.county;</td>
+                            <td name='myopac_addr_county'> </td>
+                        </tr>
+                        <tr>
+                            <td>&myopac.summary.address.state;</td>
+                            <td name='myopac_addr_state'> </td>
+                        </tr>
+                        <tr>
+                            <td>&myopac.summary.address.zip;</td>
+                            <td name='myopac_addr_zip'> </td>
+                        </tr>
+                    </table>
+                </td>
+                <td class='hide_me' name='myopac_pending_addr_td'>
+                    <table>
+                        <tr>
+                            <td>&myopac.summary.address.type;</td>
+                            <td><input name='myopac_pending_addr_type'/> </td>
+                        </tr>
+                        <tr>
+                            <td>&myopac.summary.address.street;</td>
+                            <td><input name='myopac_pending_addr_street'/> </td>
+                        </tr>
+                        <tr>
+                            <td>&myopac.summary.address.city;</td>
+                            <td><input name='myopac_pending_addr_city'/> </td>
+                        </tr>
+                        <tr>
+                            <td>&myopac.summary.address.county;</td>
+                            <td><input name='myopac_pending_addr_county'/> </td>
+                        </tr>
+                        <tr>
+                            <td>&myopac.summary.address.state;</td>
+                            <td><input name='myopac_pending_addr_state'/> </td>
+                        </tr>
+                        <tr>
+                            <td>&myopac.summary.address.zip;</td>
+                            <td><input name='myopac_pending_addr_zip'/> </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
                </tbody>
        </table>