[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. f821fbb435b87f2c0e85d1e4f4d0db8f6f16f507

[Evergreen Git]

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, rel_2_12 has been updated
       via  f821fbb435b87f2c0e85d1e4f4d0db8f6f16f507 (commit)
      from  9caba30815f4ac8aad66b8c5cd559df07a3f7b2a (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 f821fbb435b87f2c0e85d1e4f4d0db8f6f16f507
Author: Bill Erickson <berickxx at gmail.com>
Date:   Thu Sep 21 16:04:03 2017 -0400

    LP#1643927 Copy note captures initials; shows date
    
    Fixes thinko in copy note staff initials tracking.  Offloads the
    formatting of the copy note to egStrings.  Adds the workstation org unit
    to the initials block a la the XUL client.
    
    This does not add the create date to the initials block as with the XUL
    client, because the create date is part of the note.  Instead, we now
    display the note create date in the copy note display form.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/cat/volcopy/index.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/index.tt2
index 97996b7..f93cb56 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/index.tt2
@@ -15,6 +15,9 @@
 angular.module('egCoreMod').run(['egStrings', function(s) {
     s.VOL_COPY_TEMPLATE_SUCCESS_SAVE = "[% l('Saved volume/copy template(s)') %]";
     s.VOL_COPY_TEMPLATE_SUCCESS_DELETE = "[% l('Deleted volume/copy template') %]";
+    [%# Note the "~" characters escape the gettext brackets %]
+    s.COPY_NOTE_INITIALS = 
+      "[% l('[_1] ~[ [_2] @ [_3] ~]', '{{value}}', '{{initials}}', '{{ws_ou}}') %]"
 }]);
 </script>
 [% END %]
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_notes.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_notes.tt2
index 8b875f0..a679afa 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_notes.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_notes.tt2
@@ -73,11 +73,14 @@
             </div>
           </div>
           <div class="row pad-vert">
-            <div class="col-md-12">
+            <div class="col-md-10">
               <textarea class="form-control" ng-change="n.value(value) && n.ischanged(1)"
                 ng-model="value" placeholder="[% l('Note...') %]" ng-disabled="deleted">
               </textarea>
             </div>
+            <div class="col-md-2">
+              {{n.create_date() | date:$root.egDateFormat}} 
+            </div>
           </div>
           <div class="row">
             <div class="col-md-12">
diff --git a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
index 5e47bd3..e7d9f00 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -1668,7 +1668,16 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
 
                 $scope.ok = function(note) {
 
-                    if (note.initials) note.value += ' [' + note.initials + ']';
+                    if ($scope.initials) {
+                        note.value = egCore.strings.$replace(
+                            egCore.strings.COPY_NOTE_INITIALS, {
+                            value : note.value, 
+                            initials : $scope.initials,
+                            ws_ou : egCore.org.get(
+                                egCore.auth.user().ws_ou()).shortname()
+                        });
+                    }
+
                     angular.forEach(copy_list, function (cp) {
                         if (!angular.isArray(cp.notes())) cp.notes([]);
                         var n = new egCore.idl.acpn();

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/staff/cat/volcopy/index.tt2 |    3 +++
 .../templates/staff/cat/volcopy/t_copy_notes.tt2   |    5 ++++-
 .../web/js/ui/default/staff/cat/volcopy/app.js     |   11 ++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS