Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 28 additions & 26 deletions EstateReportingAPI/Controllers/Dimensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public DimensionsController(IDbContextFactory<EstateManagementGenericContext> co
#endregion

[HttpGet]
[Route("getcalendaryears")]
[Route("calendar/years")]
public async Task<IActionResult> GetCalendarYears([FromHeader] Guid estateId, CancellationToken cancellationToken){

EstateManagementGenericContext? context = await this.ContextFactory.GetContext(estateId, DimensionsController.ConnectionStringIdentifier, cancellationToken);
Expand All @@ -53,31 +53,33 @@ public async Task<IActionResult> GetCalendarYears([FromHeader] Guid estateId, Ca
return this.Ok(response);
}

//[HttpGet]
//public async Task<IActionResult> GetCalendarDates([FromHeader] Guid estateId, [FromQuery] Int32 year, CancellationToken cancellationToken)
//{
// EstateManagementGenericContext? context = await this.ContextFactory.GetContext(estateId, DimensionsController.ConnectionStringIdentifier, cancellationToken);

// List<Calendar> dates= context.Calendar.Where(c => c.Date <= DateTime.Now.Date).ToList();

// List<CalendarDate> response = new List<CalendarDate>();

// dates.ForEach(d => response.Add(new CalendarDate{
// Year = d.Year,
// Date = d.Date,
// DayOfWeek = d.DayOfWeek,
// DayOfWeekNumber = d.DayOfWeekNumber,
// DayOfWeekShort = d.DayOfWeekShort,
// MonthName = d.MonthNameLong,
// MonthNameShort = d.MonthNameShort,
// MonthNumber = d.MonthNumber,
// WeekNumber = d.WeekNumber ?? 0,
// WeekNumberString = d.WeekNumberString,
// YearWeekNumber = d.YearWeekNumber,
// }));

// return this.Ok();
//}
[HttpGet]
[Route("calendar/{year}/dates")]
public async Task<IActionResult> GetCalendarDates([FromHeader] Guid estateId, [FromRoute] Int32 year, CancellationToken cancellationToken)
{
EstateManagementGenericContext? context = await this.ContextFactory.GetContext(estateId, DimensionsController.ConnectionStringIdentifier, cancellationToken);

List<Calendar> dates = context.Calendar.Where(c => c.Date <= DateTime.Now.Date).ToList();

List<CalendarDate> response = new List<CalendarDate>();

dates.ForEach(d => response.Add(new CalendarDate
{
Year = d.Year,
Date = d.Date,
DayOfWeek = d.DayOfWeek,
DayOfWeekNumber = d.DayOfWeekNumber,
DayOfWeekShort = d.DayOfWeekShort,
MonthName = d.MonthNameLong,
MonthNameShort = d.MonthNameShort,
MonthNumber = d.MonthNumber,
WeekNumber = d.WeekNumber ?? 0,
WeekNumberString = d.WeekNumberString,
YearWeekNumber = d.YearWeekNumber,
}));

return this.Ok(dates);
}
}


Expand Down