sirtimbly/IronCalc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Adds test for TIME/HOUR/MINUTE/SECOND (#456)

Browse Source
This commit is contained in:
Nicolás Hatcher Andrés
2025-10-19 15:38:11 +02:00
committed by GitHub
parent d9812876e2
commit 330a018202
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
base/src/functions/date_and_time.rs
View File

@@ -66,6 +66,7 @@ use crate::formatter::dates::date_to_serial_number;
use crate::formatter::dates::permissive_date_to_serial_number; use crate::formatter::dates::permissive_date_to_serial_number;
use crate::formatter::dates::DATE_OUT_OF_RANGE_MESSAGE; use crate::formatter::dates::DATE_OUT_OF_RANGE_MESSAGE;
use crate::model::get_milliseconds_since_epoch; use crate::model::get_milliseconds_since_epoch;
use crate::number_format::to_precision;
use crate::{ use crate::{
calc_result::CalcResult, calc_result::CalcResult,
constants::EXCEL_DATE_BASE, constants::EXCEL_DATE_BASE,
@@ -1001,17 +1002,16 @@ impl Model {
Ok(f) => f, Ok(f) => f,
Err(e) => return e, Err(e) => return e,
}; };
if hour < 0.0 || minute < 0.0 || second < 0.0 { let total_seconds = hour.floor() * 3600.0 + minute.floor() * 60.0 + second.floor();
if total_seconds < 0.0 {
return CalcResult::Error { return CalcResult::Error {
error: Error::NUM, error: Error::NUM,
origin: cell, origin: cell,
message: "Invalid time".to_string(), message: "Invalid time".to_string(),
}; };
} }
let total_seconds = hour.floor() * 3600.0 + minute.floor() * 60.0 + second.floor(); let secs = total_seconds.rem_euclid(SECONDS_PER_DAY_F64);
let day_seconds = 24.0 * 3600.0; CalcResult::Number(secs / SECONDS_PER_DAY_F64)
let secs = total_seconds.rem_euclid(day_seconds);
CalcResult::Number(secs / day_seconds)
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@@ -1024,7 +1024,7 @@ impl Model {
((total_seconds / 60.0) as i64 % 60) as f64 ((total_seconds / 60.0) as i64 % 60) as f64
}); });
time_part_fn!(fn_second, |v: f64| { time_part_fn!(fn_second, |v: f64| {
let total_seconds = (v.rem_euclid(1.0) * SECONDS_PER_DAY_F64).floor(); let total_seconds = to_precision(v.rem_euclid(1.0) * SECONDS_PER_DAY_F64, 15).floor();
(total_seconds as i64 % 60) as f64 (total_seconds as i64 % 60) as f64
}); });

BIN
xlsx/tests/calc_tests/TIME_HOUR_MINUTE_SECOND.xlsx Normal file
View File

Binary file not shown.