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

Updated the AdjustCalendarDate() to account for the transition year quirk in the Japanese calendar.

Browse Source
This commit is contained in:
Stephanie Anderl 2019-02-08 12:30:16 -08:00
parent 278a1e714e
commit f8029942d4
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/CalcViewModel/Common/DateCalculator.cpp
View File

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved. // Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. // Licensed under the MIT License.
#include "pch.h" #include "pch.h"
@ -273,12 +273,24 @@ bool DateCalculationEngine::TryGetCalendarDaysInYear(_In_ DateTime date, _Out_ U
// Adds/Subtracts certain value for a particular date unit // Adds/Subtracts certain value for a particular date unit
DateTime DateCalculationEngine::AdjustCalendarDate(Windows::Foundation::DateTime date, DateUnit dateUnit, int difference) DateTime DateCalculationEngine::AdjustCalendarDate(Windows::Foundation::DateTime date, DateUnit dateUnit, int difference)
{ {
auto currentCalendarSystem = m_calendar->GetCalendarSystem();
m_calendar->SetDateTime(date); m_calendar->SetDateTime(date);
switch (dateUnit) switch (dateUnit)
{ {
case DateUnit::Year: case DateUnit::Year:
// In the Japanese calendar, transition years have 2 partial years.
// It is not guaranteed that adding 1 year will always add 365 days in the Japanese Calendar.
// To work around this quirk, we will change the calendar system to Gregorian before adding 1 year in the Japanese Calendar case only.
// We will then return the calendar system back to the Japanese Calendar.
if (currentCalendarSystem == L"JapaneseCalendar")
{
m_calendar->ChangeCalendarSystem(L"GregorianCalendar");
}
m_calendar->AddYears(difference); m_calendar->AddYears(difference);
m_calendar->ChangeCalendarSystem(currentCalendarSystem);
break; break;
case DateUnit::Month: case DateUnit::Month:
m_calendar->AddMonths(difference); m_calendar->AddMonths(difference);