[open-ils-commits] [GIT] Evergreen ILS branch master updated. 70c3cbeba6f3a754effcc7a3be6a17ebb8f005b5
Evergreen Git
git at git.evergreen-ils.org
Mon Jul 27 10:19:44 EDT 2020
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 70c3cbeba6f3a754effcc7a3be6a17ebb8f005b5 (commit)
via ebbdca4cde8eb4480266562a675545570d137ea4 (commit)
via c9b7c694bd9aad15cf5b91b0176011bd3cee4bd6 (commit)
via 53faf16e461e6bf329d3e72915ec474df0271ec7 (commit)
from 4355cc61ad4271f5aec7dbab371f3d46cbda0a33 (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 70c3cbeba6f3a754effcc7a3be6a17ebb8f005b5
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Mon Jul 27 10:19:29 2020 -0400
LP#1248734: stamp schema update
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 4d0ce3dc31..f02ba5f95c 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 ('1209', :eg_version); -- csharp/gmcharlt/JBoyer
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1210', :eg_version); -- csharp/rhamby/sandbergja/gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1248734_add_ws_to_ihu.sql b/Open-ILS/src/sql/Pg/upgrade/1210.schema.lp1248734_add_ws_to_ihu.sql
similarity index 81%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1248734_add_ws_to_ihu.sql
rename to Open-ILS/src/sql/Pg/upgrade/1210.schema.lp1248734_add_ws_to_ihu.sql
index a96e148faa..00381186d8 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1248734_add_ws_to_ihu.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1210.schema.lp1248734_add_ws_to_ihu.sql
@@ -1,6 +1,6 @@
BEGIN;
---SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1210', :eg_version); -- csharp/rhamby/sandbergja/gmcharlt
ALTER TABLE action.in_house_use ADD COLUMN workstation INT REFERENCES actor.workstation (id) DEFERRABLE INITIALLY DEFERRED;
ALTER TABLE action.non_cat_in_house_use ADD COLUMN workstation INT REFERENCES actor.workstation (id) DEFERRABLE INITIALLY DEFERRED;
commit ebbdca4cde8eb4480266562a675545570d137ea4
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Mon Jul 27 10:16:37 2020 -0400
LP#1248734: (follow-up) add new indexes to schema update script
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1248734_add_ws_to_ihu.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1248734_add_ws_to_ihu.sql
index 5cb74bfb2d..a96e148faa 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1248734_add_ws_to_ihu.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1248734_add_ws_to_ihu.sql
@@ -5,4 +5,7 @@ BEGIN;
ALTER TABLE action.in_house_use ADD COLUMN workstation INT REFERENCES actor.workstation (id) DEFERRABLE INITIALLY DEFERRED;
ALTER TABLE action.non_cat_in_house_use ADD COLUMN workstation INT REFERENCES actor.workstation (id) DEFERRABLE INITIALLY DEFERRED;
+CREATE INDEX action_in_house_use_ws_idx ON action.in_house_use ( workstation );
+CREATE INDEX non_cat_in_house_use_ws_idx ON action.non_cat_in_house_use ( workstation );
+
COMMIT;
commit c9b7c694bd9aad15cf5b91b0176011bd3cee4bd6
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Sat Jul 25 07:15:40 2020 -0700
LP1248734: add release notes
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/docs/RELEASE_NOTES_NEXT/Circulation/in_house_use_workstation.adoc b/docs/RELEASE_NOTES_NEXT/Circulation/in_house_use_workstation.adoc
new file mode 100644
index 0000000000..3f14775f01
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Circulation/in_house_use_workstation.adoc
@@ -0,0 +1,7 @@
+In-house use now records workstations
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Evergreen now records the workstation along with each
+in-house use. Staff can now run reports on which
+workstation created which in-house uses.
+
commit 53faf16e461e6bf329d3e72915ec474df0271ec7
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Tue Jun 16 11:56:33 2020 -0400
LP1248734: Add workstation to in-house use
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
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 8b4bf85017..f7bfcf725c 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -2402,11 +2402,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<field reporter:label="Item" name="item" reporter:datatype="int" />
<field reporter:label="Using Library" name="org_unit" reporter:datatype="org_unit"/>
<field reporter:label="Recording Staff" name="staff" reporter:datatype="link"/>
+ <field reporter:label="Workstation" name="workstation" reporter:datatype="link"/>
<field reporter:label="Use Date/Time" name="use_time" reporter:datatype="timestamp"/>
</fields>
<links>
<link field="item" reltype="has_a" key="id" map="" class="acp"/>
<link field="staff" reltype="has_a" key="id" map="" class="au"/>
+ <link field="workstation" reltype="has_a" key="id" map="" class="aws"/>
<link field="org_unit" reltype="has_a" key="id" map="" class="aou"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
@@ -2421,11 +2423,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<field reporter:label="Item Type" name="item_type" reporter:datatype="link"/>
<field reporter:label="Using Library" name="org_unit" reporter:datatype="org_unit"/>
<field reporter:label="Recording Staff" name="staff" reporter:datatype="link"/>
+ <field reporter:label="Workstation" name="workstation" reporter:datatype="link"/>
<field reporter:label="Use Date/Time" name="use_time" reporter:datatype="timestamp"/>
</fields>
<links>
<link field="item_type" reltype="has_a" key="id" map="" class="cnct"/>
<link field="staff" reltype="has_a" key="id" map="" class="au"/>
+ <link field="workstation" reltype="has_a" key="id" map="" class="aws"/>
<link field="org_unit" reltype="has_a" key="id" map="" class="aou"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
index af9c9af9ab..bb4412b6d9 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
@@ -773,6 +773,7 @@ sub create_in_house_use {
}
$ihu->staff($e->requestor->id);
+ $ihu->workstation($e->requestor->wsid);
$ihu->org_unit($org);
$ihu->use_time($use_time);
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI.pm
index 599764ff3e..1a43510944 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI.pm
@@ -702,6 +702,7 @@ sub modify_from_fieldmapper {
action::in_house_use->has_a( org_unit => 'actor::org_unit' );
action::in_house_use->has_a( staff => 'actor::user' );
+ action::in_house_use->has_a( workstation => 'actor::workstation' );
action::in_house_use->has_a( item => 'asset::copy' );
action::non_cataloged_circulation->has_a( circ_lib => 'actor::org_unit' );
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/action.pm
index 5a59393837..1dd595dcc3 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/action.pm
@@ -10,14 +10,14 @@ package action::in_house_use;
use base qw/action/;
__PACKAGE__->table('action_in_house_use');
__PACKAGE__->columns(Primary => 'id');
-__PACKAGE__->columns(Essential => qw/item staff org_unit use_time/);
+__PACKAGE__->columns(Essential => qw/item staff workstation org_unit use_time/);
#-------------------------------------------------------------------------------
package action::non_cat_in_house_use;
use base qw/action/;
__PACKAGE__->table('action_non_cat_in_house_use');
__PACKAGE__->columns(Primary => 'id');
-__PACKAGE__->columns(Essential => qw/item_type staff org_unit use_time/);
+__PACKAGE__->columns(Essential => qw/item_type staff workstation org_unit use_time/);
#-------------------------------------------------------------------------------
package action::non_cataloged_circulation;
diff --git a/Open-ILS/src/sql/Pg/090.schema.action.sql b/Open-ILS/src/sql/Pg/090.schema.action.sql
index 8d8163b6f9..685a4c3db5 100644
--- a/Open-ILS/src/sql/Pg/090.schema.action.sql
+++ b/Open-ILS/src/sql/Pg/090.schema.action.sql
@@ -25,10 +25,12 @@ CREATE TABLE action.in_house_use (
id SERIAL PRIMARY KEY,
item BIGINT NOT NULL, -- REFERENCES asset.copy (id) DEFERRABLE INITIALLY DEFERRED, -- XXX could be an serial.issuance
staff INT NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
+ workstation INT REFERENCES actor.workstation (id) DEFERRABLE INITIALLY DEFERRED,
org_unit INT NOT NULL REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,
use_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
CREATE INDEX action_in_house_use_staff_idx ON action.in_house_use ( staff );
+CREATE INDEX action_in_house_use_ws_idx ON action.in_house_use ( workstation );
CREATE TABLE action.non_cataloged_circulation (
id SERIAL PRIMARY KEY,
@@ -45,10 +47,12 @@ CREATE TABLE action.non_cat_in_house_use (
id SERIAL PRIMARY KEY,
item_type BIGINT NOT NULL REFERENCES config.non_cataloged_type(id) DEFERRABLE INITIALLY DEFERRED,
staff INT NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
+ workstation INT REFERENCES actor.workstation (id) DEFERRABLE INITIALLY DEFERRED,
org_unit INT NOT NULL REFERENCES actor.org_unit (id) DEFERRABLE INITIALLY DEFERRED,
use_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
CREATE INDEX non_cat_in_house_use_staff_idx ON action.non_cat_in_house_use ( staff );
+CREATE INDEX non_cat_in_house_use_ws_idx ON action.non_cat_in_house_use ( workstation );
CREATE TABLE action.survey (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1248734_add_ws_to_ihu.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1248734_add_ws_to_ihu.sql
new file mode 100644
index 0000000000..5cb74bfb2d
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1248734_add_ws_to_ihu.sql
@@ -0,0 +1,8 @@
+BEGIN;
+
+--SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+ALTER TABLE action.in_house_use ADD COLUMN workstation INT REFERENCES actor.workstation (id) DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE action.non_cat_in_house_use ADD COLUMN workstation INT REFERENCES actor.workstation (id) DEFERRABLE INITIALLY DEFERRED;
+
+COMMIT;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/fm_IDL.xml | 4 ++++
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm | 1 +
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI.pm | 1 +
.../perlmods/lib/OpenILS/Application/Storage/CDBI/action.pm | 4 ++--
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/090.schema.action.sql | 4 ++++
.../sql/Pg/upgrade/1210.schema.lp1248734_add_ws_to_ihu.sql | 11 +++++++++++
.../Circulation/in_house_use_workstation.adoc | 7 +++++++
8 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1210.schema.lp1248734_add_ws_to_ihu.sql
create mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/in_house_use_workstation.adoc
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list