From 2054eb96d615dc31801dea1ffbbf59424eb66230 Mon Sep 17 00:00:00 2001 From: PriestJ Date: Fri, 14 Mar 2008 15:45:42 +0000 Subject: [PATCH] Fix for #368 any details entered on the enquiry that were not explicitly saved were lost when the user attempted to upload a document. Altered the upload button to ensure that all changes are saved back to the database before the file is uploaded. git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4009 248e525c-4dfb-0310-94bc-949c084e9493 --- Screens/f155.sql | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/Screens/f155.sql b/Screens/f155.sql index 7c1069a..fc3234c 100644 --- a/Screens/f155.sql +++ b/Screens/f155.sql @@ -13,8 +13,8 @@ prompt APPLICATION 155 - webmip -- Application Export: -- Application: 155 -- Name: webmip --- Date and Time: 14:13 Friday March 14, 2008 --- Exported By: HARDYA +-- Date and Time: 15:43 Friday March 14, 2008 +-- Exported By: PRIESTJ -- Flashback: 0 -- Export Type: Application Export -- Version: 3.1.0.00.32 @@ -145,7 +145,7 @@ wwv_flow_api.create_flow( p_default_region_template=> 28038130488354430 + wwv_flow_api.g_id_offset, p_error_template => 42209241448421762 + wwv_flow_api.g_id_offset, p_page_protection_enabled_y_n=> 'N', - p_checksum_salt_last_reset => '20080314141302', + p_checksum_salt_last_reset => '20080314154339', p_home_link => 'f?p=&APP_ID.:101', p_flow_language => 'en-gb', p_flow_language_derived_from=> 'FLOW_PRIMARY_LANGUAGE', @@ -155,7 +155,7 @@ wwv_flow_api.create_flow( p_login_url => '', p_logout_url => 'wwv_flow_custom_auth_std.logout?p_this_flow=&FLOW_ID.&p_next_flow_page_sess =&FLOW_ID.:500', p_application_tab_set=> 1, - p_logo_image => 'TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:', + p_logo_image => 'TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:TEXT:', p_logo_image_attributes => 'style="font-family:Arial; color:#004C66; font-size:18px; white-space:nowrap; font-weight:bold;"', p_public_url_prefix => '', p_public_user => 'APEX_PUBLIC_USER', @@ -187,8 +187,10 @@ wwv_flow_api.create_flow( p_default_listr_template => 28038130488354430 + wwv_flow_api.g_id_offset, p_substitution_string_01 => 'SYSTEM_ENVIRONMENT', p_substitution_value_01 => '(Development)', - p_last_updated_by => 'HARDYA', - p_last_upd_yyyymmddhh24miss=> '20080314141302', + p_substitution_string_02 => 'T_AND_C_URL', + p_substitution_value_02 => 'http://www.nationalgrid.com/uk/metering/mip/tc.htm', + p_last_updated_by => 'PRIESTJ', + p_last_upd_yyyymmddhh24miss=> '20080314154339', p_required_roles=> wwv_flow_utilities.string_to_table2('')); @@ -6550,8 +6552,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 => '20080310140832', + p_last_updated_by => 'HARDYA', + p_last_upd_yyyymmddhh24miss => '20080314152324', p_page_is_public_y_n=> 'N', p_protection_level=> 'C', p_page_comment => ''); @@ -6588,10 +6590,10 @@ s:=s||'select "ID", '||chr(10)|| '"VALID_FROM",-- all'||chr(10)|| '"VALID_TO",-- all'||chr(10)|| '"COST_TYPE"-- all'||chr(10)|| -'from "#OWNER#"."COSTS" '||chr(10)|| -'where '; +'from "#OW'; -s:=s||'"#OWNER#"."COSTS"."COST_TYPE" = nvl(:P18_REQUIRED_COST_TYPE,''LACO'')'||chr(10)|| +s:=s||'NER#"."COSTS" '||chr(10)|| +'where "#OWNER#"."COSTS"."COST_TYPE" = nvl(:P18_REQUIRED_COST_TYPE,''LACO'')'||chr(10)|| ' '||chr(10)|| ''; @@ -11088,7 +11090,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 => '20080314123231', + p_last_upd_yyyymmddhh24miss => '20080314153158', p_page_is_public_y_n=> 'N', p_protection_level=> 'C', p_page_comment => ''); @@ -11266,7 +11268,6 @@ wwv_flow_api.create_page_button( p_button_image_alt=> 'Upload File', p_button_position=> 'BOTTOM', p_button_alignment=> 'RIGHT', - p_button_redirect_url=> 'f?p=&APP_ID.:41:&SESSION.::&DEBUG.:41:P41_ENQU_ID,P41_PREVIOUS_PAGE,P41_QUTE_ID,P41_DRWG_CODE:&P32_ID.,32,,', p_button_condition=> ':P32_ID is not null and #OWNER#.mip_security.page_authorization(v(''APP_USER''),v(''APP_PAGE_ID''),''A'') and not #OWNER#.mip_security.page_authorization(v(''APP_USER''),v(''APP_PAGE_ID''),''R'')', p_button_condition_type=> 'PLSQL_EXPRESSION', p_required_patch => null + wwv_flow_api.g_id_offset); @@ -11777,7 +11778,7 @@ wwv_flow_api.create_page_branch( p_id=>26621402583798277 + wwv_flow_api.g_id_offset, p_flow_id=> wwv_flow.g_flow_id, p_flow_step_id=> 32, - p_branch_action=> 'f?p=&APP_ID.:41:&SESSION.::&DEBUG.::P41_PREVIOUS_PAGE:&APP_PAGE_ID.&success_msg=#SUCCESS_MSG#', + p_branch_action=> 'f?p=&APP_ID.:41:&SESSION.::&DEBUG.:41:P41_ENQU_ID,P41_PREVIOUS_PAGE,P41_QUTE_ID,P41_DRWG_CODE:&P32_ID.,&APP_PAGE_ID.,,&success_msg=#SUCCESS_MSG#', p_branch_point=> 'AFTER_PROCESSING', p_branch_type=> 'REDIRECT_URL', p_branch_when_button_id=>26601511471798259+ wwv_flow_api.g_id_offset, @@ -44303,7 +44304,7 @@ wwv_flow_api.create_page( p_step_template => 28031530009354416+ 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 => '20080311115840', + p_last_upd_yyyymmddhh24miss => '20080314145908', p_page_is_public_y_n=> 'Y', p_protection_level=> 'C', p_page_comment => ''); @@ -44393,7 +44394,7 @@ wwv_flow_api.create_page_item( p_item_plug_id => 11076809493541525+wwv_flow_api.g_id_offset, p_use_cache_before_default=> 'YES', p_item_default_type => 'STATIC_TEXT_WITH_SUBSTITUTIONS', - p_prompt=>'The Terms and Conditions for using this site are defined here', + p_prompt=>'The Terms and Conditions for using this site are defined here', p_source_type=> 'STATIC', p_display_as=> 'RADIOGROUP', p_lov => 'STATIC2:I accept the Terms and Conditions of using this site;YES', @@ -47449,7 +47450,7 @@ c2:=c2||'
'||chr(10)|| ' Help | '||chr(10)|| ''; -c2:=c2||' Terms & conditions'||chr(10)|| +c2:=c2||' Terms & conditions'||chr(10)|| ''||chr(10)|| ' | Privacy policy'||chr(10)|| ' | #APP_VERSION#'||chr(10)|| @@ -48310,7 +48311,7 @@ c2:=c2||'
'||chr(10)|| ' Help | '||chr(10)|| ''; -c2:=c2||' Terms & conditions'||chr(10)|| +c2:=c2||' Terms & conditions'||chr(10)|| ''||chr(10)|| ' | Privacy policy'||chr(10)|| ' | #APP_VERSION#'||chr(10)||