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

795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
andrew.hardy
d96fb6925c Modified ENQUIRIES and CAVEAT_TEXTS tables to address #551 and #553. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12501 248e525c-4dfb-0310-94bc-949c084e9493
 2009-09-03 10:29:55 +00:00
jamie.priest
944dd3f27e Updated maintenance screens for new purging changes. Updated the additional item costs screen (page 19) so that meter type, meter size etc. can be associated with additional item costs and are now viable options for cost filters. AH will use this when deriving the purging costs. Also changed the Caveat maintenance screens so that caveats associated with additional items can be displayed conditionally based on the cost. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12334 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-20 17:01:40 +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
f26cae4abb The purging additional item can now be delivered on a Firm Cost basis. So we need to remove the Time and materials in the description new code (yet to be committed) will handle the time and materials description (when there is no cost listed in the quote items table) 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12327 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-20 15:27:25 +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
283dcd1e6f updated Watir install scripts to work with the latest version of Watir (1.6.2) 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12272 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-18 17:12:31 +00:00
jamie.priest
e9f1d17092 Altered tests so they run with the latest version of Watir(1.6.2) also added new assertions for the purging_required field on the enquiry screen 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12271 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-18 17:11:49 +00:00
jamie.priest
78a157791f new field purging_required is needed as part of the purging changes see ticket #548 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12269 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-18 16:28:30 +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
a4a0eb1133 updated to reflect changes in purging requirements. Fields needed to be in a different sequence for email output and new field is used to determine if the user wants purging and how this should be costed. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12260 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-17 14:48:04 +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
a778da1356 Document approved by GW, updated date and Status to reflect this 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12252 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-14 16:32:48 +00:00
jamie.priest
689e6a13dd Altered sequence numbers to fall in line with the order GW wants the fields to appear on the email to I&C. The first 3 fields he wants are not in the spreadsheet but can be derived from data in the system. See ticket #550 for more info 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12250 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-14 16:25:00 +00:00
jamie.priest
699661bedf Updated after GW's requested changes, also updated missing AMR reference in optional mandatory table 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12248 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-14 14:56:32 +00:00
jamie.priest
8d888af5e3 Made requested changes from AH have also added some of the requested changes from JK. This version is to be sent to GW 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12246 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-13 15:40:45 +00:00
jamie.priest
6a1212af05 rebranded with the new GL template by Jo, did a bit of tidy up afters, there's bound to be a few more ugly bits that need tidying up 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12242 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-13 09:44:29 +00:00
jamie.priest
f2577b0496 renamed FDS document as it referenced the version in the file name, this is not required as we are using SVN 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12216 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-11 15:08:57 +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
jamie.priest
4b7395a54f Removed the rest of the outstanding requirements that should be missing and added back in AMR and Annual Quantity requirements that currently exist in the live system. Also some other tidying up. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12210 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-10 17:18:58 +00:00
jamie.priest
f504e0c86d removed requirements for the new CSV file output that was to be generated when the user caused a quote to be generated as it's no longer required. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12201 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-10 14:39:03 +00:00
jamie.priest
894ce269ab removed changes to email output requirement that is no longer required. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12200 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-10 14:20:59 +00:00
jamie.priest
a2c4fab193 removed previous converter requirement references 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12194 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-10 11:06:36 +00:00
jamie.priest
4646ce036c Removed references to Guaranteed Pulse enquiry types as this requirement is no longer needed 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12192 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-10 10:41:47 +00:00
jamie.priest
6001b8abde updated purging description after GW's requirements changed. Also started the painful process of removing stuff that was added as part of the 2008 requirements workshops. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12177 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-07 17:06:50 +00:00
jamie.priest
f1018ba61e GW's changes after adding the Purging required field 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12165 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-06 17:15:46 +00:00
jamie.priest
372c66cbf1 first stab at making some changes to the purging aspects of the document 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12164 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-06 17:13:11 +00:00
jamie.priest
1131f1275d We can handle the revisions through SVN so have made the FDS name more generic. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12162 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-06 15:05:27 +00:00
jamie.priest
97a06365f0 Document updated to include new purging field. This version has been sent to GW to fill in the gaps. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12127 248e525c-4dfb-0310-94bc-949c084e9493
 2009-08-05 11:46:21 +00:00
jamie.priest
c6b0802bba This is the SRS for the phase 2 changes, THIS document will help us understand the FDS 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@11944 248e525c-4dfb-0310-94bc-949c084e9493
 2009-07-16 08:57:17 +00:00
