From 7d4bdbe246564b2cec44e007336dd01281818747 Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 16 Apr 2009 21:52:49 +0000 Subject: [PATCH] implemented lineitem and lineitem_detail receive git-svn-id: svn://svn.open-ils.org/ILS/trunk@12901 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/js/ui/default/acq/common/li_table.js | 54 +++++++++++++++++++++- .../web/templates/default/acq/common/li_table.tt2 | 19 ++++---- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js index e5e488cc2c..05d885217a 100644 --- a/Open-ILS/web/js/ui/default/acq/common/li_table.js +++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js @@ -156,15 +156,25 @@ function AcqLiTable() { dojo.query('[attr=title]', row)[0].onclick = function() {self.drawInfo(li.id())}; dojo.query('[name=copieslink]', row)[0].onclick = function() {self.drawCopies(li.id())}; - dojo.query('[name=count]', row)[0].innerHTML = li.item_count(); + dojo.query('[name=count]', row)[0].innerHTML = li.item_count() || 0; dojo.query('[name=notes_count]', row)[0].innerHTML = li.lineitem_notes().length; dojo.query('[name=noteslink]', row)[0].onclick = function() {self.drawLiNotes(li)}; - var priceInput = dojo.query('[name=estimated_price]', row)[0]; + var priceInput = dojo.query('[name=price]', row)[0]; var priceData = liWrapper.getPrice(); priceInput.value = (priceData) ? priceData.price : ''; priceInput.onchange = function() { self.updateLiPrice(priceInput, li) }; + var recv_link = dojo.query('[name=receive_link]', row)[0]; + if(li.state() == 'received') { + openils.Util.hide(recv_link) + } else { + recv_link.onclick = function() { + self.receiveLi(li); + openils.Util.hide(recv_link) + } + } + self.tbody.appendChild(row); self.selectors.push(dojo.query('[name=selectbox]', row)[0]); }; @@ -534,6 +544,16 @@ function AcqLiTable() { } ); + var recv_link = dojo.query('[name=receive]', row)[0]; + if(copy.recv_time()) { + openils.Util.hide(recv_link); + } else { + recv_link.onclick = function() { + self.receiveLid(copy); + openils.Util.hide(recv_link); + } + } + if(this.isPO) { openils.Util.hide(dojo.query('[name=delete]', row)[0].parentNode); } else { @@ -684,6 +704,36 @@ function AcqLiTable() { ); } + this.receiveLi = function(li) { + if(!this.isPO) return; + progressDialogInd.show(); + fieldmapper.standardRequest( + ['open-ils.acq', 'open-ils.acq.lineitem.receive'], + { async: true, + params: [this.authtoken, li.id()], + onresponse : function(r) { + var resp = openils.Util.readResponse(r); + progressDialogInd.hide(); + }, + } + ); + } + + this.receiveLid = function(li) { + if(!this.isPO) return; + progressDialogInd.show(); + fieldmapper.standardRequest( + ['open-ils.acq', 'open-ils.acq.lineitem_detail.receive'], + { async: true, + params: [this.authtoken, li.id()], + onresponse : function(r) { + var resp = openils.Util.readResponse(r); + progressDialogInd.hide(); + }, + } + ); + } + this.rollbackPoReceive = function() { if(!this.isPO) return; if(!confirm(localeStrings.ROLLBACK_PO_RECEIVE_CONFIRM)) return; diff --git a/Open-ILS/web/templates/default/acq/common/li_table.tt2 b/Open-ILS/web/templates/default/acq/common/li_table.tt2 index e788124178..e24f8e45b7 100644 --- a/Open-ILS/web/templates/default/acq/common/li_table.tt2 +++ b/Open-ILS/web/templates/default/acq/common/li_table.tt2 @@ -46,7 +46,8 @@ Line Items - Estimated Price + + Price Items Notes @@ -54,7 +55,7 @@ - + @@ -71,18 +72,15 @@ - +
- - - - - Copies(0) - + Mark Received + + Copies(0) Notes(0) @@ -226,7 +224,7 @@ Callnumber Barcode Notes - + @@ -238,6 +236,7 @@
+ Mark Received
X
-- 2.11.0