admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-09-14 22:23:59 +00:00
parent 8e024fd305
commit eb83fd050e
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -52,7 +52,7 @@
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
"AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE": "false",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"

13
server/AyaNova/Controllers/ScheduleController.cs
View File

@@ -55,21 +55,26 @@ namespace AyaNova.Api.Controllers
var UserId = UserIdFromContext.Id(HttpContext.Items); var UserId = UserIdFromContext.Id(HttpContext.Items);
var UType = UserTypeFromContext.Type(HttpContext.Items); var UType = UserTypeFromContext.Type(HttpContext.Items);
//this covers the largest possible window that could display due to nearly a week of the last or next month showing
DateTime dtStart = p.Start.AddDays(-6);
DateTime dtEnd = p.End.AddDays(6);
//WORKORDERS //WORKORDERS
if (p.WorkOrders && (UType == UserType.Service || UType == UserType.ServiceContractor)) if (p.WorkOrders && (UType == UserType.Service || UType == UserType.ServiceContractor))
{ {
r.AddRange(await ct.ViewSchedulePersonalWorkOrder.Where(x => x.SchedUserId == UserId) r.AddRange(await ct.ViewSchedulePersonalWorkOrder.Where(x => x.SchedUserId == UserId && x.StartDate > dtStart && x.StopDate < dtEnd)
.Select(x => new PersonalScheduleListItem() { Id = x.WoItemSchedUserId, Color = ColorFromWOItem(x, p), Start = x.StartDate, End = x.StopDate, Type = AyaType.WorkOrderItemScheduledUser, Name = NameFromWOItem(x, p) }) .Select(x => new PersonalScheduleListItem() { Id = x.WoItemSchedUserId, Color = ColorFromWOItem(x, p), Start = x.StartDate, End = x.StopDate, Type = AyaType.WorkOrderItemScheduledUser, Name = NameFromWOItem(x, p) })
.ToListAsync()); .ToListAsync());
} }
return Ok(r); return Ok(ApiOkResponse.Response(r));
} }
private string ColorFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p) private static string ColorFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p)
{ {
switch (p.ColorSource) switch (p.ColorSource)
{ {
@@ -83,7 +88,7 @@ namespace AyaNova.Api.Controllers
return string.Empty; return string.Empty;
} }
private string NameFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p) private static string NameFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p)
{ {
// Name=[wonumber customername] // Name=[wonumber customername]
return v.Serial.ToString() + " " + v.CustomerName; return v.Serial.ToString() + " " + v.CustomerName;