From 4a938d544ff25b2e95239c8c0c830afa63394103 Mon Sep 17 00:00:00 2001 From: PriestJ Date: Mon, 25 Feb 2008 15:30:13 +0000 Subject: [PATCH] Altered menu so that page 14 now displays the Admin menu option. Altered menu so that pages 19, 51, 55 and 57 now highlight the correct current items and display the admin menu structure. Fix for ticket #293 git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3692 248e525c-4dfb-0310-94bc-949c084e9493 --- Screens/f155.sql | 97 ++++++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 40 deletions(-) diff --git a/Screens/f155.sql b/Screens/f155.sql index fda7537..fdd340d 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: 14:18 Monday February 25, 2008 +-- Date and Time: 15:28 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 => '20080225141850', + p_checksum_salt_last_reset => '20080225152849', 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=> '20080225141850', + p_last_upd_yyyymmddhh24miss=> '20080225152849', p_required_roles=> wwv_flow_utilities.string_to_table2('')); @@ -2299,6 +2299,23 @@ wwv_flow_api.create_app_comments ( p_app_version=>''); end; / +begin +wwv_flow_api.create_app_comments ( + p_id=>42074224109543378 + wwv_flow_api.g_id_offset, + p_flow_id=>wwv_flow.g_flow_id, + p_pages=>'19', + p_app_comment=>'Addressed #179 by changing regular expression for currency to:'||chr(10)|| +''||chr(10)|| +'[[:digit:]]{0,36}(\.[[:digit:]]{0,2}|)$ '||chr(10)|| +''||chr(10)|| +'i.e. escaped the ''.'' wildcard and added the ''|'' option indicator.', + p_updated_on=>'2008.02.25.15:24:26', + p_updated_by=>'HARDYA', + p_created_on=>'2008.02.25.15:24:26', + p_created_by=>'HARDYA', + p_app_version=>''); +end; +/ --application/pages/page_00000 prompt ...PAGE 0: system @@ -6729,7 +6746,7 @@ wwv_flow_api.create_page( p_required_role => 14572900838700208+ wwv_flow_api.g_id_offset, p_required_patch=> null + wwv_flow_api.g_id_offset, p_last_updated_by => 'HARDYA', - p_last_upd_yyyymmddhh24miss => '20080225141756', + p_last_upd_yyyymmddhh24miss => '20080225152156', p_page_is_public_y_n=> 'N', p_protection_level=> 'C', p_page_comment => ''); @@ -7647,7 +7664,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, @@ -7663,14 +7680,15 @@ end; begin wwv_flow_api.create_page_validation( - p_id => 39727432666568477 + wwv_flow_api.g_id_offset, + p_id => 42046213364464547 + wwv_flow_api.g_id_offset, p_flow_id => wwv_flow.g_flow_id, p_flow_step_id => 19, p_validation_name => 'P19_DELIVERY_COST', p_validation_sequence=> 100, p_validation => 'P19_DELIVERY_COST', - 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_validation2 => '^[[:digit:]]{0,36}(\.[[:digit:]]{0,2}|)$', + p_validation_type => 'REGULAR_EXPRESSION', + p_error_message => 'Delivery Cost must be a monetary value, without a 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', p_validation_comment=> ''); @@ -7681,6 +7699,28 @@ end; / +begin + +wwv_flow_api.create_page_validation( + p_id => 39855411316196238 + wwv_flow_api.g_id_offset, + p_flow_id => wwv_flow.g_flow_id, + p_flow_step_id => 19, + p_validation_name => 'P19_SELLING_PRICE', + p_validation_sequence=> 105, + p_validation => 'P19_SELLING_PRICE', + 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, + p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION', + p_validation_comment=> ''); + +null; + +end; +/ + + begin wwv_flow_api.create_page_validation( @@ -7807,28 +7847,6 @@ end; / -begin - -wwv_flow_api.create_page_validation( - p_id => 39855411316196238 + wwv_flow_api.g_id_offset, - p_flow_id => wwv_flow.g_flow_id, - p_flow_step_id => 19, - p_validation_name => 'P19_SELLING_PRICE', - p_validation_sequence=> 160, - p_validation => 'P19_SELLING_PRICE', - 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, - p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION', - p_validation_comment=> ''); - -null; - -end; -/ - - begin declare @@ -43453,11 +43471,11 @@ wwv_flow_api.create_list_item ( p_list_item_link_text=> 'Administration', p_list_item_link_target=> 'f?p=&APP_ID.:40:&SESSION.::&DEBUG.::::', p_list_item_disp_cond_type=> 'CURRENT_PAGE_IN_CONDITION', - p_list_item_disp_condition=> '5,18,23,24,40,50,52,53,54,56,18,60,61,62,63,64,65,66,67,68,69,70,58,59,90,91,95,96', + p_list_item_disp_condition=> '5,18,19,23,24,40,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,90,91,95,96', p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'COLON_DELIMITED_PAGE_LIST', - p_list_item_current_for_pages=> '5:7:18:23:24:40:50:56:52:53:54:58:59:60:61:62:63:64:65:90:91:95:96', + p_list_item_current_for_pages=> '5:7:18:19:23:24:40:50:56:51:52:53:54:55:57:58:59:60:61:62:63:64:65:90:91:95:96', p_list_item_owner=> ''); wwv_flow_api.create_list_item ( @@ -43667,7 +43685,7 @@ wwv_flow_api.create_list_item ( p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'COLON_DELIMITED_PAGE_LIST', - p_list_item_current_for_pages=> '18', + p_list_item_current_for_pages=> '18:19', p_list_item_owner=> ''); wwv_flow_api.create_list_item ( @@ -43685,7 +43703,7 @@ wwv_flow_api.create_list_item ( p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'PLSQL_EXPRESSION', - p_list_item_current_for_pages=> ':APP_PAGE_ID=18 and :P18_REQUIRED_COST_TYPE=''LACO''', + p_list_item_current_for_pages=> ':APP_PAGE_ID=18 and :P18_REQUIRED_COST_TYPE=''LACO'' or :APP_PAGE_ID=19 and :P19_REQUIRED_COST_TYPE=''LACO''', p_list_item_owner=> ''); wwv_flow_api.create_list_item ( @@ -43703,8 +43721,7 @@ wwv_flow_api.create_list_item ( p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'PLSQL_EXPRESSION', - p_list_item_current_for_pages=> ':APP_PAGE_ID IN (18,19) and :P18_REQUIRED_COST_TYPE=''MOCO'''||chr(10)|| -'', + p_list_item_current_for_pages=> ':APP_PAGE_ID=18 and :P18_REQUIRED_COST_TYPE=''MOCO'' or :APP_PAGE_ID=19 and :P19_REQUIRED_COST_TYPE=''MOCO''', p_list_item_owner=> ''); wwv_flow_api.create_list_item ( @@ -43722,7 +43739,7 @@ wwv_flow_api.create_list_item ( p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'PLSQL_EXPRESSION', - p_list_item_current_for_pages=> ':APP_PAGE_ID=18 and :P18_REQUIRED_COST_TYPE=''BACO''', + p_list_item_current_for_pages=> ':APP_PAGE_ID=18 and :P18_REQUIRED_COST_TYPE=''BACO'' or :APP_PAGE_ID=19 and :P19_REQUIRED_COST_TYPE=''BACO''', p_list_item_owner=> ''); wwv_flow_api.create_list_item ( @@ -43740,7 +43757,7 @@ wwv_flow_api.create_list_item ( p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'PLSQL_EXPRESSION', - p_list_item_current_for_pages=> ':APP_PAGE_ID=18 and :P18_REQUIRED_COST_TYPE=''HOCO''', + p_list_item_current_for_pages=> ':APP_PAGE_ID=18 and :P18_REQUIRED_COST_TYPE=''HOCO'' or :APP_PAGE_ID=19 and :P19_REQUIRED_COST_TYPE=''HOCO''', p_list_item_owner=> ''); wwv_flow_api.create_list_item ( @@ -43758,7 +43775,7 @@ wwv_flow_api.create_list_item ( p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'PLSQL_EXPRESSION', - p_list_item_current_for_pages=> ':APP_PAGE_ID=18 and :P18_REQUIRED_COST_TYPE=''AICO''', + p_list_item_current_for_pages=> ':APP_PAGE_ID=18 and :P18_REQUIRED_COST_TYPE=''AICO'' or :APP_PAGE_ID=19 and :P19_REQUIRED_COST_TYPE=''AICO''', p_list_item_owner=> ''); wwv_flow_api.create_list_item ( @@ -43843,7 +43860,7 @@ wwv_flow_api.create_list_item ( p_list_item_link_text=> 'Administration', p_list_item_link_target=> 'f?p=&APP_ID.:40:&SESSION.::&DEBUG.::::', p_list_item_disp_cond_type=> 'PLSQL_EXPRESSION', - p_list_item_disp_condition=> '#OWNER#.mip_security.component_authorization(v(''APP_USER''),''adminmenu'') and (:APP_PAGE_ID = 30 or :APP_PAGE_ID = 31 or :APP_PAGE_ID = 32 or :APP_PAGE_ID = 80 or :APP_PAGE_ID = 81 or :APP_PAGE_ID = 82 or :APP_PAGE_ID = 3 or :APP_PAGE_ID = 6 or :APP_PAGE_ID = 1 or :APP_PAGE_ID = 101 or :APP_PAGE_ID = 103 or :APP_PAGE_ID = 500 or :APP_PAGE_ID = 501)', + p_list_item_disp_condition=> '#OWNER#.mip_security.component_authorization(v(''APP_USER''),''adminmenu'') and (:APP_PAGE_ID = 14 or :APP_PAGE_ID = 30 or :APP_PAGE_ID = 31 or :APP_PAGE_ID = 32 or :APP_PAGE_ID = 80 or :APP_PAGE_ID = 81 or :APP_PAGE_ID = 82 or :APP_PAGE_ID = 3 or :APP_PAGE_ID = 6 or :APP_PAGE_ID = 1 or :APP_PAGE_ID = 101 or :APP_PAGE_ID = 103 or :APP_PAGE_ID = 500 or :APP_PAGE_ID = 501)', p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'COLON_DELIMITED_PAGE_LIST',