Fixes made for #102, #103, #49, #108

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3504 248e525c-4dfb-0310-94bc-949c084e9493
This commit is contained in:
hardya
2008-02-08 16:23:12 +00:00
parent 073c5f5230
commit 68f300c2ca
16 changed files with 150 additions and 58 deletions

View File

@@ -50,6 +50,8 @@ sqlldr %1 control=syco
sqlldr %1 control=adit
sqlldr %1 control=dost
sqlplus %1 @enable_constraints

15
Data/Seed/dost.ctl Normal file
View File

@@ -0,0 +1,15 @@
LOAD DATA
INFILE *
INTO TABLE document_status_types
REPLACE
FIELDS TERMINATED BY '|'
(
code
,description
)
BEGINDATA
AWAIT SCAN|Awaiting virus check
AVAILABLE|Available for use
REMOVED USER|Remove by user
REMOVED MALICIOUS|Removed as result of virus check
REMOVED SIZE|Removed due to size constraints

View File

@@ -6,14 +6,16 @@ FIELDS TERMINATED BY '|'
(
code
,description
,contact_text
,quotation_text
)
BEGINDATA
NETW01|SC001 - Scotland
NETW02|NTH01 - North
NETW03|STH01 - South
NETW04|WWE01 - Wales and West
NETW05|RDN01 - North London
NETW06|RDN01 - West Midlands
NETW07|RDN01 - North West
NETW08|RDN01 - East
RDN01|Retained networks
NETW01|SC001 - Scotland|Scotia Gas Networks Ltd|
NETW02|NTH01 - North|North of England Ltd|
NETW03|STH01 - South|Scotia Gas Networks Ltd|
NETW04|WWE01 - Wales and West|Wales and West Utilities Ltd|
NETW05|RDN01 - North London|London Ltd|
NETW06|RDN01 - West Midlands|West Midlands Ltd|
NETW07|RDN01 - North West|North West Ltd|
NETW08|RDN01 - East|East of England Ltd|
RDN01|Retained networks|National Grid Metering Ltd|

View File

@@ -1 +0,0 @@
206|SUPP|2061|08-NOV-07|||

View File

@@ -1,6 +0,0 @@
4041|2001|404|200|AGENT|SUPP|08-NOV-07|AGENT|SUPP
4041|2011|404|201|AGENT|SUPP|08-NOV-07|AGENT|SUPP
4041|2021|404|202|AGENT|SUPP|08-NOV-07|AGENT|SUPP
4052|2061|405|206|SUPPADMIN|SUPP|08-NOV-07|SUPPADMIN|SUPP
4081|2061|408|206|AGENT|SUPP|08-NOV-07|AGENT|SUPP
5002|2021|419|202|SUPPADMIN|SUPP|03-FEB-08|SUPPADMIN|SUPP

View File

@@ -1 +0,0 @@
|hardya|LON|London Supplies||08-NOV-07|||LONSUPP|LT7 Contract|GT7 Contract|Adversarial Contract|||||||Supplier of gas to London|206|MKTP

View File

