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

44 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
PriestJ
e836cfd1d6 Fix for #372 caveat text no longer overwrites. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3973 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-12 16:57:04 +00:00
PriestJ
a40b896dd5 fix for ticket #365, the code was trying to get the supplier address changed this to the agent address, also the code was never going to get an address as the call to get the address occurred before we got the supplier/agent ids, so it was always passing a null as the supplier/agent id. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3944 248e525c-4dfb-0310-94bc-949c084e9493
 2008-03-11 15:04:22 +00:00
PriestJ
9e3cf59e6b fixed mam bug. Altered the way mam text is gotten, now uses the quotation_text column rather than the description. Added text for logger caveat. Altered hunt group number to the correct number. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3644 248e525c-4dfb-0310-94bc-949c084e9493
 2008-02-20 15:11:19 +00:00
PriestJ
62f5351697 Altered code to handle extra caveat condition when a logger exists and the job is a std removal, removal or adversarial then the caveat appears at the bottom of the caveats page list of caveats. Removed references to the ventilation values on the caveats page also at GW's request. Will need to run through a bit more testing and also add the text for the logger caveat once GW provides it. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3514 248e525c-4dfb-0310-94bc-949c084e9493
 2008-02-11 16:54:26 +00:00
PriestJ
f7bdbda3bd Fixed exchange PDF bug (too few parameters). Added code to report 2 different table 1's, one for LP jobs and one for MP jobs. Adjusted the layout of some of the pages so that the caveats will all fit on one page. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3428 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-30 12:06:46 +00:00
PriestJ
1d109ffdff made changes to pdf output inline with request from GW, awaiting confirmation on 2 further points that he raised so there will be further changes... 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3421 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-29 18:19:51 +00:00
hardya
acf28dc3b1 Alter references from mety_code to existing_mety_code in response to r3310 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3317 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-21 16:01:06 +00:00
PriestJ
7408008ed9 Added DH's signature back is, had forgotten to set it back after testing 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3297 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-18 15:11:12 +00:00
PriestJ
0f58ad85e0 added code to set a watermark on the pdf if the file test_watermark.jpg exists in the application images, if it does not exist then no watermark will be shown 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3293 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-17 18:23:32 +00:00
PriestJ
c436af2957 fixed code so that addons is not displayed on the pdf if there are none and made work items not display any unecessary blank lines, and made sure that existing meter details are shown for removal type jobs 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3280 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-16 17:43:29 +00:00
PriestJ
970f0e6b16 added code to get and display caveats 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3225 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-14 14:18:41 +00:00
PriestJ
e96ef7e20d tried to get caveats in, having troubles so code is broken until monday sorry... 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3208 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-11 18:55:01 +00:00
PriestJ
f3844defab Altered code to fix a couple of bugs, moved the base and housing details that are stored on the terms and conditions page out from the case statements they were in so that we always get the base and housing details, we needed this as the caveats with refer to them as minimum measurements for home made house and bases that customers might use 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3200 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-10 18:33:07 +00:00
PriestJ
177b3d818e now does drawings (requires more testing), hides drawings page if OFMAT or ADD-ON. More tidying up and bug fixing 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3179 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-09 16:52:54 +00:00
PriestJ
4c10f2ae7b new function in mip_files to set the file association for drawings/enquiries and quotes. Fixed a few more bugs in the quote pdf builder, and have made a short start on getting the module drawings into the quote. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3175 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-08 18:43:53 +00:00
PriestJ
ac7fe30db1 fixed a bug on the data collection for the quotation, was not correctly gathering the delivery costs, also added labour costs. Pointed the generate_detailed_pdf_quote to store the pdf in the APEX_APPLICATION_FILES table, also added code to place the ngm logo and DH's signature to the pages. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3151 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-07 18:06:19 +00:00
PriestJ
b24ea59d33 one of the pages was still commented out! 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3129 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-04 14:06:24 +00:00
PriestJ
fa6de4187d finished off a bit more of quotation pdf, tidied up a few bits. Moved each page inside individual procedures to make things a bit tidier. Now need to figure out how to get it into the APEX files table. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3128 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-04 14:03:05 +00:00
PriestJ
a117f49d54 added another couple of pages top the pdf a few things still need sorting on it, need to talk to AH about the quote_items table and if he is going to populate all the table columns with data 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3121 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-03 18:42:35 +00:00
PriestJ
53df2a260d made some minor changes, initialized varrays so that the quote_data record could collect data. Also made some changes to the main data collection routine as AH's quote_items table doesn't get populated with some of the stuff it expects (now getting this data from the enquiry table). Started on the build_detailed_pdf function it will now build the first 2 and a half pages of the quotation as a pdf in the testpdf table 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3112 248e525c-4dfb-0310-94bc-949c084e9493
 2008-01-02 18:35:58 +00:00
PriestJ
e80c00df53 now gathers all information for the quotation, but have not tested this. Currently has a collection error on one of my varray types. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3062 248e525c-4dfb-0310-94bc-949c084e9493
 2007-12-21 18:29:30 +00:00
PriestJ
848bbd606d added code to get most of the data for the pdf of the quotation, still need to get the tech spec details (detailed dimensions for housing, base and module), not yet tested so use at your peril... 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3056 248e525c-4dfb-0310-94bc-949c084e9493
 2007-12-20 18:28:19 +00:00