Alterations to schema (primarily enquiries) to support 'existing' meter requirements due to [wiki:MeetingNotes/MeetingNote3rdMarch Meeting to discuss/spec new variations, 3rd March]

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3837 248e525c-4dfb-0310-94bc-949c084e9493

Data/BulkLoad/DATAITEM_ROLES.csv

@@ -1,78 +1,78 @@
-COLUMN_NAME ,Appendix Reference,INSTALL,STD INSTALL,OFMAT,EXCHANGE,STD EXCHANGE,REMOVE,STD REMOVE,ADVERSARIAL,ALTERATION,CHANGE CAPACITY,ADDONS(EMS,AMR),OTHER,Notes,DisplaySequence
+COLUMN_NAME ,Appendix Reference,INSTALL,STD INSTALL,OFMAT,EXCHANGE,STD EXCHANGE,REMOVE,STD REMOVE,ADVERSARIAL,ALTERATION,CHANGE CAPACITY,"ADDONS(EMS,AMR)",OTHER,Notes,DisplaySequence
+ACCESS_ADDITIONAL,Site Detail.Access Instructions,O,O,O,O,O,O,O,O,O,O,O,O,,61
+ACCESS_PASSWORD,Site Detail.Access Password,O,O,O,O,O,O,O,O,O,O,O,O,,62
+AGENT_COMT_CODE,Supplier Agent.Telephone1/Telephone2/Fax/Email,M,M,M,M,M,M,M,M,M,M,M,M,,68
+AGENT_CONTACT_VALUE,Supplier Agent.Telephone1/Telephone2/Fax/Email,M,M,M,M,M,M,M,M,M,M,M,M,,69
+ALTY_CODE,Site Detail.Asset Location Code,M,M,M,M,M,M,M,M,M,M,M,M,,64
+AMR_REQUIRED,Job Information.Additional Services.AMR,O-M5,O-M5,H,O-M5,O-M5,H,H,H,O-M5,O-M5,O-M5,O-M5,"The AMR may only be available for the Tripartite suppliers or BG, GW to confirm!",25
+ANNUAL_QUANTITY,Job Information.Annual Quantity,O,O,O,O,O,H,H,H,O,O,O,O,if > 732 mwh go bespoke,32
+ASSET_LOCATION_NOTES,Site Detail.Asset Location Notes,O,O,O,O,O,O,O,O,O,O,O,O,,65
+BASE_REQUIRED,Job Information.Additional Services.Base,M,M,H,M,M,H,H,H,M,M,H,M,,26
+BYPASS_REQUIRED,Job Information.Additional Services.By-pass,O,O,H,O,O,H,H,H,O,O,O,O,"If yes, warn user if twin stream is no",27
+CACA_CODE,Site Detail.Care Category,O,O,O,O,O,O,O,O,O,O,O,O,,66
+CONVERTOR_REQUIRED,Job Information.Additional Services.Convertor,M,M,H,M,M,H,H,H,M,M,M,M,this can be an add-on for removals,28
+CREATED_ON,,,,,,,,,,,,,,,
+DOWNSTREAM_BOOSTER_OR_COMPRESS,Job Information.Booster/Compressor,M,M,M,M,M,H,H,H,M,M,M,M,,34
+EMS_REQUIRED,Job Information.Additional Services.EMS,M,M,H,M,M,H,H,H,M,M,M,M,,29
+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,M,M,M,M,M,M,M,M,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.Model Code,H,H,M,M,M,M,M,M,O,O,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,M,M,M,M,M,M,M,M,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
+FIRST_ALT_STREET,Contact Address.Street,O,O,O,O,O,O,O,O,O,O,O,O,,19
+FIRST_ALT_SUB_BUILDING,Contact Address.Sub Building,O,O,O,O,O,O,O,O,O,O,O,O,,20
+FIRST_CONTACT_EMAIL,Contact Address.Email,O,O,O,O,O,O,O,O,O,O,O,O,,9
+FIRST_CONTACT_FAX,Contact Address.Fax,O,O,O,O,O,O,O,O,O,O,O,O,,11
+FIRST_CONTACT_INITIALS,Contact Address.Contact Initials,O,O,O,O,O,O,O,O,O,O,O,O,,18
+FIRST_CONTACT_NAME,Address.Contact Name,M,M,M,M,M,M,M,M,M,M,M,M,,3
+FIRST_CONTACT_TELEPHONE_1,Contact Address.Telephone1,M,M,M,M,M,M,M,M,M,M,M,M,,21
+FIRST_CONTACT_TELEPHONE_2,Contact Address.Telephone2,O,O,O,O,O,O,O,O,O,O,O,O,,23
+FIRST_CONTACT_TITLE,Contact Address.Contact Title,O,O,O,O,O,O,O,O,O,O,O,O,,17
+HOUSING_REQUIRED,Job Information.Additional Services.Housing,M,M,H,M,M,H,H,H,M,M,H,M,,30
+ID,Enquiry Reference (not in spec appendix),M,M,M,M,M,M,M,M,M,M,M,M,,70
+INDICATIVE_DATE,Job Information.Indicative Substantial Completion Date,O,O,O,O,O,O,O,O,O,O,O,O,,39
+INDICATIVE_TIME,Job Information.Appointment Preference,O,O,O,O,O,O,O,O,O,O,O,O,,33
 INSTALL_BUILDING,Address.Building,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,,1
 INSTALL_CITY,Address.City,M,M,M,M,M,M,M,M,M,M,M,M,,2
