mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-11 22:03:01 -06:00
Core: GetMonths(Date, Date)
git-svn-id: svn://ultimatepp.org/upp/trunk@6433 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
5ef438b3f8
commit
d3a3328770
5 changed files with 36 additions and 0 deletions
|
|
@ -358,6 +358,11 @@ Date AddMonths(Date date, int months) {
|
|||
return date;
|
||||
}
|
||||
|
||||
int GetMonths(Date since, Date till)
|
||||
{
|
||||
return 12 * till.year + till.month - (12 * since.year + since.month) + (till.day >= since.day) - 1;
|
||||
}
|
||||
|
||||
Date AddYears(Date date, int years) {
|
||||
date.year += years;
|
||||
date.day = min(date.day, LastDayOfMonth(date).day);
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ int DayOfYear(Date d);
|
|||
|
||||
|
||||
Date AddMonths(Date date, int months);
|
||||
int GetMonths(Date since, Date till);
|
||||
Date AddYears(Date date, int years);
|
||||
|
||||
Date GetSysDate();
|
||||
|
|
|
|||
|
|
@ -209,6 +209,20 @@ nth], [@(0.0.255) int]_[*@3 year])&]
|
|||
[s2;%% Adds [%-*@3 months] to [%-*@3 date] and returns the result.&]
|
||||
[s3;%% &]
|
||||
[s4; &]
|
||||
[s5;:GetMonths`(Date`,Date`): [@(0.0.255) int]_[* GetMonths]([_^Date^ Date]_[*@3 since],
|
||||
[_^Date^ Date]_[*@3 till])&]
|
||||
[s2;%% Number of months between two dates.&]
|
||||
[s2;%% Examples:&]
|
||||
[s2;%% [*C@3 ][*C GetMonths(Date(2013, 2, 5), Date(2013, 3, 4))
|
||||
`= 0]&]
|
||||
[s2;%% [*C@3 ][*C GetMonths(Date(2013, 2, 5), Date(2013, 3, 5))
|
||||
`= 1]&]
|
||||
[s2;%% [*C@3 ][*C GetMonths(Date(2013, 8, 31), Date(2013, 9, 30))
|
||||
`= 0]&]
|
||||
[s2;%% [*C@3 ][*C GetMonths(Date(2013, 8, 31), Date(2013, 10, 1))
|
||||
`= 1]&]
|
||||
[s3;%% &]
|
||||
[s4; &]
|
||||
[s5;:AddYears`(Date`,int`): [_^Date^ Date]_[* AddYears]([_^Date^ Date]_[*@3 date],
|
||||
[@(0.0.255) int]_[*@3 years])&]
|
||||
[s2;%% Adds [%-*@3 years] to [%-*@3 date] and returns the result. Note
|
||||
|
|
|
|||
12
uppsrc/Core/src.tpp/DateTime$en-us.tppi
Normal file
12
uppsrc/Core/src.tpp/DateTime$en-us.tppi
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
TITLE("Date and Time")
|
||||
COMPRESSED
|
||||
120,156,181,89,11,115,219,54,18,254,43,152,186,201,216,169,108,3,32,41,82,82,147,113,198,61,39,157,203,163,83,231,174,211,209,80,18,37,66,22,175,20,169,35,64,187,106,38,249,237,221,5,31,34,45,82,146,93,39,86,44,18,88,44,191,253,118,23,187,160,135,156,124,255,61,237,208,35,186,231,95,255,39,49,247,210,80,185,195,192,52,157,129,199,173,193,31,255,254,216,27,224,122,6,235,13,155,25,142,101,48,147,119,225,23,51,24,183,184,97,50,135,247,76,199,48,28,218,159,133,158,148,238,48,228,142,163,23,241,14,63,226,182,197,153,109,58,166,195,12,219,225,176,150,83,202,169,205,45,102,26,14,183,250,190,144,51,119,72,65,220,128,103,244,186,70,143,50,74,109,198,168,193,109,106,88,38,99,6,7,21,220,230,140,90,125,17,249,238,240,109,119,128,11,76,52,202,234,2,244,46,104,51,77,10,218,113,153,105,48,131,114,195,98,61,171,219,159,138,155,32,106,50,201,218,107,146,77,251,129,18,203,220,34,207,28,188,184,176,6,12,150,118,59,221,35,
|
||||
27,30,107,90,240,176,30,90,100,192,50,206,187,86,143,89,38,64,50,41,239,39,226,255,105,144,136,165,136,84,174,33,96,140,179,193,148,217,3,128,240,245,235,215,51,102,210,140,41,27,176,48,10,184,57,131,49,176,195,102,86,143,246,44,135,57,212,176,77,110,217,96,250,202,75,188,101,110,201,212,228,131,220,14,167,227,28,117,89,23,24,165,14,224,183,122,160,128,130,17,240,13,68,90,240,49,156,190,202,23,227,58,92,212,235,244,142,128,36,195,162,118,143,218,166,109,153,96,9,103,93,6,68,82,180,31,220,208,143,226,100,233,133,238,240,243,248,11,25,146,207,159,25,70,201,197,49,56,228,204,228,103,244,132,12,37,29,60,123,70,134,47,46,236,129,73,126,242,148,112,221,47,95,158,187,67,105,224,56,94,176,65,31,199,39,253,73,95,170,36,157,169,62,25,94,28,211,51,122,6,80,79,12,146,13,186,67,131,140,221,225,11,35,83,130,119,125,184,175,10,174,210,105,24,204,10,193,11,99,96,144,95,69,248,113,37,113,232,199,250,226,14,113,135,227,209,
|
||||
251,248,86,120,211,80,140,12,82,92,106,217,154,232,171,241,171,177,139,64,123,136,248,53,145,193,114,21,10,226,195,52,137,167,255,19,51,69,238,2,181,32,233,138,168,152,120,48,177,38,171,68,204,2,25,196,209,89,102,170,54,148,230,22,23,60,93,29,51,238,156,188,209,191,47,216,134,42,114,25,71,153,209,113,66,124,161,188,32,220,144,166,53,89,27,202,244,247,241,228,164,143,11,53,228,227,19,20,225,168,43,79,87,50,219,40,172,2,50,91,180,105,113,242,33,13,67,145,76,158,215,116,87,8,207,180,186,99,224,49,19,29,229,75,170,94,33,147,231,238,6,79,105,24,241,34,34,150,43,181,214,52,30,130,41,136,212,164,83,254,106,131,4,115,0,8,124,79,214,110,135,52,207,44,91,103,252,38,168,82,187,20,124,61,245,164,240,73,28,145,225,179,211,236,9,197,213,178,188,242,221,179,90,108,27,135,186,252,23,29,187,228,189,88,78,69,66,222,5,64,108,171,203,33,192,192,252,241,104,186,86,98,68,240,55,226,199,184,115,55,158,247,214,117,36,219,
|
||||
188,46,227,72,45,154,20,233,137,141,170,247,120,187,219,69,107,225,37,90,19,112,201,186,35,162,191,180,46,156,217,168,250,29,238,118,107,186,22,73,224,133,193,95,224,241,107,149,8,111,153,199,95,197,95,183,113,224,107,221,165,44,196,192,120,148,137,143,72,246,125,63,6,51,7,203,138,131,203,213,82,199,17,228,238,249,60,137,151,133,39,165,187,143,191,159,229,127,97,189,143,201,167,51,161,142,114,26,199,161,70,153,139,65,90,142,183,147,167,68,243,171,80,105,18,73,2,33,39,72,48,39,106,145,239,48,129,36,183,184,126,31,109,42,75,145,118,174,84,91,166,200,153,23,130,147,54,204,188,150,50,184,137,138,176,87,11,79,33,10,9,155,7,196,127,16,105,108,81,186,4,254,102,37,91,153,142,125,148,189,65,152,141,116,229,112,200,27,196,185,147,41,72,204,91,145,64,90,34,12,21,44,5,174,197,125,183,128,4,116,165,123,182,148,203,120,9,213,14,98,76,15,236,194,147,75,234,8,67,225,81,182,233,100,204,77,221,61,72,245,218,60,190,116,141,200,
|
||||
233,154,194,22,148,228,30,159,156,50,116,248,143,211,14,161,120,49,121,57,121,73,224,70,143,190,34,211,125,156,198,43,145,120,224,155,201,15,240,147,21,130,26,212,237,68,32,213,37,213,114,129,53,80,98,17,211,30,22,127,42,220,83,118,51,89,170,58,133,159,7,62,29,150,180,62,29,10,232,109,16,167,114,63,130,119,241,93,254,224,202,163,164,242,20,180,2,100,203,107,4,196,171,15,45,243,14,158,25,198,119,2,234,222,42,134,248,159,22,21,254,24,119,48,130,13,211,201,110,28,111,131,155,197,67,128,160,124,27,146,5,204,29,12,133,14,170,21,166,189,249,250,4,185,114,175,168,64,235,133,163,7,183,94,90,197,129,173,87,181,211,122,104,151,86,60,231,128,46,173,16,221,213,165,233,93,162,169,85,147,2,82,214,111,235,214,158,172,87,43,56,214,223,69,175,166,129,63,166,87,171,107,107,236,213,50,221,79,211,171,201,77,175,134,60,182,109,71,117,84,245,110,173,211,212,188,109,99,252,167,205,91,219,204,194,29,79,94,194,70,109,16,218,42,19,29,
|
||||
32,35,43,50,45,141,162,142,180,195,26,197,226,106,81,94,69,238,254,230,163,78,243,85,16,10,125,85,163,116,60,42,198,71,164,184,202,77,152,195,45,98,108,198,95,2,247,200,42,244,212,28,14,119,68,174,32,55,230,155,74,95,106,168,35,60,48,91,14,105,115,11,19,23,113,154,52,181,167,56,190,41,178,111,225,110,119,158,44,131,40,85,162,177,209,213,51,149,78,87,223,239,214,150,109,25,77,218,178,153,141,182,107,125,191,91,91,115,209,184,13,18,149,194,177,186,173,146,100,174,45,220,250,176,74,162,35,116,111,81,43,240,53,22,215,7,194,123,64,197,173,128,155,156,30,0,175,104,123,187,230,158,198,87,159,76,186,166,62,153,116,205,189,141,175,198,241,20,141,111,1,180,189,241,221,144,185,141,241,27,119,195,5,184,111,122,144,249,164,49,229,135,24,162,27,238,205,173,7,197,23,211,249,60,203,196,243,188,30,107,204,176,157,38,104,13,73,188,232,70,236,9,132,215,178,220,10,43,86,180,109,132,100,35,126,16,189,16,162,247,233,149,107,169,68,101,
|
||||
119,220,162,153,62,172,57,211,188,32,29,154,175,121,26,205,20,244,35,178,216,29,105,165,221,92,127,156,255,38,196,31,197,225,165,249,220,82,138,53,159,92,176,45,170,4,62,72,151,133,9,103,48,122,112,131,142,231,250,109,22,124,221,129,42,56,159,92,167,17,14,76,78,73,151,92,123,224,105,191,253,61,195,207,242,157,240,86,120,228,111,60,154,86,226,170,144,107,109,7,68,45,77,239,135,88,81,102,81,10,99,43,4,117,228,24,60,150,232,80,227,61,52,66,98,40,93,137,105,146,122,201,58,75,102,72,111,92,115,210,102,0,100,31,16,35,63,206,245,27,144,74,83,211,194,121,93,190,205,152,236,237,74,91,143,209,98,170,87,247,136,54,166,232,41,180,62,156,168,242,208,102,211,59,79,42,29,27,185,77,101,12,109,31,148,106,146,45,97,212,0,213,175,196,146,75,66,208,82,196,16,230,208,178,124,153,68,7,250,141,55,172,252,215,159,30,246,234,253,250,232,240,197,37,168,200,254,65,167,127,121,15,144,70,126,204,41,99,29,210,235,16,110,156,64,255,
|
||||
250,146,76,190,51,232,121,239,28,199,39,223,185,45,36,92,5,201,161,44,220,19,125,44,13,115,84,243,212,60,96,202,180,210,192,246,178,80,211,115,80,36,228,57,250,36,129,176,46,94,5,126,35,251,13,118,206,248,193,113,176,143,130,186,228,227,56,32,238,86,20,60,158,132,58,160,29,81,192,246,112,208,100,126,91,61,249,39,182,111,85,20,180,189,67,244,223,222,162,32,186,33,250,229,43,123,28,27,141,68,192,135,103,60,240,54,227,95,251,190,78,107,153,27,95,238,238,91,1,80,74,238,168,167,173,103,214,108,97,165,207,244,125,89,219,190,165,139,239,35,106,21,24,123,129,164,210,42,39,66,166,161,218,81,170,234,134,236,242,101,41,220,108,139,12,162,153,54,166,97,78,5,97,88,49,228,67,233,212,204,12,112,167,130,78,1,138,235,93,172,237,144,103,165,108,238,74,217,47,71,182,220,88,2,43,221,104,128,15,59,196,58,233,144,202,8,124,204,204,177,212,125,10,101,86,166,140,61,84,153,3,171,89,93,27,36,159,65,31,137,173,65,29,163,240,191,
|
||||
138,174,57,134,49,242,15,10,97,45,248,136,8,94,235,117,205,1,156,205,29,26,191,228,67,92,252,77,65,45,160,57,131,79,20,43,226,201,226,133,29,92,121,190,143,27,130,62,6,122,74,37,193,52,197,63,181,206,179,38,121,42,102,94,42,245,189,110,244,244,243,119,228,5,54,151,217,81,92,238,222,226,234,178,45,44,169,166,62,52,59,22,230,153,160,65,101,7,25,153,25,186,0,155,226,217,44,197,83,164,78,46,189,2,14,204,137,194,5,185,185,245,117,144,103,37,159,170,181,155,3,200,255,249,116,89,90,87,190,10,106,62,74,110,68,181,113,245,99,58,38,247,114,175,113,5,190,204,12,214,179,233,228,148,193,167,3,79,154,133,233,150,33,187,206,197,87,176,225,3,164,234,1,126,235,221,65,69,174,245,20,159,155,84,123,163,149,157,137,139,51,122,46,209,128,90,191,13,174,49,159,217,33,252,14,70,244,167,173,23,158,112,16,115,221,191,1,220,1,127,93,
|
||||
|
||||
|
|
@ -1,3 +1,7 @@
|
|||
TOPIC("DateTime$en-us")
|
||||
#include "DateTime$en-us.tppi"
|
||||
END_TOPIC
|
||||
|
||||
TOPIC("MathUtil$en-us")
|
||||
#include "MathUtil$en-us.tppi"
|
||||
END_TOPIC
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue