From 7b51b459064b9813c9299dcacaa6c4e56ebb2fcc Mon Sep 17 00:00:00 2001 From: Jay Windsor Date: Wed, 25 Mar 2020 04:20:13 -0700 Subject: [PATCH] Remove adjustment from local time (#834) --- src/CalcViewModel/DateCalculatorViewModel.cpp | 8 ++++---- src/CalcViewModel/DateCalculatorViewModel.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/CalcViewModel/DateCalculatorViewModel.cpp b/src/CalcViewModel/DateCalculatorViewModel.cpp index 20ee012..a34c128 100644 --- a/src/CalcViewModel/DateCalculatorViewModel.cpp +++ b/src/CalcViewModel/DateCalculatorViewModel.cpp @@ -60,7 +60,7 @@ DateCalculatorViewModel::DateCalculatorViewModel() auto today = calendar->GetDateTime(); // FromDate and ToDate should be clipped (adjusted to a consistent hour in UTC) - m_fromDate = m_toDate = ClipTime(today, true); + m_fromDate = m_toDate = ClipTime(today); // StartDate should not be clipped m_startDate = today; @@ -83,7 +83,7 @@ DateCalculatorViewModel::DateCalculatorViewModel() DayOfWeek trueDayOfWeek = calendar->DayOfWeek; - DateTime clippedTime = ClipTime(today, false); + DateTime clippedTime = ClipTime(today); calendar->SetDateTime(clippedTime); if (calendar->DayOfWeek != trueDayOfWeek) { @@ -113,8 +113,8 @@ void DateCalculatorViewModel::OnInputsChanged() { if (m_IsDateDiffMode) { - DateTime clippedFromDate = ClipTime(FromDate, true); - DateTime clippedToDate = ClipTime(ToDate, true); + DateTime clippedFromDate = ClipTime(FromDate); + DateTime clippedToDate = ClipTime(ToDate); // Calculate difference between two dates auto dateDiff = m_dateCalcEngine->TryGetDateDifference(clippedFromDate, clippedToDate, m_daysOutputFormat); diff --git a/src/CalcViewModel/DateCalculatorViewModel.h b/src/CalcViewModel/DateCalculatorViewModel.h index d9e73f4..4857378 100644 --- a/src/CalcViewModel/DateCalculatorViewModel.h +++ b/src/CalcViewModel/DateCalculatorViewModel.h @@ -110,7 +110,7 @@ namespace CalculatorApp Platform::String ^ GetDateDiffString() const; Platform::String ^ GetDateDiffStringInDays() const; Platform::String ^ GetLocalizedNumberString(int value) const; - static Windows::Foundation::DateTime ClipTime(Windows::Foundation::DateTime dateTime, bool adjustToLocalTime); + static Windows::Foundation::DateTime ClipTime(Windows::Foundation::DateTime dateTime, bool adjustUsingLocalTime = false); property bool IsOutOfBound {