From b3ebbef5451c13abf4c4f42b4d961d767418be03 Mon Sep 17 00:00:00 2001 From: hardya Date: Wed, 16 Apr 2008 16:29:28 +0000 Subject: [PATCH] Address #504 - Manual Quote not created for Change Capacity (plus fix for subsequently found errors). git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4810 248e525c-4dfb-0310-94bc-949c084e9493 --- Data/BulkLoad/DATAITEM_ROLES.csv | 4 ++-- Documentation/Design/DATAITEM_ROLES.xls | Bin 39424 -> 39424 bytes Modules/mip_helper_special_cases.pck | 2 +- Modules/mip_quotation.pck | 28 +++++++++++++----------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Data/BulkLoad/DATAITEM_ROLES.csv b/Data/BulkLoad/DATAITEM_ROLES.csv index a7868bc..4681848 100644 --- a/Data/BulkLoad/DATAITEM_ROLES.csv +++ b/Data/BulkLoad/DATAITEM_ROLES.csv @@ -53,11 +53,11 @@ 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 +QMAX,Job Information.Measuring Capacity Qmax,M,O-M2,O,M,O-M2,O,O,O,O,O-M2,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 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_MESC_CODE,Job Information.Meter Size,H,O-M2,H,H,O-M2,H,H,H,H,O-M2,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 SECOND_ALT_BUILDING,Second Contact Address.Building,O,O,O,O,O,O,O,O,O,O,O,O,,56 diff --git a/Documentation/Design/DATAITEM_ROLES.xls b/Documentation/Design/DATAITEM_ROLES.xls index d895d29cad8f42267293ae5868a50303e42e4d00..d02201d1889c62352f67b72613e315af965b7f60 100644 GIT binary patch delta 863 zcmY*XOK4L;6g@NVz2trJv-#Q3q$$-lwME1#5niDdrCp?8p`g%Bp;+81rQHZ7b|Hu$ z(zh^f>?$ikl!*($h3>i#!G$1LL>GdBU{Mge5Irxnp)-p)_uPBt%-or2v}L0$pA-!- z8I+77=ZVg|VEBv|jImS!TM+nHe<1-#Oa?nf#*N{g0Mpd$gnE@Q-&(;BJ1b2ucThfy#_SabXc0dX`)R-K0xyZZ9&m}f zKO_DkPElN^=R@K)aXn6*39KdnWdW~~fExv}hk$u{AMODz(sP$srRSqG@Qt{dq27a! z@hotSW?zXzH2awYPSEUq9>~#bxEEMX0agJxN7FCFL7JWH3;vX5;?GBb@(ghPGH_ST z_BTg^zT>ty6Wkn2Z`4jX4N-wDQ_L~A zWZYwKouw%wnlh>>ZH+k?m_A_RYDG`8iD|X?9=jpKV<&M`jW2G>`Ve>(oiq9DWf;p{ zCQ-qiE;GpXd+}jvHA`a=O&Qf{w#FP(rVni4YDG`8iD|VsS$LIUFFt!2QTLZVr1BDH zncN>!e4p^=js~|^iiv9H%>-L#F|9LK+JX4hS3|IFsjnysuWDnYbFhf-mrKZph`7$LRkMbW%P6vfi1wL>9w z5#MFK=xJ{qjAu~Lp_?B2bMR0X!HeKQ2nr8U-#6s^nSuGf&-{Mx``-7>EN&W$o5n`T z6g#rVEb%$wJ*Q2V<7u;!D`Fc0e;c0+00wsCq3Kv@EDP{8dk%HK%ErFNS z$7wuF0%=Z2v;!^b3u>8D`Yhlx^&_=L$2%$D7j>7~Fo7$a^po0`VP6a=WC0Zi9@v1D z0N&?-NqT=c1>B|QY6mbxuWBCHrxqOcr{Ll{2ajpCQ~=J>Y^4*pNV8|BfliujbpZ=B zYn=f`Y4)-R^waEHx4c)rk(oNj^~Zs|dEkP2TW+402bH84mb;a_oULB+Xhf6RsP^O= zU0?tl!@>}crHDzN4A{8rlSx|jDMq^QQ#{hy7U@hxI+GDjty%9K0;9mu0~xo#l;B;Vdq6mY}Ay1QgEVLT3qTI!i!amH>5@fOM9V z<8t|Xg=^s~E-St2&)kn3KlU~5_vE_H@1uX)LAn2=l&x{3sm5Cf $$PLSQL_UNIT - ,p_line => p_line - ,p_in => p_in); - $END - NULL; + $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 NULL; END pl; PROCEDURE add_quote_reason(p_enqu_id IN enquiries.id%TYPE @@ -1722,15 +1720,14 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); PROCEDURE survey_required(p_enqu IN t_enqu ,p_manual_or_automatic_quote IN OUT t_manual_or_automatic_quote) IS - l_svcpt_code service_pressure_types.code%TYPE; - l_rec_metr_details t_rec_metr_details; - l_required_mesc_code meter_size_codes.code%TYPE; + l_svcpt_code service_pressure_types.code%TYPE; + l_rec_metr_details t_rec_metr_details; + l_required_mesc_code meter_size_codes.code%TYPE; + l_manual_or_automatic_quote t_manual_or_automatic_quote := gc_automatic_quote; BEGIN pl('survey_required' ,$$PLSQL_LINE); - p_manual_or_automatic_quote := gc_automatic_quote; - -- Site survey required for: -- Existing meter is (rotary or turbine) AND OFMAT enquiry; @@ -1739,7 +1736,7 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); l_rec_metr_details := get_existing_metr_details(p_enqu); IF l_rec_metr_details.mety_code IN ('ROTARY', 'TURBINE') THEN - p_manual_or_automatic_quote := gc_manual_quote; + l_manual_or_automatic_quote := gc_manual_quote; add_quote_reason(p_enqu.id ,'Site Survey is required for OFMAT of an existing ' || initcap(l_rec_metr_details.mety_code) || @@ -1748,6 +1745,10 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); END IF; -- ROTARY / TURBINE END IF; -- OFMAT + IF l_manual_or_automatic_quote = gc_manual_quote THEN + p_manual_or_automatic_quote := gc_manual_quote; + END IF; + END survey_required; FUNCTION tripartite_agreement_message(p_rec IN mip_enquiries_helper.t_rec_enquiries) @@ -2304,7 +2305,8 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); pl('Looking for modules to match the following: Service Pressure ' || p_enqu.required_svcp_code || ', Outlet Pressure ' || - p_enqu.required_metering_pressure || CASE l_required_mesc_code IS NULL WHEN TRUE THEN + p_enqu.required_metering_pressure || CASE + l_required_mesc_code IS NULL WHEN TRUE THEN 'and required Qmax ' || l_required_qmax ELSE 'and required Meter Size Code ' || l_required_mesc_code END || '.');