andy/mip
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
724 Commits 1 Branch 0 Tags
ea2b52225b26a3223b5ca41b725d6ed1df85bd88
Commit Graph

182 Commits

Author SHA1 Message Date
PriestJ
ea2b52225b Fix for #518, moved caveat print out to be a little further to the right so that larger costs do not get overwritten. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@5344 248e525c-4dfb-0310-94bc-949c084e9493
 2008-06-18 14:45:15 +00:00
PriestJ
7c1ad73fa7 Fix for #514 Implemented AH's suggested code, this seems to have fixed the issue. The correct qmax value is now passed for Removal, OFMAT and alteration jobs 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@5280 248e525c-4dfb-0310-94bc-949c084e9493
 2008-06-12 15:15:21 +00:00
PriestJ
03cdf0fa79 Altered code to only display the watermark on the pdf if the watermark jpeg has a flow id the same as the current application 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4860 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-21 14:42:37 +00:00
hardya
cf4e7ff452 Modified lead time calculations to cope with boundary cases. Addresses #506. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4823 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-17 13:52:20 +00:00
hardya
b3ebbef545 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
 2008-04-16 16:29:28 +00:00
hardya
9b6d215e2c Addresses #502 - lead times to use a Qmax 'inclusive' between upper and lower bounds 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4809 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-16 15:11:52 +00:00
PriestJ
1e79598e18 Fix for #503(SC2023) removed AMR from cost breakdown, had to add an extra routine to tidy up the cost list as the code is quiting as soon as a blank cost is found as AMR is often in the middle the pdf was only displaying the first few cost items and when the spot where AMR would have been was reached the code exited. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4798 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-15 16:45:39 +00:00
PriestJ
91bb6b3537 fix for #500(SC4004) change code such that the 2 techspecs pages do not get built into the quote if the job type is a Removal, Std Removal or Adversarial. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4796 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-15 11:43:07 +00:00
PriestJ
1b7a772e37 Fix for #498(SC7001) part 2. ensured that the data logger caveat only appears if the job is Std removal, Removal or adversarial and the user has stated 'yes' there is an existing data logger on the enquiry form. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4795 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-15 10:22:37 +00:00
PriestJ
96ef45a770 Partial fix for #498 (SC7001) removed gap in description of works on cost page of quote, caveats now on one line for contact_sum, contract_sum_qa and also added contract_sum caveat to total cost on cost page. Still need to change code on datalogger caveat such that it looks up the enquiry to see if one was specified. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4794 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-14 17:44:14 +00:00
hardya
cae05e68a9 Address #483 with changes to DATAITEM_ROLES.csv, DATAITEM_ROLES.xls. 
Add conditional compilation for debugging.

Use correct NLS language in dads.conf 

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4793 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-14 17:04:06 +00:00
PriestJ
a776069554 removed code to put lifting gear caveat on for contract sum and total costs on quotes as this was an inappropriate change, we already handled the caveat, although NGM don't like the position it appears in. Moved the contract sum caveats up a little so it looks a little better on the quote. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4777 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-11 16:36:57 +00:00
PriestJ
e63a58d1be Fix for #495(SCM003/SC3017) set the quote reference on the quotation document to display the enquiry id instead of the quote id. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4766 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-10 12:46:21 +00:00
PriestJ
e6c930c935 Fix for #487(SC3011) set the technical spec detail to point to the Module QMAX rather than the meter QMAX 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4765 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-10 12:13:01 +00:00
hardya
66a5a771ef When deleting enquiry, also delete uploaded files. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4758 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-10 08:19:52 +00:00
hardya
d4ab832e08 Address #484 - Qmax not saving 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4754 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-09 17:44:20 +00:00
hardya
1b445a73e1 mip_quotation.pck addresses #446 (Site Survey Rules) and #465 (Lifting Gear Rules) 
mip_bulk_load.pck moved 'init' to package initialization to allow procedures other than load_all be run in isolation.

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4753 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-09 16:22:28 +00:00
PriestJ
6bd177231b Fix for #476(SC4001 & SC4002) and #496(SC2021) Altered works description so that it now gets the meter model for jobs where we need to know the existing meter model. Also set the Service pressure part to get the service pressure from the enquiry rather than the quote items as the quote items only display the high level pressure tier, due to the pricing structure. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4750 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-09 14:04:19 +00:00
PriestJ
76f5017ae3 Fix for #465(SC2012,SC3004,SC3020,SC3008) screens. Have added a condition for each of the references to 'Excluding lifting gear' on the quote. Now if there is Lifting gear item in the quote items then the 'excluding lifting gear' will appear. If there is no lifting gear item in the quote items then the 'excluding lifting gear' caveats will not be displayed on the quote. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4749 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-09 11:49:42 +00:00
PriestJ
3dcf390ee9 Fix for #442(SC1006) added a new function to return if the enquiry has quotes or not. Used by the delete quotes button on the enquiry form to hide the button if there are no quotes to delete. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4740 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-08 16:47:53 +00:00
hardya
759f63c635 MIP_ENQUIRY.pck - address back-end of #439. 
mip_quotation.pck - address back-end of #442.

