From 9de52bf9abcb03888774fb08a7237572119f4e20 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 11 Mar 2016 13:34:36 -0500 Subject: [PATCH] LP#1549505: tweak percentage of time checked out calculation This patch excludes lost, claims-returned, claims-never-checked-out, long-overdue, and open max-fines loans from consideration. Signed-off-by: Galen Charlton --- .../sql/Pg/upgrade/XXXX.schema.statisitcal-ratings.sql | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.statisitcal-ratings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.statisitcal-ratings.sql index a03d64cd17..3f8570dbc6 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.statisitcal-ratings.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.statisitcal-ratings.sql @@ -906,7 +906,7 @@ BEGIN EXTRACT( EPOCH FROM AGE( - COALESCE(circ.checkin_time, NOW()), + COALESCE(circ.checkin_time, circ.stop_fines_time, NOW()), circ.xact_start ) ) @@ -914,7 +914,19 @@ BEGIN FROM asset.copy cp JOIN asset.call_number cn ON (cn.id = cp.call_number) JOIN precalc_bib_list f ON (f.id = cn.record) - LEFT JOIN action.all_circulation circ ON (circ.target_copy = cp.id) + LEFT JOIN action.all_circulation circ ON ( + circ.target_copy = cp.id + AND stop_fines NOT IN ( + 'LOST', + 'LONGOVERDUE', + 'CLAIMSRETURNED', + 'LONGOVERDUE' + ) + AND NOT ( + checkin_time IS NULL AND + stop_fines = 'MAXFINES' + ) + ) WHERE cn.owning_lib = ANY (badge.orgs) GROUP BY 1,2,3 ) x -- 2.11.0