fix for ticket #443, have added an extra column (nicked sql code from matts screen 81), note it runs slowly on the supplier only report. However there is another issue with the report in a yet to be raised ticket, there are duplicate quote references in the report, so this could be looked at together.

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@4709 248e525c-4dfb-0310-94bc-949c084e9493
2008-04-02 16:16:41 +00:00
parent 8bbfd79acd
commit f27bbde7b2
1 changed files with 131 additions and 36 deletions
--- 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:19 Wednesday April 2, 2008
--   Exported By:     MULLENM
+--   Date and Time:   17:14 Wednesday April 2, 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 => '20080402141927',
+  p_checksum_salt_last_reset => '20080402171410',
  p_home_link         => 'f?p=&APP_ID.:101',
  p_flow_language     => 'en-gb',
  p_flow_language_derived_from=> 'FLOW_PRIMARY_LANGUAGE',
@@ -193,8 +193,8 @@ wwv_flow_api.create_flow(
  p_substitution_value_03  => 'http://www.nationalgrid.com/corporate/legal/privacy.htm',
  p_substitution_string_04 => 'HELP_URL',
  p_substitution_value_04  => 'http://www.nationalgrid.com/corporate/legal/help.htm',
-  p_last_updated_by => 'MULLENM',
-  p_last_upd_yyyymmddhh24miss=> '20080402141927',
+  p_last_updated_by => 'PRIESTJ',
+  p_last_upd_yyyymmddhh24miss=> '20080402171410',
  p_required_roles=> wwv_flow_utilities.string_to_table2(''));
 
 
@@ -6205,8 +6205,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 => 'HARDYA',
-  p_last_upd_yyyymmddhh24miss => '20080402092503',
+  p_last_updated_by => 'PRIESTJ',
+  p_last_upd_yyyymmddhh24miss => '20080402170639',
  p_page_comment  => '');
 
 end;
@@ -6253,14 +6253,14 @@ s:=s||'SELECT qute.id AS "Quote Reference Number"'||chr(10)||
 '      ,prty_supplier.name AS "Supplier Name"'||chr(10)||
 '      ,prty_agent.first_name||'' ''||prty_agent.last_name AS "Agent Name"'||chr(10)||
 '      ,quote_status.event_date AS "Date Status Change"'||chr(10)||
-''||chr(10)||
+'      ,v_files.id as View_PDF '||chr(10)||
 'FROM (SELECT DISTINCT vlare.prty_id'||chr(10)||
 '      FROM quotes qute, v_latest_rt_code_for_enro vlare'||chr(10)||
 '      WHERE vlare.enqu_id = qute.enqu_id'||chr(10)||
-'      AND vlare.rt_code = ''ENQ SUPP'''||chr(10)||
-'     ';
+'      AND vla';

-s:=s||' ) supplier'||chr(10)||
+s:=s||'re.rt_code = ''ENQ SUPP'''||chr(10)||
+'      ) supplier'||chr(10)||
 '    ,quotes qute'||chr(10)||
 '    ,quote_roles quro'||chr(10)||
 '    ,parties prty_supplier'||chr(10)||
@@ -6268,22 +6268,28 @@ s:=s||' ) supplier'||chr(10)||
 '    ,(SELECT vcqs.*'||chr(10)||
 '        FROM v_current_quote_status vcqs'||chr(10)||
 '       WHERE vcqs.qust_code = decode(:P14_QUTE_STATUS, ''%'', vcqs.qust_code, :P14_QUTE_STATUS)) quote_status'||chr(10)||
+'    ,document_roles docro'||chr(10)||
+'    ,documents docs'||chr(10)||
+'    ,wwv_flow_files v_files'||chr(10)||
 '       '||chr(10)||
-'WHERE qute.id = quro.qute_id'||chr(10)||
+'WHERE';
+
+s:=s||' qute.id = quro.qute_id'||chr(10)||
 'AND supplier.prty_id = prty_supplier.id'||chr(10)||
 'AND quro.prty_id = prty_agent.id'||chr(10)||
