From 7a5e8507276ed91674ec4987edad9a43e7f6aeea Mon Sep 17 00:00:00 2001 From: miker Date: Wed, 1 Feb 2006 21:31:01 +0000 Subject: [PATCH] adding workstation underpinnings git-svn-id: svn://svn.open-ils.org/ILS/trunk@2927 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../perlmods/OpenILS/Application/Storage/CDBI/actor.pm | 8 ++++++++ .../perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm | 6 ++++++ Open-ILS/src/sql/Pg/005.schema.actors.sql | 7 +++++++ Open-ILS/src/sql/Pg/080.schema.money.sql | 5 ++++- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/actor.pm index 8df2155777..60bcf5209a 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/actor.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/actor.pm @@ -20,6 +20,14 @@ __PACKAGE__->columns( Essential => qw/usrname email first_given_name standing profile prefix suffix alert_message day_phone evening_phone other_phone mailing_address/ ); +#------------------------------------------------------------------------------- +package actor::workstation; +use base qw/actor/; + +__PACKAGE__->table( 'actor_workstation' ); +__PACKAGE__->columns( Primary => qw/id/); +__PACKAGE__->columns( Essential => qw/name owning_lib/); + #------------------------------------------------------------------------------- package actor::user_standing_penalty; use base qw/actor/; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm index 0f96e0a0db..021b61623f 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm @@ -328,6 +328,12 @@ biblio::record_note->table( 'biblio.record_note' ); biblio::record_note->sequence( 'biblio.record_note_id_seq' ); + #--------------------------------------------------------------------- + package actor::workstation; + + actor::workstation->table( 'actor.workstation' ); + actor::workstation->sequence( 'actor.workstation_id_seq' ); + #--------------------------------------------------------------------- package actor::user; diff --git a/Open-ILS/src/sql/Pg/005.schema.actors.sql b/Open-ILS/src/sql/Pg/005.schema.actors.sql index 732e60ef8b..fd5ed10aa4 100644 --- a/Open-ILS/src/sql/Pg/005.schema.actors.sql +++ b/Open-ILS/src/sql/Pg/005.schema.actors.sql @@ -378,6 +378,13 @@ INSERT INTO actor.org_unit (parent_ou, ou_type, shortname, name) VALUES (3, 3, ' INSERT INTO actor.org_unit (parent_ou, ou_type, shortname, name) VALUES (4, 4, 'SL1', 'Example Sub-lib 1'); INSERT INTO actor.org_unit (parent_ou, ou_type, shortname, name) VALUES (6, 5, 'BM1', 'Example Bookmobile 1'); +-- Workstation registration... +CREATE TABLE actor.workstation ( + id SERIAL PRIMARY KEY, + name TEXT NOT NULL UNIQUE, + owning_lib INT NOT NULL REFERENCES actor.org_unit (id) +); + CREATE TABLE actor.org_unit_setting ( id BIGSERIAL PRIMARY KEY, org_unit INT NOT NULL REFERENCES actor.org_unit ON DELETE CASCADE, diff --git a/Open-ILS/src/sql/Pg/080.schema.money.sql b/Open-ILS/src/sql/Pg/080.schema.money.sql index 22e8437bb6..d3458ff9e9 100644 --- a/Open-ILS/src/sql/Pg/080.schema.money.sql +++ b/Open-ILS/src/sql/Pg/080.schema.money.sql @@ -204,18 +204,20 @@ CREATE INDEX money_credit_payment_xact_idx ON money.credit_payment (xact); CREATE INDEX money_credit_payment_accepting_usr_idx ON money.credit_payment (accepting_usr); CREATE TABLE money.bnm_desk_payment ( - cash_drawer TEXT NOT NULL + cash_drawer INT REFERENCES actor.workstation (id) ) INHERITS (money.bnm_payment); CREATE TABLE money.cash_payment () INHERITS (money.bnm_desk_payment); CREATE INDEX money_cash_payment_xact_idx ON money.cash_payment (xact); CREATE INDEX money_cash_payment_accepting_usr_idx ON money.cash_payment (accepting_usr); +CREATE INDEX money_cash_payment_cash_drawer_idx ON money.cash_payment (cash_drawer); CREATE TABLE money.check_payment ( check_number TEXT NOT NULL ) INHERITS (money.bnm_desk_payment); CREATE INDEX money_check_payment_xact_idx ON money.check_payment (xact); CREATE INDEX money_check_payment_accepting_usr_idx ON money.check_payment (accepting_usr); +CREATE INDEX money_check_payment_cash_drawer_idx ON money.check_payment (cash_drawer); CREATE TABLE money.credit_card_payment ( cc_type TEXT NOT NULL, @@ -226,6 +228,7 @@ CREATE TABLE money.credit_card_payment ( ) INHERITS (money.bnm_desk_payment); CREATE INDEX money_credit_card_payment_xact_idx ON money.credit_card_payment (xact); CREATE INDEX money_credit_card_payment_accepting_usr_idx ON money.credit_card_payment (accepting_usr); +CREATE INDEX money_credit_card_payment_cash_drawer_idx ON money.credit_card_payment (cash_drawer); COMMIT; -- 2.43.2