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

206 Commits

Author SHA1 Message Date
andrew.hardy
99d3210ea5 Modified bulk load process to correctly assign ALTERATION costs (previously used EXCHANGE costs). 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@51117 248e525c-4dfb-0310-94bc-949c084e9493
 2012-03-22 17:57:44 +00:00
andrew.hardy
053ce6148a Addressed #573 by modifying mip_quotation_document.pck so that the quotation page costs do not overlap. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@26040 248e525c-4dfb-0310-94bc-949c084e9493
 2010-09-02 14:42:01 +00:00
andrew.hardy
04696f1008 Moved the signature image upwards in the signature block (following earlier movements of the text). 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@25710 248e525c-4dfb-0310-94bc-949c084e9493
 2010-08-17 09:14:23 +00:00
andrew.hardy
b66ed437f4 Moved the body of the quotation front page up by 4 units to give space below the signature block (mip_quotation_document.pck). 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@25663 248e525c-4dfb-0310-94bc-949c084e9493
 2010-08-13 14:23:32 +00:00
andrew.hardy
78497b6b8f Modify mip_quotation_document and f155.sql to use new signature on 
documents.

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@25576 248e525c-4dfb-0310-94bc-949c084e9493
 2010-08-10 16:45:56 +00:00
andrew.hardy
a94562afc6 Modified the dateformat retrieved by the Java routine 'DirList' (MIP_DIRLIST.jsp). Previous version would generate an ORA-1850 when viewing files with a file modified time during the midnight hour. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@16885 248e525c-4dfb-0310-94bc-949c084e9493
 2010-03-24 11:46:28 +00:00
andrew.hardy
81db2835f2 Add routines to mip_quotation.pck and mip_*_helper (via gen_mandatory.prc) packages to set to NULL fields in the enquiry that are not relevant for that enquiry type (following issue raised in UAT). 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@13609 248e525c-4dfb-0310-94bc-949c084e9493
 2009-11-20 15:59:47 +00:00
andrew.hardy
1110407d42 Addresses #566 
Include ADDITIONAL_ITEM 'SELFPURGING' to cover instances of 'purging' where the user has selected 'NO' - i.e. the customer will carry out any required purging. Used to simplify CAVEAT text selection.

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@13258 248e525c-4dfb-0310-94bc-949c084e9493
 2009-11-03 15:08:58 +00:00
jamie.priest
cb89ce6f76 tidy up of old commented code 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12677 248e525c-4dfb-0310-94bc-949c084e9493
 2009-09-14 14:09:47 +00:00
jamie.priest
f447e65bf9 Resolved a couple of formatting issues on the pdf quote. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12552 248e525c-4dfb-0310-94bc-949c084e9493
 2009-09-08 13:41:26 +00:00
andrew.hardy
44a6ce11a5 Include further error logging (backtrace, call_stack, etc.) to error_logs table through updated cout_err.pck. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12551 248e525c-4dfb-0310-94bc-949c084e9493
 2009-09-08 13:16:26 +00:00
andrew.hardy
a645a35335 Modify additional item cost routines in mip_bulk_load.pck and mip_quotation.pck to make use of enquiry type as a cost parameter. Matching changes to the BULK_LOAD.xls spreadsheet. 
Change get_quote_items.fnc to return the descriptions of additional items instead of the 'code'.

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12542 248e525c-4dfb-0310-94bc-949c084e9493
 2009-09-08 10:58:39 +00:00
jamie.priest
561266e548 Fixed issue with 'Too few operands' where a vertical offset value of null was being passed causing the costs page not displaying. Also made some changes to tidy up the output on the costs page. Replaces missing cont_sum caveat that was missing. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12539 248e525c-4dfb-0310-94bc-949c084e9493
 2009-09-07 17:07:26 +00:00
andrew.hardy
c621cd7b24 Initial changes to mip_quotation.pck and mip_bulk_load.pck to support PhaseII purging requirements. 
New attributes added to Schema/ext_cost.pdc,  Data/BulkLoad/BULK_LOAD.xls (as exported through Data/BulkLoad/MATERIAL_COSTS.csv).

Changes to views V_AICO.vw and V_QUOTE_DETAILS.vw to recognize the new attributes and to stop PURGING being excluded from details.


git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12526 248e525c-4dfb-0310-94bc-949c084e9493
 2009-09-04 16:29:42 +00:00
jamie.priest
f6d4c45b37 Altered the caveats cursor to ensure that we get new caveats that list an additional items (purging) and a condition for display based on the value in the additional items cost line(in quote_items table). Currently we just intend to handle if the cost is there or not, but the condition will take a regexp so you could have a caveat that only displays if the value is greater than a specified value etc. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12328 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-20 15:32:58 +00:00
jamie.priest
9bf1aea3a8 change to ensure that purging costs are displayed correctly and that purging is displayed as a work item if there is a cost associated. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12312 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-19 16:25:07 +00:00
jamie.priest
1a42b8892f sequencing of the enquiry fields for produce_enquiry_entry_details procedure was based on text rather than numerical order. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12261 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-17 15:20:11 +00:00
jamie.priest
502c6564f9 had a stab at bringing the email output inline with the fds see ticket #550 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12254 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-17 12:19:49 +00:00
jamie.priest
ac40cb550d altered PDF output to fall in-line with FDS ahead of MIP Purging changes 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12215 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-11 15:07:23 +00:00
hardya
5ece842aa5 Merged r6132 from RB-1.0 for #531 (Invalid costs) 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@6133 248e525c-4dfb-0310-94bc-949c084e9493
 2008-08-06 11:54:12 +00:00
PriestJ
bfdb160ca1 Fix for #528 email to internal users was being called twice 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@5644 248e525c-4dfb-0310-94bc-949c084e9493
 2008-07-08 12:49:59 +00:00
hardya
f36c5b079a Merged in changes from RB-1.0 related to #524 (Add-Ons not being quoted for). 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@5624 248e525c-4dfb-0310-94bc-949c084e9493
 2008-07-07 15:22:55 +00:00
PriestJ
a04c43c75b fix for #526 and #525 removed unnecessary legacy reference on how to display the lifting gear and removed dependence on the quote item to be a labour before we get the meter, service pressure and enquiry type. Altered formatting on quote acceptance page for cost value (would only show 1 decimal place in some cases) 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@5612 248e525c-4dfb-0310-94bc-949c084e9493
 2008-07-07 10:45:45 +00:00
PriestJ
93079d1656 altered in relation to ticket #519, the code was removing all drawings in the workspace, rather than just the current application. Removed redundant reference to the Init procedure at the start of the package and removed default value for the flow id so that the user must supply a correct flow_id. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@5363 248e525c-4dfb-0310-94bc-949c084e9493
 2008-06-19 16:39:05 +00:00
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