[open-ils-commits] [GIT] Evergreen ILS branch master updated. 575db96866e1520906148218da6da6cec24f9036
Evergreen Git
git at git.evergreen-ils.org
Wed Sep 16 13:24:47 EDT 2015
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, master has been updated
via 575db96866e1520906148218da6da6cec24f9036 (commit)
via 668e875e0e815210686fa045c2d3065766165d3b (commit)
via 6e97a567b6e830e294ef024c76857ce1a2d60296 (commit)
via 7d05cee8bceedc827c20470f98a00744115171f9 (commit)
via d4729caf23587a156de35b422a6bac609e3f4025 (commit)
via d8d3f031351c69a5d1091b51091729297e0aca14 (commit)
from 4efea97f1385be94a5d94caff7dae7dd9136e77f (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 575db96866e1520906148218da6da6cec24f9036
Author: Victoria Lewis <“vlewis at catalystitservices.com”>
Date: Thu Jul 16 13:07:04 2015 -0700
webstaff: LP#1437110 add Manual Floating Active
Add Manual Floating Active to Checkin Modifiers in web staff client.
Signed-off-by: Victoria Lewis <“vlewis at catalystitservices.com”>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2
index 732b342..ba3b332 100644
--- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin.tt2
@@ -38,6 +38,9 @@
<div ng-if="modifiers.hold_as_transit" class="alert-danger pad-all-min">
[% l('Capture Local Holds As Transits') %]
</div>
+ <div ng-if="modifiers.manual_float" class="alert-danger pad-all-min">
+ [% l('Manual Floating Active') %]
+ </div>
</div>
</div>
@@ -219,6 +222,16 @@
<span>[% l('Capture Local Holds As Transits') %]</span>
</a>
</li>
+ <li>
+ <a href
+ ng-click="toggle_mod('manual_float')">
+ <span ng-if="modifiers.manual_float"
+ class="label label-success">✓</span>
+ <span ng-if="!modifiers.manual_float"
+ class="label label-warning">✗</span>
+ <span>[% l('Manual Floating Active') %]</span>
+ </a>
+ </li>
</ul>
</div><!-- btn grp -->
</div><!-- col -->
commit 668e875e0e815210686fa045c2d3065766165d3b
Author: Mike Rylander <mrylander at gmail.com>
Date: Wed Sep 16 10:28:46 2015 -0400
webstaff: LP#1436980: Default copy circ count to 0 instead of undefined
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
index 9f1b29b..80be1fe 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
@@ -584,6 +584,7 @@ function($scope, $q , $routeParams , egCore , egGridDataProvider , patronSvc ,
}
// -- retrieve our data
+ $scope.total_circs = 0; // start with 0 instead of undefined
egBilling.fetchXact(xact_id).then(function(xact) {
$scope.xact = xact;
commit 6e97a567b6e830e294ef024c76857ce1a2d60296
Author: Victoria Lewis <vlewis at catalystitservices.com>
Date: Fri Jul 24 15:08:15 2015 -0700
webstaff: LP#1436980 Total Circulations in Patron Bills
Add code to display Total Circulations in
Item Summary on Bills page.
Signed-off-by: Victoria Lewis <vlewis at catalystitservices.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
index 059153b..9e83fe3 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
@@ -100,7 +100,7 @@
</div>
<div class="col-md-2 strong-text">[% l('Total Circulations') %]</div>
<div class="col-md-2">
- TODO
+ {{total_circs}}
</div>
</div>
</div>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
index 2c7d18d..9f1b29b 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
@@ -587,6 +587,16 @@ function($scope, $q , $routeParams , egCore , egGridDataProvider , patronSvc ,
egBilling.fetchXact(xact_id).then(function(xact) {
$scope.xact = xact;
+ var copyId = xact.circulation().target_copy().id();
+ var circ_count = 0;
+ egCore.pcrud.search('circbyyr',
+ {copy : copyId}, null, {atomic : true})
+ .then(function(counts) {
+ angular.forEach(counts, function(count) {
+ circ_count += Number(count.count());
+ });
+ $scope.total_circs = circ_count;
+ });
// set the title. only needs to be done on initial page load
if (xact.circulation()) {
if (xact.circulation().target_copy().call_number().id() == -1) {
commit 7d05cee8bceedc827c20470f98a00744115171f9
Author: Stephen Moss <smoss at catalystitservices.com>
Date: Tue Aug 18 11:28:25 2015 -0700
webstaff: LP#1483857 Add code to clear barcodes from in-house use
Signed-off-by: Stephen Moss <smoss at catalystitservices.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/in_house_use/app.js b/Open-ILS/web/js/ui/default/staff/circ/in_house_use/app.js
index 06a1889..0904c94 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/in_house_use/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/in_house_use/app.js
@@ -98,6 +98,7 @@ function($scope, egCore, egGridDataProvider , egConfirmDialog) {
coArgs, {title : $scope.selectedNcType()}
);
}
+ $scope.args.barcode='';
}
function performCheckout(method, args, data) {
commit d4729caf23587a156de35b422a6bac609e3f4025
Author: Mike Rylander <mrylander at gmail.com>
Date: Tue Sep 15 17:32:41 2015 -0400
webstaff: Provide hooks for on-save callback for marc edit to, for instance, refresh the record summary UI
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
index 62db3ca..8437ee8 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
@@ -76,7 +76,7 @@
<eg-embed-frame save-space="300" frame="opac_iframe" url="catalog_url" handlers="handlers" onchange="handle_page"></eg-embed-frame>
</div>
<div ng-show="record_tab == 'marc_edit'">
- <eg-marc-edit-record dirty-flag="stop_unload" record-id="record_id"/>
+ <eg-marc-edit-record on-save="refresh_record_callback" dirty-flag="stop_unload" record-id="record_id"/>
</div>
<!-- ng-if the remaining tabs so they can be instantiated on demand -->
<div ng-if="record_tab == 'marc_html'">
diff --git a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
index f60abf3..80423a1 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
@@ -233,6 +233,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
// set record ID on page load if available...
$scope.record_id = $routeParams.record_id;
+ $scope.summary_pane_record;
if ($routeParams.record_id) $scope.from_route = true;
else $scope.from_route = false;
@@ -325,6 +326,20 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
if ($scope.record_id)
egCore.hatch.setLocalItem("eg.cat.last_record_retrieved", $scope.record_id);
+ $scope.refresh_record_callback = function (record_id) {
+ egCore.pcrud.retrieve('bre', record_id, {
+ flesh : 1,
+ flesh_fields : {
+ bre : ['simple_record','creator','editor']
+ }
+ }).then(function(rec) {
+ rec.owner(egCore.org.get(rec.owner()));
+ $scope.summary_pane_record = rec;
+ });
+
+ return record_id;
+ }
+
// also set it when the iframe changes to a new record
$scope.handle_page = function(url) {
diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js b/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
index 26a1e6c..d4686eb 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
@@ -521,6 +521,7 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
dirtyFlag : '=',
recordId : '=',
marcXml : '=',
+ onSave : '=',
// in-place mode means that the editor is being
// used just to munge some MARCXML client-side, rather
// than to (immediately) update the database
@@ -545,6 +546,11 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
controller : ['$timeout','$scope','$q','$window','egCore', 'egTagTable',
function ( $timeout , $scope , $q, $window , egCore , egTagTable ) {
+
+ $scope.onSaveCallback = $scope.onSave;
+ if (typeof $scope.onSaveCallback !== 'undefined' && !angular.isArray($scope.onSaveCallback))
+ $scope.onSaveCallback = [ $scope.onSaveCallback ];
+
MARC21.Record.delimiter = '$';
$scope.enable_fast_add = false;
@@ -1074,10 +1080,23 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
});
}
+ processOnSaveCallbacks = function() {
+ var deferred = $q.defer();
+ if (typeof $scope.onSaveCallback !== 'undefined') {
+ var promise = deferred.promise;
+
+ angular.forEach($scope.onSaveCallback, function (f) {
+ if (angular.isFunction(f)) promise = promise.then(f);
+ });
+
+ }
+ return deferred.resolve($scope.recordId)
+ };
+
$scope.saveRecord = function () {
if ($scope.inPlaceMode) {
$scope.marcXml = $scope.record.toXmlString();
- return;
+ return processOnSaveCallbacks();
}
$scope.mangle_005();
$scope.Record().editor(egCore.auth.user().id());
@@ -1110,7 +1129,7 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
}
});
}
- }).then(loadRecord);
+ }).then(loadRecord).then(processOnSaveCallbacks);
} else {
$scope.Record().creator(egCore.auth.user().id());
$scope.Record().create_date('now');
@@ -1140,7 +1159,7 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
}
});
}
- }).then(loadRecord);
+ }).then(loadRecord).then(processOnSaveCallbacks);
}
commit d8d3f031351c69a5d1091b51091729297e0aca14
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Sep 15 01:22:12 2015 +0000
webstaff: record summary now signals if record is deleted
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2 b/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
index 6a8a6b3..6f9f030 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
@@ -1,6 +1,11 @@
<div class="strong-text-2">
<div class="flex-row" style="justify-content: space-between">
- <div class="flex-cell">[% l('Record Summary') %]</div>
+ <div class="flex-cell">
+ [% l('Record Summary') %]
+ <span ng-if="record.deleted() == 't'" class="record-summary-alert">
+ [% l('(Deleted)') %]
+ </span>
+ </div>
<div ng-if="!noMarcLink" class="flex-cell">
<a target="_self"
href="[% ctx.base_path %]/staff/cat/catalog/record/{{record.id()}}/marc_html">
diff --git a/Open-ILS/src/templates/staff/css/cat.css.tt2 b/Open-ILS/src/templates/staff/css/cat.css.tt2
index ef3cd9c..ede0007 100644
--- a/Open-ILS/src/templates/staff/css/cat.css.tt2
+++ b/Open-ILS/src/templates/staff/css/cat.css.tt2
@@ -1,3 +1,8 @@
+/* record summary */
+.record-summary-alert {
+ color: red;
+}
+
.marcrecord {
//background-color: #f5f5f5;
}
-----------------------------------------------------------------------
Summary of changes:
.../src/templates/staff/cat/catalog/t_catalog.tt2 | 2 +-
.../templates/staff/cat/share/t_record_summary.tt2 | 7 ++++-
.../src/templates/staff/circ/checkin/t_checkin.tt2 | 13 ++++++++++
.../templates/staff/circ/patron/t_xact_details.tt2 | 2 +-
Open-ILS/src/templates/staff/css/cat.css.tt2 | 5 ++++
.../web/js/ui/default/staff/cat/catalog/app.js | 15 ++++++++++++
.../js/ui/default/staff/cat/services/marcedit.js | 25 +++++++++++++++++--
.../js/ui/default/staff/circ/in_house_use/app.js | 1 +
.../web/js/ui/default/staff/circ/patron/bills.js | 11 ++++++++
9 files changed, 75 insertions(+), 6 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list