From 0a822f681067955f57fe5f7434d4780b99488a56 Mon Sep 17 00:00:00 2001 From: Ronak Date: Mon, 6 Mar 2017 12:34:29 +0530 Subject: [PATCH 1/3] Resloved issue of selected scrum date and Fixes #231 --- .../ScrumReportRepository/ScrumReportRepository.cs | 4 ++-- .../scrumProject-Details/scrumProject-Details.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Slack.Automation/Promact.Core.Repository/ScrumReportRepository/ScrumReportRepository.cs b/Slack.Automation/Promact.Core.Repository/ScrumReportRepository/ScrumReportRepository.cs index 68f1fc51..e5a373dd 100644 --- a/Slack.Automation/Promact.Core.Repository/ScrumReportRepository/ScrumReportRepository.cs +++ b/Slack.Automation/Promact.Core.Repository/ScrumReportRepository/ScrumReportRepository.cs @@ -82,7 +82,7 @@ private async Task AssignAnswersAsync(Scrum scrum, DateTim { EmployeeScrumDetails employeeScrumDetail = new EmployeeScrumDetails(); //Fetch all the scrum answers for a particular employee - List scrumAnswers = (await _scrumAnswerDataRepository.FetchAsync(x => x.EmployeeId == user.Id && DbFunctions.TruncateTime(x.AnswerDate) == scrumDate)).ToList(); + List scrumAnswers = (await _scrumAnswerDataRepository.FetchAsync(x => x.EmployeeId == user.Id && DbFunctions.TruncateTime(x.AnswerDate) == DbFunctions.TruncateTime(scrumDate))).ToList(); //Find scrum answers for a particular employee of a particular project on a specific date List todayScrumAnswers = scrumAnswers.FindAll(x => x.ScrumId == scrum.Id).ToList(); employeeScrumDetail.EmployeeName = string.Format("{0} {1}", user.FirstName, user.LastName); @@ -183,7 +183,7 @@ public async Task ScrumReportDetailsAsync(int projectId, Da //Getting details of the specific project from Oauth server ProjectAc project = await _oauthCallsRepository.GetProjectDetailsAsync(projectId); //Getting scrum for a specific project - Scrum scrum = await _scrumDataRepository.FirstOrDefaultAsync(x => x.ProjectId == project.Id && DbFunctions.TruncateTime(x.ScrumDate) == scrumDate); + Scrum scrum = await _scrumDataRepository.FirstOrDefaultAsync(x => x.ProjectId == project.Id && DbFunctions.TruncateTime(x.ScrumDate) == DbFunctions.TruncateTime(scrumDate)); ScrumProjectDetails scrumProjectDetail = new ScrumProjectDetails(); scrumProjectDetail.ScrumDate = scrumDate.ToString(_stringConstant.FormatForDate); scrumProjectDetail.ProjectCreationDate = project.CreatedDate; diff --git a/Slack.Automation/Promact.Erp.Web/app/ScrumReport/scrumProject-Details/scrumProject-Details.component.ts b/Slack.Automation/Promact.Erp.Web/app/ScrumReport/scrumProject-Details/scrumProject-Details.component.ts index 545ebba2..0bda247a 100644 --- a/Slack.Automation/Promact.Erp.Web/app/ScrumReport/scrumProject-Details/scrumProject-Details.component.ts +++ b/Slack.Automation/Promact.Erp.Web/app/ScrumReport/scrumProject-Details/scrumProject-Details.component.ts @@ -28,12 +28,12 @@ export class ScrumProjectDetailComponent implements OnInit { } getScrumDetailsToday() { - this.Date = new Date().toDateString(); + this.Date = new Date().toJSON(); this.getScrumDetails(this.Date); } getScrumDetailsYesterday(date: string) { - let yesterday = new Date((new Date(date)).valueOf() - 1000 * 60 * 60 * 24).toDateString(); //subtracting milliseconds in a day + let yesterday = new Date((new Date(date)).valueOf() - 1000 * 60 * 60 * 24).toJSON(); //subtracting milliseconds in a day this.Date = yesterday; this.getScrumDetails(this.Date); } From 60fca366b6350b299ef7b770e26da52b4f488db0 Mon Sep 17 00:00:00 2001 From: Ronak Date: Mon, 6 Mar 2017 12:55:27 +0530 Subject: [PATCH 2/3] Commit to rebuild --- .../ScrumReportRepository/ScrumReportRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Slack.Automation/Promact.Core.Repository/ScrumReportRepository/ScrumReportRepository.cs b/Slack.Automation/Promact.Core.Repository/ScrumReportRepository/ScrumReportRepository.cs index e5a373dd..cde54fa2 100644 --- a/Slack.Automation/Promact.Core.Repository/ScrumReportRepository/ScrumReportRepository.cs +++ b/Slack.Automation/Promact.Core.Repository/ScrumReportRepository/ScrumReportRepository.cs @@ -79,7 +79,7 @@ private async Task> GetEmployeeScrumDetailsAsync(Pro /// /// object with scrum answers for an employee private async Task AssignAnswersAsync(Scrum scrum, DateTime scrumDate, User user) - { + { EmployeeScrumDetails employeeScrumDetail = new EmployeeScrumDetails(); //Fetch all the scrum answers for a particular employee List scrumAnswers = (await _scrumAnswerDataRepository.FetchAsync(x => x.EmployeeId == user.Id && DbFunctions.TruncateTime(x.AnswerDate) == DbFunctions.TruncateTime(scrumDate))).ToList(); From afba00232f5a17b87e78118d2d1b854f802d0a3f Mon Sep 17 00:00:00 2001 From: Ronak Date: Mon, 6 Mar 2017 13:51:50 +0530 Subject: [PATCH 3/3] Commit to Rebuild --- .../ScrumReportRepository/ScrumReportRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Slack.Automation/Promact.Core.Repository/ScrumReportRepository/ScrumReportRepository.cs b/Slack.Automation/Promact.Core.Repository/ScrumReportRepository/ScrumReportRepository.cs index cde54fa2..4e941ecf 100644 --- a/Slack.Automation/Promact.Core.Repository/ScrumReportRepository/ScrumReportRepository.cs +++ b/Slack.Automation/Promact.Core.Repository/ScrumReportRepository/ScrumReportRepository.cs @@ -75,7 +75,7 @@ private async Task> GetEmployeeScrumDetailsAsync(Pro /// Method to assign scrum answers for a specific date to a particular employee /// /// - /// + /// /// /// object with scrum answers for an employee private async Task AssignAnswersAsync(Scrum scrum, DateTime scrumDate, User user)