Commit Graph

720 Commits

Author SHA1 Message Date
PriestJ
be9a53fd40 updated due to fix in #404 tests now work with new enquiry screen
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@5318 248e525c-4dfb-0310-94bc-949c084e9493
2008-06-16 17:19:53 +00:00
PriestJ
0b789a4fe8 new lead times used to fix #516, webMIP will now consider all diaphragm modules that have a qmax > than 1468 (the limit of U16). Fix also contains a fix in lead time value for Tubine MP OFMAT jobs.
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@5311 248e525c-4dfb-0310-94bc-949c084e9493
2008-06-16 09:31:59 +00:00
PriestJ
10f01a990e mm's fix for #512
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@5306 248e525c-4dfb-0310-94bc-949c084e9493
2008-06-13 15:54:42 +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
ac0fdbd17c Changes for #513(E504250699) fixed home link in the errorpage and no tabs templates. Altered alternate text/title text for the national grid logo on both templates also.
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@5168 248e525c-4dfb-0310-94bc-949c084e9493
2008-05-29 09:30:34 +00:00
hardya
f41e9a1173 Addressed remaining parts of #511 (Cosmetic Changes):
- Removed 'I&C...' banner
 - Added help text to username and password on login page (page 101)
 - Set the 'login' menu item as current for login page
 - Aligned the login, new password and forgotten password buttons under the username and password

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4935 248e525c-4dfb-0310-94bc-949c084e9493
2008-05-01 15:56:23 +00:00
hardya
1997cb63a4 Addressed part of #511 (Cosmetic Changes)
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4917 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-30 10:06:42 +00:00
hardya
4c4eaa6f87 Automatic export of Application 155
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4915 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-29 20:00:06 +00:00
hardya
cf927b3cf4 Automatic export of Application 155
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4877 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-22 20:00:09 +00:00
hardya
294e3d2e06 Automatic export of Application 155
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4863 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-21 20:00:06 +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
481e3d46a3 Automatic export of Application 155
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4855 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-18 20:00:07 +00:00
PriestJ
390a22ec5e Altered install script for live install
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4853 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-18 17:17:39 +00:00
PriestJ
8d0c2c9377 reverting back to the screens version before JP started to change page 32
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4851 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-18 16:45:24 +00:00
PriestJ
95adef7c41 latest bulk load 'Just' before go live, Note this bulkload change does create some errors in the costs table that can be ignored, the NGM team have tried to specify some labour costs for 25mm (Flange size) meters, there are no 25mm meters in the system and the MESC table does not have any reference to a meter size of '25mm', you can ignore the FK errors in relation to this when completing the bulk load.
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4849 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-18 16:16:52 +00:00
hardya
9ce10ce720 Automatic export of Application 155
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4837 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-17 20:00:06 +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
PriestJ
600e12a712 Latest bulk load from NGM, includes typo fix for Caveats and a Change to the housing reference for a small number of modules
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4811 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-16 16:42:15 +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
hardya
e881019ae0 Apply svn:keywords Id
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4807 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-16 10:35:08 +00:00
hardya
f6077a6741 Added database scripts used for htobackup, standby, log shipping, etc.
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4804 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-16 10:16:57 +00:00
hardya
60fd32941e Updated meter size codes in line with Gareth's email of 15th April 2008.
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4802 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-16 07:53:24 +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
hardya
da43803539 Automatic export of Application 155
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4780 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-11 20:00:05 +00:00
PriestJ
8ab8c0a0f0 latest bulk load update based on bulk load sheet provided on 11/04/08
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4778 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-11 16:59:50 +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
f1d8cc0ee3 fix for #489 qmax was not ordered correctly on screen 80
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4776 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-11 15:23:56 +00:00
PriestJ
55159b63ce Fix for #489(SC2018/SC2019). Altered the report on Page 80 to display the quotes in qmax order and for the report to only show the first 10 quotes.
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4775 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-11 14:57:48 +00:00
hardya
9785066866 Automatic export of Application 155
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4772 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-10 20:00:07 +00:00
PriestJ
c04c1908e8 extension was incorrect for bulkload script
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4770 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-10 16:44:58 +00:00
PriestJ
96c33045ba renamed filename extension to avoid confusion
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4769 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-10 15:56:10 +00:00
PriestJ
aedcfd8d82 New image provided by NGM for large meter housing.
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4768 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-10 15:52:41 +00:00
mullenm
7aafe567df Tickets 488 and 493
edited page 32.

added condition to the TRIPARTITE validation so that it will only run if there are no other errors to display.  This is because the missing postcode was causing this validation to fail with the reported error message.

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4767 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-10 15:23:32 +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
0cc22cc234 updated file as tab was causing error on sgldr process
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4764 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-10 11:20:41 +00:00
PriestJ
2262feaf06 had typo on the request for quotation exception message
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4763 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-10 10:53:58 +00:00
PriestJ
1d3d54f79c added code to the request for quote process on the enquiry screen such that it raises an exception (above) if the user has already requested a quotation, this displays an error message that is understandable. Fix for #482(SC1011)
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4762 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-10 10:44:37 +00:00
PriestJ
768fc75c75 Added exception for Requesting quote for enquiry that has already be requested this is a part of the fix for #482. Also added exception for Selecting quote when one has already been selected, as this was missing in the build.
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4761 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-10 10:37:58 +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
b3635ec1df Automatic export of Application 155
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4757 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-09 20:00:06 +00:00
PriestJ
428a870c18 bulk load changes from GW and Baz checked in
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4755 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-09 17:54:24 +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
ad7a23f54e Fix for #447(SC1009) Altered quote reports (page 14) so that the option to view discarded speculative quotes is no longer available to the agents. Also altered the supplier reports query so that it does not look for discarded speculative quotes, also upped the max row count (it was limiting to 500) I set it to 10,000.
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4752 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-09 15:59:59 +00:00