From e423a0220dff8fa2b5592224e33a2b03d5f913f4 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 29 Jul 2009 08:15:50 +0000
Subject: [PATCH] Staff initials for standing penalties.  Looks for org setting
 ui.circ.standing_penalty.require_initials to enable this feature.

The Apply/Modify button will jump to the initials textbox if empty.

No dedicated initials field in actor.user_standing_penalty, so appending to the note field.  Not parsing notes for initials when editing, though we may want to (I'd argue for a dedicated field in
this case).



git-svn-id: svn://svn.open-ils.org/ILS/trunk@13768 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/src/sql/Pg/950.data.seed-values.sql             |  5 +++++
 Open-ILS/web/opac/locale/en-US/lang.dtd                  |  4 ++++
 .../staff_client/server/patron/edit_standing_penalty.js  | 16 +++++++++++++++-
 .../staff_client/server/patron/edit_standing_penalty.xul |  8 +++++++-
 .../staff_client/server/patron/new_standing_penalty.js   | 16 +++++++++++++++-
 .../staff_client/server/patron/new_standing_penalty.xul  |  8 +++++++-
 6 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 0c8577477e..68ddd59251 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1782,6 +1782,11 @@ INSERT into config.org_unit_setting_type
   null,
   'bool' ),
 
+( 'ui.circ.standing_penalty.require_initials',
+  'Require staff initials for entry/edit of standing penalties.',
+  null,
+  'bool' ),
+
 ( 'ui.general.button_bar',
   'Button bar',
   null,
diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index bd2a2ab261..ac7006e299 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1239,6 +1239,8 @@
 <!ENTITY staff.patron_display.apply_penalty_dialog.cancel_btn.accesskey "C">
 <!ENTITY staff.patron_display.apply_penalty_dialog.apply_btn.label "Apply">
 <!ENTITY staff.patron_display.apply_penalty_dialog.apply_btn.accesskey "A">
+<!ENTITY staff.patron_display.apply_penalty_dialog.initials_entry.label "Initials">
+<!ENTITY staff.patron_display.apply_penalty_dialog.initials_entry.accesskey "I">
 <!ENTITY staff.patron_display.edit_penalty_dialog.title "Modify Standing Penalty/Message">
 <!ENTITY staff.patron_display.edit_penalty_dialog.header "Modify Standing Penalty/Message">
 <!ENTITY staff.patron_display.edit_penalty_dialog.description "Notes, Alerts, Blocks">
@@ -1252,6 +1254,8 @@
 <!ENTITY staff.patron_display.edit_penalty_dialog.cancel_btn.accesskey "C">
 <!ENTITY staff.patron_display.edit_penalty_dialog.apply_btn.label "Modify">
 <!ENTITY staff.patron_display.edit_penalty_dialog.apply_btn.accesskey "M">
+<!ENTITY staff.patron_display.edit_penalty_dialog.initials_entry.label "Initials">
+<!ENTITY staff.patron_display.edit_penalty_dialog.initials_entry.accesskey "I">
 <!ENTITY staff.patron_editor_interface_label "Patron Edit">
 <!ENTITY staff.patron_interface_label "Patron ">
 <!ENTITY staff.patron_navbar.bills 'Bills'>
diff --git a/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js b/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
index 6215f8b112..df846f9f48 100644
--- a/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
+++ b/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
@@ -24,6 +24,11 @@ function edit_penalty_init() {
 
         build_penalty_menu();
 
+        var show_initials = String( data.hash.aous['ui.circ.standing_penalty.require_initials'] ) == 'true';
+        if (show_initials) {
+            document.getElementById('initials_box').hidden = false;
+        }
+
         /* set widget values */
         document.getElementById('csp_menupopup').setAttribute('value',xul_param('id',{'modal_xulG':true}));
         if (xul_param('id',{'modal_xulG':true})==21) { // SILENT_NOTE
@@ -81,10 +86,19 @@ function edit_penalty_init() {
         document.getElementById('apply_btn').addEventListener(
             'command', 
             function() {
+                var note = document.getElementById('note_tb').value;
+                if (!document.getElementById('initials_box').hidden) {
+                    var initials_tb = document.getElementById('initials_tb');
+                    if (initials_tb.value == '') {
+                        initials_tb.focus(); return;
+                    } else {
+                        note = note + ' - ' + initials_tb.value;
+                    }
+                }
                 update_modal_xulG(
                     {
                         'id' : document.getElementById('csp_menupopup').getAttribute('value'),
-                        'note' : document.getElementById('note_tb').value,
+                        'note' : note,
                         'modify' : 1
                     }
                 )
diff --git a/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul b/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul
index 792baaf559..4670318700 100644
--- a/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul
+++ b/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul
@@ -58,9 +58,15 @@
     </toolbox>
     <textbox id="note_tb" multiline="true" />
     <hbox>
+        <hbox id="initials_box">
+            <label control="initials_tb" 
+                value="&staff.patron_display.edit_penalty_dialog.initials_entry.label;" 
+                accesskey="&staff.patron_display.edit_penalty_dialog.initials_entry.accesskey;"/>
+            <textbox id="initials_tb" />
+        </hbox>
         <spacer flex="1"/>
         <button id="cancel_btn" label="&staff.patron_display.edit_penalty_dialog.cancel_btn.label;" accesskey="&staff.patron_display.edit_penalty_dialog.cancel_btn.accesskey;" />
-        <button id="apply_btn" label="&staff.patron_display.edit_penalty_dialog.apply_btn.label;" accesskey="&staff.patron_display.edit_penalty_dialog.apply_btn.label;" />
+        <button id="apply_btn" label="&staff.patron_display.edit_penalty_dialog.apply_btn.label;" accesskey="&staff.patron_display.edit_penalty_dialog.apply_btn.accesskey;" />
     </hbox>
 </window>
 
diff --git a/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js b/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
index b40e62a903..dffdc24ad0 100644
--- a/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
+++ b/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
@@ -24,6 +24,11 @@ function new_penalty_init() {
 
         build_penalty_menu();
 
+        var show_initials = String( data.hash.aous['ui.circ.standing_penalty.require_initials'] ) == 'true';
+        if (show_initials) {
+            document.getElementById('initials_box').hidden = false;
+        }
+
         /* set widget behavior */
         document.getElementById('csp_menulist').addEventListener(
             'command',
@@ -64,10 +69,19 @@ function new_penalty_init() {
         document.getElementById('apply_btn').addEventListener(
             'command', 
             function() {
+                var note = document.getElementById('note_tb').value;
+                if (!document.getElementById('initials_box').hidden) {
+                    var initials_tb = document.getElementById('initials_tb');
+                    if (initials_tb.value == '') {
+                        initials_tb.focus(); return;
+                    } else {
+                        note = note + ' - ' + initials_tb.value;
+                    }
+                }
                 update_modal_xulG(
                     {
                         'id' : document.getElementById('csp_menupopup').getAttribute('value'),
-                        'note' : document.getElementById('note_tb').value,
+                        'note' : note,
                         'modify' : 1
                     }
                 )
diff --git a/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul b/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul
index edb0b7f3ea..cc9b800ce4 100644
--- a/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul
+++ b/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul
@@ -58,9 +58,15 @@
     </toolbox>
     <textbox id="note_tb" multiline="true" />
     <hbox>
+        <hbox id="initials_box">
+            <label control="initials_tb" 
+                value="&staff.patron_display.apply_penalty_dialog.initials_entry.label;" 
+                accesskey="&staff.patron_display.apply_penalty_dialog.initials_entry.accesskey;"/>
+            <textbox id="initials_tb" />
+        </hbox>
         <spacer flex="1"/>
         <button id="cancel_btn" label="&staff.patron_display.apply_penalty_dialog.cancel_btn.label;" accesskey="&staff.patron_display.apply_penalty_dialog.cancel_btn.accesskey;" />
-        <button id="apply_btn" label="&staff.patron_display.apply_penalty_dialog.apply_btn.label;" accesskey="&staff.patron_display.apply_penalty_dialog.apply_btn.label;" />
+        <button id="apply_btn" label="&staff.patron_display.apply_penalty_dialog.apply_btn.label;" accesskey="&staff.patron_display.apply_penalty_dialog.apply_btn.accesskey;" />
     </hbox>
 </window>
 
-- 
2.11.0