-'AND qut';
-
-s:=s||'e.id = quote_status.qute_id'||chr(10)||
+'AND qute.id = quote_status.qute_id'||chr(10)||
 'AND qute.qute_type = decode(:P14_QUTE_TYPE,''%'', qute.qute_type, :P14_QUTE_TYPE)'||chr(10)||
 'AND quro.rt_code = (decode(quote_status.qust_code, ''ACCEPTED'', ''Q ACC'','||chr(10)||
 '                                                   ''INP'', ''Q RFQ'','||chr(10)||
-'                                                   ''REJECTED'', ''Q REJ'','||chr(10)||
-'                                                   ''SELECTED'', ''Q SEL'','||chr(10)||
 '                                          ';

-s:=s||'                                                ''Q OWN''))'||chr(10)||
+s:=s||'         ''REJECTED'', ''Q REJ'','||chr(10)||
+'                                                   ''SELECTED'', ''Q SEL'','||chr(10)||
+'                                                   ''Q OWN''))'||chr(10)||
 'AND quote_status.qust_code <> ''LAPSED'''||chr(10)||
+'   and docro.qute_id = qute.id'||chr(10)||
+'   and docs.id = docro.docu_id'||chr(10)||
+'   and v_files.name = docs.uri'||chr(10)||
 'ORDER BY quote_status.event_date ASC';

 wwv_flow_api.create_report_region (
@@ -6308,7 +6314,7 @@ wwv_flow_api.create_report_region (
  p_translate_title=> 'Y',
  p_ajax_enabled=> 'N',
  p_query_row_template=> 28041136573354435+ wwv_flow_api.g_id_offset,
-  p_query_headings_type=> 'QUERY_COLUMNS',
+  p_query_headings_type=> 'COLON_DELMITED_LIST',
  p_query_num_rows=> '15',
  p_query_options=> 'DERIVED_REPORT_COLUMNS',
  p_query_show_nulls_as=> ' - ',
@@ -6346,7 +6352,10 @@ wwv_flow_api.create_report_columns (
  p_sum_column=> 'N',
  p_hidden_column=> 'N',
  p_display_as=>'WITHOUT_MODIFICATION',
+  p_lov_show_nulls=> 'NO',
  p_pk_col_source=> s,
+  p_lov_display_extra=> 'YES',
+  p_include_in_export=> 'Y',
  p_column_comment=>'');
 end;
 /
@@ -6422,6 +6431,35 @@ wwv_flow_api.create_report_columns (
  p_column_comment=>'');
 end;
 /
+declare
+  s varchar2(32767) := null;
+begin
+s := null;
+wwv_flow_api.create_report_columns (
+  p_id=> 8083704250341885 + wwv_flow_api.g_id_offset,
+  p_region_id=> 29838414799785978 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_query_column_id=> 5,
+  p_form_element_id=> null,
+  p_column_alias=> 'VIEW_PDF',
+  p_column_display_sequence=> 5,
+  p_column_heading=> '',
+  p_column_link=>'p?n=#VIEW_PDF#',
+  p_column_linktext=>'View PDF',
+  p_column_alignment=>'LEFT',
+  p_heading_alignment=>'CENTER',
+  p_default_sort_column_sequence=>0,
+  p_disable_sort_column=>'Y',
+  p_sum_column=> 'N',
+  p_hidden_column=> 'N',
+  p_display_as=>'WITHOUT_MODIFICATION',
+  p_lov_show_nulls=> 'NO',
+  p_pk_col_source=> s,
+  p_lov_display_extra=> 'YES',
+  p_include_in_export=> 'N',
+  p_column_comment=>'');
+end;
+/
 declare
  s varchar2(32767) := null;
  l_clob clob;
@@ -6431,12 +6469,13 @@ s:=s||'SELECT DISTINCT qute.id "Quote Reference Number"'||chr(10)||
 '               ,prty_supplier.name "Supplier"'||chr(10)||
 '               ,prty_agent.first_name||'' ''||prty_agent.last_name "Agent"'||chr(10)||
 '               ,vcqs.event_date "Date Status Change"'||chr(10)||
+'               ,v_files.id as View_PDF '||chr(10)||
 'FROM (SELECT DISTINCT vlare.prty_id'||chr(10)||
 '      FROM quote_roles quro, quotes qute, v_latest_rt_code_for_enro vlare'||chr(10)||
-'      WHERE quro.qute_id = qute.id'||chr(10)||
-'      AND vlare.enqu_id = q';
+'      WHERE quro.qute_';

-s:=s||'ute.enqu_id'||chr(10)||
+s:=s||'id = qute.id'||chr(10)||
+'      AND vlare.enqu_id = qute.enqu_id'||chr(10)||
 '      AND quro.rt_code = ''Q OWN'''||chr(10)||
 '      AND vlare.rt_code = ''ENQ SUPP'''||chr(10)||
 '      AND quro.prty_id = mip_parties.get_user_id(:APP_USER)'||chr(10)||
@@ -6447,21 +6486,27 @@ s:=s||'ute.enqu_id'||chr(10)||
 '      ,v_current_quote_status vcqs'||chr(10)||
 '      ,parties prty_supplier'||chr(10)||
 '      ,parties prty_agent'||chr(10)||
-'WHERE quro.qute_id = qute.id'||chr(10)||
-'AND vlare.enqu_id = qute.enq';
+'      ,document_r';

-s:=s||'u_id'||chr(10)||
+s:=s||'oles docro'||chr(10)||
+'      ,documents docs'||chr(10)||
+'      ,wwv_flow_files v_files'||chr(10)||
+'WHERE quro.qute_id = qute.id'||chr(10)||
+'AND vlare.enqu_id = qute.enqu_id'||chr(10)||
 'AND vlare.prty_id = supplier.prty_id'||chr(10)||
 'AND vcqs.qute_id = qute.id'||chr(10)||
 'AND supplier.prty_id = prty_supplier.id'||chr(10)||
 'AND quro.prty_id = prty_agent.id'||chr(10)||
 'AND quro.rt_code = ''Q OWN'''||chr(10)||
 'AND qute.qute_type = decode(:P14_QUTE_TYPE,''%'', qute.qute_type, :P14_QUTE_TYPE)'||chr(10)||
-'AND vcqs.qust_code = decode(:P14_QUTE_STATUS, ''%'', vcqs.qust_code, :P14_QUTE_STATUS)'||chr(10)||
-'AND vcqs.qust_code <> ''LAPSED'''||chr(10)||
-'ORDER BY vcqs.event_date A';
+'AND vcqs.qust_code =';

-s:=s||'SC';
+s:=s||' decode(:P14_QUTE_STATUS, ''%'', vcqs.qust_code, :P14_QUTE_STATUS)'||chr(10)||
+'AND vcqs.qust_code <> ''LAPSED'''||chr(10)||
+'   and docro.qute_id = qute.id'||chr(10)||
+'   and docs.id = docro.docu_id'||chr(10)||
+'   and v_files.name = docs.uri'||chr(10)||
+'ORDER BY vcqs.event_date ASC';

 wwv_flow_api.create_report_region (
  p_id=> 30454210649729114 + wwv_flow_api.g_id_offset,
@@ -6593,6 +6638,35 @@ wwv_flow_api.create_report_columns (
  p_column_comment=>'');
 end;
 /
+declare
+  s varchar2(32767) := null;
+begin
+s := null;
+wwv_flow_api.create_report_columns (
+  p_id=> 8084917372392970 + wwv_flow_api.g_id_offset,
+  p_region_id=> 30454210649729114 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_query_column_id=> 5,
+  p_form_element_id=> null,
+  p_column_alias=> 'VIEW_PDF',
+  p_column_display_sequence=> 5,
+  p_column_heading=> 'View Pdf',
+  p_column_link=>'p?n=#VIEW_PDF#',
+  p_column_linktext=>'View PDF',
+  p_column_alignment=>'LEFT',
+  p_heading_alignment=>'CENTER',
+  p_default_sort_column_sequence=>0,
+  p_disable_sort_column=>'Y',
+  p_sum_column=> 'N',
+  p_hidden_column=> 'N',
+  p_display_as=>'WITHOUT_MODIFICATION',
+  p_lov_show_nulls=> 'NO',
+  p_pk_col_source=> s,
+  p_lov_display_extra=> 'YES',
+  p_include_in_export=> 'N',
+  p_column_comment=>'');
+end;
+/
 
 begin
 
@@ -11403,8 +11477,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 => 'DHARSHANIK',
-  p_last_upd_yyyymmddhh24miss => '20080402131632',
+  p_last_updated_by => 'HARDYA',
+  p_last_upd_yyyymmddhh24miss => '20080402171159',
  p_page_is_public_y_n=> 'N',
  p_protection_level=> 'C',
  p_page_comment  => '');
@@ -20249,9 +20323,30 @@ wwv_flow_api.create_page_validation(
  p_flow_step_id => 32,
  p_validation_name => 'TRIPARTITE',
  p_validation_sequence=> 1670,
-  p_validation => 'if not #OWNER#.mip_tripartite.enquiry_allowed(:P32_ID) then'||chr(10)||
+  p_validation => 'DECLARE'||chr(10)||
+'  l_tab_messages #OWNER#.mip_tripartite.t_tab_messages;'||chr(10)||
+'  l_idx pls_integer;'||chr(10)||
+'  l_error_text varchar2(2000);'||chr(10)||
+'BEGIN'||chr(10)||
+'if not #OWNER#.mip_tripartite.enquiry_allowed(:P32_ID) then'||chr(10)||
 '  return ''Enquiry not allowed under current Tripartite arrangements'';'||chr(10)||
-'end if;',
+'end if;'||chr(10)||
+''||chr(10)||
+'IF not #OWNER#.mip_tripartite.addons_allowed('||chr(10)||
+'p_amr_required => :P32_AMR_REQUIRED'||chr(10)||
+',p_ems_required => :P32_EMS_REQUIRED'||chr(10)||
+',p_bypass_required => :P32_BYPASS_REQUIRED'||chr(10)||
+',p_regi_code  => #OWNER#.mip_regions.get_region_for_postcode(p_postcode => :P32_INSTALL_POSTCODE)'||chr(10)||
+',p_tab_messages => l_tab_messages) THEN'||chr(10)||
+'  l_idx := l_tab_messages.first;'||chr(10)||
+'  loop'||chr(10)||
+'    exit when l_idx is null;'||chr(10)||
+'    l_error_text := l_error_text || l_tab_messages(l_idx);'||chr(10)||
+'    l_idx := l_tab_messages.next(l_idx);'||chr(10)||
+'  end loop;'||chr(10)||
+'  return l_error_text;'||chr(10)||
+'END IF;'||chr(10)||
+'END;',
  p_validation_type => 'FUNC_BODY_RETURNING_ERR_TEXT',
  p_error_message => '',
  p_when_button_pressed=> 28015631689078569 + wwv_flow_api.g_id_offset,
@@ -42285,8 +42380,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 => 'HARDYA',
-  p_last_upd_yyyymmddhh24miss => '20080401160708',
+  p_last_updated_by => 'PRIESTJ',
+  p_last_upd_yyyymmddhh24miss => '20080402170209',
  p_page_is_public_y_n=> 'N',
  p_page_comment  => '');