-FIRST_CONTACT_NAME,Address.Contact Name,M,M,M,M,M,M,M,M,M,M,M,M,,3
 INSTALL_POSTCODE,Address.Post Code,M,M,M,M,M,M,M,M,M,M,M,M,,4
 INSTALL_STREET,Address.Street,M,M,M,M,M,M,M,M,M,M,M,M,,5
 INSTALL_SUB_BUILDING,Address.Sub Building,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,O-M1,,6
-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_CONTACT_EMAIL,Contact Address.Email,O,O,O,O,O,O,O,O,O,O,O,O,,9
-SECOND_CONTACT_EMAIL,Second Contact Address.Email,O,O,O,O,O,O,O,O,O,O,O,O,,10
-FIRST_CONTACT_FAX,Contact Address.Fax,O,O,O,O,O,O,O,O,O,O,O,O,,11
-SECOND_CONTACT_FAX,Contact Address.Fax,O,O,O,O,O,O,O,O,O,O,O,O,,12
-FIRST_ALT_POSTCODE,Contact Address.Post Code,O,O,O,O,O,O,O,O,O,O,O,O,,13
-SECOND_CONTACT_TITLE,Second Contact Address.Contact Title,O,O,O,O,O,O,O,O,O,O,O,O,,14
-SECOND_CONTACT_INITIALS,Second Contact Address.Contact Initials,O,O,O,O,O,O,O,O,O,O,O,O,,15
-SECOND_CONTACT_NAME,Second Contact Address.Second Contact Name,O,O,O,O,O,O,O,O,O,O,O,O,,16
-FIRST_CONTACT_TITLE,Contact Address.Contact Title,O,O,O,O,O,O,O,O,O,O,O,O,,17
-FIRST_CONTACT_INITIALS,Contact Address.Contact Initials,O,O,O,O,O,O,O,O,O,O,O,O,,18
-FIRST_ALT_STREET,Contact Address.Street,O,O,O,O,O,O,O,O,O,O,O,O,,19
-FIRST_ALT_SUB_BUILDING,Contact Address.Sub Building,O,O,O,O,O,O,O,O,O,O,O,O,,20
-FIRST_CONTACT_TELEPHONE_1,Contact Address.Telephone1,M,M,M,M,M,M,M,M,M,M,M,M,,21
-SECOND_CONTACT_TELEPHONE_1,Contact Address.Telephone1,O,O,O,O,O,O,O,O,O,O,O,O,,22
-FIRST_CONTACT_TELEPHONE_2,Contact Address.Telephone2,O,O,O,O,O,O,O,O,O,O,O,O,,23
-SECOND_CONTACT_TELEPHONE_2,Contact Address.Telephone2,O,O,O,O,O,O,O,O,O,O,O,O,,24
-AMR_REQUIRED,Job Information.Additional Services.AMR,O-M5,O-M5,H,O-M5,O-M5,H,H,H,O-M5,O-M5,O-M5,O-M5,The AMR may only be available for the Tripartite suppliers or BG, GW to confirm!,25
-BASE_REQUIRED,Job Information.Additional Services.Base,M,M,H,M,M,H,H,H,M,M,H,M,,26
-BYPASS_REQUIRED,Job Information.Additional Services.By-pass,O,O,H,O,O,H,H,H,O,O,O,O,If yes, warn user if twin stream is no,27
-CONVERTOR_REQUIRED,Job Information.Additional Services.Convertor,M,M,H,M,M,H,H,H,M,M,M,M,this can be an add-on for removals,28
-EMS_REQUIRED,Job Information.Additional Services.EMS,M,M,H,M,M,H,H,H,M,M,M,M,,29
-HOUSING_REQUIRED,Job Information.Additional Services.Housing,M,M,H,M,M,H,H,H,M,M,H,M,,30
-TWIN_STREAM_REQUIRED,Job Information.Additional Services.Twin Stream,M,M,H,M,M,H,H,H,M,M,H,M,,31
-ANNUAL_QUANTITY,Job Information.Annual Quantity,O,O,O,O,O,H,H,H,O,O,O,O,if > 732 mwh go bespoke,32
-INDICATIVE_TIME,Job Information.Appointment Preference,O,O,O,O,O,O,O,O,O,O,O,O,,33
-DOWNSTREAM_BOOSTER_OR_COMPRESS,Job Information.Booster/Compressor,M,M,M,M,M,H,H,H,M,M,M,M,,34
-EXISTING_METER_SERIAL_NO,Job Information.Existing Asset Serial Number,H,H,M,M,M,M,M,M,M,M,M,O,,35
-EXISTING_MESC_CODE,Job Information.Existing Meter Size,H,H,M,M,M,M,M,M,M,M,O,O,,36
-EXISTING_METY_CODE,Job Information.Meter Type Existing ,H,H,M,M,M,M,M,M,M,M,O,O,,37
-EXISTING_METER_OWNER,Job Information.Gas Act Owner,O,O,M,M,M,M,M,M,M,M,M,O,,38
-INDICATIVE_DATE,Job Information.Indicative Substantial Completion Date,O,O,O,O,O,O,O,O,O,O,O,O,,39
-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
 JOB_DESCRIPTION,Job Information.Job Description,O,O,O,O,O,O,O,O,O,O,O,O,,42