mip_security.pck - track CGI environment variables as part of #454.

mip_quotation.pck - store files with the correct flow_id;

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4733 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-07 15:25:13 +00:00
PriestJ
86b02a52ce part of the fix for ticket #439(sc1004) added new function to determine if an enquiry can be deleted. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4726 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-04 17:05:18 +00:00
PriestJ
a4104562e2 Fix for ticket #479(SC2004) 'excluding lifting gear if required.' text was missing on the costs page next to contract sum line 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4724 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-04 15:51:06 +00:00
PriestJ
28a1c94434 Fix for ticket #473 (SC5003) The code for displaying the existing meter details was incorrectly using the meter type code instead of the description. Added a new function to get the description for a given meter code. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4720 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-03 16:36:38 +00:00
hardya
71f3313e86 Address #460 - Tripartite membership not being recognized. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4718 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-03 15:03:48 +00:00
PriestJ
5568825e82 Fix for ticket #469 (SC2016) Meter type now looks up the description rather than the code (which was UPPERCASE) 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4717 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-03 14:38:40 +00:00
PriestJ
40f0e02822 fix for tickets #449, #450, #464 (SC2003, SC3003 and SC2_011) pointed meter type reference in the description of works to the correct field. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4715 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-03 11:20:14 +00:00
hardya
5974a9c36f Meter Type was missing from labour quote item. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4714 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-03 11:13:25 +00:00
hardya
d17dab1993 Address #448 - Tripartite agreement and addons. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4713 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-03 10:19:33 +00:00
hardya
fde2af4036 Addresses #451 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4712 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-03 09:56:56 +00:00
hardya
b6dc95e69c Addresses #444. The select/header lists exceeded the maximum length of the varchar2 allocated to hold them. Rewrote without the need for the varchar2s. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4197 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-01 17:16:54 +00:00
hardya
d81fe866b1 Addresses #444. The select/header lists exceeded the maximum length of the varchar2 allocated to hold them. Rewrote without the need for the varchar2s. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4196 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-01 17:13:26 +00:00
hardya
42cf6385cc Addresses #436. Incorrect validation of: The only letters to appear in the fourth position are A, B, E, H, M, N, P, R, V, W, X and Y. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4173 248e525c-4dfb-0310-94bc-949c084e9493
 2008-04-01 13:22:15 +00:00
hardya
46e5e90a43 New bulk load data. 
Address #431 - invalid manufacturer id in enquiry select lists.

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4160 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-31 14:20:14 +00:00
mullenm
a4833064b4 Ticket #434 
Error with AV routine if an empty file was uploaded.  This includes any infected files being intercepted by the server's AV scanner.

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4159 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-31 14:15:25 +00:00
hardya
3f3dce36b0 Ensure distinct manufacturers are returned by mip_select_xml.pck. 
Remove extraneous page templates from f155_theme_101.sql, ensure CSS references are made to #IMAGE_PREFIX#

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4086 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-26 19:45:25 +00:00
hardya
e310449816 Committed prior to FAT testing 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4072 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-26 09:15:49 +00:00
hardya
d11ee1ccc9 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
 2008-03-25 15:56:53 +00:00
hardya
54a2987177 Addressed #351 by adding existing_prty_id to calc_meter_reqs (similar change to screen 32). 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4022 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-17 14:10:40 +00:00
PriestJ
d587d408bc fix for #365 removed blank line in agent address if one of the lines is null 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4020 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-17 12:22:35 +00:00
hardya
6bd7a6c926 Additional logging for the mandatory check (see ticket #402) 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4019 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-17 12:13:05 +00:00
hardya
5d2da832ea Addresses #396. Checking of existing meter didn't recognize the 'OTHER' meter model correctly in labour-only quotes. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4010 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-14 16:01:33 +00:00
hardya
72de82bbde Addresses #376. Correct detection of a bypass_required reason. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4006 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-14 14:54:52 +00:00
hardya
2b164a768e Addresses #390, bypass_other to be mandatory if bypass_required = bypass_reason description associated with code '7' 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4005 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-14 14:44:36 +00:00
hardya
bdbb396c22 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
 2008-03-14 14:35:40 +00:00
PriestJ
8af9f4937c Fixed problem with qmax not being returned when required meter size is selected by user 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3997 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-14 12:15:34 +00:00
hardya
2c936de2b2 Addresses #394, convertor required to lead to manual quote. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3996 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-14 11:44:27 +00:00
hardya
792890a15e Removed bind parameter. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3992 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-14 11:10:04 +00:00
hardya
24c31ebc45 Add calc_meter_reqs to mip_quotation.pck. 
Ensure that all calls to add_quote_reason use correct parameters (mip_quotation.pck).

Change grant from 'CREATE ANY VIEW' to 'CREATE VIEW' in InstallMIP.sql following problems installing 'supporting objects' into MIP_TEST.


git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3989 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-13 18:36:18 +00:00
hardya
8ee044c2dd Addressed #363, assertion error and/or ORA-06502 errors during the quote generation caused by missing Required Meter Size or Qmax in the submitted enquiry. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3975 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-12 17:56:39 +00:00