From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 17 Feb 2009 16:12:46 +0000 (+0000)
Subject: plugged in saving of new users
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0a61aedd712cfd82ecc5e2a4a033828b7ca12e92;p=Evergreen.git

plugged in saving of new users

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

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 de61863ff6..3ff91e847d 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -7,6 +7,7 @@ dojo.require('openils.PermaCrud');
 dojo.require('openils.widget.AutoGrid');
 dojo.require('openils.widget.AutoFieldWidget');
 dojo.require('dijit.form.CheckBox');
+dojo.require('dijit.form.Button');
 
 var pcrud;
 var fmClasses = ['au', 'ac', 'aua', 'actsc', 'asv', 'asvq', 'asva'];
@@ -15,12 +16,17 @@ var statCats;
 var statCatTempate;
 var surveys;
 var staff;
+var patron;
+var uEditUsePhonePw = false;
+var widgetPile = [];
+var uEditCardVirtId = -1;
+var uEditAddrVirtId = -1;
 
 
 function load() {
     staff = new openils.User().user;
     pcrud = new openils.PermaCrud();
-
+    
     var list = pcrud.search('fdoc', {fm_class:fmClasses});
     for(var i in list) {
         var doc = list[i];
@@ -29,22 +35,18 @@ function load() {
         fieldDoc[doc.fm_class()][doc.field()] = doc;
     }
 
-    statCats = fieldmapper.standardRequest(
-        ['open-ils.circ', 'open-ils.circ.stat_cat.actor.retrieve.all'],
-        {params : [openils.User.authtoken, staff.ws_ou()]}
-    );
-
-    surveys = fieldmapper.standardRequest(
-        ['open-ils.circ', 'open-ils.circ.survey.retrieve.all'],
-        {params : [openils.User.authtoken]}
-    );
+    var tbody = dojo.byId('uedit-tbody');
+    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'));
 
-    loadTable();
+    loadStaticFields(tbody);
+    loadStatCats(tbody);
+    loadSurveys(tbody);
 }
 
-function loadTable() {
-    var tbody = dojo.byId('uedit-tbody');
-
+function loadStaticFields(tbody) {
+    // draw static user/addr fields
     for(var idx = 0; tbody.childNodes[idx]; idx++) {
         var row = tbody.childNodes[idx];
         if(row.nodeType != row.ELEMENT_NODE) continue;
@@ -52,44 +54,67 @@ function loadTable() {
         if(!fmcls) continue;
         fleshFMRow(row, fmcls);
     }
+}
 
-    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'));
+function loadStatCats(tbody) {
+    statCats = fieldmapper.standardRequest(
+        ['open-ils.circ', 'open-ils.circ.stat_cat.actor.retrieve.all'],
+        {params : [openils.User.authtoken, staff.ws_ou()]}
+    );
 
+    // draw stat cats
     for(var idx in statCats) {
         var stat = statCats[idx];
         var row = statCatTemplate.cloneNode(true);
         row.id = 'stat-cat-row-' + idx;
         tbody.appendChild(row);
-        dojo.query('[name=name]', row)[0].innerHTML = stat.name();
-        var valtd = dojo.query('[name=widget]', row)[0];
+        getByName(row, 'name').innerHTML = stat.name();
+        var valtd = getByName(row, 'widget');
         var span = valtd.appendChild(document.createElement('span'));
         var store = new dojo.data.ItemFileReadStore(
                 {data:fieldmapper.actsc.toStoreData(stat.entries())});
         var comboBox = new dijit.form.ComboBox({store:store}, span);
         comboBox.labelAttr = 'value';
         comboBox.searchAttr = 'value';
+
+        comboBox._wtype = 'statcat';
+        comboBox._statcat = stat.id();
+        widgetPile.push(comboBox); 
+
     }
+}
+
+function loadSurveys(tbody) {
+
+    surveys = fieldmapper.standardRequest(
+        ['open-ils.circ', 'open-ils.circ.survey.retrieve.all'],
+        {params : [openils.User.authtoken]}
+    );
 
+    // draw surveys
     for(var idx in surveys) {
         var survey = surveys[idx];
         var srow = surveyTemplate.cloneNode(true);
         tbody.appendChild(srow);
-        dojo.query('[name=name]', srow)[0].innerHTML = survey.name();
+        getByName(srow, 'name').innerHTML = survey.name();
 
         for(var q in survey.questions()) {
             var quest = survey.questions()[q];
             var qrow = surveyQuestionTemplate.cloneNode(true);
             tbody.appendChild(qrow);
-            dojo.query('[name=question]', qrow)[0].innerHTML = quest.question();
+            getByName(qrow, 'question').innerHTML = quest.question();
 
-            var span = dojo.query('[name=answers]', qrow)[0].appendChild(document.createElement('span'));
+            var span = getByName(qrow, 'answers').appendChild(document.createElement('span'));
             var store = new dojo.data.ItemFileReadStore(
                 {data:fieldmapper.asva.toStoreData(quest.answers())});
             var select = new dijit.form.FilteringSelect({store:store}, span);
             select.labelAttr = 'answer';
             select.searchAttr = 'answer';
+
+            select._wtype = 'survey';
+            select._survey = survey.id();
+            select._question = quest.id();
+            widgetPile.push(select); 
         }
     }
 }
@@ -133,6 +158,15 @@ function fleshFMRow(row, fmcls) {
         orgLimitPerms : ['UPDATE_USER'],
     });
     widget.build();
+
+    widget._wtype = fmcls;
+    widget._fmfield = fmfield;
+    widget._addr = uEditAddrVirtId;
+    widgetPile.push(widget);
+}
+
+function getByName(node, name) {
+    return dojo.query('[name='+name+']', node)[0];
 }
 
 
@@ -143,5 +177,127 @@ function ueLoadContextHelp(fmcls, fmfield) {
 }
 
 
+/* creates a new patron object with card attached */
+function uEditNewPatron() {
+    patron = new au();
+    patron.isnew(1);
+    patron.id(-1);
+    card = new ac();
+    card.id(uEditCardVirtId--);
+    card.isnew(1);
+    patron.card(card);
+    patron.cards([card]);
+    //patron.net_access_level(defaultNetLevel);
+    patron.stat_cat_entries([]);
+    patron.survey_responses([]);
+    patron.addresses([]);
+    //patron.home_ou(USER.ws_ou());
+    uEditMakeRandomPw(patron);
+}
+
+function uEditMakeRandomPw(patron) {
+    if(uEditUsePhonePw) return;
+    var rand  = Math.random();
+    rand = parseInt(rand * 10000) + '';
+    while(rand.length < 4) rand += '0';
+/*
+    appendClear($('ue_password_plain'),text(rand));
+    unHideMe($('ue_password_gen'));
+*/
+    patron.passwd(rand);
+    return rand;
+}
+
+function uEditWidgetVal(w) {
+    var val = (w.getFormattedValue) ? w.getFormattedValue() : w.attr('value');
+    if(val == '') val = null;
+    return val;
+}
+
+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':
+                patron[w._fmfield](uEditWidgetVal(w));
+                break;
+
+            case 'ac':
+                patron.card()[w._fmfield](uEditWidgetVal(w));
+                break;
+
+            case 'aua':
+                var addr = patron.addresses().filter(function(i){return (i.id() == w._addr)})[0];
+                if(!addr) {
+                    addr = new fieldmapper.aua();
+                    addr.id(w._addr);
+                    addr.isnew(1);
+                    patron.addresses().push(addr);
+                    console.log("pushing address " + addr.id());
+                }
+                addr[w._fmfield](uEditWidgetVal(w));
+                break;
+
+            case 'survey':
+                var val = uEditWidgetVal(w);
+                if(val == null) break;
+                var resp = new fieldmapper.asvr();
+                resp.isnew(1);
+                resp.survey(w._survey)
+                resp.usr(patron.id());
+                resp.question(w._question)
+                resp.answer(val);
+                patron.survey_responses().push(resp);
+                break;
+
+            case 'statcat':
+                var val = uEditWidgetVal(w);
+                if(val == null) break;
+                var map = new fieldmapper.actscecm();
+                map.isnew(1);
+                map.stat_cat(w._statcat);
+                map.stat_cat_entry(val);
+                map.target_usr(patron.id());
+                patron.stat_cat_entries().push(map);
+                break;
+        }
+    }
+
+    console.log(js2JSON(patron.addresses()));
+    alert(js2JSON(patron));
+
+    fieldmapper.standardRequest(
+        ['open-ils.actor', 'open-ils.actor.patron.update'],
+        {   async: true,
+            params: [openils.User.authtoken, patron],
+            oncomplete: function(r) {
+                patron = openils.Util.readResponse(r);
+                if(patron) {
+                    alert('success');
+                    //uEditRefresh();
+                } else {
+                    alert('no success?');
+                }
+            }
+        }
+    );
+}
+
+function uEditRefresh() {
+    var href = location.href;
+    href = href.replace(/\&?clone=\d+/, '');
+    location.href = href;
+}
+
+
+
+
+
+
+
 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 8eab3ff15f..38613106c8 100644
