From c6a3b36b6475f86c206af83518058fe4dc07ba4c Mon Sep 17 00:00:00 2001 From: PriestJ Date: Fri, 7 Mar 2008 11:16:08 +0000 Subject: [PATCH] Altered the menu in relation to #331 at MM's request git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3886 248e525c-4dfb-0310-94bc-949c084e9493 --- Screens/f155.sql | 105 +++++++++++++++++++++++++---------------------- 1 file changed, 57 insertions(+), 48 deletions(-) diff --git a/Screens/f155.sql b/Screens/f155.sql index c95872f..8189807 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: 17:53 Thursday March 6, 2008 +-- Date and Time: 11:14 Friday March 7, 2008 -- Exported By: PRIESTJ -- Flashback: 0 -- Export Type: Application Export @@ -144,9 +144,9 @@ wwv_flow_api.create_flow( p_printer_friendly_template=> 24735530196526758 + wwv_flow_api.g_id_offset, 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 => '20080306175304', - p_home_link => 'f?p=&APP_ID.:1', + p_page_protection_enabled_y_n=> 'Y', + p_checksum_salt_last_reset => '20080307111402', + p_home_link => 'f?p=&APP_ID.:101', p_flow_language => 'en-gb', p_flow_language_derived_from=> 'FLOW_PRIMARY_LANGUAGE', p_flow_image_prefix => '/i/', @@ -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=> '20080306175304', + p_last_upd_yyyymmddhh24miss=> '20080307111402', p_required_roles=> wwv_flow_utilities.string_to_table2('')); @@ -4360,7 +4360,7 @@ wwv_flow_api.create_page( p_step_template => '', p_required_patch=> null + wwv_flow_api.g_id_offset, p_last_updated_by => 'DHARSHANIK', - p_last_upd_yyyymmddhh24miss => '20080306155307', + p_last_upd_yyyymmddhh24miss => '20080307104905', p_page_is_public_y_n=> 'N', p_page_comment => ''); @@ -4379,40 +4379,41 @@ begin s:=s||'--MODULE'||chr(10)|| 'SELECT DISTINCT modu.code AS modu_code, modu.svcp_code, '||chr(10)|| ' prty_modu.name AS modu_manf, '||chr(10)|| -' DECODE(doro.drwg_code, NULL, modu.drwg_code,''''||docu.uri||'''') AS modu_drwg, '||chr(10)|| +' DECODE(doro.drwg_code, NULL, modu.drwg_code,''''||modu.drwg_code||'''') AS modu_drwg, '||chr(10)|| ' modu.lead_time,'||chr(10)|| ' modu.dim_a AS modu_dima, modu.dim_b AS modu_dimb, '||chr(10)|| -' modu.dim_c AS modu_dimc, modu.dim_d AS m'; +' modu.dim_c AS modu_dimc, modu.dim_d '; -s:=s||'odu_dimd, '||chr(10)|| +s:=s||'AS modu_dimd, '||chr(10)|| ' modu.dim_e AS modu_dime, modu.dim_f AS modu_dimf, '||chr(10)|| ' modu.dim_h AS modu_dimh, '||chr(10)|| ' modu.weight AS modu_weight, modu.qmax,'||chr(10)|| ' cnor_inlet.description AS inlet_orientation, '||chr(10)|| ' cnty_inlet.description inlet_con_type, '||chr(10)|| ' modu.inlet_height, modu.inlet_size,'||chr(10)|| -' cnor_outlet.description AS outle'; +' cnor_outlet.description AS o'; -s:=s||'t_orientation, '||chr(10)|| +s:=s||'utlet_orientation, '||chr(10)|| ' cnty_outlet.description AS outlet_con_type, '||chr(10)|| ' modu.outlet_height, modu.outlet_size,'||chr(10)|| ' modu.metr_code, '||chr(10)|| ' nvl(cost_modu.selling_price, ''0.00'') AS modu_selling_price'||chr(10)|| -'FROM modules modu, parties prty_modu, document_roles doro, documents docu,'||chr(10)|| -' connection_orientations cnor_inlet, connection_types cnty_inlet, '||chr(10)|| -' con'; +'FROM modules modu, parties prty_modu, document_roles doro, documents docu, wwv_flow_files wwf,'||chr(10)|| +' connection_orientations cnor_inlet, connection_type'; -s:=s||'nection_orientations cnor_outlet, connection_types cnty_outlet,'||chr(10)|| +s:=s||'s cnty_inlet, '||chr(10)|| +' connection_orientations cnor_outlet, connection_types cnty_outlet,'||chr(10)|| ' v_moco cost_modu, bases bas, v_baco cost_bas, housings hou, '||chr(10)|| ' housing_types hoty, parties prty_hou, v_hoco cost_hou'||chr(10)|| 'WHERE modu.prty_id = prty_modu.id'||chr(10)|| ' AND modu.drwg_code = doro.drwg_code(+)'||chr(10)|| ' AND docu.id(+) = doro.docu_id'||chr(10)|| -' AND modu.inlet_cnor_code = cnor_inlet.code'||chr(10)|| -' AND modu.inlet_cnty_code = cnty_inlet.code'||chr(10)|| -' AND '; +' AND wwf.name(+) = docu.uri'||chr(10)|| +' AND modu.inlet_cnor_code = cnor_inlet.code'; -s:=s||'modu.outlet_cnor_code = cnor_outlet.code'||chr(10)|| +s:=s||''||chr(10)|| +' AND modu.inlet_cnty_code = cnty_inlet.code'||chr(10)|| +' AND modu.outlet_cnor_code = cnor_outlet.code'||chr(10)|| ' AND modu.outlet_cnty_code = cnty_outlet.code'||chr(10)|| ' AND modu.code = cost_modu.modu_code'||chr(10)|| ' AND modu.bas_code = bas.code(+)'||chr(10)|| @@ -4420,15 +4421,16 @@ s:=s||'modu.outlet_cnor_code = cnor_outlet.code'||chr(10)|| ' AND modu.hou_code = hou.code(+)'||chr(10)|| ' AND hou.hoty_code = hoty.code(+)'||chr(10)|| ' AND hou.prty_id = prty_hou.id(+)'||chr(10)|| -' AND hou.code = cost_hou.hou_code(+)'||chr(10)|| -' AND doro.rt_code(+) = ''HIGH DEFINITION DRAWING'''||chr(10)|| -''; +' AND hou.code = cost_hou.hou_code(+'; -s:=s||' AND modu.valid_from IS NOT NULL'||chr(10)|| +s:=s||')'||chr(10)|| +' AND doro.rt_code(+) = ''HIGH DEFINITION DRAWING'''||chr(10)|| +' AND modu.valid_from IS NOT NULL'||chr(10)|| ' AND SYSDATE BETWEEN cost_modu.effective_from(+) AND cost_modu.effective_to(+)'||chr(10)|| ' AND SYSDATE BETWEEN cost_bas.effective_from(+) AND cost_bas.effective_to(+)'||chr(10)|| ' AND SYSDATE BETWEEN cost_hou.effective_from(+) AND cost_hou.effective_to(+)'||chr(10)|| -' AND modu.code = :P8_MODULE_CODE'; +' AND modu.code = :P8_MODULE_CODE'||chr(10)|| +''; wwv_flow_api.create_report_region ( p_id=> 997215818433865 + wwv_flow_api.g_id_offset, @@ -5051,48 +5053,53 @@ declare begin s:=s||'--BASE'||chr(10)|| 'SELECT DISTINCT nvl(bas.code, ''No Base'') AS bas_code, '||chr(10)|| -' nvl(bas.drwg_code, ''-'') AS bas_drwg, '||chr(10)|| +' DECODE(doro.drwg_code, NULL, '' - '',''''||bas.drwg_code||'''') AS bas_drwg, '||chr(10)|| ' nvl(bas.description, ''-'') AS bas_description, '||chr(10)|| ' nvl(bas.dim_a, 0) AS bas_dima, '||chr(10)|| ' nvl(bas.dim_b, 0) AS bas_dimb, '||chr(10)|| ' nvl(bas.dim_c, 0) AS bas_dimc, '||chr(10)|| -' nvl(bas.dim_d, 0) AS bas_dimd, '||chr(10)|| -' nvl(b'; +' '; -s:=s||'as.dim_e, 0) AS bas_dime, '||chr(10)|| +s:=s||' nvl(bas.dim_d, 0) AS bas_dimd, '||chr(10)|| +' nvl(bas.dim_e, 0) AS bas_dime, '||chr(10)|| ' nvl(bas.dim_f, 0) AS bas_dimf, '||chr(10)|| ' nvl(bas.dim_g, 0) AS bas_dimg, '||chr(10)|| ' nvl(bas.dim_h, 0) AS bas_dimh, '||chr(10)|| ' nvl(bas.dim_i, 0) AS bas_dimi, '||chr(10)|| ' nvl(bas.depth, 0), '||chr(10)|| ' nvl(cost_bas.selling_price, 0.00) AS bas_selling_price'||chr(10)|| -'FROM modules modu, parties prty_modu, '||chr(10)|| -' connection_orientation'; +'FR'; -s:=s||'s cnor_inlet, connection_types cnty_inlet, '||chr(10)|| +s:=s||'OM modules modu, parties prty_modu, document_roles doro, documents docu, wwv_flow_files wwf,'||chr(10)|| +' connection_orientations cnor_inlet, connection_types cnty_inlet, '||chr(10)|| ' connection_orientations cnor_outlet, connection_types cnty_outlet,'||chr(10)|| ' v_moco cost_modu, bases bas, v_baco cost_bas, housings hou, '||chr(10)|| ' housing_types hoty, parties prty_hou, v_hoco cost_hou'||chr(10)|| -'WHERE modu.prty_id = prty_modu.id'||chr(10)|| +'WHERE modu.prty_id = prty_modu.id'; + +s:=s||''||chr(10)|| +' AND bas.drwg_code = doro.drwg_code(+)'||chr(10)|| +' AND docu.id(+) = doro.docu_id'||chr(10)|| +' AND wwf.name(+) = docu.uri '||chr(10)|| ' AND modu.inlet_cnor_code = cnor_inlet.code'||chr(10)|| ' AND modu.inlet_cnty_code = cnty_inlet.code'||chr(10)|| -' AND modu.outlet_cnor_code '; - -s:=s||'= cnor_outlet.code'||chr(10)|| +' AND modu.outlet_cnor_code = cnor_outlet.code'||chr(10)|| ' AND modu.outlet_cnty_code = cnty_outlet.code'||chr(10)|| ' AND modu.code = cost_modu.modu_code'||chr(10)|| ' AND modu.bas_code = bas.code(+)'||chr(10)|| -' AND bas.code = cost_bas.bas_code(+)'||chr(10)|| +' AND bas.code = cost_bas.ba'; + +s:=s||'s_code(+)'||chr(10)|| ' AND modu.hou_code = hou.code(+)'||chr(10)|| ' AND hou.hoty_code = hoty.code(+)'||chr(10)|| ' AND hou.prty_id = prty_hou.id(+)'||chr(10)|| ' AND hou.code = cost_hou.hou_code(+)'||chr(10)|| ' AND modu.valid_from IS NOT NULL'||chr(10)|| -' AND SYSDATE BETWEEN cost_modu.effect'; +' AND SYSDATE BETWEEN cost_modu.effective_from AND cost_modu.effective_to'||chr(10)|| +' AND SYSDATE BETWEEN cost_bas.effective_from AND cost_bas.effective_to'||chr(10)|| +' AND SYSDATE BETWEEN cost_hou.effective_from AND cost_hou.e'; -s:=s||'ive_from(+) AND cost_modu.effective_to(+)'||chr(10)|| -' AND SYSDATE BETWEEN cost_bas.effective_from(+) AND cost_bas.effective_to(+)'||chr(10)|| -' AND SYSDATE BETWEEN cost_hou.effective_from(+) AND cost_hou.effective_to(+)'||chr(10)|| +s:=s||'ffective_to'||chr(10)|| ' AND modu.code = :P8_MODULE_CODE'; wwv_flow_api.create_report_region ( @@ -6036,8 +6043,8 @@ wwv_flow_api.create_page( p_html_page_header => '', p_step_template => '', p_required_patch=> null + wwv_flow_api.g_id_offset, - p_last_updated_by => 'ADMIN', - p_last_upd_yyyymmddhh24miss => '20080306163330', + p_last_updated_by => 'DHARSHANIK', + p_last_upd_yyyymmddhh24miss => '20080307095503', p_page_comment => ''); wwv_flow_api.set_page_help_text(p_flow_id=>wwv_flow.g_flow_id,p_flow_step_id=>10,p_text=>h); @@ -31084,8 +31091,8 @@ wwv_flow_api.create_page( p_html_page_header => '', p_step_template => '', p_required_patch=> null + wwv_flow_api.g_id_offset, - p_last_updated_by => 'PRIESTJ', - p_last_upd_yyyymmddhh24miss => '20080229134330', + p_last_updated_by => 'MULLENM', + p_last_upd_yyyymmddhh24miss => '20080307092025', p_page_is_public_y_n=> 'N', p_page_comment => ''); @@ -47104,6 +47111,8 @@ wwv_flow_api.create_list_item ( p_list_item_display_sequence=>100, p_list_item_link_text=> 'Home', p_list_item_link_target=> 'f?p=&APP_ID.:1:&SESSION.::&DEBUG.::::', + p_list_item_disp_cond_type=> 'CURRENT_PAGE_NOT_IN_CONDITION', + p_list_item_disp_condition=> '102', p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'COLON_DELIMITED_PAGE_LIST', @@ -47596,7 +47605,7 @@ wwv_flow_api.create_list_item ( p_list_item_link_text=> 'Enquiries', p_list_item_link_target=> 'f?p=&APP_ID.:30:&SESSION.::&DEBUG.::::', p_list_item_disp_cond_type=> 'PLSQL_EXPRESSION', - p_list_item_disp_condition=> '#OWNER#.mip_security.component_authorization(v(''APP_USER''),''enqumenu'') and (:APP_PAGE_ID <> 30 and :APP_PAGE_ID <> 31 and :APP_PAGE_ID <> 32)', + p_list_item_disp_condition=> '#OWNER#.mip_security.component_authorization(v(''APP_USER''),''enqumenu'') and (:APP_PAGE_ID <> 30 and :APP_PAGE_ID <> 31 and :APP_PAGE_ID <> 32 and :APP_PAGE_ID <> 102)', p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'COLON_DELIMITED_PAGE_LIST', @@ -47612,7 +47621,7 @@ wwv_flow_api.create_list_item ( p_list_item_link_text=> 'Quotes', p_list_item_link_target=> 'f?p=&APP_ID.:14:&SESSION.::&DEBUG.:14:::', p_list_item_disp_cond_type=> 'PLSQL_EXPRESSION', - p_list_item_disp_condition=> '#OWNER#.mip_security.component_authorization(v(''APP_USER''),''quotemenu'') and (:APP_PAGE_ID <> 14 and :APP_PAGE_ID <> 80 and :APP_PAGE_ID <> 81 and :APP_PAGE_ID <> 82)', + p_list_item_disp_condition=> '#OWNER#.mip_security.component_authorization(v(''APP_USER''),''quotemenu'') and (:APP_PAGE_ID <> 14 and :APP_PAGE_ID <> 80 and :APP_PAGE_ID <> 81 and :APP_PAGE_ID <> 82 and :APP_PAGE_ID <> 102)', p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'COLON_DELIMITED_PAGE_LIST', @@ -47661,7 +47670,7 @@ wwv_flow_api.create_list_item ( p_list_item_link_text=> 'Design Selection Tool', p_list_item_link_target=> 'f?p=&APP_ID.:4:&SESSION.::&DEBUG.::::', p_list_item_disp_cond_type=> 'PLSQL_EXPRESSION', - p_list_item_disp_condition=> '#OWNER#.mip_security.component_authorization(v(''APP_USER''),''icadmin'')', + p_list_item_disp_condition=> '#OWNER#.mip_security.component_authorization(v(''APP_USER''),''icadmin'') and (:APP_PAGE_ID <> 102)', p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'COLON_DELIMITED_PAGE_LIST', @@ -47693,7 +47702,7 @@ wwv_flow_api.create_list_item ( p_list_item_link_text=> 'Login', p_list_item_link_target=> 'f?p=&APP_ID.:101:&SESSION.::&DEBUG.:101:::', p_list_item_disp_cond_type=> 'PLSQL_EXPRESSION', - p_list_item_disp_condition=> 'not(APEX_CUSTOM_AUTH.IS_SESSION_VALID)', + p_list_item_disp_condition=> 'not(APEX_CUSTOM_AUTH.IS_SESSION_VALID) and (:APP_PAGE_ID <> 102)', p_list_countclicks_y_n=> 'N', p_list_text_01=> '', p_list_item_current_type=> 'COLON_DELIMITED_PAGE_LIST',