teach vol/copy editor how to deal with copy alerts

Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 7c36709..e7d4291 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -6982,6 +6982,7 @@ SELECT  usr,
                        <field reporter:label="Last Captured Hold" name="last_captured_hold" oils_persist:virtual="true" reporter:datatype="link"/>
                        <field reporter:label="Has Holds" name="holds_count" oils_persist:virtual="true" reporter:datatype="link"/>
                        <field reporter:label="Copy Tags" name="tags" oils_persist:virtual="true" reporter:datatype="link"/>
+                       <field reporter:label="Copy Alerts" name="copy_alerts" oils_persist:virtual="true" reporter:datatype="link"/>
                </fields>
                <links>
                        <link field="age_protect" reltype="has_a" key="id" map="" class="crahp"/>
@@ -7008,6 +7009,7 @@ SELECT  usr,
                        <link field="floating" reltype="has_a" key="id" map="" class="cfg"/>
                        <link field="holds_count" reltype="might_have" key="id" map="" class="hasholdscount"/>
                        <link field="tags" reltype="has_many" key="copy" map="" class="acptcm"/>
+                       <link field="copy_alerts" reltype="has_many" key="copy" map="" class="aca"/>
                </links>
         <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
             <actions>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
index 14a52d4..e52d94f 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
@@ -258,6 +258,39 @@ sub update_copy_notes {
     return undef;
 }
 
