Skip to content

Commit 60d208d

Browse files
committed
Adding more stats information.
1 parent e5bc77a commit 60d208d

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Models/Compliances/CompliancesStatsModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ public class CompliancesStatsModel
2121
public DateTime? DateOfOldestEnvironmentInspectionTagPlannedTask { get; set; }
2222
public int NumberOfAdHocTasks { get; set; }
2323
public DateTime? DateOfOldestAdHocTask { get; set; }
24+
public int NumberOfCompletedEnvironmentInspectionTagPlanningsLast30Days { get; set; }
2425
}

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationCompliancesService/BackendConfigurationCompliancesService.cs

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,26 @@ public async Task<OperationDataResult<CompliancesStatsModel>> Stats()
440440
.OrderBy(x => x.CreatedAt)
441441
.FirstOrDefaultAsync();
442442

443+
var numberOfActiveAreaRulePlannings = _backendConfigurationPnDbContext.AreaRulePlannings
444+
.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
445+
.Select(x => x.Status)
446+
.Distinct()
447+
.ToList()
448+
.Count;
449+
450+
var numberOfCompletedEnvironmentInspectionTagPlanningsLast30Days = _itemsPlanningPnDbContext.PlanningCases
451+
.Where(x => x.Status == 100)
452+
.Where(x => x.UpdatedAt >= DateTime.UtcNow.AddDays(-30))
453+
.ToList()
454+
.Where(x =>
455+
{
456+
var planningTags = _itemsPlanningPnDbContext.PlanningsTags
457+
.Where(y => y.PlanningId == x.PlanningId && y.PlanningTagId == envTag.Id)
458+
.ToList();
459+
return planningTags.Any();
460+
})
461+
.Count();
462+
443463
var totalCount = complianceList.Count();
444464

445465
var statsModel = new CompliancesStatsModel
@@ -458,7 +478,9 @@ public async Task<OperationDataResult<CompliancesStatsModel>> Stats()
458478
DateOfOldestEnvironmentInspectionTagPlannedTask = oldestEnvironmentInspectionTagPlannedTask,
459479
NumberOfAdHocTasks = numberOfWorkorderTasks,
460480
DateOfOldestAdHocTask = oldestWorkorderTask?.CreatedAt,
461-
NumberOfPlannedEnvironmentInspectionTagTasks = numberOfPlannedEnvironmentInspectionTagTasks
481+
NumberOfPlannedEnvironmentInspectionTagTasks = numberOfPlannedEnvironmentInspectionTagTasks,
482+
NumberOfPlannedTasks = numberOfActiveAreaRulePlannings,
483+
NumberOfCompletedEnvironmentInspectionTagPlanningsLast30Days = numberOfCompletedEnvironmentInspectionTagPlanningsLast30Days
462484
};
463485

464486
return new OperationDataResult<CompliancesStatsModel>(true, statsModel);

0 commit comments

Comments
 (0)