From 95e8f13342501b1b580a0ab4e6ff51b6034ddb85 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 17 Feb 2009 22:50:41 +0000
Subject: [PATCH] plugged in new/delete addr handling

git-svn-id: svn://svn.open-ils.org/ILS/trunk@12209 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../web/js/ui/default/actor/user/register.js  | 83 ++++++++++++-------
 .../templates/default/actor/user/register.tt2 | 57 +++++++++----
 2 files changed, 94 insertions(+), 46 deletions(-)

diff --git a/Open-ILS/web/js/ui/default/actor/user/register.js b/Open-ILS/web/js/ui/default/actor/user/register.js
index 3ff91e847d..ccd6e6197c 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -21,12 +21,23 @@ var uEditUsePhonePw = false;
 var widgetPile = [];
 var uEditCardVirtId = -1;
 var uEditAddrVirtId = -1;
+var orgSettings = {};
+var tbody;
+var addrTemplateRows;
 
 
 function load() {
     staff = new openils.User().user;
     pcrud = new openils.PermaCrud();
-    
+    uEditNewPatron(); /* XXX */
+
+    orgSettings = fieldmapper.aou.fetchOrgSettingBatch(staff.ws_ou(), [
+        'global.juvenile_age_threshold',
+        'patron.password.use_phone',
+    ]);
+    for(k in orgSettings)
+        orgSettings[k] = orgSettings[k].value;
+
     var list = pcrud.search('fdoc', {fm_class:fmClasses});
     for(var i in list) {
         var doc = list[i];
@@ -35,18 +46,21 @@ function load() {
         fieldDoc[doc.fm_class()][doc.field()] = doc;
     }
 
-    var tbody = dojo.byId('uedit-tbody');
+    tbody = dojo.byId('uedit-tbody');
+
+    addrTemplateRows = dojo.query('tr[type=addr-template]', tbody);
+    dojo.forEach(addrTemplateRows, function(row) { row.parentNode.removeChild(row); } );
     statCatTemplate = tbody.removeChild(dojo.byId('stat-cat-row-template'));
     surveyTemplate = tbody.removeChild(dojo.byId('survey-row-template'));
     surveyQuestionTemplate = tbody.removeChild(dojo.byId('survey-question-row-template'));
 
-    loadStaticFields(tbody);
-    loadStatCats(tbody);
-    loadSurveys(tbody);
+    loadStaticFields();
+    uEditNewAddr(null, uEditAddrVirtId);
+    loadStatCats();
+    loadSurveys();
 }
 
-function loadStaticFields(tbody) {
-    // draw static user/addr fields
+function loadStaticFields() {
     for(var idx = 0; tbody.childNodes[idx]; idx++) {
         var row = tbody.childNodes[idx];
         if(row.nodeType != row.ELEMENT_NODE) continue;
@@ -56,7 +70,8 @@ function loadStaticFields(tbody) {
     }
 }
 
-function loadStatCats(tbody) {
+function loadStatCats() {
+
     statCats = fieldmapper.standardRequest(
         ['open-ils.circ', 'open-ils.circ.stat_cat.actor.retrieve.all'],
         {params : [openils.User.authtoken, staff.ws_ou()]}
@@ -84,7 +99,7 @@ function loadStatCats(tbody) {
     }
 }
 
-function loadSurveys(tbody) {
+function loadSurveys() {
 
     surveys = fieldmapper.standardRequest(
         ['open-ils.circ', 'open-ils.circ.survey.retrieve.all'],
@@ -120,11 +135,12 @@ function loadSurveys(tbody) {
 }
 
 
-function fleshFMRow(row, fmcls) {
+function fleshFMRow(row, fmcls, args) {
     var fmfield = row.getAttribute('fmfield');
     var wclass = row.getAttribute('wclass');
     var wstyle = row.getAttribute('wstyle');
     var fieldIdl = fieldmapper.IDL.fmclasses[fmcls].field_map[fmfield];
+    if(!args) args = {};
 
     var existing = dojo.query('td', row);
     var htd = existing[0] || row.appendChild(document.createElement('td'));
@@ -135,7 +151,7 @@ function fleshFMRow(row, fmcls) {
     if(fieldDoc[fmcls] && fieldDoc[fmcls][fmfield]) {
         var link = dojo.byId('uedit-help-template').cloneNode(true);
         link.id = '';
-        link.setAttribute('href', 'javascript:ueLoadContextHelp("'+fmcls+'","'+fmfield+'")');
+        link.onclick = function() { ueLoadContextHelp(fmcls, fmfield) };
         openils.Util.removeCSSClass(link, 'hidden');
         htd.appendChild(link);
     }
@@ -161,8 +177,9 @@ function fleshFMRow(row, fmcls) {
 
     widget._wtype = fmcls;
     widget._fmfield = fmfield;
-    widget._addr = uEditAddrVirtId;
+    widget._addr = args.addr;
     widgetPile.push(widget);
+    return widget;
 }
 
 function getByName(node, name) {
@@ -183,7 +200,7 @@ function uEditNewPatron() {
     patron.isnew(1);
     patron.id(-1);
     card = new ac();
-    card.id(uEditCardVirtId--);
+    card.id(uEditCardVirtId);
     card.isnew(1);
     patron.card(card);
     patron.cards([card]);
@@ -215,11 +232,8 @@ function uEditWidgetVal(w) {
 }
 
 function uEditSave() {
-    if(!patron) uEditNewPatron();
-
     for(var idx in widgetPile) {
         var w = widgetPile[idx];
-        console.log(w._wtype + ' : ' + w._fmfield + ' : ' + uEditWidgetVal(w));
 
         switch(w._wtype) {
             case 'au':
@@ -237,7 +251,6 @@ function uEditSave() {
                     addr.id(w._addr);
                     addr.isnew(1);
                     patron.addresses().push(addr);
-                    console.log("pushing address " + addr.id());
                 }
                 addr[w._fmfield](uEditWidgetVal(w));
                 break;
@@ -267,9 +280,6 @@ function uEditSave() {
         }
     }
 
-    console.log(js2JSON(patron.addresses()));
-    alert(js2JSON(patron));
-
     fieldmapper.standardRequest(
         ['open-ils.actor', 'open-ils.actor.patron.update'],
         {   async: true,
@@ -277,11 +287,8 @@ function uEditSave() {
             oncomplete: function(r) {
                 patron = openils.Util.readResponse(r);
                 if(patron) {
-                    alert('success');
-                    //uEditRefresh();
-                } else {
-                    alert('no success?');
-                }
+                    uEditRefresh();
+                } 
             }
         }
     );
@@ -293,11 +300,31 @@ function uEditRefresh() {
     location.href = href;
 }
 
+function uEditNewAddr(evt, id) {
+    if(id == null) id = --uEditAddrVirtId;
+    dojo.forEach(addrTemplateRows, 
+        function(row) {
+            row = tbody.insertBefore(row.cloneNode(true), dojo.byId('new-addr-row'));
+            row.setAttribute('type', '');
+            row.setAttribute('addr', id+'');
+            if(row.getAttribute('fmclass')) {
+                fleshFMRow(row, 'aua', {addr:id});
+            } else {
+               var btn = dojo.query('[name=delete-button]', row)[0];
+               if(btn) btn.onclick = function(){ uEditDeleteAddr(id) };
+            }
+        }
+    );
+}
 
 
-
-
+function uEditDeleteAddr(id) {
+    if(!confirm('Delete address ' + id)) return; /* XXX i18n */
+    var rows = dojo.query('tr[addr='+id+']', tbody);
+    for(var i = 0; i < rows.length; i++)
+        rows[i].parentNode.removeChild(rows[i]);
+    widgetPile = widgetPile.filter(function(w){return (w._addr != id)});
+}
 
 
 openils.Util.addOnLoad(load);
-
diff --git a/Open-ILS/web/templates/default/actor/user/register.tt2 b/Open-ILS/web/templates/default/actor/user/register.tt2
index 38613106c8..04c6bc4dde 100644
--- a/Open-ILS/web/templates/default/actor/user/register.tt2
+++ b/Open-ILS/web/templates/default/actor/user/register.tt2
@@ -44,6 +44,19 @@
         background-color: #e0e0e0;
     }
 
+    .divider span { padding: 0px 5px 0px 5px; }
+
+    .newaddr-row td {
+        text-align: right;
+        border-top:1px dashed #d9e8f9;
+    }
+    .newaddr-row td:last-child {
+        border-right:1px dashed #d9e8f9;
+    }
+
+    .uedit-addr-del-button {margin-left: 10px; color:red;}
+    
+
 </style>
 
 <table>
@@ -75,28 +88,37 @@
         <tr fmclass='au' fmfield='claims_returned_count'/>
         <tr fmclass='au' fmfield='alert_message' wclass='dijit.form.Textarea' wstyle='height:5em'/>
 
-        <tr class='divider' type='addr'><td colspan='0'>Address</td></tr>
-        <tr fmclass='aua' fmfield='address_type' type='addr'/>
-        <tr fmclass='aua' fmfield='post_code' type='addr'/>
-        <tr fmclass='aua' fmfield='street1' type='addr'/>
-        <tr fmclass='aua' fmfield='street2' type='addr'/>
-        <tr fmclass='aua' fmfield='city' type='addr'/>
-        <tr fmclass='aua' fmfield='county' type='addr'/>
-        <tr fmclass='aua' fmfield='state' type='addr'/>
-        <tr fmclass='aua' fmfield='country' type='addr'/>
-        <tr fmclass='aua' fmfield='valid' type='addr'/>
-        <tr fmclass='aua' fmfield='within_city_limits' type='addr'/>
-
-        <tr type='addr'><td class='uedit-help'><td>Billing Address</td>
-            <td><div dojoType='dijit.form.CheckBox' name='billing-addr-widget'></div></td>
+        <!-- Address -->
+        <tr name='uedit-addr-divider' class='divider' type='addr-template'>
+            <td colspan='2'>Address</td>
+            <td>
+                <span>Mailing</span><input type='radio' name='mailing_address'>
+                <span>Billing</span><input type='radio' name='billing_address'>
+                <button name='delete-button' class='uedit-addr-del-button'>X</button>
+            </td>
         </tr>
-        <tr type='addr'><td class='uedit-help'><td>Mailing Address</td>
-            <td><div dojoType='dijit.form.CheckBox' name='billing-addr-widget'></div></td>
+        <tr fmclass='aua' fmfield='address_type' type='addr-template'/>
+        <tr fmclass='aua' fmfield='post_code' type='addr-template'/>
+        <tr fmclass='aua' fmfield='street1' type='addr-template'/>
+        <tr fmclass='aua' fmfield='street2' type='addr-template'/>
+        <tr fmclass='aua' fmfield='city' type='addr-template'/>
+        <tr fmclass='aua' fmfield='county' type='addr-template'/>
+        <tr fmclass='aua' fmfield='state' type='addr-template'/>
+        <tr fmclass='aua' fmfield='country' type='addr-template'/>
+        <tr fmclass='aua' fmfield='valid' type='addr-template'/>
+        <tr fmclass='aua' fmfield='within_city_limits' type='addr-template'/>
+
+        <tr id='new-addr-row' class='newaddr-row'>
+            <td colspan='0' align='middle'/>
+                <button dojoType='dijit.form.Button' onClick='uEditNewAddr'>New Address</button>
+            </td>
         </tr>
 
+        <!-- stat cats -->
         <tr class='divider' id='stat-cat-divider'><td colspan='0'>Statistical Categories</td></tr>
         <tr id='stat-cat-row-template'><td class='uedit-help'/><td name='name'/><td name='widget'/></tr>
 
+        <!-- surveys -->
         <tr id='survey-row-template' class='divider'><td colspan='0' name='name'/></tr>
         <tr id='survey-question-row-template'><td class='uedit-help'/><td name='question'/><td name='answers'/></tr>
     </tbody>
@@ -104,8 +126,7 @@
 
 <div id='uedit-save-div'>
     <button dojoType='dijit.form.Button' jsId='saveButton' onClick='uEditSave'>Save</button>
-    <button dojoType='dijit.form.Button' jsId='saveCloneButton'>Save &amp; Clone</button>
-    <button dojoType='dijit.form.Button' jsId='cancelButton'>Cancel</button>
+    <button dojoType='dijit.form.Button' jsId='saveCloneButton' onClick='uEditSaveClone'>Save &amp; Clone</button>
 </div>
 
 <!-- context help widget -->
-- 
2.43.2