-ENTY_CODE,Job Information.Job Type,M,M,M,M,M,M,M,M,M,M,M,M,,43
 LOAD_CONTROL_TYPE,Job Information.Load Control Type,M,M,H,M,M,H,H,H,O,M,O,O,,44
 MARKET_SECTOR_CODE,Job Information.Market Sector Code,O,O,O,O,O,O,O,O,O,O,O,O,,45
-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_MESC_CODE,Job Information.Meter Size,H,O-M2,H,H,O-M2,H,H,H,H,O,H,O,,48
-EXISTING_METER_MODEL,Job Information.Model Code,H,H,M,M,M,M,M,M,O,O,O,O,,49
+MPRN,Site Detail.MPRN,O-M4,O-M4,M,M,M,M,M,M,M,M,M,O,,67
+MPRN_ALT,Site Detail.Additional Information,O-M4,O-M4,O,O,O,O,O,O,O,O,O,O,,63
 OTHER_INFORMATION,Job Information.Other Information,O,O,O,O,O,O,O,O,O,O,O,O,,50
 OTHER_PROJECT_REFERENCE,Job Information.Other Related Projects,O,O,O,O,O,O,O,O,O,O,O,O,,51
+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_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
-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
-TRANSACTION_REFERENCE,Job Site Details.Transaction Reference,O,O,O,O,O,O,O,O,O,O,O,O,,55
 SECOND_ALT_BUILDING,Second Contact Address.Building,O,O,O,O,O,O,O,O,O,O,O,O,,56
 SECOND_ALT_CITY,Second Contact Address.City,O,O,O,O,O,O,O,O,O,O,O,O,,57
 SECOND_ALT_POSTCODE,Second Contact Address.Post Code,O,O,O,O,O,O,O,O,O,O,O,O,,58
 SECOND_ALT_STREET,Second Contact Address.Street,O,O,O,O,O,O,O,O,O,O,O,O,,59
 SECOND_ALT_SUB_BUILDING,Second Contact Address.Sub Building,O,O,O,O,O,O,O,O,O,O,O,O,,60