--- a/Open-ILS/web/templates/default/actor/user/register.tt2
+++ b/Open-ILS/web/templates/default/actor/user/register.tt2
@@ -9,13 +9,26 @@
         padding: 5px;
         text-align: left;
     }
+
+    #uedit-save-div {
+        position: fixed;
+        top:40px;
+        right:30px;
+        width:300px;
+        border:2px solid #d9e8f9;
+        -moz-border-radius: 10px;
+        font-weight: bold;
+        padding: 12px;
+        text-align:center;
+        vertical-align:middle;
+    }
+
     #uedit-help-div {
         position: fixed;
-        top: 40px;
-        right: 30px;
+        top:124px;
+        right:30px;
         width:300px;
-        height:200px;
-        border:2px dashed #e0e0c0;
+        border:2px dashed #d9e8f9;
         -moz-border-radius: 10px;
         font-weight: bold;
         padding: 20px;
@@ -33,13 +46,6 @@
 
 </style>
 
-<!-- context help widget -->
-<a class='hidden' id='uedit-help-template'><img src='/opac/images/advancedsearch-icon.png'></img></a>
-<fieldset id='uedit-help-div' class='hidden'>
-    <legend id='uedit-help-field'/>
-    <div id='uedit-help-text'/>
-</fieldset>
-
 <table>
     <tbody id='uedit-tbody'>
         <tr fmclass='ac' fmfield='barcode'/>