jamie.priest
695efb64d9 added for reference, will help us understand the FDS 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@11943 248e525c-4dfb-0310-94bc-949c084e9493
 2009-07-16 08:53:10 +00:00
andrew.hardy
f85b1331ca Move WEBMIP_TEX from andy/shelves to main WEBMIP documentation area. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@11593 248e525c-4dfb-0310-94bc-949c084e9493
 2009-06-24 09:47:27 +00:00
jamie.priest
7fba145f7c Adding fat script for completeness as part of webMIP support documentation update 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@11553 248e525c-4dfb-0310-94bc-949c084e9493
 2009-06-22 13:57:35 +00:00
jamie.priest
7573ff3ab9 tidied up user guide directory. Removed old versions, and placed the latest version in the repository, without the unnecessary version numbers in the file name. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@11552 248e525c-4dfb-0310-94bc-949c084e9493
 2009-06-22 13:49:28 +00:00
jamie.priest
20562bccb3 requeried diagrams as part of support documentation update, attempting to keep trac documentation up-to-date. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@11548 248e525c-4dfb-0310-94bc-949c084e9493
 2009-06-22 10:05:45 +00:00
andrew.hardy
7f5b2e006a No longer required as we do not split the APEX application into individual components. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@11447 248e525c-4dfb-0310-94bc-949c084e9493
 2009-06-15 15:14:24 +00:00
jamie.priest
f27855f2dd Fix for ticket #543, changed tripartite validation to use the overloaded version of the mip_tripartite.enquiry_allowed function as the previous version was looking at the database for the postcode rather than the submitted form, this caused some enquiries to be incorrectly submitted 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@11372 248e525c-4dfb-0310-94bc-949c084e9493
 2009-06-09 13:42:05 +00:00
jamie.priest
0e3fef1d05 Approved FDS for webMIP phase 2 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@11283 248e525c-4dfb-0310-94bc-949c084e9493
 2009-05-27 16:00:12 +00:00
jamie.priest
9cac25cdf8 new bulk load for Labour price fix, LP rotary 100mm/150mm had wrong prices 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@10463 248e525c-4dfb-0310-94bc-949c084e9493
 2009-03-30 12:23:32 +00:00
jamie.priest
7c32d899ee Bulk load 2009 new data and changes, committing after initial testing in mip_bulk_load and mip_dev 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@10434 248e525c-4dfb-0310-94bc-949c084e9493
 2009-03-27 11:01:10 +00:00
kanagad
d7ba74e6c3 updated with latest files 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@8969 248e525c-4dfb-0310-94bc-949c084e9493
 2009-01-09 13:17:59 +00:00
hardya
7faa286195 Added WEBMIP/trunk/Documentation/SupportingDocumentation/webmipdatabase.pdf as generated by the webmipdatabase.tex file. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@8634 248e525c-4dfb-0310-94bc-949c084e9493
 2008-12-18 16:10:49 +00:00
hardya
49bcb35244 Merged r6969 from RB-1.0 to address #535 and #537 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@6972 248e525c-4dfb-0310-94bc-949c084e9493
 2008-10-02 09:51:33 +00:00
hardya
456f02a123 Moved from andy/shelves to main WebMIP documentation area. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@6472 248e525c-4dfb-0310-94bc-949c084e9493
 2008-08-28 09:56:01 +00:00
hardya
659bc637d4 Moved from andy/shelves to main WebMIP documentation area. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@6471 248e525c-4dfb-0310-94bc-949c084e9493
 2008-08-28 09:43:37 +00:00
hardya
c7be637506 Amended template for TreeList to refer to /i/ng_black.gif for sub-list items (previously referred to #WORKSPACE_IMAGE#black.gif 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@6377 248e525c-4dfb-0310-94bc-949c084e9493
 2008-08-21 09:55:47 +00:00
hardya
b3caa8bd23 Re-label 'Has Existing Convertor' to 'Has Existing Converter' in enquiry screen (32). 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@6255 248e525c-4dfb-0310-94bc-949c084e9493
 2008-08-13 08:37:47 +00:00
PriestJ
c00177d2b7 Fixed typo on Converter required field on enquiry screen. No ticket raised, have also made change in the UAT environment 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@6235 248e525c-4dfb-0310-94bc-949c084e9493
 2008-08-11 16:56:32 +00:00