diff --git a/Data/BulkLoad/DATAITEM_ROLES.csv b/Data/BulkLoad/DATAITEM_ROLES.csv index 2465644..a7868bc 100644 --- a/Data/BulkLoad/DATAITEM_ROLES.csv +++ b/Data/BulkLoad/DATAITEM_ROLES.csv @@ -19,12 +19,12 @@ ENTY_CODE,Job Information.Job Type,M,M,M,M,M,M,M,M,M,M,M,M,,43 EXISTING_CONVERTOR,Job Information.Existing Convertor,H,H,O,M,M,M,M,M,O,O,O,O,,72 EXISTING_LOGGER,Job Information.Logger,H,H,H,O,O,O,O,O,O,O,O,O,,71 EXISTING_PRTY_ID,Job Information.Existing Manufacturer,H,H,M,M,M,M,M,M,O,O,O,O,, -EXISTING_MESC_CODE,Job Information.Existing Meter Size,H,H,O-M6,O-M6,O-M6,O-M6,O-M6,O-M6,M,O-M6,O,O,,36 +EXISTING_MESC_CODE,Job Information.Existing Meter Size,H,H,O-M6,O-M6,O-M6,O-M6,O-M6,O-M6,O-M6,O-M6,O,O,,36 EXISTING_METER_ASSET_PROVIDER,Job Information.Supplier / Job Information.Consumer(Meter Asset Manager),O,O,O,O,O,O,O,O,O,O,O,O,,54 EXISTING_METR_CODE,Job Information.Existing Model Code,H,H,M,M,M,M,M,M,O,M,O,O,,49 EXISTING_METER_OWNER,Job Information.Gas Act Owner,O,O,M,M,M,M,M,M,M,M,M,O,,38 EXISTING_METER_SERIAL_NO,Job Information.Existing Asset Serial Number,H,H,M,M,M,M,M,M,M,M,M,O,,35 -EXISTING_METY_CODE,Job Information.Meter Type Existing ,H,H,O-M6,O-M6,O-M6,O-M6,O-M6,O-M6,M,O-M6,O,O,,37 +EXISTING_METY_CODE,Job Information.Meter Type Existing ,H,H,O-M6,O-M6,O-M6,O-M6,O-M6,O-M6,O-M6,O-M6,O,O,,37 FIRST_ALT_BUILDING,Contact Address.Building,O,O,O,O,O,O,O,O,O,O,O,O,,7 FIRST_ALT_CITY,Contact Address.City,O,O,O,O,O,O,O,O,O,O,O,O,,8 FIRST_ALT_POSTCODE,Contact Address.Post Code,O,O,O,O,O,O,O,O,O,O,O,O,,13 @@ -56,7 +56,7 @@ OTHER_PROJECT_REFERENCE,Job Information.Other Related Projects,O,O,O,O,O,O,O,O,O QMAX,Job Information.Measuring Capacity Qmax,M,O-M2,O,M,O-M2,O,O,O,O,M,O,O,,46 QMIN,Job Information.Measuring Capacity Qmin,O,O,O,O,O,O,O,O,O,O,O,O,,47 REQUIRED_IP_DETAILS,Job Information.IP Details,O-M3,H,O-M3,O-M3,H,O-M3,H,O-M3,O-M3,O-M3,O-M3,O-M3,if service pressure is IP,40 -REQUIRED_IP_MBAR,Job Information.IP Mbar,O-M3,H,O-M3,O-M3,H,O-M3,H,O-M3,O-M3,O-M3,O-M3,O-M3,if service pressure is IP,41 +REQUIRED_IP_MBAR,Job Information.IP Inlet pressure,O-M3,H,O-M3,O-M3,H,O-M3,H,O-M3,O-M3,O-M3,O-M3,O-M3,if service pressure is IP,41 REQUIRED_MESC_CODE,Job Information.Meter Size,H,O-M2,H,H,O-M2,H,H,H,H,O,H,O,,48 REQUIRED_METERING_PRESSURE,Job Information.Required Meter Pressure,M,M,M,M,M,M,M,M,M,M,O,O,,52 REQUIRED_SVCP_CODE,Job Information.Service Pressure,O-M3,M,O-M3,O-M3,M,O-M3,M,O-M3,O-M3,O-M3,O-M3,O-M3,,53 @@ -87,3 +87,4 @@ UPDATED_ON,,,,,,,,,,,,,,, ,O-M5: AMR AVAILABILITY IS DETERMINED BY TRIPARTITE AGREEMENT,,,,,,,,,,,,,, ,O-M6: IF EXISTING_METR_CODE IS 'OTHER' THEN EXISTING_MESC_CODE AND EXISTING_METY_CODE MUST BE COMPLETED,,,,,,,,,,,,,, ,O-M7: IF BY_PASS IS 'OTHER' THEN BYPASS_OTHER MUST BE COMPLETED,,,,,,,,,,,,,, +,,,,,,,,,,,,,,, diff --git a/Documentation/Design/DATAITEM_ROLES.xls b/Documentation/Design/DATAITEM_ROLES.xls index 5fe39b4..d895d29 100644 Binary files a/Documentation/Design/DATAITEM_ROLES.xls and b/Documentation/Design/DATAITEM_ROLES.xls differ diff --git a/Modules/MIP_ENQUIRY.pck b/Modules/MIP_ENQUIRY.pck index dc4e8eb..5ad7f33 100644 --- a/Modules/MIP_ENQUIRY.pck +++ b/Modules/MIP_ENQUIRY.pck @@ -100,13 +100,13 @@ CREATE OR REPLACE PACKAGE BODY mip_enquiry IS PROCEDURE pl(p_in VARCHAR2 ,p_line IN NUMBER DEFAULT NULL) IS BEGIN - NULL; - /* $IF mip_debug_constants.debugging OR mip_debug_constants.enquiry - $THEN*/ + $IF mip_debug_constants.debugging OR mip_debug_constants.enquiry + $THEN mip_debug.pl(p_unit => $$PLSQL_UNIT ,p_line => p_line ,p_in => p_in); - /* $END*/ + $END + NULL; END pl; /* FUNCTION enquiry_has_quotes diff --git a/Modules/MIP_FILES.pck b/Modules/MIP_FILES.pck index 002b523..1a538be 100644 --- a/Modules/MIP_FILES.pck +++ b/Modules/MIP_FILES.pck @@ -36,13 +36,13 @@ CREATE OR REPLACE PACKAGE BODY mip_files AS PROCEDURE pl(p_in VARCHAR2 ,p_line NUMBER DEFAULT NULL) IS BEGIN - NULL; - -- $IF $$DEBUGGING OR mip_debug_constants.debugging OR mip_debug_constants.files - -- $THEN + $IF mip_debug_constants.debugging OR mip_debug_constants.files + $THEN mip_debug.pl(p_unit => $$PLSQL_UNIT ,p_in => p_in ,p_line => p_line); - -- $END + $END + NULL; END pl; /* diff --git a/Modules/mip_bulk_load.pck b/Modules/mip_bulk_load.pck index 701631c..bd9ee80 100644 --- a/Modules/mip_bulk_load.pck +++ b/Modules/mip_bulk_load.pck @@ -31,12 +31,11 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS PROCEDURE pl(p_in IN VARCHAR2 ,p_line IN NUMBER DEFAULT NULL) IS BEGIN - NULL; - --$IF $$DEBUGGING OR mip_debug_constants.debugging OR mip_debug_constants.bulk_load $THEN - mip_debug.pl(p_unit => $$PLSQL_UNIT - ,p_line => p_line - ,p_in => p_in); - --$END + + $IF mip_debug_constants.debugging OR mip_debug_constants.bulk_load $THEN mip_debug.pl(p_unit => $$PLSQL_UNIT + ,p_line => p_line + ,p_in => p_in); + $END NULL; END pl; PROCEDURE get_dir_list(p_directory IN VARCHAR2) AS diff --git a/Modules/mip_debug_constants.pks b/Modules/mip_debug_constants.pks index 5d8876b..7098a16 100644 --- a/Modules/mip_debug_constants.pks +++ b/Modules/mip_debug_constants.pks @@ -5,10 +5,15 @@ CREATE OR REPLACE PACKAGE mip_debug_constants IS -- Purpose : Constants used for conditional compilation of debug functions -- Public constant declarations - debugging CONSTANT BOOLEAN := TRUE; - bulk_load CONSTANT BOOLEAN := TRUE; - quotation CONSTANT BOOLEAN := TRUE; - files CONSTANT BOOLEAN := TRUE; + debugging CONSTANT BOOLEAN := TRUE; + bulk_load CONSTANT BOOLEAN := TRUE; + quotation CONSTANT BOOLEAN := TRUE; + enquiry CONSTANT BOOLEAN := TRUE; + files CONSTANT BOOLEAN := TRUE; + tripartite CONSTANT BOOLEAN := TRUE; + security CONSTANT BOOLEAN := TRUE; + select_xml CONSTANT BOOLEAN := TRUE; + friendly_messages CONSTANT BOOLEAN := TRUE; END mip_debug_constants; / diff --git a/Modules/mip_friendly_messages.pck b/Modules/mip_friendly_messages.pck index 2058393..911d293 100644 --- a/Modules/mip_friendly_messages.pck +++ b/Modules/mip_friendly_messages.pck @@ -17,13 +17,13 @@ CREATE OR REPLACE PACKAGE BODY mip_friendly_messages IS PROCEDURE pl(p_in VARCHAR2 ,p_line IN NUMBER DEFAULT NULL) IS BEGIN - NULL; - /* $IF mip_debug_constants.debugging OR mip_debug_constants.friendly_messages - $THEN*/ + $IF mip_debug_constants.debugging OR mip_debug_constants.friendly_messages + $THEN mip_debug.pl(p_unit => $$PLSQL_UNIT ,p_line => p_line ,p_in => p_in); - /* $END*/ + $END + NULL; END pl; FUNCTION get_constraint_message(p_ora_msg IN VARCHAR2) RETURN VARCHAR2 IS diff --git a/Modules/mip_helper_special_cases.pck b/Modules/mip_helper_special_cases.pck index 14b8182..0aafaee 100644 --- a/Modules/mip_helper_special_cases.pck +++ b/Modules/mip_helper_special_cases.pck @@ -69,8 +69,8 @@ CREATE OR REPLACE PACKAGE BODY mip_helper_special_cases IS -- O-M6 IF p_rec.enty_code IN ('OFMAT', 'EXCHANGE', 'STD EXCHANGE', 'REMOVE', - 'STD REMOVE', 'ADVERSARIAL', 'CHANGE CAPACITY') - AND p_rec.existing_metr_code = 'OTHER' + 'STD REMOVE', 'ADVERSARIAL', 'CHANGE CAPACITY', 'ALTERATION') + AND nvl(p_rec.existing_metr_code, 'OTHER') = 'OTHER' AND (p_rec.existing_mesc_code IS NULL OR p_rec.existing_mety_code IS NULL) THEN mip_mandatory.add_error(p_mandatory_checks => p_mandatory_checks @@ -95,7 +95,7 @@ CREATE OR REPLACE PACKAGE BODY mip_helper_special_cases IS ,p_field_name => 'BYPASS_OTHER' ,p_error_message => '''Other'' reason must be completed.'); END IF; - END IF; + END IF; END table_enquiries; BEGIN -- Initialization diff --git a/Modules/mip_quotation.pck b/Modules/mip_quotation.pck index a76d477..b06bf0a 100644 --- a/Modules/mip_quotation.pck +++ b/Modules/mip_quotation.pck @@ -213,13 +213,12 @@ CREATE OR REPLACE PACKAGE BODY mip_quotation IS PROCEDURE pl(p_in VARCHAR2 ,p_line IN NUMBER DEFAULT NULL) IS BEGIN - NULL; - /* $IF mip_debug_constants.debugging OR mip_debug_constants.quotation - $THEN*/ + $IF mip_debug_constants.debugging OR mip_debug_constants.quotation $THEN mip_debug.pl(p_unit => $$PLSQL_UNIT ,p_line => p_line ,p_in => p_in); - /* $END*/ + $END + NULL; END pl; PROCEDURE add_quote_reason(p_enqu_id IN enquiries.id%TYPE diff --git a/Modules/mip_security.pck b/Modules/mip_security.pck index 268caad..4adba1a 100644 --- a/Modules/mip_security.pck +++ b/Modules/mip_security.pck @@ -106,13 +106,13 @@ CREATE OR REPLACE PACKAGE BODY mip_security AS PROCEDURE pl(p_in VARCHAR2 ,p_line IN NUMBER DEFAULT NULL) IS BEGIN - NULL; - /* $IF mip_debug_constants.debugging OR mip_debug_constants.security - $THEN*/ + $IF mip_debug_constants.debugging OR mip_debug_constants.security + $THEN mip_debug.pl(p_unit => $$PLSQL_UNIT ,p_line => p_line ,p_in => p_in); - /* $END*/ + $END + NULL; END pl; /* returns the current status of the user diff --git a/Modules/mip_select_xml.pck b/Modules/mip_select_xml.pck index cb17b4d..62ea94d 100644 --- a/Modules/mip_select_xml.pck +++ b/Modules/mip_select_xml.pck @@ -22,13 +22,13 @@ CREATE OR REPLACE PACKAGE BODY mip_select_xml IS PROCEDURE pl(p_in VARCHAR2 ,p_line IN NUMBER DEFAULT NULL) IS BEGIN - NULL; - /* $IF mip_debug_constants.debugging OR mip_debug_constants.select_xml - $THEN*/ + $IF mip_debug_constants.debugging OR mip_debug_constants.select_xml + $THEN mip_debug.pl(p_unit => $$PLSQL_UNIT ,p_line => p_line ,p_in => p_in); - /* $END*/ + $END + NULL; END pl; PROCEDURE select_xml(p_select_list IN VARCHAR2 diff --git a/Modules/mip_tripartite.pck b/Modules/mip_tripartite.pck index b1f2c56..9ae369d 100644 --- a/Modules/mip_tripartite.pck +++ b/Modules/mip_tripartite.pck @@ -85,13 +85,13 @@ CREATE OR REPLACE PACKAGE BODY mip_tripartite IS PROCEDURE pl(p_in VARCHAR2 ,p_line IN NUMBER DEFAULT NULL) IS BEGIN - NULL; - /* $IF mip_debug_constants.debugging OR mip_debug_constants.tripartite - $THEN*/ + $IF mip_debug_constants.debugging OR mip_debug_constants.tripartite + $THEN mip_debug.pl(p_unit => $$PLSQL_UNIT ,p_line => p_line ,p_in => p_in); - /* $END*/ + $END + NULL; END pl; PROCEDURE al(p_in IN VARCHAR2 diff --git a/Modules/mip_virus_check.pck b/Modules/mip_virus_check.pck index 1be57cf..28f2404 100644 --- a/Modules/mip_virus_check.pck +++ b/Modules/mip_virus_check.pck @@ -26,8 +26,6 @@ CREATE OR REPLACE PACKAGE mip_virus_check IS %return VARCHAR2 - the actual name of the file */ FUNCTION get_fs_name(p_name IN documents.uri%TYPE) RETURN VARCHAR2; - -- - PROCEDURE pl(p_in VARCHAR2); END mip_virus_check; / CREATE OR REPLACE PACKAGE BODY mip_virus_check IS @@ -35,17 +33,17 @@ CREATE OR REPLACE PACKAGE BODY mip_virus_check IS Updates: MM 25-Feb-2008 added the load file */ - PROCEDURE pl(p_in VARCHAR2) IS - l_fh utl_file.file_type; + PROCEDURE pl(p_in VARCHAR2 + ,p_line IN NUMBER DEFAULT NULL) IS BEGIN - dbms_application_info.set_module('mip_virus_check', p_in); - l_fh := utl_file.fopen(location => 'WEBMIP_VIRUS', - filename => 'WEBMIP_VIRUS.txt', - open_mode => 'A'); - utl_file.put_line(l_fh, - to_char(SYSDATE, 'DD/MM/YYYY HH24:MI:SS') || ',' || p_in); - utl_file.fclose(l_fh); - END pl; + $IF mip_debug_constants.debugging OR mip_debug_constants.friendly_messages + $THEN + mip_debug.pl(p_unit => $$PLSQL_UNIT + ,p_line => p_line + ,p_in => p_in); + $END + NULL; + END pl; PROCEDURE write_file(p_name IN wwv_flow_files.NAME%TYPE, p_location IN VARCHAR2 DEFAULT 'WEBMIP_VIRUS', diff --git a/WebServer/conf/dads.conf b/WebServer/conf/dads.conf index 198af06..8361f06 100644 --- a/WebServer/conf/dads.conf +++ b/WebServer/conf/dads.conf @@ -23,8 +23,7 @@ AddType text/x-component htc AllowOverride None PlsqlDatabaseUsername APEX_PUBLIC_USER # ###PlsqlNLSLanguage AMERICAN_AMERICA.WE8MSWIN1252 - PlsqlNLSLanguage AMERICAN_AMERICA.WE8MSWIN1252 - # PlsqlNLSLanguage AMERICAN_AMERICA.AL32UTF + PlsqlNLSLanguage AMERICAN_AMERICA.AL32UTF8 PlsqlDatabasePassword thaawtsom PlsqlDatabaseConnectString 127.0.0.1:1521:webmip ServiceNameFormat PlsqlAuthenticationMode Basic