From: Jeff Godin <jgodin@tadl.org>
Date: Mon, 23 Apr 2012 12:17:41 +0000 (-0400)
Subject: Include reshelving count in multi-lib summary
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fskin_tadlv4;p=evergreen%2Ftadl.git

Include reshelving count in multi-lib summary

Also include reshelving counts in multi-lib summary, so that
we don't say "0 available at Example Branch 1" without further
information "(plus 2 recently returned)".

Signed-off-by: Jeff Godin <jgodin@tadl.org>
---

diff --git a/Open-ILS/web/opac/skin/tadlv4/xml/rdetail/rdetail_summary.xml b/Open-ILS/web/opac/skin/tadlv4/xml/rdetail/rdetail_summary.xml
index 3cedebfc2b..7ccb149be0 100644
--- a/Open-ILS/web/opac/skin/tadlv4/xml/rdetail/rdetail_summary.xml
+++ b/Open-ILS/web/opac/skin/tadlv4/xml/rdetail/rdetail_summary.xml
@@ -299,14 +299,20 @@
                         // output the grouped-by-library summary
                         for (var libname in copySummaryObj) {
                             var copycount = 0;
+                            var copycount_reshelving = 0;
                             for (var loc in copySummaryObj[libname]) {
                                 for (var cn in copySummaryObj[libname][loc]) {
                                     copycount = copycount + copySummaryObj[libname][loc][cn]['count'];
+                                    copycount_reshelving = copycount_reshelving + copySummaryObj[libname][loc][cn]['count_reshelving'];
                                 }
                             }
                             var libdiv = dojo.create('div');
                             var libcontent = dojo.create('span', { "style": "font-weight: bold;" });
-                            var libtext = dojo.doc.createTextNode(copycount + ' available at ' + libname);
+                            var summary_text = copycount + ' available at ' + libname;
+                            if (copycount_reshelving) {
+                                summary_text += ' (plus ' + copycount_reshelving + ' recently returned)';
+                            }
+                            var libtext = dojo.doc.createTextNode(summary_text);
                             libcontent.appendChild(libtext);
                             libdiv.appendChild(libcontent);
                             output.appendChild(libdiv);
diff --git a/Open-ILS/web/opac/skin/tadlv4/xml/result/result_table.xml b/Open-ILS/web/opac/skin/tadlv4/xml/result/result_table.xml
index 738971ddd4..30776971ad 100644
--- a/Open-ILS/web/opac/skin/tadlv4/xml/result/result_table.xml
+++ b/Open-ILS/web/opac/skin/tadlv4/xml/result/result_table.xml
@@ -293,14 +293,20 @@
                                     // output the grouped-by-library summary
                                     for (var libname in copySummaryObj) {
                                         var copycount = 0;
+                                        var copycount_reshelving = 0;
                                         for (var loc in copySummaryObj[libname]) {
                                             for (var cn in copySummaryObj[libname][loc]) {
                                                 copycount = copycount + copySummaryObj[libname][loc][cn]['count'];
+                                                copycount_reshelving = copycount_reshelving + copySummaryObj[libname][loc][cn]['count_reshelving'];
                                             }
                                         }
                                         var libdiv = dojo.create('div');
                                         var libcontent = dojo.create('span', { "style": "font-weight: bold;" });
-                                        var libtext = dojo.doc.createTextNode(copycount + ' available at ' + libname);
+                                        var summary_text = copycount + ' available at ' + libname;
+                                        if (copycount_reshelving) {
+                                            summary_text += ' (plus ' + copycount_reshelving + ' recently returned)';
+                                        }
+                                        var libtext = dojo.doc.createTextNode(summary_text);
                                         libcontent.appendChild(libtext);
                                         libdiv.appendChild(libcontent);
                                         output.appendChild(libdiv);