andy/mip
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
832 Commits 1 Branch 0 Tags
3a63bbde76d7ad2a664878188f57668da2376b0d
Commit Graph

832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dharshani.k
3a63bbde76 19Oct Load B corrected date.xls saved as BULK_LOAD.xls for upload 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@39961 248e525c-4dfb-0310-94bc-949c084e9493
 2011-10-21 15:44:52 +00:00
dharshani.k
21f04bce4b Labour and Material costs from 19Oct Load B.xls 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@39900 248e525c-4dfb-0310-94bc-949c084e9493
 2011-10-20 12:03:33 +00:00
dharshani.k
c8261402e4 19Oct Load B.xls saved as BULK_LOAD.xls for upload 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@39895 248e525c-4dfb-0310-94bc-949c084e9493
 2011-10-20 12:01:59 +00:00
dharshani.k
3bc1ab5f1d Junk columns removed 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@39871 248e525c-4dfb-0310-94bc-949c084e9493
 2011-10-20 09:42:54 +00:00
dharshani.k
fc8eccb4c3 Labour and Material costs from 19Oct Load A.xls 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@39870 248e525c-4dfb-0310-94bc-949c084e9493
 2011-10-20 09:35:46 +00:00
dharshani.k
307bddd61a 19Oct Load A.xls saved as BULK_LOAD.xls for upload 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@39869 248e525c-4dfb-0310-94bc-949c084e9493
 2011-10-20 09:32:37 +00:00
dharshani.k
0ba033e5e2 Original bulk load file provided for the upload 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@39868 248e525c-4dfb-0310-94bc-949c084e9493
 2011-10-20 09:30:18 +00:00
dharshani.k
0efab5c9ba git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@38996 248e525c-4dfb-0310-94bc-949c084e9493 2011-10-07 12:08:51 +00:00
dharshani.k
770b53de21 git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@38984 248e525c-4dfb-0310-94bc-949c084e9493 2011-10-07 10:22:36 +00:00
dharshani.k
653b9b571f Unwanted data lines removed 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@38937 248e525c-4dfb-0310-94bc-949c084e9493
 2011-10-06 13:43:01 +00:00
dharshani.k
65f16d711d Latest material cost data 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@38936 248e525c-4dfb-0310-94bc-949c084e9493
 2011-10-06 13:39:21 +00:00
dharshani.k
34ad5a1e03 Latest labour cost data 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@38935 248e525c-4dfb-0310-94bc-949c084e9493
 2011-10-06 13:38:51 +00:00
dharshani.k
bfc499348b Latest labour cost data 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@38933 248e525c-4dfb-0310-94bc-949c084e9493
 2011-10-06 13:26:27 +00:00
dharshani.k
e53d67a5c8 Bulk load data provided on 06/10/2011 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@38932 248e525c-4dfb-0310-94bc-949c084e9493
 2011-10-06 13:12:55 +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
099645fa72 Added PRTY_MKTP_SHORTCODE_UK to constraint_messages (following support call showing error when user entered a duplicate market participant shortcode). 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@17082 248e525c-4dfb-0310-94bc-949c084e9493
 2010-04-13 15:26:43 +00:00
jamie.priest
bd2fb7941b bulkload changes for april 2010, includes the raw BULK_LOAD.xls provided by Ng metering finance team. The csv files are manipulated in order to get the correct data into the system. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@16979 248e525c-4dfb-0310-94bc-949c084e9493
 2010-03-31 20:04:26 +00:00
jamie.priest
ca7c636d19 file added for the purpose of moving from 1.0.6 to 1.1.0, this is a copy of the caveat_texts from the UAT system. The contents were updated to read correctly during the UAT process and will be required for the 1.1.0 release. Normally we'd expect the data to appear in the bulkload sheet but this has not been possible. This script will be run once the system has been upgraded. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@16908 248e525c-4dfb-0310-94bc-949c084e9493
 2010-03-25 17:23:48 +00:00
andrew.hardy
bd1afd4652 Modified InstallMIP.cmd to halt with error message if invalid data load requested. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@16907 248e525c-4dfb-0310-94bc-949c084e9493
 2010-03-25 16:35:59 +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
jamie.priest
61118404a8 updated costs report screen (18) so that additional items now display the MEter type, Meter size, enquiry type and Service pressure. This will help the I&C team to manage the costs on purging a little easier. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@15130 248e525c-4dfb-0310-94bc-949c084e9493
 2010-01-07 11:16:31 +00:00
jamie.priest
61bff865f8 set search quotes (page 14) so pagination is reset on branch. Also changed pagination type as the select list could have blown up on the live server 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@13638 248e525c-4dfb-0310-94bc-949c084e9493
 2009-11-23 12:19:24 +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
jamie.priest
651a1ab38c fix for the quote reports screen, it was only returning the first 10000 quotes. Have altered this so that it will return the first 1000000. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@13298 248e525c-4dfb-0310-94bc-949c084e9493
 2009-11-05 10:43:30 +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
andrew.hardy
b9a3a321f9 Add Upgrade Scripts to convert release 1.0.6 to current version. 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@13046 248e525c-4dfb-0310-94bc-949c084e9493
 2009-10-12 12:05:47 +00:00
jamie.priest
f6ae239211 possible fix for ticket #564 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12916 248e525c-4dfb-0310-94bc-949c084e9493
 2009-09-29 15:16:37 +00:00
jamie.priest
b025bea06e fix for ticket #563 (also first introduction of the test script) 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12915 248e525c-4dfb-0310-94bc-949c084e9493
 2009-09-29 14:18:53 +00:00
jamie.priest
addad49af2 fix for ticket #562, commit also includes the jquery date picker that AH has added 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12885 248e525c-4dfb-0310-94bc-949c084e9493
 2009-09-25 13:55:39 +00:00
jamie.priest
8bdf50dc19 Fix for ticket #556, for some reason the print atributes for the ADIT_CODE column were set to 0 width, I've changed this to 6 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12704 248e525c-4dfb-0310-94bc-949c084e9493
 2009-09-15 14:35:16 +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
10e8709041 made changes to caveat admin screen (added help and set default value on additional item field) 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@12576 248e525c-4dfb-0310-94bc-949c084e9493
 2009-09-08 17:23:42 +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
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