show name of session on url select page ...

... and link back to that on review attempt page

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

diff --git a/Open-ILS/src/templates/url_verify/review_attempt.tt2 b/Open-ILS/src/templates/url_verify/review_attempt.tt2
index 21118a0..59db000 100644 (file)
--- a/Open-ILS/src/templates/url_verify/review_attempt.tt2
+++ b/Open-ILS/src/templates/url_verify/review_attempt.tt2
@@ -19,11 +19,12 @@
 </script>
 <style type="text/css">
     .url-verify-attempt-info { font-style: italic; }
+    #session-link-here { font-weight: normal; font-size: 90%; }
 </style>
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
     <div dojoType="dijit.layout.ContentPane"
          layoutAlign="top" class="oils-header-panel">
-        <div>[% ctx.page_title %]</div>
+        <div>[% ctx.page_title %] - <span id="session-link-here"></span></div>
         <div>
             <!-- buttons here -->
         </div>

diff --git a/Open-ILS/src/templates/url_verify/select_urls.tt2 b/Open-ILS/src/templates/url_verify/select_urls.tt2
index 1b21172..0fab21f 100644 (file)
--- a/Open-ILS/src/templates/url_verify/select_urls.tt2
+++ b/Open-ILS/src/templates/url_verify/select_urls.tt2
@@ -19,9 +19,10 @@
 </script>
 <style type="text/css">
     .url-verify-attempt-info { font-style: italic; }
+    #session-name-here { font-weight: normal; font-size: 90%; }
 </style>
 <div class="oils-header-panel" dojoType="dijit.layout.ContentPane" layoutAlign="top">
-    <div>[% ctx.page_title %]</div>
+    <div>[% ctx.page_title %] - <span id="session-name-here"></span></div>
     <div class="url-verify-button">
         <button dojoType="dijit.form.Button"
             onClick="module.verify_selected();">[%

diff --git a/Open-ILS/web/js/dojo/openils/URLVerify/ReviewAttempt.js b/Open-ILS/web/js/dojo/openils/URLVerify/ReviewAttempt.js
index ac5d30b..d9a1cf5 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/URLVerify/ReviewAttempt.js
+++ b/Open-ILS/web/js/dojo/openils/URLVerify/ReviewAttempt.js
@@ -1,7 +1,8 @@
 if (!dojo._hasResource["openils.URLVerify.ReviewAttempt"]) {
     dojo.require("dojo.string");
     dojo.require("openils.CGI");
-    dojo.require("openils.Util");
+    dojo.require("openils.PermaCrud");
+    dojo.require("dijit.Tooltip");
 
     dojo.requireLocalization("openils.URLVerify", "URLVerify");
 
@@ -19,7 +20,34 @@ if (!dojo._hasResource["openils.URLVerify.ReviewAttempt"]) {
     var localeStrings =
         dojo.i18n.getLocalization("openils.URLVerify", "URLVerify");
 
+    module._display_session_name = function() {
+        var pcrud = new openils.PermaCrud();
+
+        var attempt = pcrud.retrieve(
+            "uvva", module.attempt_id, {
+                "flesh": 1, "flesh_fields": {"uvva": ["session"]}
+            }
+        );
+
+        dojo.byId("session-link-here").innerHTML =
+            "<a href='select_urls?session_id=" + attempt.session().id() + "'>" +
+            dojo.string.substitute(
+                localeStrings.SESSION_NAME, [attempt.session().name()]
+            ) + "</a>";
+
+        pcrud.disconnect();
+
+        new dijit.Tooltip({
+            "connectId": "session-link-here",
+            "label": localeStrings.SELECT_MORE
+        });
+    };
+
     module.setup = function(grid, progress_dialog) {
+        module.progress_dialog = progress_dialog;
+        module.progress_dialog.attr("title", localeStrings.INTERFACE_SETUP);
+        module.progress_dialog.show(true);
+
         var cgi = new openils.CGI();
         module.attempt_id = cgi.param("attempt_id");
 
@@ -28,11 +56,10 @@ if (!dojo._hasResource["openils.URLVerify.ReviewAttempt"]) {
         module.grid.setBaseQuery({"attempt_id": module.attempt_id});
 
         module.grid.refresh();
-        // Alternative to grid.refresh() once filter is set up
-        //module.grid.fetchLock = false;
-        //module.grid.filterUi.doApply();
 
-        module.progress_dialog = progress_dialog;
+        module._display_session_name();
+
+        module.progress_dialog.hide();
     };
 
 }());

diff --git a/Open-ILS/web/js/dojo/openils/URLVerify/SelectURLs.js b/Open-ILS/web/js/dojo/openils/URLVerify/SelectURLs.js
index 60c2dc3..83e5fdf 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/URLVerify/SelectURLs.js
+++ b/Open-ILS/web/js/dojo/openils/URLVerify/SelectURLs.js
@@ -2,6 +2,7 @@ if (!dojo._hasResource["openils.URLVerify.SelectURLs"]) {
     dojo.require("dojo.string");
     dojo.require("openils.CGI");
     dojo.require("openils.Util");
+    dojo.require("openils.PermaCrud");
     dojo.require("openils.URLVerify.Verify");
 
     dojo.requireLocalization("openils.URLVerify", "URLVerify");
@@ -21,6 +22,10 @@ if (!dojo._hasResource["openils.URLVerify.SelectURLs"]) {
         dojo.i18n.getLocalization("openils.URLVerify", "URLVerify");
 
     module.setup = function(grid, progress_dialog) {
+        module.progress_dialog = progress_dialog;
+        module.progress_dialog.attr("title", localeStrings.INTERFACE_SETUP);
+        module.progress_dialog.show(true);
+
         var cgi = new openils.CGI();
         module.session_id = cgi.param("session_id");
 
@@ -33,7 +38,29 @@ if (!dojo._hasResource["openils.URLVerify.SelectURLs"]) {
         //module.grid.fetchLock = false;
         //module.grid.filterUi.doApply();
 
-        module.progress_dialog = progress_dialog;
+        module._display_session_name();
+
+        module.progress_dialog.hide();
+    };
+
+    module._display_session_name = function() {
+        var pcrud = new openils.PermaCrud();
+
+        pcrud.retrieve(
+            "uvs", module.session_id, {
+                "async": true,
+                "oncomplete": function(r) {
+                    if (r = openils.Util.readResponse(r)) {
+                        dojo.byId("session-name-here").innerHTML =
+                            dojo.string.substitute(
+                                localeStrings.SESSION_NAME, [r.name()]
+                            );
+
+                        pcrud.disconnect();
+                    }
+                }
+            }
+        );
     };
 
     module.verify_selected = function() {

diff --git a/Open-ILS/web/js/dojo/openils/URLVerify/nls/URLVerify.js b/Open-ILS/web/js/dojo/openils/URLVerify/nls/URLVerify.js
index d1ca998..d2128db 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/URLVerify/nls/URLVerify.js
+++ b/Open-ILS/web/js/dojo/openils/URLVerify/nls/URLVerify.js
@@ -15,5 +15,7 @@
     "REREVIEW": "Review / Verify",
     "CLONING": "Cloning existing session ...",
     "CLONE_SESSION_NAME": "Copy of ${0}",
-    "XPATH": "XPath"
+    "XPATH": "XPath",
+    "SESSION_NAME": "Session '${0}'",
+    "SELECT_MORE": "Click here to review all session URLs and/or select other URLs to verify"
 }