SAP/abap2xlsx
1
0
Fork 0
mirror of https://github.com/abap2xlsx/abap2xlsx.git synced 2025-05-04 20:28:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

How to get rid of the obscure code in writer's method create_xl_sheet_sheet_data step #1 (#1231)

Browse Source 
Fix #440
This commit is contained in:
Bernd 2024-06-15 12:07:36 +02:00 committed by GitHub
parent d25eb31d78
commit 48db7f0b1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/zcl_excel_autofilter.clas.abap
View File

@ -19,7 +19,7 @@ CLASS zcl_excel_autofilter DEFINITION
tr_textfilter2 TYPE RANGE OF string,
END OF ts_filter .
TYPES:
tt_filters TYPE HASHED TABLE OF ts_filter WITH UNIQUE KEY column .
tt_filters TYPE SORTED TABLE OF ts_filter WITH UNIQUE KEY column .
DATA filter_area TYPE zexcel_s_autofilter_area .
CONSTANTS mc_filter_rule_single_values TYPE tv_filter_rule VALUE 'single_values'. "#EC NOTEXT
@ -208,9 +208,6 @@ CLASS zcl_excel_autofilter IMPLEMENTATION.
METHOD is_row_hidden.
DATA: lr_filter TYPE REF TO ts_filter,
lv_col TYPE i.
FIELD-SYMBOLS: <ls_filter> TYPE ts_filter.
rv_is_hidden = abap_false.
@ -219,29 +216,25 @@ CLASS zcl_excel_autofilter IMPLEMENTATION.
* 1st row of filter area is never hidden, because here the filter
* symbol is being shown
*--------------------------------------------------------------------*
IF iv_row = me->filter_area-row_start.
IF iv_row <= me->filter_area-row_start OR
iv_row > me->filter_area-row_end.
RETURN.
ENDIF.
lv_col = me->filter_area-col_start.
WHILE lv_col <= me->filter_area-col_end.
lr_filter = me->get_column_filter( lv_col ).
ASSIGN lr_filter->* TO <ls_filter>.
LOOP AT mt_filters ASSIGNING <ls_filter> WHERE column >= me->filter_area-col_start
AND column <= me->filter_area-col_end.
CASE <ls_filter>-rule.
WHEN mc_filter_rule_single_values.
rv_is_hidden = me->is_row_hidden_single_values( iv_row = iv_row
iv_col = lv_col
iv_col = <ls_filter>-column
is_filter = <ls_filter> ).
WHEN mc_filter_rule_text_pattern.
rv_is_hidden = me->is_row_hidden_text_pattern( iv_row = iv_row
iv_col = lv_col
iv_col = <ls_filter>-column
is_filter = <ls_filter> ).
ENDCASE.
@ -250,10 +243,7 @@ CLASS zcl_excel_autofilter IMPLEMENTATION.
RETURN.
ENDIF.
ADD 1 TO lv_col.
ENDWHILE.
ENDLOOP.
ENDMETHOD.

48
src/zcl_excel_writer_2007.clas.abap
View File

@ -4233,10 +4233,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
DATA: col_count TYPE int4,
lo_autofilters TYPE REF TO zcl_excel_autofilters,
lo_autofilter TYPE REF TO zcl_excel_autofilter,
l_autofilter_hidden TYPE flag,
lt_values TYPE zexcel_t_autofilter_values,
ls_values TYPE zexcel_s_autofilter_values,
ls_area TYPE zexcel_s_autofilter_area,
lo_iterator TYPE REF TO zcl_excel_collection_iterator,
lo_table TYPE REF TO zcl_excel_table,
@ -4282,9 +4278,8 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lo_autofilters = excel->get_autofilters_reference( ).
lo_autofilter = lo_autofilters->get( io_worksheet = io_worksheet ) .
IF lo_autofilter IS BOUND.
lt_values = lo_autofilter->get_values( ) .
ls_area = lo_autofilter->get_filter_area( ) .
l_autofilter_hidden = abap_true. " First defautl is not showing
* Area not used here, but makes the validation for lo_autofilter->is_row_hidden
lo_autofilter->get_filter_area( ) .
ENDIF.
*--------------------------------------------------------------------*
*issue #220 - If cell in tables-area don't use default from row or column or sheet - Coding 1 - start
@ -4347,14 +4342,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
CLEAR ls_sheet_content.
LOOP AT io_worksheet->sheet_content INTO ls_sheet_content.
IF lt_values IS INITIAL. " no values attached to autofilter " issue #368 autofilter filtering too much
CLEAR l_autofilter_hidden.
ELSE.
READ TABLE lt_values INTO ls_values WITH KEY column = ls_last_row-cell_column.
IF sy-subrc = 0 AND ls_values-value = ls_last_row-cell_value.
CLEAR l_autofilter_hidden.
ENDIF.
ENDIF.
CLEAR ls_style_mapping.
*Create row element
*issues #346,#154, #195 - problems when we have information in row_dimension but no cell content in that row
@ -4385,18 +4372,11 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
ENDIF.
IF ls_last_row-cell_row NE <ls_sheet_content>-cell_row.
IF lo_autofilter IS BOUND.
IF ls_area-row_start >= ls_last_row-cell_row OR " One less for header
ls_area-row_end < ls_last_row-cell_row .
CLEAR l_autofilter_hidden.
ENDIF.
ELSE.
CLEAR l_autofilter_hidden.
ENDIF.
IF ls_last_row-cell_row IS NOT INITIAL.
" Row visibility of previos row.
IF lo_row->get_visible( io_worksheet ) = abap_false OR
l_autofilter_hidden = abap_true.
( lo_autofilter IS BOUND AND
lo_autofilter->is_row_hidden( ls_last_row-cell_row ) = abap_true ).
lo_element_2->set_attribute_ns( name = 'hidden' value = 'true' ).
ENDIF.
rv_ixml_sheet_data_root->append_child( new_child = lo_element_2 ). " row node
@ -4444,11 +4424,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lo_element_2->set_attribute_ns( name = 's' value = lv_value ).
lo_element_2->set_attribute_ns( name = 'customFormat' value = '1' ).
ENDIF.
IF lt_values IS INITIAL. " no values attached to autofilter " issue #368 autofilter filtering too much
CLEAR l_autofilter_hidden.
ELSE.
l_autofilter_hidden = abap_true. " First default is not showing
ENDIF.
ELSE.
ENDIF.
@ -4561,21 +4536,10 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
ls_last_row = <ls_sheet_content>.
ENDLOOP.
IF sy-subrc = 0.
READ TABLE lt_values INTO ls_values WITH KEY column = ls_last_row-cell_column.
IF sy-subrc = 0 AND ls_values-value = ls_last_row-cell_value.
CLEAR l_autofilter_hidden.
ENDIF.
IF lo_autofilter IS BOUND.
IF ls_area-row_start >= ls_last_row-cell_row OR " One less for header
ls_area-row_end < ls_last_row-cell_row .
CLEAR l_autofilter_hidden.
ENDIF.
ELSE.
CLEAR l_autofilter_hidden.
ENDIF.
" Row visibility of previos row.
IF lo_row->get_visible( ) = abap_false OR
l_autofilter_hidden = abap_true.
( lo_autofilter IS BOUND AND
lo_autofilter->is_row_hidden( ls_last_row-cell_row ) = abap_true ).
lo_element_2->set_attribute_ns( name = 'hidden' value = 'true' ).
ENDIF.
rv_ixml_sheet_data_root->append_child( new_child = lo_element_2 ). " row node