Address #408, Tripartite region check.

Address #422, Missing mandatory fields when meter model selected. Removed Popup LOV with AJAX select lists. Supporred by mip_select_xml.pck)


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

Modules/Modules.sql

@@ -30,6 +30,7 @@ exec gen_mandatory
 @@mip_virus_check.pck
 @@mip_email.pck
 @@mip_friendly_messages.pck
+@@mip_select_xml.pck
 @@compile.sql
 
 -- Add the scheduled jobs

Modules/mip_bulk_load.pck

@@ -62,7 +62,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
       SELECT id
         INTO g_other_manufacturer_id
         FROM parties
-       WHERE NAME = 'OTHER'
+       WHERE NAME = '- OTHER -'
          AND prty_type = 'MANU';
     EXCEPTION
       WHEN no_data_found THEN
@@ -76,8 +76,8 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
           ,created_by)
         VALUES
           (prty_seq.NEXTVAL
-          ,'OTHER'
+          ,'- OTHER -'
-          ,'OTHER'
+          ,'- OTHER -'
           ,'Other Manufacturer'
           ,'MANU'
           ,SYSDATE
@@ -91,7 +91,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('OTHER'
-        ,'OTHER Meter Type');
+        ,'- OTHER -');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -106,7 +106,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,valid_for_new_meter)
       VALUES
         ('OTHER'
-        ,'Other Meter Size'
+        ,'- OTHER -'
         ,0
         ,'YES'
         ,'YES');
@@ -139,7 +139,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('OTHER'
-        ,'Other Housing Type');
+        ,'- OTHER -');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -151,7 +151,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('OTHER'
-        ,'Other Regulator Type');
+        ,'- OTHER -');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -163,7 +163,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('OTHER'
-        ,'Other Filter Type');
+        ,'- OTHER -');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -175,7 +175,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('OTHER'
-        ,'Other Relief Valve Type');
+        ,'- OTHER -');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -199,7 +199,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('OTHER'
-        ,'Other Slamshut Type ');
+        ,'- OTHER -');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -223,7 +223,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('OTHER'
-        ,'Other Service Pressure Type ');
+        ,'- OTHER -');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -235,7 +235,7 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
         ,description)
       VALUES
         ('OTHER'
-        ,'Other Drawing ');
+        ,'- OTHER -');
     EXCEPTION
       WHEN dup_val_on_index THEN
         NULL;
@@ -1161,7 +1161,6 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
   END load_housings;
 
   PROCEDURE load_costs IS
-    l_cost_enty_code VARCHAR2(20);
   BEGIN
     pl('load_costs');
   

Modules/mip_select_xml.pck

@@ -0,0 +1,86 @@
+CREATE OR REPLACE PACKAGE mip_select_xml IS
+
+  -- Author  : HARDYA
+  -- Created : 25/03/2008 09:55:57
+  -- Purpose : Produce select lists in XML format
+
+  /** 
+  Return an selection list suitable for use within AJAX Select_XML call
+  
+  %param p_select_list identifies the select list required
+  %param p_select_list_key1 key used to condition list returned
+  %param p_select_list_key2 optional second key used to condition list returned
+  */
+  PROCEDURE select_xml(p_select_list      IN VARCHAR2
+                      ,p_select_list_key1 IN VARCHAR2
+                      ,p_select_list_key2 IN VARCHAR2 DEFAULT NULL);
+
+END mip_select_xml;
+/
+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*/
+    mip_debug.pl(p_unit => $$PLSQL_UNIT
+                ,p_line => p_line
+                ,p_in   => p_in);
+    /*  $END*/
+  END pl;
+
+  PROCEDURE select_xml(p_select_list      IN VARCHAR2
+                      ,p_select_list_key1 IN VARCHAR2
+                      ,p_select_list_key2 IN VARCHAR2 DEFAULT NULL) IS
+  BEGIN
+    pl('select_xml:entry:' || p_select_list || ':' || p_select_list_key1 || ':' ||
+       p_select_list_key2);
+    owa_util.mime_header('text/xml'
+                        ,FALSE);
+    htp.p('Cache-Control: no-cache');
+    htp.p('Pragma: no-cache');
+    owa_util.http_header_close;
+    htp.prn('<select>');
+  
+    IF p_select_list = 'MANU_METR' THEN
+      FOR l_rec IN (SELECT '- OTHER -' AS NAME
+                          ,'OTHER' AS id
+                      FROM dual
+                    UNION
+                    SELECT code AS NAME
+                          ,code AS id
+                      FROM meters
+                     WHERE prty_id = decode(p_select_list_key1
+                                           ,'OTHER'
+                                           ,NULL
+                                           ,p_select_list_key1)
+                       AND mety_code = p_select_list_key2
+                     ORDER BY 1) LOOP
+        htp.prn('<option value="' || l_rec.id || '">' || l_rec.NAME ||
+                '</option>');
+      END LOOP;
+    ELSIF p_select_list = 'METY_MANU' THEN
+      FOR l_rec IN (SELECT prty.NAME AS NAME
+                          ,prty.id   AS id
+                      FROM parties prty
+                          ,meters  metr
+                     WHERE metr.mety_code = p_select_list_key1
+                       AND metr.prty_id = prty.id
+                       AND prty.prty_type = 'MANU'
+                     ORDER BY 1) LOOP
+        htp.prn('<option value="' || l_rec.id || '">' || l_rec.NAME ||
+                '</option>');
+      END LOOP;
+    END IF;
+  
+    htp.prn('</select>');
+    pl('select_xml:exit');
+  END select_xml;
+
+BEGIN
+  -- Initialization
+  NULL;
+END mip_select_xml;
+/

