mirror of
https://github.com/abap2xlsx/abap2xlsx.git
synced 2025-05-04 20:28:22 +08:00
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 <sandra.rossi@gmail.com>
This commit is contained in:
Kjetil Kilhavn
GitHub
parent
0f473095e1
commit
f9685c981d
|
|
@ -102,9 +102,22 @@ CLASS zcl_excel_common DEFINITION
|
|||
VALUE(ev_unescaped_string) TYPE string
|
||||
RAISING
|
||||
zcx_excel .
|
||||
"! <p class="shorttext synchronized" lang="en">Convert date from Excel format to SAP</p>
|
||||
"! @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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
<lv_data> = zcl_excel_common=>excel_string_to_date( <ls_sheet_content>-cell_value ).
|
||||
<lv_data> = zcl_excel_common=>excel_string_to_date( ip_value = <ls_sheet_content>-cell_value
|
||||
ip_exact = abap_true ).
|
||||
WHEN cl_abap_typedescr=>typekind_time.
|
||||
<lv_data> = zcl_excel_common=>excel_string_to_time( <ls_sheet_content>-cell_value ).
|
||||
ENDCASE.
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user