This commit is contained in:
@@ -645,56 +645,53 @@ namespace AyaNova.Biz
|
|||||||
|
|
||||||
//=======================
|
//=======================
|
||||||
//NEW ONES FOR RAVEN
|
//NEW ONES FOR RAVEN
|
||||||
case FilterSpecialToken.LastQuarter:
|
|
||||||
//First determine what quarter we are in now, then get the date range for the quarter before that
|
case FilterSpecialToken.LastQuarter:
|
||||||
switch(DateTime.Now.Month)
|
//First determine what quarter we are in now, then get the date range for the quarter before that
|
||||||
{
|
switch (DateTime.Now.Month)
|
||||||
//are we in the first quarter?
|
{
|
||||||
case 1:
|
//are we in the first quarter?
|
||||||
case 2:
|
case 1:
|
||||||
case 3:
|
case 2:
|
||||||
//Then we need the dates of the last quarter of last year
|
case 3:
|
||||||
//From zero hour October 1st last year
|
//Then we need the dates of the last quarter of last year
|
||||||
dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 10, 1, 00, 00, 00);
|
//From zero hour October 1st last year
|
||||||
//To zero hour January 1 this year
|
dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 10, 1, 00, 00, 00);
|
||||||
dtBefore = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
|
//To zero hour January 1 this year
|
||||||
break;
|
dtBefore = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
|
||||||
//are we in the second quarter?
|
break;
|
||||||
case 4:
|
//are we in the second quarter?
|
||||||
case 5:
|
case 4:
|
||||||
case 6:
|
case 5:
|
||||||
//Then we need this year first quarter JAN-FEB-MAR
|
case 6:
|
||||||
//From zero hour january 1 this year
|
//Then we need this year first quarter JAN-FEB-MAR
|
||||||
dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
|
//From zero hour january 1 this year
|
||||||
//To zero hour April 1 this year
|
dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
|
||||||
dtBefore = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00);
|
//To zero hour April 1 this year
|
||||||
break;
|
dtBefore = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00);
|
||||||
//Are we in the third quarter?
|
break;
|
||||||
case 7:
|
//Are we in the third quarter?
|
||||||
case 8:
|
case 7:
|
||||||
case 9:
|
case 8:
|
||||||
//Then we need this year Second quarter APR-MAY-JUN
|
case 9:
|
||||||
//From zero hour April 1 this year
|
//Then we need this year Second quarter APR-MAY-JUN
|
||||||
dtAfter = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00);
|
//From zero hour April 1 this year
|
||||||
//To zero hour July 1 this year
|
dtAfter = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00);
|
||||||
dtBefore = new DateTime(DateTime.Now.Year, 7, 1, 00, 00, 00);
|
//To zero hour July 1 this year
|
||||||
break;
|
dtBefore = new DateTime(DateTime.Now.Year, 7, 1, 00, 00, 00);
|
||||||
default:
|
break;
|
||||||
//We're in the fourth quarter
|
default:
|
||||||
//Then we need this year Third quarter JUL-AUG-SEP
|
//We're in the fourth quarter
|
||||||
//From zero hour July 1 this year
|
//Then we need this year Third quarter JUL-AUG-SEP
|
||||||
dtAfter = new DateTime(DateTime.Now.Year, 7, 1, 00, 00, 00);
|
//From zero hour July 1 this year
|
||||||
//To zero hour Oct 1 this year
|
dtAfter = new DateTime(DateTime.Now.Year, 7, 1, 00, 00, 00);
|
||||||
dtBefore = new DateTime(DateTime.Now.Year, 10, 1, 00, 00, 00);
|
//To zero hour Oct 1 this year
|
||||||
break;
|
dtBefore = new DateTime(DateTime.Now.Year, 10, 1, 00, 00, 00);
|
||||||
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
//From zero hour january 1 this year
|
|
||||||
dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
|
|
||||||
//To now
|
|
||||||
dtBefore = System.DateTime.Now;
|
|
||||||
sb.Append(">'");
|
sb.Append(">'");
|
||||||
sb.Append(PostgresDateFormat(dtAfter));
|
sb.Append(PostgresDateFormat(dtAfter));
|
||||||
sb.Append("') AND (");
|
sb.Append("') AND (");
|
||||||
@@ -718,8 +715,53 @@ namespace AyaNova.Biz
|
|||||||
sb.Append(PostgresDateFormat(dtBefore));
|
sb.Append(PostgresDateFormat(dtBefore));
|
||||||
sb.Append("'");
|
sb.Append("'");
|
||||||
break;
|
break;
|
||||||
|
case FilterSpecialToken.QuarterToDate:
|
||||||
|
switch (DateTime.Now.Month)
|
||||||
|
{
|
||||||
|
//FirstQuarter to date
|
||||||
|
case 1:
|
||||||
|
case 2:
|
||||||
|
case 3:
|
||||||
|
//Jan 1st to now
|
||||||
|
dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
|
||||||
|
dtBefore = DateTime.Now;
|
||||||
|
break;
|
||||||
|
//Second Quarter to date
|
||||||
|
case 4:
|
||||||
|
case 5:
|
||||||
|
case 6:
|
||||||
|
//April 1st to now
|
||||||
|
dtAfter = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00);
|
||||||
|
dtBefore = DateTime.Now;
|
||||||
|
break;
|
||||||
|
//Third quarter to date
|
||||||
|
case 7:
|
||||||
|
case 8:
|
||||||
|
case 9:
|
||||||
|
//From July 1
|
||||||
|
dtAfter = new DateTime(DateTime.Now.Year, 7, 1, 00, 00, 00);
|
||||||
|
dtBefore = DateTime.Now;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
//Fourth quarter to date
|
||||||
|
//From Oct 1 this year
|
||||||
|
dtAfter = new DateTime(DateTime.Now.Year, 10, 1, 00, 00, 00);
|
||||||
|
dtBefore = DateTime.Now;
|
||||||
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
sb.Append(">'");
|
||||||
|
sb.Append(PostgresDateFormat(dtAfter));
|
||||||
|
sb.Append("') AND (");
|
||||||
|
sb.Append(sColumn);
|
||||||
|
sb.Append(" ");
|
||||||
|
sb.Append("<'");
|
||||||
|
sb.Append(PostgresDateFormat(dtBefore));
|
||||||
|
sb.Append("'");
|
||||||
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
Reference in New Issue
Block a user