DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove adjustment from local time (#834)

Browse Source
This commit is contained in:
Jay Windsor 2020-03-25 04:20:13 -07:00 committed by GitHub
parent 15944fcd10
commit 7b51b45906
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CalcViewModel/DateCalculatorViewModel.cpp
View File

@ -60,7 +60,7 @@ DateCalculatorViewModel::DateCalculatorViewModel()
auto today = calendar->GetDateTime(); auto today = calendar->GetDateTime();
// FromDate and ToDate should be clipped (adjusted to a consistent hour in UTC) // 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 // StartDate should not be clipped
m_startDate = today; m_startDate = today;
@ -83,7 +83,7 @@ DateCalculatorViewModel::DateCalculatorViewModel()
DayOfWeek trueDayOfWeek = calendar->DayOfWeek; DayOfWeek trueDayOfWeek = calendar->DayOfWeek;
DateTime clippedTime = ClipTime(today, false); DateTime clippedTime = ClipTime(today);
calendar->SetDateTime(clippedTime); calendar->SetDateTime(clippedTime);
if (calendar->DayOfWeek != trueDayOfWeek) if (calendar->DayOfWeek != trueDayOfWeek)
{ {
@ -113,8 +113,8 @@ void DateCalculatorViewModel::OnInputsChanged()
{ {
if (m_IsDateDiffMode) if (m_IsDateDiffMode)
{ {
DateTime clippedFromDate = ClipTime(FromDate, true); DateTime clippedFromDate = ClipTime(FromDate);
DateTime clippedToDate = ClipTime(ToDate, true); DateTime clippedToDate = ClipTime(ToDate);
// Calculate difference between two dates // Calculate difference between two dates
auto dateDiff = m_dateCalcEngine->TryGetDateDifference(clippedFromDate, clippedToDate, m_daysOutputFormat); auto dateDiff = m_dateCalcEngine->TryGetDateDifference(clippedFromDate, clippedToDate, m_daysOutputFormat);

2
src/CalcViewModel/DateCalculatorViewModel.h
View File

@ -110,7 +110,7 @@ namespace CalculatorApp
Platform::String ^ GetDateDiffString() const; Platform::String ^ GetDateDiffString() const;
Platform::String ^ GetDateDiffStringInDays() const; Platform::String ^ GetDateDiffStringInDays() const;
Platform::String ^ GetLocalizedNumberString(int value) 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 property bool IsOutOfBound
{ {