[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2db572dcc89f201e9384b781e630b05e80405702
Evergreen Git
git at git.evergreen-ils.org
Tue Oct 1 17:20:21 EDT 2019
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 2db572dcc89f201e9384b781e630b05e80405702 (commit)
via 4b70112dc86f8f64d2c2469b45b6486906a72087 (commit)
via 8998ecbc6be79f71cbbbd06e91375656a14db20a (commit)
from 289922394d5567aa47fb672a7f2792c61898483e (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 2db572dcc89f201e9384b781e630b05e80405702
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Oct 1 17:19:51 2019 -0400
LP#1835577: stamp schema updates
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 7b8db1d6f2..f96960c972 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1188', :eg_version); -- Dyrcona/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1189', :eg_version); -- Dyrcona/gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.auto_renewal_view_updates.sql b/Open-ILS/src/sql/Pg/upgrade/1189.schema.auto_renewal_view_updates.sql
similarity index 91%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.auto_renewal_view_updates.sql
rename to Open-ILS/src/sql/Pg/upgrade/1189.schema.auto_renewal_view_updates.sql
index 9365993c46..6c04d2b41d 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.auto_renewal_view_updates.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1189.schema.auto_renewal_view_updates.sql
@@ -1,6 +1,6 @@
BEGIN;
---SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1189', :eg_version);
CREATE OR REPLACE VIEW action.open_circulation AS
SELECT *
commit 4b70112dc86f8f64d2c2469b45b6486906a72087
Author: Jason Stephenson <jason at sigio.com>
Date: Tue Sep 10 11:27:07 2019 -0400
Lp 1835577: Add more missing auto_renewal fields
Add missing auto_renewal and auto_renewal_remaining fields to the
following additional IDL classes:
* aacs
* aoc
* circbyyr
* robcirc
Add database updates to add auto_renewal fields to the following
views:
* action.billable_circulations
* action.open_circulation
* reporter.circ_type
* reporter.overdue_circs
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index e41ce8b6d5..bb01086e3c 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -4759,6 +4759,8 @@ SELECT usr,
<field reporter:label="Archived Copy Stat-Cat Entries" name="aaasc_entries" oils_persist:virtual="true" reporter:datatype="link"/>
<field reporter:label="Linked Active Circulation" name="active_circ" oils_persist:virtual="true" reporter:datatype="link"/>
<field reporter:label="Linked Aged Circulation" name="aged_circ" oils_persist:virtual="true" reporter:datatype="link"/>
+ <field reporter:label="Auto Renewal" name="auto_renewal" reporter:datatype="bool"/>
+ <field reporter:label="Remaining Auto Renewals" name="auto_renewal_remaining" reporter:datatype="int" />
</fields>
<links>
<link field="billable_transaction" reltype="might_have" key="id" map="" class="mbt"/>
@@ -7390,6 +7392,8 @@ SELECT usr,
<field name="xact_finish" reporter:datatype="timestamp" />
<field name="xact_start" reporter:datatype="timestamp" />
<field name="circulation" oils_persist:virtual="true" reporter:datatype="link"/>
+ <field name="auto_renewal" reporter:datatype="bool"/>
+ <field name="auto_renewal_remaining" reporter:datatype="int" />
</fields>
<links>
<link field="circulation" reltype="might_have" key="id" map="" class="circ"/>
@@ -12342,7 +12346,7 @@ SELECT usr,
cp.id as copy,
COUNT(circ.id),
EXTRACT(YEAR FROM circ.xact_start) AS year,
- (phone_renewal OR desk_renewal OR opac_renewal) as is_renewal
+ (phone_renewal OR desk_renewal OR opac_renewal OR auto_renewal) as is_renewal
FROM
asset.copy cp
JOIN action.circulation circ ON (cp.id = circ.target_copy)
@@ -12352,7 +12356,7 @@ SELECT usr,
cp.id as copy,
COUNT(circ.id),
EXTRACT(YEAR FROM circ.xact_start) AS year,
- (phone_renewal OR desk_renewal OR opac_renewal) as is_renewal
+ (phone_renewal OR desk_renewal OR opac_renewal OR auto_renewal) as is_renewal
FROM
asset.copy cp
JOIN action.aged_circulation circ ON (cp.id = circ.target_copy)
@@ -12416,6 +12420,8 @@ SELECT usr,
<field reporter:label="Circulation Type" name="circ_type" oils_persist:virtual="true" reporter:datatype="link"/>
<field reporter:label="Billing Totals" name="billing_total" oils_persist:virtual="true" reporter:datatype="link"/>
<field reporter:label="Payment Totals" name="payment_total" oils_persist:virtual="true" reporter:datatype="link"/>
+ <field reporter:label="Auto Renewal" name="auto_renewal" reporter:datatype="bool"/>
+ <field reporter:label="Remaining Auto Renewals" name="auto_renewal_remaining" reporter:datatype="int" />
</fields>
<links>
<link field="billable_transaction" reltype="might_have" key="id" map="" class="mbt"/>
diff --git a/Open-ILS/src/sql/Pg/reporter-schema.sql b/Open-ILS/src/sql/Pg/reporter-schema.sql
index 52f2f398d9..4ed00474cd 100644
--- a/Open-ILS/src/sql/Pg/reporter-schema.sql
+++ b/Open-ILS/src/sql/Pg/reporter-schema.sql
@@ -245,7 +245,7 @@ SELECT u.id,
CREATE OR REPLACE VIEW reporter.circ_type AS
SELECT id,
- CASE WHEN opac_renewal OR phone_renewal OR desk_renewal
+ CASE WHEN opac_renewal OR phone_renewal OR desk_renewal OR auto_renewal
THEN 'RENEWAL'
ELSE 'CHECKOUT'
END AS "type"
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.auto_renewal_view_updates.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.auto_renewal_view_updates.sql
new file mode 100644
index 0000000000..9365993c46
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.auto_renewal_view_updates.sql
@@ -0,0 +1,31 @@
+BEGIN;
+
+--SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+CREATE OR REPLACE VIEW action.open_circulation AS
+ SELECT *
+ FROM action.circulation
+ WHERE checkin_time IS NULL
+ ORDER BY due_date;
+
+CREATE OR REPLACE VIEW action.billable_circulations AS
+ SELECT *
+ FROM action.circulation
+ WHERE xact_finish IS NULL;
+
+CREATE OR REPLACE VIEW reporter.overdue_circs AS
+SELECT *
+ FROM "action".circulation
+ WHERE checkin_time is null
+ AND (stop_fines NOT IN ('LOST','CLAIMSRETURNED') OR stop_fines IS NULL)
+ AND due_date < now();
+
+CREATE OR REPLACE VIEW reporter.circ_type AS
+SELECT id,
+ CASE WHEN opac_renewal OR phone_renewal OR desk_renewal OR auto_renewal
+ THEN 'RENEWAL'
+ ELSE 'CHECKOUT'
+ END AS "type"
+ FROM action.circulation;
+
+COMMIT;
commit 8998ecbc6be79f71cbbbd06e91375656a14db20a
Author: Jason Stephenson <jason at sigio.com>
Date: Thu Aug 29 10:15:33 2019 -0400
Lp 1835577: Add missing Auto Renewal fields to the IDL
Add entries for auto_renewal and auto_renewal_remaining fields to the
acirc and combcirc classes in fm_IDL.xml. They were missing after the
auto-renewal feature was added.
Signed-off-by: Jason Stephenson <jason at sigio.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index aea0037d60..e41ce8b6d5 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -4842,6 +4842,8 @@ SELECT usr,
<field reporter:label="Archived Copy Stat-Cat Entries" name="aaasc_entries" oils_persist:virtual="true" reporter:datatype="link"/>
<field reporter:label="Linked Active Circulation" name="active_circ" oils_persist:virtual="true" reporter:datatype="link"/>
<field reporter:label="Linked Aged Circulation" name="aged_circ" oils_persist:virtual="true" reporter:datatype="link"/>
+ <field reporter:label="Auto Renewal" name="auto_renewal" reporter:datatype="bool"/>
+ <field reporter:label="Remaining Auto Renewals" name="auto_renewal_remaining" reporter:datatype="int" />
</fields>
<links>
<link field="billable_transaction" reltype="might_have" key="id" map="" class="mbt"/>
@@ -4928,6 +4930,8 @@ SELECT usr,
<field reporter:label="Bib Record" name="copy_bib_record" reporter:datatype="link"/>
<field reporter:label="Archived Patron Stat-Cat Entries" name="aaactsc_entries" oils_persist:virtual="true" reporter:datatype="link"/>
<field reporter:label="Archived Copy Stat-Cat Entries" name="aaasc_entries" oils_persist:virtual="true" reporter:datatype="link"/>
+ <field reporter:label="Auto Renewal" name="auto_renewal" reporter:datatype="bool"/>
+ <field reporter:label="Remaining Auto Renewals" name="auto_renewal_remaining" reporter:datatype="int" />
</fields>
<links>
<link field="billable_transaction" reltype="might_have" key="id" map="" class="mbt"/>
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/fm_IDL.xml | 14 ++++++++--
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/reporter-schema.sql | 2 +-
.../1189.schema.auto_renewal_view_updates.sql | 31 ++++++++++++++++++++++
4 files changed, 45 insertions(+), 4 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1189.schema.auto_renewal_view_updates.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list