@@ -68,22 +74,23 @@
         <tr fmclass='au' fmfield='master_account'/>
         <tr fmclass='au' fmfield='claims_returned_count'/>
         <tr fmclass='au' fmfield='alert_message' wclass='dijit.form.Textarea' wstyle='height:5em'/>
-        <tr class='divider'><td colspan='0'>Address</td></tr>
-        <tr fmclass='aua' fmfield='address_type'/>
-        <tr fmclass='aua' fmfield='post_code'/>
-        <tr fmclass='aua' fmfield='street1'/>
-        <tr fmclass='aua' fmfield='street2'/>
-        <tr fmclass='aua' fmfield='city'/>
-        <tr fmclass='aua' fmfield='county'/>
-        <tr fmclass='aua' fmfield='state'/>
-        <tr fmclass='aua' fmfield='country'/>
-        <tr fmclass='aua' fmfield='valid'/>
-        <tr fmclass='aua' fmfield='within_city_limits'/>
 
-        <tr><td class='uedit-help'><td>Billing Address</td>
+        <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>
         </tr>
-        <tr><td class='uedit-help'><td>Mailing Address</td>
+        <tr type='addr'><td class='uedit-help'><td>Mailing Address</td>
             <td><div dojoType='dijit.form.CheckBox' name='billing-addr-widget'></div></td>
         </tr>
 
@@ -94,5 +101,19 @@
         <tr id='survey-question-row-template'><td class='uedit-help'/><td name='question'/><td name='answers'/></tr>
     </tbody>
 </table>
+
+<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>
+</div>
+
+<!-- context help widget -->
+<a class='hidden' id='uedit-help-template'><img src='/opac/images/advancedsearch-icon.png'></img></a>
+<fieldset id='uedit-help-div' class='hidden'>
+    <legend id='uedit-help-field'/>
+    <div id='uedit-help-text'/>
+</fieldset>
+
 [% END %]