From f9685c981d9a45a5539933c6d74672fb7bc0a880 Mon Sep 17 00:00:00 2001 From: Kjetil Kilhavn Date: Sat, 20 Apr 2024 09:53:31 +0200 Subject: [PATCH 1/2] Convert fields with date & time value correctly to just date or just time (#1197) * Convert fields with date Ignore decimals when converting to date and ignore integer when converting to time Fix #1132 * New ip_exact parameter of excel_string_to_date - I'm not comfortable about changing the logic in `excel_string_to_date`, in case other people have implemented a "-1 day" fix after the call, so I added a parameter `ip_exact` to keep an ascending compatibility. - I reused the old structure of unit tests to simplify the diff - fix #1205 (I added this time issue that you fixed, the original issue mentioned only the date issue) --------- Co-authored-by: sandraros --- src/zcl_excel_common.clas.abap | 25 ++++++++-- src/zcl_excel_common.clas.testclasses.abap | 55 ++++++++++++++++++++++ src/zcl_excel_worksheet.clas.abap | 3 +- 3 files changed, 79 insertions(+), 4 deletions(-) diff --git a/src/zcl_excel_common.clas.abap b/src/zcl_excel_common.clas.abap index 9d9300a..67a9e6c 100644 --- a/src/zcl_excel_common.clas.abap +++ b/src/zcl_excel_common.clas.abap @@ -102,9 +102,22 @@ CLASS zcl_excel_common DEFINITION VALUE(ev_unescaped_string) TYPE string RAISING zcx_excel . + "!

Convert date from Excel format to SAP

+ "! @parameter ip_value | String being an Excel number representing a date (e.g. 45141 means 2023/08/03, + "! 45141.58832 means 2023/08/03 14:07:11). Important: if the input is date + + "! time, use the additional parameter IP_EXACT = 'X'. + "! @parameter ip_exact | If the input value also contains the time i.e. a fractional part exists + "! (e.g. 45141.58832 means 2023/08/03 14:07:11), ip_exact = 'X' will + "! return the exact date (e.g. 2023/08/03), while ip_exact = ' ' (default) will + "! return the rounded-up date (e.g. 2023/08/04). NB: this rounding-up doesn't + "! happen if the time is before 12:00:00. + "! @parameter ep_value | Date corresponding to the input Excel number. It returns a null date if + "! the input value contains non-numeric characters. + "! @raising zcx_excel | The numeric input corresponds to a date before 1900/1/1 or after 9999/12/31. CLASS-METHODS excel_string_to_date IMPORTING !ip_value TYPE zexcel_cell_value + !ip_exact TYPE abap_bool DEFAULT abap_false RETURNING VALUE(ep_value) TYPE d RAISING @@ -860,11 +873,16 @@ CLASS zcl_excel_common IMPLEMENTATION. METHOD excel_string_to_date. DATA: lv_date_int TYPE i. + DATA lv_error_text TYPE string. CHECK ip_value IS NOT INITIAL AND ip_value CN ' 0'. TRY. - lv_date_int = ip_value. + IF ip_exact = abap_false. + lv_date_int = ip_value. + ELSE. + lv_date_int = trunc( ip_value ). + ENDIF. IF lv_date_int NOT BETWEEN 1 AND 2958465. zcx_excel=>raise_text( 'Unable to interpret date' ). ENDIF. @@ -876,7 +894,8 @@ CLASS zcl_excel_common IMPLEMENTATION. ep_value = ep_value + 1. ENDIF. CATCH cx_sy_conversion_error. - zcx_excel=>raise_text( 'Index out of bounds' ). + lv_error_text = |String "{ ip_value }" is not a valid Excel date|. + zcx_excel=>raise_text( lv_error_text ). ENDTRY. ENDMETHOD. @@ -898,7 +917,7 @@ CLASS zcl_excel_common IMPLEMENTATION. TRY. - lv_day_fraction = ip_value. + lv_day_fraction = frac( ip_value ). lv_seconds_in_day = lv_day_fraction * lc_seconds_in_day. ep_value = lv_seconds_in_day. diff --git a/src/zcl_excel_common.clas.testclasses.abap b/src/zcl_excel_common.clas.testclasses.abap index 011dc9d..bf5f471 100644 --- a/src/zcl_excel_common.clas.testclasses.abap +++ b/src/zcl_excel_common.clas.testclasses.abap @@ -55,6 +55,7 @@ CLASS lcl_excel_common_test DEFINITION FOR TESTING METHODS excel_string_to_time3 FOR TESTING RAISING cx_static_check. METHODS excel_string_to_time4 FOR TESTING RAISING cx_static_check. METHODS excel_string_to_time5 FOR TESTING RAISING cx_static_check. + METHODS excel_string_to_time6 FOR TESTING RAISING cx_static_check. METHODS time_to_excel_string1 FOR TESTING RAISING cx_static_check. METHODS time_to_excel_string2 FOR TESTING RAISING cx_static_check. METHODS time_to_excel_string3 FOR TESTING RAISING cx_static_check. @@ -688,6 +689,45 @@ CLASS lcl_excel_common_test IMPLEMENTATION. level = if_aunit_constants=>fatal ). ENDTRY. + +* 45141.58832 (2023/08/03 14:07:11) ip_exact = abap_false -> 2023/08/04 + TRY. + ep_value = zcl_excel_common=>excel_string_to_date( ip_value = '45141.58832' + ip_exact = abap_false ). + cl_abap_unit_assert=>assert_equals( + act = ep_value + exp = '20230804' ). + CATCH zcx_excel INTO lx_excel. + cl_abap_unit_assert=>fail( + msg = 'unexpected exception' + level = if_aunit_constants=>critical ). + ENDTRY. + +* 45141.58832 (2023/08/03 14:07:11) ip_exact = abap_true -> 2023/08/03 + TRY. + ep_value = zcl_excel_common=>excel_string_to_date( ip_value = '45141.58832' + ip_exact = abap_true ). + cl_abap_unit_assert=>assert_equals( + act = ep_value + exp = '20230803' ). + CATCH zcx_excel INTO lx_excel. + cl_abap_unit_assert=>fail( + msg = 'unexpected exception' + level = if_aunit_constants=>critical ). + ENDTRY. + +* 45141.48832 (2023/08/03 11:43:11) ip_exact = abap_false -> 2023/08/03 + TRY. + ep_value = zcl_excel_common=>excel_string_to_date( ip_value = '45141.48832' + ip_exact = abap_false ). + cl_abap_unit_assert=>assert_equals( + act = ep_value + exp = '20230803' ). + CATCH zcx_excel INTO lx_excel. + cl_abap_unit_assert=>fail( + msg = 'unexpected exception' + level = if_aunit_constants=>critical ). + ENDTRY. ENDMETHOD. "excel_String_To_Date @@ -767,6 +807,21 @@ CLASS lcl_excel_common_test IMPLEMENTATION. ENDTRY. ENDMETHOD. + METHOD excel_string_to_time6. + DATA ep_value TYPE t. +* 45141.58832 (2023/08/03 14:07:11) -> 14:07:11 + TRY. + ep_value = zcl_excel_common=>excel_string_to_time( ip_value = '45141.58832' ). + + cl_abap_unit_assert=>assert_equals( + act = ep_value + exp = '140711' ). + + CATCH zcx_excel INTO lx_excel. + cl_abap_unit_assert=>fail( lx_excel->get_text( ) ). + ENDTRY. + ENDMETHOD. + METHOD time_to_excel_string1. DATA ep_value TYPE zexcel_cell_value. diff --git a/src/zcl_excel_worksheet.clas.abap b/src/zcl_excel_worksheet.clas.abap index 81b24f0..cfa86a3 100644 --- a/src/zcl_excel_worksheet.clas.abap +++ b/src/zcl_excel_worksheet.clas.abap @@ -2328,7 +2328,8 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. IF sy-subrc EQ 0. CASE ls_style_conv-abap_type. WHEN cl_abap_typedescr=>typekind_date. - = zcl_excel_common=>excel_string_to_date( -cell_value ). + = zcl_excel_common=>excel_string_to_date( ip_value = -cell_value + ip_exact = abap_true ). WHEN cl_abap_typedescr=>typekind_time. = zcl_excel_common=>excel_string_to_time( -cell_value ). ENDCASE. From 191bf9cf61f41f008bb9e77e4fab868f8bb441e6 Mon Sep 17 00:00:00 2001 From: Bernd <135710507+darnoc312@users.noreply.github.com> Date: Sat, 20 Apr 2024 12:26:15 +0200 Subject: [PATCH 2/2] Update zcl_excel_writer_2007.clas.locals_imp.abap (#1200) solves #1113 --- src/zcl_excel_writer_2007.clas.locals_imp.abap | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/zcl_excel_writer_2007.clas.locals_imp.abap b/src/zcl_excel_writer_2007.clas.locals_imp.abap index 0ae8e20..ae9def7 100644 --- a/src/zcl_excel_writer_2007.clas.locals_imp.abap +++ b/src/zcl_excel_writer_2007.clas.locals_imp.abap @@ -1730,7 +1730,7 @@ CLASS lcl_create_xl_sheet IMPLEMENTATION. value = lv_value ). o_element_root->append_child( new_child = lo_element ). - ADD 1 TO v_relation_id. " +1 for comments (not referenced in XL sheet but let's reserve the rId) + ADD 1 TO v_relation_id. "for xl/comments.xml (not referenced in XL sheet but counted in sheet rels) ENDIF. * End - Add - Issue #180 ENDMETHOD. @@ -1753,7 +1753,6 @@ CLASS lcl_create_xl_sheet IMPLEMENTATION. lo_element->set_attribute( name = 'r:id' value = lv_value ). o_element_root->append_child( new_child = lo_element ). - ADD 1 TO v_relation_id. " +1 for comments (not referenced in XL sheet but let's reserve the rId) ENDIF. * ENDMETHOD.