From 6d4a5703187d6ffaaeb4459fb044d8ecc1a81825 Mon Sep 17 00:00:00 2001 From: PriestJ Date: Mon, 25 Feb 2008 14:21:50 +0000 Subject: [PATCH] fixed problem when both qmax and qmin were empty and the user attempts a standard install where a meter size has been selected. webMIP was insisting that the qmax be greater than the qmin (both are null). Altered validation to report error only if both qmax and qmin have a value other than null. git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3690 248e525c-4dfb-0310-94bc-949c084e9493 --- Screens/f155.sql | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/Screens/f155.sql b/Screens/f155.sql index d462275..fda7537 100644 --- a/Screens/f155.sql +++ b/Screens/f155.sql @@ -13,7 +13,7 @@ prompt APPLICATION 155 - webmip -- Application Export: -- Application: 155 -- Name: webmip --- Date and Time: 13:46 Monday February 25, 2008 +-- Date and Time: 14:18 Monday February 25, 2008 -- Exported By: PRIESTJ -- Flashback: 0 -- Export Type: Application Export @@ -145,7 +145,7 @@ wwv_flow_api.create_flow( p_default_region_template=> 24740611526526770 + wwv_flow_api.g_id_offset, p_error_template => 38911722486594102 + wwv_flow_api.g_id_offset, p_page_protection_enabled_y_n=> 'N', - p_checksum_salt_last_reset => '20080225134656', + p_checksum_salt_last_reset => '20080225141850', p_home_link => 'f?p=&APP_ID.:1', p_box_width => '98%', p_flow_language => 'en-gb', @@ -187,7 +187,7 @@ wwv_flow_api.create_flow( p_substitution_string_01 => 'SYSTEM_ENVIRONMENT', p_substitution_value_01 => '(Development)', p_last_updated_by => 'PRIESTJ', - p_last_upd_yyyymmddhh24miss=> '20080225134656', + p_last_upd_yyyymmddhh24miss=> '20080225141850', p_required_roles=> wwv_flow_utilities.string_to_table2('')); @@ -2286,6 +2286,19 @@ wwv_flow_api.create_app_comments ( p_app_version=>''); end; / +begin +wwv_flow_api.create_app_comments ( + p_id=>42007108301122525 + wwv_flow_api.g_id_offset, + p_flow_id=>wwv_flow.g_flow_id, + p_pages=>'32', + p_app_comment=>'altered qmax greater than or equal to qmin validation as part of bug #262', + p_updated_on=>'2008.02.25.14:14:17', + p_updated_by=>'PRIESTJ', + p_created_on=>'2008.02.25.14:14:17', + p_created_by=>'PRIESTJ', + p_app_version=>''); +end; +/ --application/pages/page_00000 prompt ...PAGE 0: system @@ -6715,8 +6728,8 @@ wwv_flow_api.create_page( p_step_template => '', p_required_role => 14572900838700208+ wwv_flow_api.g_id_offset, p_required_patch=> null + wwv_flow_api.g_id_offset, - p_last_updated_by => 'PRIESTJ', - p_last_upd_yyyymmddhh24miss => '20080225130602', + p_last_updated_by => 'HARDYA', + p_last_upd_yyyymmddhh24miss => '20080225141756', p_page_is_public_y_n=> 'N', p_protection_level=> 'C', p_page_comment => ''); @@ -7634,7 +7647,7 @@ wwv_flow_api.create_page_validation( p_validation_name => 'P19_COST_PRICE', p_validation_sequence=> 90, p_validation => 'P19_COST_PRICE', - p_validation2 => '^[[:digit:]]{0,36}(.[[:digit:]]{0,2})$', + p_validation2 => '^[[:digit:]]{0,36}(\.[[:digit:]]{0,2})$', p_validation_type => 'REGULAR_EXPRESSION', p_error_message => 'Cost Price must be a monetary value, without a currency symbol and less than three decimal places.', p_associated_item=> 15244806184197267 + wwv_flow_api.g_id_offset, @@ -7656,8 +7669,7 @@ wwv_flow_api.create_page_validation( p_validation_name => 'P19_DELIVERY_COST', p_validation_sequence=> 100, p_validation => 'P19_DELIVERY_COST', - p_validation2 => '^[[:digit:]]{0,36}(.[[:digit:]]{0,2})$', - p_validation_type => 'REGULAR_EXPRESSION', + p_validation_type => 'ITEM_IS_NUMERIC', p_error_message => 'Delivery Price must be a monetary value, without currency symbol and less than three decimal places', p_associated_item=> 39724531496558605 + wwv_flow_api.g_id_offset, p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION', @@ -7804,7 +7816,7 @@ wwv_flow_api.create_page_validation( p_validation_name => 'P19_SELLING_PRICE', p_validation_sequence=> 160, p_validation => 'P19_SELLING_PRICE', - p_validation2 => '^[[:digit:]]{0,36}(.[[:digit:]]{0,2})$', + p_validation2 => '^[[:digit:]]{0,36}(\.[[:digit:]]{0,2})$', p_validation_type => 'REGULAR_EXPRESSION', p_error_message => 'Selling Price must be a monetary value, without currency symbol and less than three decimal places', p_associated_item=> 15245615928197267 + wwv_flow_api.g_id_offset, @@ -10961,7 +10973,7 @@ wwv_flow_api.create_page( p_required_role => 16097609166220701+ wwv_flow_api.g_id_offset, p_required_patch=> null + wwv_flow_api.g_id_offset, p_last_updated_by => 'PRIESTJ', - p_last_upd_yyyymmddhh24miss => '20080222154705', + p_last_upd_yyyymmddhh24miss => '20080225141301', p_page_is_public_y_n=> 'N', p_protection_level=> 'C', p_page_comment => ''); @@ -16567,11 +16579,18 @@ wwv_flow_api.create_page_validation( p_id => 36549430795270180 + wwv_flow_api.g_id_offset, p_flow_id => wwv_flow.g_flow_id, p_flow_step_id => 32, - p_validation_name => 'QMAX_greater_than_QMIN', + p_validation_name => 'QMAX_greater_than_or_equal_to_QMIN', p_validation_sequence=> 500, - p_validation => 'to_number(:P32_QMAX) > to_number(nvl(:P32_QMIN,''0''))', - p_validation_type => 'PLSQL_EXPRESSION', - p_error_message => 'QMAX must be greater than or equal to QMIN', + p_validation => 'if :P32_QMAX is null or :P32_QMIN is null then'||chr(10)|| +' return null;'||chr(10)|| +'else'||chr(10)|| +' if to_number(:P32_QMAX) < to_number(:P32_QMIN) then'||chr(10)|| +' return ''QMAX must be greater than or equal to QMIN'';'||chr(10)|| +' end if;'||chr(10)|| +' return null;'||chr(10)|| +'end if;', + p_validation_type => 'FUNC_BODY_RETURNING_ERR_TEXT', + p_error_message => '', p_when_button_pressed=> 28015631689078569 + wwv_flow_api.g_id_offset, p_associated_item=> 26615123286798270 + wwv_flow_api.g_id_offset, p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION',