[open-ils-commits] [GIT] Evergreen ILS branch master updated. b2e84c0c72b8e3099c1fe3dc687065e18f50d7e2
Evergreen Git
git at git.evergreen-ils.org
Mon Aug 19 17:04:21 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via b2e84c0c72b8e3099c1fe3dc687065e18f50d7e2 (commit)
via 203c122803bcdab667c413ec624d3b12320c9d03 (commit)
from cdec380cf70ef29750490f4618b1826d69f3bbc5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b2e84c0c72b8e3099c1fe3dc687065e18f50d7e2
Author: Bill Erickson <berick at esilibrary.com>
Date: Wed Dec 26 16:43:20 2012 -0500
ACQ delayed lineitems style release notes
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/docs/RELEASE_NOTES_NEXT/Acquisitions/acq-style-cancelled-delayted.txt b/docs/RELEASE_NOTES_NEXT/Acquisitions/acq-style-cancelled-delayted.txt
new file mode 100644
index 0000000..3867adf
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Acquisitions/acq-style-cancelled-delayted.txt
@@ -0,0 +1,11 @@
+New Feature: Differentiate between cancelled and "delayed" lineitems
+====================================================================
+In the ACQ user interface, it is now more clear to users when a lineitem has
+been fully cancelled or if it has been cancelled temporarily (e.g. back-
+ordered).
+
+When a lineitem is cancelled, but "keep_debits" is true on the cancel reason,
+the lineitem is in effect delayed instead of truly cancelled. This is now
+more obvious in the interface with different row styling for cancelled vs
+delayed lineitems. We also always show the lineitem cancel reason (label)
+next to the non-title attributes in the lineitem list display.
commit 203c122803bcdab667c413ec624d3b12320c9d03
Author: Bill Erickson <berick at esilibrary.com>
Date: Tue Dec 11 10:26:30 2012 -0500
Improve styling for 'delayed' lineitems in PO UI
When a lineitem is cancelled, but "keep_debits" is true, the lineitem is
in effect delayed instead of truly cancelled. Make it more obvious in
the UI the difference between delayed and truly cancelled lineitems by
applying a row styling for delayed items (similar to other status row
styling) and always show the cancel reason (label) in the lineitem
display in the PO, next to the non-title attributes.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/templates/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2
index c6f2908..d6a478e 100644
--- a/Open-ILS/src/templates/acq/common/li_table.tt2
+++ b/Open-ILS/src/templates/acq/common/li_table.tt2
@@ -155,6 +155,7 @@
<span attr='pubdate'></span>
<span attr='publisher'></span>
<span name='source_label'></span>
+ <span name='cancel_reason'></span>
</td>
</tr>
<tr>
diff --git a/Open-ILS/web/css/skin/default/acq.css b/Open-ILS/web/css/skin/default/acq.css
index 7da2a78..1beff27 100644
--- a/Open-ILS/web/css/skin/default/acq.css
+++ b/Open-ILS/web/css/skin/default/acq.css
@@ -278,3 +278,4 @@ span[name="bib_origin"] img { vertical-align: middle; }
border: 1px solid #464;
}
+span[name="cancel_reason"] { text-decoration: underline; font-weight: bold; }
diff --git a/Open-ILS/web/css/theme/default/acq.css b/Open-ILS/web/css/theme/default/acq.css
index d59e28e..bc73c72 100644
--- a/Open-ILS/web/css/theme/default/acq.css
+++ b/Open-ILS/web/css/theme/default/acq.css
@@ -35,6 +35,7 @@
.oils-acq-li-state-pending-order td { background-color: #EEEEDD; }
.oils-acq-li-state-on-order td { background-color: #EEDDDD; }
.oils-acq-li-state-received td { background-color: #DDDDDD; }
+.oils-acq-li-state-delayed td { background-color: #99CCFF; }
/* po display */
#oils-acq-po-table thead tr { border: 1px solid #A1A1A1; }
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 16665c4..068f351 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
@@ -626,6 +626,11 @@ function AcqLiTable() {
dojo.forEach(tds, function(td) {self.setRowAttr(td, liWrapper, td.getAttribute('attr'), td.getAttribute('attr_type'));});
dojo.query('[name=source_label]', row)[0].appendChild(document.createTextNode(li.source_label()));
+ if (li.cancel_reason() && typeof li.cancel_reason() == 'object') {
+ dojo.query('[name=cancel_reason]', row)[0].appendChild(
+ document.createTextNode(li.cancel_reason().label()));
+ }
+
// so we can scroll to it later
dojo.query('[name=bib-info-cell]', row)[0].id = 'li-title-ref-' + li.id();
@@ -1162,6 +1167,11 @@ function AcqLiTable() {
"connectId": [holds_state]
}, dojo.create("span", null, state_cell, "last")
);
+
+ if (li.cancel_reason().keep_debits() == 't') {
+ openils.Util.removeCSSClass(row, /^oils-acq-li-state-/);
+ openils.Util.addCSSClass(row, "oils-acq-li-state-delayed");
+ }
}
return; // all done
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/acq/common/li_table.tt2 | 1 +
Open-ILS/web/css/skin/default/acq.css | 1 +
Open-ILS/web/css/theme/default/acq.css | 1 +
Open-ILS/web/js/ui/default/acq/common/li_table.js | 10 ++++++++++
.../Acquisitions/acq-style-cancelled-delayted.txt | 11 +++++++++++
5 files changed, 24 insertions(+), 0 deletions(-)
create mode 100644 docs/RELEASE_NOTES_NEXT/Acquisitions/acq-style-cancelled-delayted.txt
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list