-ACCESS_ADDITIONAL,Site Detail.Access Instructions,O,O,O,O,O,O,O,O,O,O,O,O,,61
-ACCESS_PASSWORD,Site Detail.Access Password,O,O,O,O,O,O,O,O,O,O,O,O,,62
-MPRN_ALT,Site Detail.Additional Information,O-M4,O-M4,O,O,O,O,O,O,O,O,O,O,,63
-ALTY_CODE,Site Detail.Asset Location Code,M,M,M,M,M,M,M,M,M,M,M,M,,64
-ASSET_LOCATION_NOTES,Site Detail.Asset Location Notes,O,O,O,O,O,O,O,O,O,O,O,O,,65
-CACA_CODE,Site Detail.Care Category,O,O,O,O,O,O,O,O,O,O,O,O,,66
-MPRN,Site Detail.MPRN,O-M4,O-M4,M,M,M,M,M,M,M,M,M,O,,67
-AGENT_COMT_CODE,Supplier Agent.Telephone1/Telephone2/Fax/Email,M,M,M,M,M,M,M,M,M,M,M,M,,68
-AGENT_CONTACT_VALUE,Supplier Agent.Telephone1/Telephone2/Fax/Email,M,M,M,M,M,M,M,M,M,M,M,M,,69
-ID,Enquiry Reference (not in spec appendix),M,M,M,M,M,M,M,M,M,M,M,M,,70
-EXISTING_LOGGER,Job Information.Logger,H,H,H,O,O,O,O,O,O,O,O,O,,71
-EXISTING_CONVERTOR,Job Information.Existing Convertor,H,H,O,M,M,M,M,M,O,O,O,O,,72
-EXISTING_MANUFACTURER,Job Information.Existing Manufacturer,H,H,M,M,M,M,M,M,O,O,O,O,,
-CREATED_ON,,,,,,,,,,,,,,,
+SECOND_CONTACT_EMAIL,Second Contact Address.Email,O,O,O,O,O,O,O,O,O,O,O,O,,10
+SECOND_CONTACT_FAX,Contact Address.Fax,O,O,O,O,O,O,O,O,O,O,O,O,,12
+SECOND_CONTACT_INITIALS,Second Contact Address.Contact Initials,O,O,O,O,O,O,O,O,O,O,O,O,,15
+SECOND_CONTACT_NAME,Second Contact Address.Second Contact Name,O,O,O,O,O,O,O,O,O,O,O,O,,16
+SECOND_CONTACT_TELEPHONE_1,Contact Address.Telephone1,O,O,O,O,O,O,O,O,O,O,O,O,,22
+SECOND_CONTACT_TELEPHONE_2,Contact Address.Telephone2,O,O,O,O,O,O,O,O,O,O,O,O,,24
+SECOND_CONTACT_TITLE,Second Contact Address.Contact Title,O,O,O,O,O,O,O,O,O,O,O,O,,14
+TRANSACTION_REFERENCE,Job Site Details.Transaction Reference,O,O,O,O,O,O,O,O,O,O,O,O,,55
+TWIN_STREAM_REQUIRED,Job Information.Additional Services.Twin Stream,M,M,H,M,M,H,H,H,M,M,H,M,,31
 UPDATED_BY,,,,,,,,,,,,,,,
 UPDATED_ON,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,

Data/Seed/MESC.ctl

@@ -11,14 +11,9 @@ code
 ,valid_for_new_meter
 )
 BEGINDATA