Modules/mip_tripartite.pck

@@ -68,6 +68,18 @@ END mip_tripartite;
 /
 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*/
+    mip_debug.pl(p_unit => $$PLSQL_UNIT
+                ,p_line => p_line
+                ,p_in   => p_in);
+    /*  $END*/
+  END pl;
+
   PROCEDURE al(p_in           IN VARCHAR2
               ,p_tab_messages IN OUT t_tab_messages) IS
   BEGIN
@@ -78,6 +90,8 @@ CREATE OR REPLACE PACKAGE BODY mip_tripartite IS
     l_regi_code regions.code%TYPE;
     l_rec_found NUMBER DEFAULT 0;
   BEGIN
+    pl('tripartite_region:entry:' || p_postcode
+      ,$$PLSQL_LINE);
   
     cout_assert.istrue(mip_regions.valid_postcode_format(p_postcode => p_postcode)
                       ,'Invalid Postcode format');
@@ -88,20 +102,33 @@ CREATE OR REPLACE PACKAGE BODY mip_tripartite IS
       SELECT 1
         INTO l_rec_found
         FROM regi_enqu_exclusions reee
-       WHERE reee.regi_code = l_regi_code;
+       WHERE reee.regi_code = l_regi_code
+         AND rownum < 2;
     EXCEPTION
       WHEN no_data_found THEN
         NULL;
     END;
   
+    pl('tripartite_region:exit:' || CASE l_rec_found WHEN 0 THEN 'FALSE' ELSE
+       'TRUE' END
+      ,$$PLSQL_LINE);
+  
     RETURN(CASE l_rec_found WHEN 0 THEN FALSE ELSE TRUE END);
   
+  EXCEPTION
+    WHEN OTHERS THEN
+      pl('tripartite_region:EXCEPTION:' || SQLERRM
+        ,$$PLSQL_LINE);
+      RAISE;
   END tripartite_region;
 
   FUNCTION tripartite_member(p_supp_prty_id IN parties.id%TYPE)
     RETURN BOOLEAN IS
     l_rec_found NUMBER DEFAULT 0;
   BEGIN
+    pl('tripartite_member:entry:' || p_supp_prty_id
+      ,$$PLSQL_LINE);
+  
     BEGIN
       SELECT 1
         INTO l_rec_found
@@ -113,6 +140,10 @@ CREATE OR REPLACE PACKAGE BODY mip_tripartite IS
         NULL;
     END;
   
+    pl('tripartite_member:exit:' || CASE l_rec_found WHEN 0 THEN 'FALSE' ELSE
+       'TRUE' END
+      ,$$PLSQL_LINE);
+  
     RETURN(CASE l_rec_found WHEN 0 THEN FALSE ELSE TRUE END);
   
   END tripartite_member;