From 3d99fbd6873c2f8a94ce08ce51a7b148765dd380 Mon Sep 17 00:00:00 2001 From: PriestJ Date: Thu, 28 Feb 2008 17:40:44 +0000 Subject: [PATCH] Altered the agent fields and the supplier fields on the enquiry to ensure that the agents can see the owner of a quoted for enquiry. See ticket #288 git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3772 248e525c-4dfb-0310-94bc-949c084e9493 --- Screens/f155.sql | 67 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 13 deletions(-) diff --git a/Screens/f155.sql b/Screens/f155.sql index cda404a..16eb3a0 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: 16:15 Thursday February 28, 2008 +-- Date and Time: 17:31 Thursday February 28, 2008 -- Exported By: PRIESTJ -- Flashback: 0 -- Export Type: Application Export @@ -28,7 +28,7 @@ prompt APPLICATION 155 - webmip -- Pages: 54 -- Items: 344 -- Computations: 1 --- Validations: 260 +-- Validations: 261 -- Processes: 94 -- Regions: 78 -- Buttons: 118 @@ -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 => '20080228161551', + p_checksum_salt_last_reset => '20080228173153', 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=> '20080228161551', + p_last_upd_yyyymmddhh24miss=> '20080228173153', p_required_roles=> wwv_flow_utilities.string_to_table2('')); @@ -11350,7 +11350,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 => '20080228161158', + p_last_upd_yyyymmddhh24miss => '20080228171443', p_page_is_public_y_n=> 'N', p_protection_level=> 'C', p_page_comment => ''); @@ -12360,8 +12360,17 @@ wwv_flow_api.create_page_item( p_rowspan => 1, p_label_alignment => 'RIGHT', p_field_alignment => 'LEFT', - p_display_when=>'#OWNER#.mip_parties.get_user_role(v(''APP_USER'')) = ''AGENT''', - p_display_when_type=>'PLSQL_EXPRESSION', + p_display_when=>'if :P32_ID is null and #OWNER#.mip_parties.get_user_role(v(''APP_USER'')) = ''AGENT'' then'||chr(10)|| +' return true;'||chr(10)|| +'else'||chr(10)|| +' if #OWNER#.mip_enquiry.get_enquiry_status(:P32_ID) = ''INP'' and #OWNER#.mip_parties.get_user_role(v(''APP_USER'')) = ''AGENT'' then'||chr(10)|| +' return true;'||chr(10)|| +' else'||chr(10)|| +' return false;'||chr(10)|| +' end if;'||chr(10)|| +' return false;'||chr(10)|| +'end if;', + p_display_when_type=>'FUNCTION_BODY', p_read_only_when=>'If (:P32_ID is not null and #OWNER#.mip_enquiry.get_enquiry_status(:P32_ID) <> ''INP'') or #OWNER#.mip_security.page_authorization(v(''APP_USER''),v(''APP_PAGE_ID''),''R'') then'||chr(10)|| 'return true;'||chr(10)|| 'else'||chr(10)|| @@ -14782,7 +14791,7 @@ wwv_flow_api.create_page_item( p_rowspan => 1, p_label_alignment => 'RIGHT', p_field_alignment => 'LEFT', - p_display_when=>'#OWNER#.mip_parties.get_user_role(v(''APP_USER'')) <> ''AGENT''', + p_display_when=>'#OWNER#.mip_parties.get_user_role(v(''APP_USER'')) <> ''AGENT'' or :P32_ID is not null and #OWNER#.mip_enquiry.get_enquiry_status(:P32_ID) <> ''INP'' and #OWNER#.mip_parties.get_user_role(v(''APP_USER'')) = ''AGENT''', p_display_when_type=>'PLSQL_EXPRESSION', p_read_only_when=>'declare '||chr(10)|| 'partytime number;'||chr(10)|| @@ -14848,8 +14857,17 @@ wwv_flow_api.create_page_item( p_rowspan => 1, p_label_alignment => 'RIGHT', p_field_alignment => 'LEFT', - p_display_when=>'#OWNER#.mip_parties.get_user_role(v(''APP_USER'')) <> ''AGENT'' and :P32_MKTP_REF is not null and :P32_MKTP_REF<> ''%''||''null%''', - p_display_when_type=>'PLSQL_EXPRESSION', + p_display_when=>'if #OWNER#.mip_parties.get_user_role(v(''APP_USER'')) <> ''AGENT'' and :P32_MKTP_REF is not null then'||chr(10)|| +' return true;'||chr(10)|| +'else'||chr(10)|| +' if :P32_ID is not null and #OWNER#.mip_enquiry.get_enquiry_status(:P32_ID) <> ''INP'' and #OWNER#.mip_parties.get_user_role(v(''APP_USER'')) = ''AGENT'' then'||chr(10)|| +' return true;'||chr(10)|| +' else'||chr(10)|| +' return false;'||chr(10)|| +' end if;'||chr(10)|| +' return false;'||chr(10)|| +'end if;', + p_display_when_type=>'FUNCTION_BODY', p_read_only_when=>'If (:P32_ID is not null and #OWNER#.mip_enquiry.get_enquiry_status(:P32_ID) <> ''INP'') or #OWNER#.mip_security.page_authorization(v(''APP_USER''),v(''APP_PAGE_ID''),''R'') then'||chr(10)|| 'return true;'||chr(10)|| 'else'||chr(10)|| @@ -14954,7 +14972,8 @@ wwv_flow_api.create_page_item( p_rowspan => 1, p_label_alignment => 'RIGHT', p_field_alignment => 'LEFT', - p_display_when=>'#OWNER#.mip_parties.get_user_role(v(''APP_USER'')) = ''AGENT''', + p_display_when=>'#OWNER#.mip_parties.get_user_role(v(''APP_USER'')) = ''AGENT'' and (:P32_ID is null '||chr(10)|| +'or #OWNER#.mip_enquiry.get_enquiry_status(:P32_ID) = ''INP'')', p_display_when_type=>'PLSQL_EXPRESSION', p_read_only_when=>'declare '||chr(10)|| 'partytime number;'||chr(10)|| @@ -19709,8 +19728,8 @@ wwv_flow_api.create_page( p_step_template => '', 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 => '20080226094320', + p_last_updated_by => 'HARDYA', + p_last_upd_yyyymmddhh24miss => '20080228162652', p_page_is_public_y_n=> 'N', p_page_comment => ''); @@ -20238,6 +20257,28 @@ end; / +begin + +wwv_flow_api.create_page_validation( + p_id => 45007827738838281 + wwv_flow_api.g_id_offset, + p_flow_id => wwv_flow.g_flow_id, + p_flow_step_id => 41, + p_validation_name => 'Must Enter Filename', + p_validation_sequence=> 10, + p_validation => 'P41_FILE_UPLOAD', + p_validation_type => 'ITEM_NOT_NULL', + p_error_message => 'Filename must be entered', + p_when_button_pressed=> 26588816352789811 + wwv_flow_api.g_id_offset, + p_associated_item=> 26589627456789812 + wwv_flow_api.g_id_offset, + p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION', + p_validation_comment=> ''); + +null; + +end; +/ + + begin declare