+sub update_copy_alerts {
+    my($class, $editor, $copy) = @_;
+
+    return undef if $copy->isdeleted;
+
+    my $evt;
+    my $incoming_copy_alerts = $copy->copy_alerts;
+
+    for my $incoming_copy_alert (@$incoming_copy_alerts) { 
+        next unless $incoming_copy_alert;
+
+        if ($incoming_copy_alert->isnew) {
+            next if ($incoming_copy_alert->isdeleted); # if it was added and deleted in the same session
+
+            my $new_copy_alert = Fieldmapper::asset::copy_alert->new();
+            $new_copy_alert->copy( $copy->id );
+            $new_copy_alert->temp( $incoming_copy_alert->temp );
+            $new_copy_alert->ack_time( $incoming_copy_alert->ack_time );
+            $new_copy_alert->note( $incoming_copy_alert->note );
+            $new_copy_alert->alert_type( $incoming_copy_alert->alert_type );
+            $new_copy_alert->create_staff( $incoming_copy_alert->create_staff || $editor->requestor->id );
+            $incoming_copy_alert = $editor->create_asset_copy_alert($new_copy_alert)
+                or return $editor->event;
+        } elsif ($incoming_copy_alert->ischanged) {
+            $incoming_copy_alert = $editor->update_asset_copy_alert($incoming_copy_alert)
+        } elsif ($incoming_copy_alert->isdeleted) {
+            $incoming_copy_alert = $editor->delete_asset_copy_alert($incoming_copy_alert->id)
+        }
+    
+    }
+
+    return undef;
+}
 
 sub update_copy_tags {
     my($class, $editor, $copy) = @_;
@@ -303,8 +336,6 @@ sub update_copy_tags {
     return undef;
 }
 
-
-
 sub update_copy {
     my($class, $editor, $override, $vol, $copy, $retarget_holds, $force_delete_empty_bib) = @_;
 
@@ -415,9 +446,13 @@ sub update_fleshed_copies {
 
         my $notes = $copy->notes;
         $copy->clear_notes;
+
         my $tags = $copy->tags;
         $copy->clear_tags;
 
+        my $copy_alerts = $copy->copy_alerts;
+        $copy->clear_copy_alerts;
+
         if( $copy->isdeleted ) {
             $evt = $class->delete_copy($editor, $override, $vol, $copy, $retarget_holds, $force_delete_empty_bib);
             return $evt if $evt;
@@ -445,6 +480,9 @@ sub update_fleshed_copies {
         $copy->tags( $tags );
         $evt = $class->update_copy_tags($editor, $copy);
 
+        $copy->copy_alerts( $copy_alerts );
+        $evt = $class->update_copy_alerts($editor, $copy);
+
         return $evt if $evt;
     }
 

diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
index 6e40e32..d4646de 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
@@ -383,6 +383,13 @@
                       type="button">
                         [% l('Copy Notes') %]
                     </button>
+                    <button
+                      class="btn btn-default"
+                      ng-disabled="!defaults.copy_alerts"
+                      ng-click="copy_alerts_dialog(workingGridControls.selectedItems())"
+                      type="button">
+                        [% l('Copy Alerts') %]
+                    </button>
                 </div>
             </div>
 

diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_alerts.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_alerts.tt2
new file mode 100644 (file)
index 0000000..043a5ea
--- /dev/null
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_alerts.tt2
@@ -0,0 +1,94 @@
+<form ng-submit="ok(copy_alert)" role="form">
+    <div class="modal-header">
+      <button type="button" class="close" ng-click="cancel()" 
+        aria-hidden="true">&times;</button>
+      <h4 class="modal-title">[% l('New Copy Alert') %]</h4>
+    </div>
+    <div class="modal-body">
+      <div class="row">
+        <div class="col-md-6 form-inline">
+          <label for="copy-alert-type-selector"> [% l('Type') %]</label>
+          <select id="copy-alert-type-selector" class="form-control"
+            ng-model="copy_alert.alert_type"
+            ng-options="at.id() as at.name() for at in alert_types">
+          </select>
+        </div>
+        <div class="col-md-3">
+          <label>
+            <input type="checkbox" ng-model="copy_alert.temp"/>
+            [% l('Temporary') %]
+          </label>
+        </div>
+      </div>
+      <div class="row pad-vert">
+        <div class="col-md-12">
+          <textarea class="form-control" 
+            ng-model="copy_alert.note" placeholder="[% l('Alert...') %]">
+          </textarea>
+        </div>
+      </div>
+    </div>
+    <div class="modal-footer">
+      <div class="row">
+        <div class="col-md-10 pull-right">
+          <input type="submit" class="btn btn-primary" value="[% l('OK') %]"/>
+          <button class="btn btn-warning" ng-click="cancel($event)">[% l('Cancel') %]</button>
+        </div>
+      </div>
+
+      <div class="row pad-vert" ng-if="copy_alert_list.length &gt; 0"> 
+        <div class="col-md-12">
+          <div class="row">
+            <div class="col-md-12">
+              <hr/>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-12">
+              <h4 class="pull-left">[% l('Existing Copy Alerts') %]</h4>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="row" ng-repeat="a in copy_alert_list" ng-init="temp = (a.temp() == 't'); note = a.note(); acked = (a.ack_time() !== null); alert_type = a.alert_type().id()">
+        <div class="col-md-12">
+          <div class="row">
+            <div class="col-md-6 form-inline">
+              <label for="copy-alert-type-select-{{a.id()}}">[% l('Type') %]</label>
+              <select id="copy-alert-type-select-{{a.id()}}" class="form-control"
+                      ng-model="alert_type"
+                      ng-change="a.alert_type(alert_type) && a.ischanged(1)"
+                      ng-options="at.id() as at.name() for at in alert_types">
+              </select>
+            </div>
+            <div class="col-md-3">
+              <label>
+                <input type="checkbox" ng-model="temp" ng-change="a.temp(temp ? 't' : 'f') && a.ischanged(1)" ng-disabled="acked"/>
+                [% l('Temporary') %]
+              </label>
+            </div>
+            <div class="col-md-3">
+              <label>
+                <input type="checkbox" ng-model="acked" ng-change="acked ? a.ack_time('now') : a.ack_time(null)"/>
+                [% l('Acknowledge?') %]
+              </label>
+            </div>
+          </div>
+          <div class="row pad-vert">
+            <div class="col-md-12">
+              <textarea class="form-control" ng-change="a.note(note) && a.ischanged(1)"
+                ng-model="note" placeholder="[% l('Alert...') %]" ng-disabled="acked">
+              </textarea>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-12">
+              <hr/>
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+</form>

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 285f5e8..45d0cd7 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -136,6 +136,21 @@ function(egCore , $q) {
         );
     };
 
+    service.get_copy_alert_types = function(orgs) {
+        return egCore.pcrud.search('ccat',
+            { active : 't' },
+            {},
+            { atomic : true }
+        );
+    };
+
+    service.get_copy_alerts = function(copy_id) {
+        return egCore.pcrud.search('aca', { copy : copy_id, ack_time : null },
+            { flesh : 1, flesh_fields : { aca : ['alert_type'] } },
+            { atomic : true }
+        );
+    };
+
     service.get_locations = function(orgs) {
         return egCore.pcrud.search('acpl',
             {owning_lib : orgs, deleted : 'f'},
@@ -256,6 +271,10 @@ function(egCore , $q) {
 
         if (!cp.parts()) cp.parts([]); // just in case...
 
+        service.get_copy_alerts(cp.id()).then(function(aca) {
+            cp.copy_alerts(aca);
+        });
+
         var lib = cp.call_number().owning_lib();
         var cn = cp.call_number().id();
 
@@ -816,6 +835,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
         statcats : true,
         copy_notes : true,
         copy_tags : true,
+        copy_alerts : true,
         attributes : {
             status : true,
             loan_duration : true,
@@ -1832,6 +1852,63 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
         });
     }
 
+    $scope.copy_alerts_dialog = function(copy_list) {
+        if (!angular.isArray(copy_list)) copy_list = [copy_list];
+
+        return $modal.open({
+            templateUrl: './cat/volcopy/t_copy_alerts',
+            animation: true,
+            controller:
+                   ['$scope','$modalInstance',
+            function($scope , $modalInstance) {
+
+                itemSvc.get_copy_alert_types().then(function(ccat) {
+                    $scope.alert_types = ccat;
+                });
+
+                $scope.focusNote = true;
+                $scope.copy_alert = {
+                    create_staff : egCore.auth.user().id(),
+                    note         : '',
+                    temp         : false
+                };
+
+                if (copy_list.length == 1) {
+                    $scope.copy_alert_list = copy_list[0].copy_alerts();
+                }
+
+                $scope.ok = function(copy_alert) {
+
+                    if (typeof(copy_alert.note) != 'undefined' &&
+                        copy_alert.note != '') {
+                        angular.forEach(copy_list, function (cp) {
+                            var a = new egCore.idl.aca();
+                            a.isnew(1);
+                            a.create_staff(copy_alert.create_staff);
+                            a.note(copy_alert.note);
+                            a.temp(copy_alert.temp ? 't' : 'f');
+                            a.copy(cp.id());
+                            a.ack_time(null);
+                            a.alert_type(
+                                $scope.alert_types.filter(function(at) {
+                                    return at.id() == copy_alert.alert_type;
+                                })[0]
+                            );
+                            cp.copy_alerts().push( a );
+                        });
+                    }
+
+                    $modalInstance.close();
+                }
+
+                $scope.cancel = function($event) {
+                    $modalInstance.dismiss();
+                    $event.preventDefault();
+                }
+            }]
+        });
+    }
+
 }])
 
 .directive("egVolTemplate", function () {
@@ -1851,6 +1928,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
                     statcats : true,
                     copy_notes : true,
                     copy_tags : true,
+                    copy_alerts : true,
                     attributes : {
                         status : true,
                         loan_duration : true,