From bdbb396c22fe68280dcef786451b600d6704963c Mon Sep 17 00:00:00 2001 From: hardya Date: Fri, 14 Mar 2008 14:35:40 +0000 Subject: [PATCH] Addresses #390, bypass_other to be mandatory if bypass_required = '7' git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4004 248e525c-4dfb-0310-94bc-949c084e9493 --- Data/BulkLoad/DATAITEM_ROLES.csv | 2 ++ Documentation/Design/DATAITEM_ROLES.xls | Bin 38912 -> 38912 bytes Modules/mip_helper_special_cases.pck | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/Data/BulkLoad/DATAITEM_ROLES.csv b/Data/BulkLoad/DATAITEM_ROLES.csv index 983bde7..2465644 100644 --- a/Data/BulkLoad/DATAITEM_ROLES.csv +++ b/Data/BulkLoad/DATAITEM_ROLES.csv @@ -9,6 +9,7 @@ ANNUAL_QUANTITY,Job Information.Annual Quantity,O,O,O,O,O,H,H,H,O,O,O,O,if > 732 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 +BYPASS_OTHER,Job Information.Additional Services.By-pass Other,O-M7,O-M7,H,O-M7,O-M7,H,H,H,O-M7,O-M7,O-M7,O-M7,, 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,,,,,,,,,,,,,,, @@ -85,3 +86,4 @@ UPDATED_ON,,,,,,,,,,,,,,, ,O-M4: IF MPRN IS NOT COMPLETED THEN MPRN_ALT MUST BE COMPLETED,,,,,,,,,,,,,, ,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 80e41183ff8a5dbecd392f5d8698637b8db32ba9..c54b4c83f38b7c2274e23f6daaa2f6303b920536 100644 GIT binary patch delta 8766 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 XQKz0RUkQKpzYXD!Pp^FXbb09iKx?>H delta 8386 zcmY*eX>eQB6+V)k#Jgb`Rc$5M1cy~_M?V`SKpfcGj!s^^gtS5fo}m& z{G-O@(8J=B#_4r4vA%kM3)NE7WX!(^KZgc5-T=^oy6YMN&f@h^y!PX&nI?cY@%jc{ z528^AngRZU*AMXO*8yzBhu+6)rWN&Y(s&y{bq&Cw2*4+60nW7p?8dpP9RRC1=krm3 zX`E{%2JjEOcFm%(uj6EY#Ou8{+5K^V1Wxu;0$>CuJKY5^fRnwKL>W%@TsOdGoa}KA zARiTP_02^OqP@S!1LSrBls^M-{H|)OzoRvDu)1OB)zDlel!1nDJK)674j1tg|3VQS z!$tI1poa_UG1RNJ4*#vuPXgKipF$Hfqhmdo(m1bJphk%J z))GyQu-QQ^4r*2CkuaGZp?s+9nLm0kvs;+bWf~Es35|%7Zy<4cLJNtLkr5|@ zh?CJIP6i<-3lSyr9GPkmQJV1eg2c%P+Ykwq5kpc;m>6q_CEapTkhB zO~7JE$wqd-Vn|8KC}1)0gBqrtE{hSA`Ot}c*29$=g(0I8uoL;%s2A*BNXd9KfmtV!Pt~75PPUNZ6gWSDX=ft}laW!F0<#kwCL^=M zlyJh7kYTDU&423S@^nn_prBZEahw)4l5vtT>~g}?j!xecuX*awEgxv8&Vf&e$ zirjnfV21iHDE)4J`n339`^Md-47xdlLEUw81P!t)t(zlgWL#)sbw_uHJsbBu@!*bL zUltD@3ekq!l?@)-aEnHEP&_9no>My>2PMc5{HsU0t9*?D%7=M;~JZZjR+lf@(E z76yBuhy9&mYwu9@rP$hA#g`UpsWi)bSbnFH_ptn!IJj6#4YHihZywyGoW82;#Y@5;`CBVyt0(5{%+}s zaO9*?Ota#B;+ExFD#sJ8M@a;}ujK1leokyzsrh3pr*7uK7nD51@*^5iSb}8Da99ko zPg)tLRx(blWH>D5IaMpNQDvN3$#7VVs(sYTa7!~X`=pgowbH?9|LUshM?BGwY;g)=AB*lbYEeHID<;Z`Mi8tdpAA zpsy=U`!tbtP7_(>gGr{e0nLxVtBS-1rt|~x=-!$?%JLjal4yqPAUT#_qfy`^vM%R@ zJ;#)TFAF&*>^UdwIi_qh)d5?EJ;#)d&~A}Ar$y#C>_*cLdrnc_%9J*u`5ru`NNi+E zk82cA5}Q|(c$VI~YR=LdIUGS|ZIl@)o?fLh_it8v{E9rF(bthAt{`2O=lNGOva=-b zWJ%u1lDv~8c_&NqPL||VmZ%d&-pP`@lO=g4OY+X*6`0bLMnTr_sixpmLV?2?WKF@T zgo0BE1*ZWPoNOz|Y|{(cg-|esu$?Wn4+{kjD=kl)3W^hOn1*na4h53a5Odlh<_^?S z?JU2P<#b9S4_wOf!=mHLn%~LtVV2X$kmSQGKctZz=3#b8;OAj>i9vRlhuI}YW`}v0 zU4k+h=3yty!)SsD=lANs=iQnG!X6qEuu`musXl9XQNIr+SM{ z^%kA#Ejra(bgH+gsyA5B{>E5jO2HwfXo{B(uSKVNi%#_x6({)>e}p;F22Y$un9~7` zg4C5V`z6T;Qwmz@h?Ti}X&U=2$%xa$N0^g&kT@AcVG1~n$kY|Fs|)^44!|fIOItG; zG|I-_s8J9ADI;TpnMNJ|k2?Mzb^Jf-_10a5Tbt-gJ{PpTVzas4#W4rM6 zD65UJUE4JxyPngC>@vtc|BP8qY=SYzhht9pkFi}7nCfal`@6yzCq~dy#!UU=_?UD4 z8FTVt3=K;IyeZ!xj-$az+_&Wl<4kFrMv9VXy|&vAoILKhb=-05xZ~FGz^!ckxU(mX zv-M_9YRCrJCzo+)J-!s?QXQA(SN6_R{5P@rEz00cZ2nam*_pCQR;u{$+A}?{n;$0M zCGqW|St)F0g)20o*#q})=Go7PCl9A0W{j%ijCkYlA|4Jd z9v+;6UA!*sf=S##<+_tR?UyyOjh<9S-*6-q3A{5YJuXfkS;Xvo=Llw}oR)T?BnsuU zQ#|c1jcD3uHKObcs&R^|#>l7>8$=w8CUs&XlgBibol_iNBcu{Hh~jGy#n&L(a1Ek2 zp)!G!Qe~P|qDp0&Rc_XZd=PM%mJ!o3 zs!$^%9~i`O)SBc2Ba=Q5LpQYeW{|iWWasv@b3~nXDsvj2O5-y4W&%^Ygm*nyYm#jV zsr15bjqKzrF%|uCy~ObhvasZIn-V9Fkr5Yzh>JmXvng@88W~YCNS5njU@66uvXvrO z!uvGdmzmQH-X-zHpVXY;@K9kB-x+>0@vM04##AB5h8Z^AAbY!+;a>Bs_`{7U-)Pub zH^V*A$n30}Vb7C{tfcqyX@H8fau!EDctF`T%T`iik(IM-Wl)Q=vOci_l#sH>2q}vU zBI6Ar&l^OZH;A_%J*T}_&YJz7jgg+843@V&KZ{eQagr7G{8qg4;B#uyt;}gg^xt%$ zry>>RSm8mXFvkkB;@>x22*V!n>d}&TeyKtH^XP@HN~n*2bE90eeut~Rar2r`H@Rq@ zXL?A@G|w}Y#Kl{1sXc7VHdc68DQshfN5ng~Ug&|#Sb_Fbk9Ixw>ULK6p?L9FEtO^Y z4whGxdQlEwlSv z+35{sr#Fzqs$tNqULf=S8Wksv3&_p71qW^Z%+K1!)@NK2Fj~AiwRUGevZ>jNB zJ-#2uH$YX5@7Lp(v;KF~_~m;13Lbx6Jba=n_gy7Dpru#xY_H?^yLb$H9}f>d3yHs+ z80y~|j>4~T^Qz+lK{@|zL&J~`G>PI#uOkBCZgd|FbmM<>v$+0b-$wfNlWL8A>7zgT z4J(3OG>-T5OJSVrFd@#Kytex0sS}~6PMvLdZ`Z%Bs=OVltG;$>Z$#Yv%-U-Bi~o&= M{kyB5JhL|Rf8Bw5`~Uy| diff --git a/Modules/mip_helper_special_cases.pck b/Modules/mip_helper_special_cases.pck index ab1a81d..d9100b9 100644 --- a/Modules/mip_helper_special_cases.pck +++ b/Modules/mip_helper_special_cases.pck @@ -80,6 +80,15 @@ CREATE OR REPLACE PACKAGE BODY mip_helper_special_cases IS ,p_error_message => 'Either Existing Meter Model OR Existing Meter Size and Meter Type information must be completed.'); END IF; + -- O-M7 + IF p_rec.enty_code IN + ('INSTALL', 'STD INSTALL', 'EXCHANGE', 'STD EXCHANGE', 'ALTERATION', + 'CHANGE CAPACITY', 'ADDON', 'OTHER') + AND (p_rec.bypass_required = '7' AND p_rec.bypass_other IS NULL) THEN + mip_mandatory.add_error(p_mandatory_checks => p_mandatory_checks + ,p_field_name => 'BYPASS_OTHER' + ,p_error_message => '''Other'' reason must be completed.'); + END IF; END table_enquiries; BEGIN -- Initialization