-U16|U16|16|YES|YES
-U25|U25|25|YES|YES
-U40|U40|40|YES|YES
-U65|U65|65|YES|YES
-U100|U100|100|YES|YES
-U160|U160|160|YES|YES
-Rotary/Turbine 2inch|Rotary/Turbine 2inch|999|YES|NO
-Rotary/Turbine 3inch|Rotary/Turbine 3inch|9999|YES|NO
-Rotary/Turbine 4inch|Rotary/Turbine 4inch|99999|YES|NO
-Rotary/Turbine 6inch|Rotary/Turbine 6inch|999999|YES|NO
-Other|Other|9999999|YES|YES
+U16|U16|12.8|YES|YES
+U25|U25|20|YES|YES
+U40|U40|32|YES|YES
+U65|U65|52|YES|YES
+U100|U100|80|YES|YES
+U160|U160|128|YES|YES

Modules/mip_bulk_load.pck

@@ -26,7 +26,7 @@ END mip_bulk_load;
 /
 CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
 
-  g_unknown_manufacturer_id parties.id%TYPE;
+  g_other_manufacturer_id parties.id%TYPE;
 
   PROCEDURE pl(p_in IN VARCHAR2) IS
   BEGIN
@@ -59,9 +59,9 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
   
     BEGIN
       SELECT id
-        INTO g_unknown_manufacturer_id
+        INTO g_other_manufacturer_id
         FROM parties
-       WHERE NAME = 'UNKNOWN'
+       WHERE NAME = 'OTHER'
          AND prty_type = 'MANU';
     EXCEPTION
       WHEN no_data_found THEN
@@ -75,13 +75,13 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
           ,created_by)
         VALUES
           (prty_seq.NEXTVAL
-          ,'UNKNOWN'
-          ,'UNKNOWN'
-          ,'Unknown Manufacturer - inserted for bulk load'
+          ,'OTHER'
+          ,'OTHER'
+          ,'Other Manufacturer'
           ,'MANU'
           ,SYSDATE
           ,USER)
-        RETURNING id INTO g_unknown_manufacturer_id;
+        RETURNING id INTO g_other_manufacturer_id;
     END;
   
     BEGIN
@@ -90,7 +90,43 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('UNKNOWN'
-        ,'Unknown Meter Type - inserted for bulk load');
+        ,'Unknown Meter Type');
+    EXCEPTION
+      WHEN dup_val_on_index THEN
+        NULL;
+    END;
+  
+    BEGIN
+      INSERT INTO meter_size_codes
+        (code
+        ,description
+        ,qmax
+        ,valid_for_existing_meter
+        ,valid_for_new_meter)
+      VALUES
+        ('OTHER'
+        ,'Other Meter Size'
+        ,0
+        ,'YES'
+        ,'YES');
+    EXCEPTION
+      WHEN dup_val_on_index THEN
+        NULL;
+    END;
+  
+    BEGIN
+      INSERT INTO meters
+        (code
+        ,mesc_code
+        ,mety_code
+        ,prty_id
+        ,valid_from)
+      VALUES
+        ('OTHER'
+        ,'OTHER'
+        ,'UNKNOWN'
+        ,g_other_manufacturer_id
+        ,SYSDATE);
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -102,7 +138,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('UNKNOWN'
-        ,'Unknown Housing Type - inserted for bulk load');
+        ,'Unknown Housing Type');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -114,7 +150,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('UNKNOWN'
-        ,'Unknown Regulator Type - inserted for bulk load');
+        ,'Unknown Regulator Type');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -126,7 +162,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('UNKNOWN'
-        ,'Unknown Filter Type - inserted for bulk load');
+        ,'Unknown Filter Type');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -138,7 +174,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('UNKNOWN'
-        ,'Unknown Relief Valve Type - inserted for bulk load');
+        ,'Unknown Relief Valve Type');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -162,7 +198,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('UNKNOWN'
-        ,'Unknown Slamshut Type - inserted for bulk load');
+        ,'Unknown Slamshut Type ');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -186,7 +222,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('UNKNOWN'
-        ,'Unknown Service Pressure Type - inserted for bulk load');
+        ,'Unknown Service Pressure Type ');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -198,25 +234,12 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('UNKNOWN'
-        ,'Unknown Drawing - inserted for bulk load');
+        ,'Unknown Drawing ');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
     END;
