Alexandr/ISEbd-21_Milyushkin_A.A._Accounting-Time-It-Company
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Скоректироваль

Browse Source
This commit is contained in:
Pipiaka 2024-12-22 21:47:25 +04:00
parent 0d7216a9a0
commit d2d9219957
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Accounting-Time-It-Company/Accounting-Time-It-Company/Forms/FormEmployeeReport.cs
View File

@ -1,6 +1,7 @@
using Accounting_Time_It_Company.Entities.Enums; using Accounting_Time_It_Company.Entities.Enums;
using Accounting_Time_It_Company.Reports; using Accounting_Time_It_Company.Reports;
using Accounting_Time_It_Company.Repositories; using Accounting_Time_It_Company.Repositories;
using Accounting_Time_It_Company.Repositories.Implementations;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -18,12 +19,14 @@ namespace Accounting_Time_It_Company.Forms
{ {
private readonly IUnityContainer _container; private readonly IUnityContainer _container;
public FormEmployeeReport(IUnityContainer container, IEmployeeRepositories employeeRepositories) public FormEmployeeReport(IUnityContainer container, IEmployeeRepositories employeeRepositories, IPostRepositories postRepositories)
{ {
InitializeComponent(); InitializeComponent();
_container = container; _container = container;
comboBoxEmployee.DataSource = employeeRepositories.ReadEmployees().Where(x => x.PostId != (int)TypePost.Director).ToList(); List<int> DirectorId = postRepositories.ReadPosts().Where(y => y.NamePost == TypePost.Director).Select(y => y.Id).ToList();
comboBoxEmployee.DataSource = employeeRepositories.ReadEmployees().Where(x => DirectorId.Any(z => z != x.PostId)).ToList();
comboBoxEmployee.DisplayMember = "Name"; comboBoxEmployee.DisplayMember = "Name";
comboBoxEmployee.ValueMember = "Id"; comboBoxEmployee.ValueMember = "Id";
} }

2
Accounting-Time-It-Company/Accounting-Time-It-Company/Reports/ChartReport.cs
View File

@ -33,7 +33,7 @@ internal class ChartReport
{ {
return _vacationRepositories return _vacationRepositories
.ReadVacations() .ReadVacations()
.Where(x => x.StartDate.Date == dateTime.Date) .Where(x => x.StartDate.Date <= dateTime.Date && x.EndDate.Date >= dateTime.Date)
.GroupBy(x => x.EmployeeId, (key, group) => new { .GroupBy(x => x.EmployeeId, (key, group) => new {
Id = key, Id = key,
Count = group.Sum(x => (x.EndDate - x.StartDate).TotalHours) Count = group.Sum(x => (x.EndDate - x.StartDate).TotalHours)