From 0a167177ed7e55226892f5d2d28a82ad9c56440e Mon Sep 17 00:00:00 2001 From: erickson Date: Tue, 15 Nov 2005 16:05:32 +0000 Subject: [PATCH] added holds cancellation to myopac set remote request to dev.gapines.org for XUL for now git-svn-id: svn://svn.open-ils.org/ILS/trunk@2028 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/common/js/RemoteRequest.js | 12 +++- Open-ILS/web/opac/common/js/config.js | 1 + Open-ILS/web/opac/locale/en-US/lang.dtd | 2 +- Open-ILS/web/opac/skin/default/js/myopac.js | 72 ++++++++++++------- .../opac/skin/default/xml/myopac_holds.xml | 6 +- .../skin/default/xml/rdetail_altcanvas.xml | 8 ++- 6 files changed, 67 insertions(+), 34 deletions(-) diff --git a/Open-ILS/web/opac/common/js/RemoteRequest.js b/Open-ILS/web/opac/common/js/RemoteRequest.js index c01adcf5f1..65b9cfd439 100644 --- a/Open-ILS/web/opac/common/js/RemoteRequest.js +++ b/Open-ILS/web/opac/common/js/RemoteRequest.js @@ -1,5 +1,5 @@ var XML_HTTP_GATEWAY = "gateway"; -var XML_HTTP_SERVER = "gapines.org"; +var XML_HTTP_SERVER = "dev.gapines.org"; var XML_HTTP_MAX_TRIES = 3; //var IAMXUL = false; @@ -159,6 +159,12 @@ RemoteRequest.prototype.send = function(blocking) { url += "?" + this.param_string; } + + try { + dump( 'Remote Request URL: ' + url + '\n'); + } catch(E){} + + if(blocking) { this.xmlhttp.open(this.type, url, false); } else { @@ -172,6 +178,10 @@ RemoteRequest.prototype.send = function(blocking) { 'application/x-www-form-urlencoded'); } + try { + dump( 'Remote Request URL: ' + url + '\n'); + } catch(E){} + try{ this.xmlhttp.send( data ); } catch(e){} this.sendCount += 1; diff --git a/Open-ILS/web/opac/common/js/config.js b/Open-ILS/web/opac/common/js/config.js index 585d87404e..15d8b3015f 100644 --- a/Open-ILS/web/opac/common/js/config.js +++ b/Open-ILS/web/opac/common/js/config.js @@ -195,6 +195,7 @@ var FETCH_FINES_SUMMARY = "open-ils.actor:open-ils.actor.user.fines.summary"; var FETCH_TRANSACTIONS = "open-ils.actor:open-ils.actor.user.transactions.have_charge.fleshed"; var FETCH_CROSSREF = "open-ils.search:open-ils.search.authority.crossref"; var CREATE_HOLD = "open-ils.circ:open-ils.circ.holds.create"; +var CANCEL_HOLD = "open-ils.circ:open-ils.circ.hold.cancel"; /* ---------------------------------------------------------------------------- */ diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index d38ad8b4c2..2659dc1067 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -63,4 +63,4 @@ - + diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js index 27bf445444..30bceac6ac 100644 --- a/Open-ILS/web/opac/skin/default/js/myopac.js +++ b/Open-ILS/web/opac/skin/default/js/myopac.js @@ -118,11 +118,11 @@ function myOPACDrawCheckedOut(r) { var due = circ.due_date(); due = due.replace(/[0-9][0-9]:.*$/,""); - var tlink = findNodeByName( row, "myopac_checked_title_link" ); - var alink = findNodeByName( row, "myopac_checked_author_link" ); - var dlink = findNodeByName( row, "myopac_checked_due" ); - var rlink = findNodeByName( row, "myopac_checked_renewals" ); - var rnlink = findNodeByName( row, "myopac_checked_renew_link" ); + var tlink = $n( row, "myopac_checked_title_link" ); + var alink = $n( row, "myopac_checked_author_link" ); + var dlink = $n( row, "myopac_checked_due" ); + var rlink = $n( row, "myopac_checked_renewals" ); + var rnlink = $n( row, "myopac_checked_renew_link" ); buildTitleDetailLink(record, tlink); buildSearchLink(STYPE_AUTHOR, record.author(), alink); @@ -143,12 +143,19 @@ function myOPACShowHolds() { req.send(); } +var holdsTemplateRowOrig; var holdsTemplateRow; function myOPACDrawHolds(r) { var tbody = $("myopac_holds_tbody"); if(holdsTemplateRow) return; - holdsTemplateRow = tbody.removeChild($("myopac_holds_row")); + if(holdsTemplateRowOrig) { + holdsTemplateRow = holdsTemplateRowOrig; + removeChildren(tbody); + } else { + holdsTemplateRow = tbody.removeChild($("myopac_holds_row")); + holdsTemplateRowOrig = holdsTemplateRow; + } hideMe($('myopac_holds_loading')); @@ -162,23 +169,36 @@ function myOPACDrawHolds(r) { row.id = "myopac_holds_row_" + h.target(); var formats = (h.holdable_formats()) ? h.holdable_formats() : null; - var form = findNodeByName(row, "myopac_holds_formats"); + var form = $n(row, "myopac_holds_formats"); form.id = "myopac_holds_form_" + h.target(); if(formats) form.appendChild(text(formats)); - findNodeByName(row, "myopac_holds_location"). + $n(row, "myopac_holds_location"). appendChild(text(findOrgUnit(h.pickup_lib()).name())); - findNodeByName(row, "myopac_holds_email_link"). + $n(row, "myopac_holds_email_link"). appendChild(text(h.email_notify())); - findNodeByName(row, "myopac_holds_phone_link"). + $n(row, "myopac_holds_phone_link"). appendChild(text(h.phone_notify())); tbody.appendChild(row); + + $n(row,'myopac_holds_cancel_link').setAttribute( + 'href','javascript:myOPACCancelHold("'+ h.id()+'");'); unHideMe(row); myOPACDrawHoldTitle(h); } } +function myOPACCancelHold(holdid) { + if( confirm($('myopac_holds_cancel_verify').innerHTML) ) { + holdsCancel(holdid); + holdsTemplateRow = null + myOPACShowHolds(); + } +} + + + function myOPACDrawHoldTitle(hold) { var method; if(hold.hold_type() == "M") method = FETCH_MRMODS; @@ -192,8 +212,8 @@ function myOPACFleshHoldTitle(r) { var record = r.getResultObject(); var row = $("myopac_holds_row_" + record.doc_id()); - var title_link = findNodeByName(row, "myopac_holds_title_link"); - var author_link = findNodeByName(row, "myopac_holds_author_link"); + var title_link = $n(row, "myopac_holds_title_link"); + var author_link = $n(row, "myopac_holds_author_link"); buildTitleDetailLink(record, title_link); buildSearchLink(STYPE_AUTHOR, record.author(), author_link); @@ -269,24 +289,24 @@ function myOPACShowTransactions(r) { var record = transactions[idx].record; var row = transTemplate.cloneNode(transTemplate); - findNodeByName(row,'myopac_trans_start'). + $n(row,'myopac_trans_start'). appendChild(text(_trimSeconds(trans.xact_start()))); - findNodeByName(row,'myopac_trans_last_bill'). + $n(row,'myopac_trans_last_bill'). appendChild(text(_trimSeconds(trans.last_billing_ts()))); - findNodeByName(row,'myopac_trans_last_payment'). + $n(row,'myopac_trans_last_payment'). appendChild(text(_trimSeconds(trans.last_payment_ts()))); - findNodeByName(row,'myopac_trans_init_amount'). + $n(row,'myopac_trans_init_amount'). appendChild(text(_finesFormatNumber(trans.total_owed()))); - findNodeByName(row,'myopac_trans_total_paid'). + $n(row,'myopac_trans_total_paid'). appendChild(text(_finesFormatNumber(trans.total_paid()))); - findNodeByName(row,'myopac_trans_balance'). + $n(row,'myopac_trans_balance'). appendChild(text(_finesFormatNumber(trans.balance_owed()))); var extra = ""; var type = trans.xact_type(); - findNodeByName(row,'myopac_trans_type').appendChild(text(type)); + $n(row,'myopac_trans_type').appendChild(text(type)); if( type == "circulation" ) extra = record.title(); - findNodeByName(row, 'myopac_trans_extra').appendChild(text(extra)); + $n(row, 'myopac_trans_extra').appendChild(text(extra)); tbody.appendChild(row); } @@ -333,13 +353,13 @@ function _myOPACSummaryShowUer(r) { } function myOPACDrawAddr(row, addr) { - findNodeByName(row, 'myopac_addr_type').appendChild(text(addr.address_type())); + $n(row, 'myopac_addr_type').appendChild(text(addr.address_type())); var street = (addr.street2()) ? addr.street1() + ", " + addr.street2() : addr.street1(); - findNodeByName(row, 'myopac_addr_street').appendChild(text(street)); - findNodeByName(row, 'myopac_addr_city').appendChild(text(addr.city())); - findNodeByName(row, 'myopac_addr_county').appendChild(text(addr.county())); - findNodeByName(row, 'myopac_addr_state').appendChild(text(addr.state())); - findNodeByName(row, 'myopac_addr_zip').appendChild(text(addr.post_code())); + $n(row, 'myopac_addr_street').appendChild(text(street)); + $n(row, 'myopac_addr_city').appendChild(text(addr.city())); + $n(row, 'myopac_addr_county').appendChild(text(addr.county())); + $n(row, 'myopac_addr_state').appendChild(text(addr.state())); + $n(row, 'myopac_addr_zip').appendChild(text(addr.post_code())); } diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml b/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml index b88ce1bef3..d028e359e3 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml @@ -2,9 +2,7 @@
- - + @@ -55,6 +53,8 @@
+
Are you sure you wish to cancel the selected hold?
+
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml index c7b37847c8..38a48416a9 100644 --- a/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml +++ b/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml @@ -12,9 +12,11 @@
-
- &rdetail.detailMain.hideMarc; -
+ + +
+ &rdetail.detailMain.hideMarc; +

-- 2.43.2