-  
-    /*  BEGIN
-      INSERT INTO meter_size_codes
-        (code
-        ,description
-        ,QMAX,valid_for_existing_meter,valid_for_new_meter)
-      VALUES
-        ('UNKNOWN'
-        ,'Unknown Meter Size - inserted for bulk load'
-        ,0,'NO','NO');
-    EXCEPTION
-      WHEN dup_val_on_index THEN
-        NULL;
-    END;*/
+
   END get_globals;
 
   PROCEDURE load_meters IS
@@ -471,43 +494,6 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
     pl(to_char(SQL%ROWCOUNT
               ,'FM099G999G999') || ': manufacturers');
   
-    /*-- Meters
-      INSERT INTO meters
-        (code
-        ,mety_code
-        ,prty_id
-        ,dim_a
-        ,dim_b
-        ,dim_c
-        ,centres
-        ,weight
-        ,qmax
-        ,qmin
-        ,qnom
-        ,valid_from
-        ,mesc_code)
-        (SELECT code
-               ,'UNKNOWN'
-               ,g_unknown_manufacturer_id
-               ,999
-               ,999
-               ,999
-               ,999
-               ,999
-               ,.999
-               ,.999
-               ,.999
-               ,trunc(SYSDATE)
-               ,'UNKNOWN'
-           FROM (SELECT DISTINCT nvl(upper(TRIM(metr_code))
-                                    ,'UNKNOWN') AS code
-                   FROM ext_modules)
-          WHERE code NOT IN (SELECT code
-                               FROM meters));
-    
-      pl(to_char(SQL%ROWCOUNT
-                ,'FM099G999G999') || ': meters');
-    */
     -- Relief valves
     INSERT INTO relief_valves
       (code
@@ -613,7 +599,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
       (SELECT code
              ,'UNKNOWN'
              ,'UNKNOWN'
-             ,g_unknown_manufacturer_id
+             ,g_other_manufacturer_id
              ,code
              ,999
              ,999

Modules/mip_quotation.pck

@@ -1347,10 +1347,13 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.');
         INTO l_svcpt_code
         FROM service_pressures
        WHERE code = p_enqu.required_svcp_code;
-      IF l_svcpt_code <> 'MP' THEN
+      IF l_svcpt_code = 'LP' THEN
+        p_manual_or_automatic_quote := gc_automatic_quote;
+      ELSIF l_svcpt_code <> 'MP' THEN
         p_manual_or_automatic_quote := gc_manual_quote;
         add_quote_reason(p_enqu.id
-                        ,'Site Survey is required for exchange of an existing non-MP meter.');
+                        ,'Site Survey is required for exchange of an existing ' ||
+                         l_svcpt_code || ' meter.');
       ELSE
         -- Exchange, MP
         IF p_enqu.existing_mety_code <> 'DIAPHRAGM' THEN

Schema/mip.con

@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.con
 --
--- Generated for Oracle 10g on Tue Mar 04  11:30:31 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Tue Mar 04  13:44:17 2008 by Server Generator 10.1.2.6.18
   
 PROMPT Creating Primary Key on 'SYSTEM_CONFIGURATION'
 ALTER TABLE SYSTEM_CONFIGURATION
@@ -511,12 +511,12 @@ ALTER TABLE REGI_ENQU_EXCLUSIONS
                
 PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
 ALTER TABLE METER_SIZE_CODES
- ADD (CONSTRAINT AVCON_1204630230_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204638256_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_1204630230_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204638256_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
 /
  
 PROMPT Creating Check Constraint on 'COSTS'
@@ -552,18 +552,18 @@ ALTER TABLE COSTS
 
 PROMPT Creating Check Constraint on 'COSTS'
 ALTER TABLE COSTS
- ADD (CONSTRAINT AVCON_1204630230_COST__000 CHECK (COST_TYPE 
+ ADD (CONSTRAINT AVCON_1204638256_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_1204630230_DOCU__000 CHECK (DOCU_TYPE IN ('DOCU', 'INDO', 'EXDO', 'FIDO')))
+ ADD (CONSTRAINT AVCON_1204638256_DOCU__000 CHECK (DOCU_TYPE IN ('DOCU', 'INDO', 'EXDO', 'FIDO')))
 /
        
 PROMPT Creating Check Constraint on 'QUOTES'
 ALTER TABLE QUOTES
- ADD (CONSTRAINT AVCON_1204630230_QUTE__000 CHECK (QUTE_TYPE IN ('AQ', 'MQ', 'QUTE')))
+ ADD (CONSTRAINT AVCON_1204638256_QUTE__000 CHECK (QUTE_TYPE IN ('AQ', 'MQ', 'QUTE')))
 /
  
 PROMPT Creating Check Constraint on 'PARTY_RELATIONSHIPS'
@@ -575,17 +575,17 @@ to_parl_rt_code = to_prtp_rt_code))
      
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1204630230_TRIPA_000 CHECK (TRIPARTITE_MEMBER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204638256_TRIPA_000 CHECK (TRIPARTITE_MEMBER IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1204630230_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
+ ADD (CONSTRAINT AVCON_1204638256_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
 /
 
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1204630230_PRTY__000 CHECK (PRTY_TYPE 
+ ADD (CONSTRAINT AVCON_1204638256_PRTY__000 CHECK (PRTY_TYPE 
 IN ('PRTY', 'IO', 'EO', 'MKTP', 'PERS', 'MANU', 'NEMP', 'EMP', 'ORG'
 )))
 /
@@ -603,82 +603,82 @@ OR
 
 PROMPT Creating Check Constraint on 'DOCUMENT_ROLES'
 ALTER TABLE DOCUMENT_ROLES
- ADD (CONSTRAINT AVCON_1204630230_DORO__000 CHECK (DORO_TYPE IN ('DRRO', 'DORO', 'ENDO', 'QUDO')))
+ ADD (CONSTRAINT AVCON_1204638256_DORO__000 CHECK (DORO_TYPE IN ('DRRO', 'DORO', 'ENDO', 'QUDO')))
 /
  
 PROMPT Creating Check Constraint on 'QUOTE_ITEMS'
 ALTER TABLE QUOTE_ITEMS
- ADD (CONSTRAINT AVCON_1204630230_QUIT__000 CHECK (QUIT_TYPE IN ('LQI', 'AQI', 'BQI', 'MQI', 'QUIT', 'HQI')))
+ ADD (CONSTRAINT AVCON_1204638256_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_1204630230_RT_TY_000 CHECK (RT_TYPE IN ('DORT', 'PART', 'RT', 'PCMRT', 'QURT', 'ENRT', 'PRT')))
+ ADD (CONSTRAINT AVCON_1204638256_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_1204630230_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204638256_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204630230_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
+ ADD (CONSTRAINT AVCON_1204638256_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204630230_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204638256_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204630230_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204638256_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204630230_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204638256_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204630230_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204638256_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204630230_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204638256_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204630230_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204638256_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204630230_EXIST_000 CHECK (EXISTING_LOGGER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204638256_EXIST_000 CHECK (EXISTING_LOGGER IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204630230_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
+ ADD (CONSTRAINT AVCON_1204638256_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204630230_EXIST_001 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
+ ADD (CONSTRAINT AVCON_1204638256_EXIST_001 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204630230_EXIST_002 CHECK (EXISTING_CONVERTOR IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204638256_EXIST_002 CHECK (EXISTING_CONVERTOR IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204630230_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
+ ADD (CONSTRAINT AVCON_1204638256_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
 /
           
 PROMPT Creating Check Constraint on 'REGI_ENQU_EXCLUSIONS'
@@ -1255,6 +1255,20 @@ ALTER TABLE ENQUIRIES ADD (CONSTRAINT
   (CODE))
 /
 
+PROMPT Creating Foreign Key on 'ENQUIRIES'
+ALTER TABLE ENQUIRIES ADD (CONSTRAINT
+ ENQU_PRTY_FK FOREIGN KEY 
+  (EXISTING_PRTY_ID) REFERENCES PARTIES
+  (ID))
+/
+
+PROMPT Creating Foreign Key on 'ENQUIRIES'
+ALTER TABLE ENQUIRIES ADD (CONSTRAINT
+ ENQU_METR_FK FOREIGN KEY 
+  (EXISTING_METR_CODE) REFERENCES METERS
+  (CODE))
+/
+
 PROMPT Creating Foreign Key on 'RELIEF_VALVES'
 ALTER TABLE RELIEF_VALVES ADD (CONSTRAINT
  REVA_RVTY_FK FOREIGN KEY 

Schema/mip.ind

@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.ind
 --
--- Generated for Oracle 10g on Tue Mar 04  11:30:31 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Tue Mar 04  13:44:17 2008 by Server Generator 10.1.2.6.18
   
 
 PROMPT Creating Index 'REGU_RETY_FK_I'
@@ -399,6 +399,11 @@ CREATE INDEX ENQU_MESC_EXISTING_FK_I ON ENQUIRIES
  (EXISTING_MESC_CODE)
 /
 
+PROMPT Creating Index 'ENQU_METR_FK_I'
+CREATE INDEX ENQU_METR_FK_I ON ENQUIRIES
+ (EXISTING_METR_CODE)
+/
+
 PROMPT Creating Index 'ENQU_ENTY_FK_I'
 CREATE INDEX ENQU_ENTY_FK_I ON ENQUIRIES
  (ENTY_CODE)
@@ -419,6 +424,11 @@ CREATE INDEX ENQU_COMT_AGENT_FK_I ON ENQUIRIES
  (AGENT_COMT_CODE)
 /
 
+PROMPT Creating Index 'ENQU_PRTY_FK_I'
+CREATE INDEX ENQU_PRTY_FK_I ON ENQUIRIES
+ (EXISTING_PRTY_ID)
+/
+
 PROMPT Creating Index 'ENQU_SVCP_REQUIRED_FK_I'
 CREATE INDEX ENQU_SVCP_REQUIRED_FK_I ON ENQUIRIES
  (REQUIRED_SVCP_CODE)

Schema/mip.sql

@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.sql
 --
--- Generated for Oracle 10g on Tue Mar 04  11:30:31 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Tue Mar 04  13:44:17 2008 by Server Generator 10.1.2.6.18
 
 
 SPOOL mip.lst

Schema/mip.sqs

@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.sqs
 --
--- Generated for Oracle 10g on Tue Mar 04  11:30:31 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Tue Mar 04  13:44:17 2008 by Server Generator 10.1.2.6.18
  
 PROMPT Creating Sequence 'FLTR_SEQ'
 CREATE SEQUENCE FLTR_SEQ

Schema/mip.tab

@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.tab
 --
--- Generated for Oracle 10g on Tue Mar 04  11:30:30 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Tue Mar 04  13:44:16 2008 by Server Generator 10.1.2.6.18
  
 
 
@@ -553,6 +553,8 @@ CREATE TABLE ENQUIRIES
  ,ENTY_CODE VARCHAR2(80)
  ,EXISTING_MESC_CODE VARCHAR2(80)
  ,EXISTING_METY_CODE VARCHAR2(80)
+ ,EXISTING_METR_CODE VARCHAR2(80)
+ ,EXISTING_PRTY_ID NUMBER
  ,REQUIRED_MESC_CODE VARCHAR2(80)
  ,REQUIRED_SVCP_CODE VARCHAR2(80)
  ,AGENT_CONTACT_VALUE VARCHAR2(240)
@@ -611,7 +613,6 @@ CREATE TABLE ENQUIRIES
  ,QMIN NUMBER
  ,LOAD_CONTROL_TYPE VARCHAR2(10)
  ,EXISTING_METER_SERIAL_NO VARCHAR2(30)
- ,EXISTING_METER_MODEL VARCHAR2(20)
  ,EXISTING_METER_OWNER VARCHAR2(1)
  ,EXISTING_METER_ASSET_PROVIDER VARCHAR2(210)
  ,EXISTING_CONVERTOR VARCHAR2(3)