@@ -206,11 +206,13 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
INSERT INTO parties
(id
,manu_ref
,NAME
,description
,prty_type
,created_on
,created_by)
(SELECT prty_seq.NEXTVAL
,manu_ref
,manu_ref
,'Inserted for load_meters'
,'MANU'
@@ -372,11 +374,13 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
INSERT INTO parties
(id
,manu_ref
,NAME
,description
,prty_type
,created_on
,created_by)
(SELECT prty_seq.NEXTVAL
,manu_ref
,manu_ref
,'Inserted for load_modules'
,'MANU'
@@ -975,11 +979,13 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
INSERT INTO parties
(id
,manu_ref
,NAME
,description
,prty_type
,created_on
,created_by)
(SELECT prty_seq.NEXTVAL
,manu_ref
,manu_ref
,'Inserted for load_housings'
,'MANU'

View File

@@ -1284,13 +1284,9 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.');
l_idx := l_tab_messages.FIRST;
LOOP
EXIT WHEN l_idx IS NULL;
l_return := l_return || l_tab_messages(l_idx) || ',';
l_return := l_return || l_tab_messages(l_idx);
l_idx := l_tab_messages.NEXT(l_idx);
END LOOP;
-- remove the trailing comma
l_return := substr(l_return
,1
,length(l_return) - 1);
END IF;
RETURN l_return;

View File

@@ -190,21 +190,21 @@ CREATE OR REPLACE PACKAGE BODY mip_tripartite IS
AND NOT addon_allowed(p_adit_code => 'AMR'
,p_regi_code => p_regi_code) THEN
l_valid := FALSE;
al('Tripartite agreement prevents AMR being requested.'
al('Tripartite Agreement prevents AMR being requested. '
,p_tab_messages);
END IF;
IF p_ems_required = 'YES'
AND NOT addon_allowed(p_adit_code => 'EMS'
,p_regi_code => p_regi_code) THEN
l_valid := FALSE;
al('Tripartite agreement prevents EMS being requested.'
al('Tripartite Agreement prevents EMS being requested. '
,p_tab_messages);
END IF;
IF p_bypass_required = 'YES'
AND NOT addon_allowed(p_adit_code => 'BYPASS'
,p_regi_code => p_regi_code) THEN
l_valid := FALSE;
al('Tripartite agreement prevents Bypass being requested.'
al('Tripartite Agreement prevents Bypass being requested. '
,p_tab_messages);
END IF;
@@ -250,6 +250,7 @@ CREATE OR REPLACE PACKAGE BODY mip_tripartite IS
l_valid BOOLEAN DEFAULT TRUE;
l_regi_code regions.code%TYPE;
l_supp_prty_id parties.id%TYPE;
l_contact_text regions.contact_text%TYPE;
BEGIN
l_regi_code := mip_regions.get_region_for_postcode(p_postcode => p_rec.install_postcode);
l_supp_prty_id := mip_enquiry.get_enquiry_role(p_enquiryid => p_rec.id
@@ -257,7 +258,14 @@ CREATE OR REPLACE PACKAGE BODY mip_tripartite IS
IF NOT enquiry_allowed(p_supp_prty_id => l_supp_prty_id
,p_enty_code => p_rec.enty_code
,p_regi_code => l_regi_code) THEN
al('Tripartite agreement prevents this enquiry being processed.'
SELECT regions.contact_text
INTO l_contact_text
FROM regions
WHERE code = l_regi_code;
al('Unable to quote for the specified postcode due to Tripartite Agreement. Please contact ' ||
l_contact_text || ' metering services. '
,l_tab_messages);
l_valid := FALSE;
ELSE

View File

@@ -0,0 +1,11 @@
CREATE OR REPLACE VIEW V_CURRENT_DOCUMENT_STATUS AS
SELECT docu_id
,event_date
,dost_code
FROM (SELECT docu_id
,event_date
,dost_code
,id
,MAX(id) over(PARTITION BY docu_id) AS max_id
FROM document_events)
WHERE id = max_id;

View File

@@ -1,6 +1,6 @@
-- C:\Andy\svn\WEBMIP\Schema\mip.con
--
-- Generated for Oracle 10g on Fri Feb 08 15:31:37 2008 by Server Generator 10.1.2.6.18
-- Generated for Oracle 10g on Fri Feb 08 15:56:52 2008 by Server Generator 10.1.2.6.18
PROMPT Creating Primary Key on 'SYSTEM_CONFIGURATION'
ALTER TABLE SYSTEM_CONFIGURATION
@@ -129,6 +129,12 @@ ALTER TABLE CONTACT_MECHANISM_TYPES
(CODE))
/
PROMPT Creating Primary Key on 'DOCUMENT_EVENTS'
ALTER TABLE DOCUMENT_EVENTS
ADD (CONSTRAINT DOEV_PK PRIMARY KEY
(ID))
/
PROMPT Creating Primary Key on 'FILTERS'
ALTER TABLE FILTERS
ADD (CONSTRAINT FLTR_PK PRIMARY KEY
@@ -274,6 +280,12 @@ ALTER TABLE ENQUIRY_ROLES
,START_DATE))
/
PROMPT Creating Primary Key on 'DOCUMENT_STATUS_TYPES'
ALTER TABLE DOCUMENT_STATUS_TYPES
ADD (CONSTRAINT DOST_PK PRIMARY KEY
(CODE))
/
PROMPT Creating Primary Key on 'ERROR_LOGS'
ALTER TABLE ERROR_LOGS
ADD (CONSTRAINT ERLO_PK PRIMARY KEY
@@ -453,28 +465,28 @@ ALTER TABLE REGI_ENQU_EXCLUSIONS
PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
ALTER TABLE METER_SIZE_CODES
ADD (CONSTRAINT AVCON_1202484697_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
ADD (CONSTRAINT AVCON_1202486212_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
/
PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
ALTER TABLE METER_SIZE_CODES
ADD (CONSTRAINT AVCON_1202484697_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
ADD (CONSTRAINT AVCON_1202486212_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
/
PROMPT Creating Check Constraint on 'COSTS'
ALTER TABLE COSTS
ADD (CONSTRAINT AVCON_1202484697_COST__000 CHECK (COST_TYPE
ADD (CONSTRAINT AVCON_1202486212_COST__000 CHECK (COST_TYPE
IN ('LACO', 'BACO', 'MOCO', 'MECO', 'AICO', 'HOCO', 'COST')))
/
PROMPT Creating Check Constraint on 'DOCUMENTS'
ALTER TABLE DOCUMENTS
ADD (CONSTRAINT AVCON_1202484697_DOCU__000 CHECK (DOCU_TYPE IN ('DOCU', 'INDO', 'EXDO', 'FIDO')))
ADD (CONSTRAINT AVCON_1202486212_DOCU__000 CHECK (DOCU_TYPE IN ('DOCU', 'INDO', 'EXDO', 'FIDO')))
/
PROMPT Creating Check Constraint on 'QUOTES'
ALTER TABLE QUOTES
ADD (CONSTRAINT AVCON_1202484697_QUTE__000 CHECK (QUTE_TYPE IN ('AQ', 'MQ', 'QUTE')))
ADD (CONSTRAINT AVCON_1202486212_QUTE__000 CHECK (QUTE_TYPE IN ('AQ', 'MQ', 'QUTE')))
/
PROMPT Creating Check Constraint on 'PARTY_RELATIONSHIPS'
@@ -486,17 +498,17 @@ to_parl_rt_code = to_prtp_rt_code))
PROMPT Creating Check Constraint on 'PARTIES'
ALTER TABLE PARTIES
ADD (CONSTRAINT AVCON_1202484697_TRIPA_000 CHECK (TRIPARTITE_MEMBER IN ('YES', 'NO')))
ADD (CONSTRAINT AVCON_1202486212_TRIPA_000 CHECK (TRIPARTITE_MEMBER IN ('YES', 'NO')))
/
PROMPT Creating Check Constraint on 'PARTIES'
ALTER TABLE PARTIES
ADD (CONSTRAINT AVCON_1202484697_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
ADD (CONSTRAINT AVCON_1202486212_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
/
PROMPT Creating Check Constraint on 'PARTIES'
ALTER TABLE PARTIES
ADD (CONSTRAINT AVCON_1202484697_PRTY__000 CHECK (PRTY_TYPE
ADD (CONSTRAINT AVCON_1202486212_PRTY__000 CHECK (PRTY_TYPE
IN ('PRTY', 'IO', 'EO', 'MKTP', 'PERS', 'MANU', 'NEMP', 'EMP', 'ORG'
)))
/
@@ -514,82 +526,82 @@ OR
PROMPT Creating Check Constraint on 'DOCUMENT_ROLES'
ALTER TABLE DOCUMENT_ROLES
ADD (CONSTRAINT AVCON_1202484697_DORO__000 CHECK (DORO_TYPE IN ('DRRO', 'DORO', 'ENDO', 'QUDO')))
ADD (CONSTRAINT AVCON_1202486212_DORO__000 CHECK (DORO_TYPE IN ('DRRO', 'DORO', 'ENDO', 'QUDO')))
/
PROMPT Creating Check Constraint on 'QUOTE_ITEMS'
ALTER TABLE QUOTE_ITEMS
ADD (CONSTRAINT AVCON_1202484697_QUIT__000 CHECK (QUIT_TYPE IN ('LQI', 'AQI', 'BQI', 'MQI', 'QUIT', 'HQI')))
ADD (CONSTRAINT AVCON_1202486212_QUIT__000 CHECK (QUIT_TYPE IN ('LQI', 'AQI', 'BQI', 'MQI', 'QUIT', 'HQI')))
/
PROMPT Creating Check Constraint on 'ROLE_TYPES'
ALTER TABLE ROLE_TYPES
ADD (CONSTRAINT AVCON_1202484697_RT_TY_000 CHECK (RT_TYPE IN ('DORT', 'PART', 'RT', 'PCMRT', 'QURT', 'ENRT', 'PRT')))
ADD (CONSTRAINT AVCON_1202486212_RT_TY_000 CHECK (RT_TYPE IN ('DORT', 'PART', 'RT', 'PCMRT', 'QURT', 'ENRT', 'PRT')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
ADD (CONSTRAINT AVCON_1202486212_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
ADD (CONSTRAINT AVCON_1202486212_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
ADD (CONSTRAINT AVCON_1202486212_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
ADD (CONSTRAINT AVCON_1202486212_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
ADD (CONSTRAINT AVCON_1202486212_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
ADD (CONSTRAINT AVCON_1202486212_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
ADD (CONSTRAINT AVCON_1202486212_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
ADD (CONSTRAINT AVCON_1202486212_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_EXIST_000 CHECK (EXISTING_LOGGER IN ('YES', 'NO')))
ADD (CONSTRAINT AVCON_1202486212_EXIST_000 CHECK (EXISTING_LOGGER IN ('YES', 'NO')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
ADD (CONSTRAINT AVCON_1202486212_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_EXIST_001 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
ADD (CONSTRAINT AVCON_1202486212_EXIST_001 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_EXIST_002 CHECK (EXISTING_CONVERTOR IN ('YES', 'NO')))
ADD (CONSTRAINT AVCON_1202486212_EXIST_002 CHECK (EXISTING_CONVERTOR IN ('YES', 'NO')))
/
PROMPT Creating Check Constraint on 'ENQUIRIES'
ALTER TABLE ENQUIRIES
ADD (CONSTRAINT AVCON_1202484697_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
ADD (CONSTRAINT AVCON_1202486212_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
/
@@ -755,6 +767,20 @@ ALTER TABLE COSTS ADD (CONSTRAINT
(CODE))
/
PROMPT Creating Foreign Key on 'DOCUMENT_EVENTS'
ALTER TABLE DOCUMENT_EVENTS ADD (CONSTRAINT
DOEV_DOST_FK FOREIGN KEY
(DOST_CODE) REFERENCES DOCUMENT_STATUS_TYPES
(CODE))
/
PROMPT Creating Foreign Key on 'DOCUMENT_EVENTS'
ALTER TABLE DOCUMENT_EVENTS ADD (CONSTRAINT
DOEV_DOCU_FK FOREIGN KEY
(DOCU_ID) REFERENCES DOCUMENTS
(ID))
/
PROMPT Creating Foreign Key on 'FILTERS'
ALTER TABLE FILTERS ADD (CONSTRAINT
FLTR_FITY_FK FOREIGN KEY

View File

@@ -1,6 +1,6 @@
-- C:\Andy\svn\WEBMIP\Schema\mip.ind
--
-- Generated for Oracle 10g on Fri Feb 08 15:31:37 2008 by Server Generator 10.1.2.6.18
-- Generated for Oracle 10g on Fri Feb 08 15:56:52 2008 by Server Generator 10.1.2.6.18
PROMPT Creating Index 'REGU_RETY_FK_I'
@@ -122,6 +122,16 @@ CREATE INDEX COST_HOU_FK_I ON COSTS
(HOU_CODE)
/
PROMPT Creating Index 'DOEV_DOCU_FK_I'
CREATE INDEX DOEV_DOCU_FK_I ON DOCUMENT_EVENTS
(DOCU_ID)
/
PROMPT Creating Index 'DOEV_DOST_FK_I'
CREATE INDEX DOEV_DOST_FK_I ON DOCUMENT_EVENTS
(DOST_CODE)
/
PROMPT Creating Index 'FLTR_FITY_FK_I'
CREATE INDEX FLTR_FITY_FK_I ON FILTERS
(FITY_CODE)

View File

@@ -1,6 +1,6 @@
-- C:\Andy\svn\WEBMIP\Schema\mip.sql
--
-- Generated for Oracle 10g on Fri Feb 08 15:31:37 2008 by Server Generator 10.1.2.6.18
-- Generated for Oracle 10g on Fri Feb 08 15:56:53 2008 by Server Generator 10.1.2.6.18
SPOOL mip.lst

View File

@@ -1,6 +1,6 @@
-- C:\Andy\svn\WEBMIP\Schema\mip.sqs
--
-- Generated for Oracle 10g on Fri Feb 08 15:31:37 2008 by Server Generator 10.1.2.6.18
-- Generated for Oracle 10g on Fri Feb 08 15:56:52 2008 by Server Generator 10.1.2.6.18
PROMPT Creating Sequence 'FLTR_SEQ'
CREATE SEQUENCE FLTR_SEQ
@@ -89,6 +89,13 @@ CREATE SEQUENCE MOCO_SEQ
NOCYCLE
/
PROMPT Creating Sequence 'DOEV_SEQ'
CREATE SEQUENCE DOEV_SEQ
NOMAXVALUE
NOMINVALUE
NOCYCLE
/
PROMPT Creating Sequence 'QUTE_SEQ'
CREATE SEQUENCE QUTE_SEQ
START WITH 20080000

View File

@@ -1,6 +1,6 @@
-- C:\Andy\svn\WEBMIP\Schema\mip.tab
--
-- Generated for Oracle 10g on Fri Feb 08 15:31:37 2008 by Server Generator 10.1.2.6.18
-- Generated for Oracle 10g on Fri Feb 08 15:56:52 2008 by Server Generator 10.1.2.6.18
@@ -181,6 +181,16 @@ CREATE TABLE CONTACT_MECHANISM_TYPES
)
/
PROMPT Creating Table 'DOCUMENT_EVENTS'
CREATE TABLE DOCUMENT_EVENTS
(DOCU_ID NUMBER(*,0) NOT NULL
,DOST_CODE VARCHAR2(80) NOT NULL
,EVENT_DATE DATE NOT NULL
,DESCRIPTION VARCHAR2(80)
,ID NUMBER(*,0) NOT NULL
)
/
PROMPT Creating Table 'FILTERS'
CREATE TABLE FILTERS
(CODE VARCHAR2(80) NOT NULL
@@ -447,6 +457,13 @@ CREATE TABLE ENQUIRY_ROLES
)
/
PROMPT Creating Table 'DOCUMENT_STATUS_TYPES'
CREATE TABLE DOCUMENT_STATUS_TYPES
(CODE VARCHAR2(80) NOT NULL
,DESCRIPTION VARCHAR2(80)
)
/
PROMPT Creating Table 'ERROR_LOGS'
CREATE TABLE ERROR_LOGS
(ERLO_ID NUMBER NOT NULL

View File

@@ -18,5 +18,5 @@
@@V_QUOTE_DETAILS.vw
@@V_current_enquiry_status.vw
@@V_current_quote_status.vw
@@V_CURRENT_DOCUMENT_STATUS.vw