Olivloe/123
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hello

Browse Source
This commit is contained in:
Class_Student 2024-12-04 10:24:43 +03:00
parent 8ba9a00ccc
commit db7680b8ec
39 changed files with 773 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
123.sln
View File

@ -5,6 +5,10 @@ VisualStudioVersion = 17.11.35312.102
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo", "123\Demo.csproj", "{5A6EDB7C-E5C5-4FCD-B6CE-7E131BD9EDA3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "123", "123", "{C10296D5-B348-4B12-B15C-226DD4F1C7EB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "presence_api", "123\presence_api\presence_api.csproj", "{1BCA5E0B-EF97-421C-AC72-0655BB7AEF7B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -15,6 +19,10 @@ Global
{5A6EDB7C-E5C5-4FCD-B6CE-7E131BD9EDA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5A6EDB7C-E5C5-4FCD-B6CE-7E131BD9EDA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5A6EDB7C-E5C5-4FCD-B6CE-7E131BD9EDA3}.Release|Any CPU.Build.0 = Release|Any CPU
{1BCA5E0B-EF97-421C-AC72-0655BB7AEF7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1BCA5E0B-EF97-421C-AC72-0655BB7AEF7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1BCA5E0B-EF97-421C-AC72-0655BB7AEF7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1BCA5E0B-EF97-421C-AC72-0655BB7AEF7B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -22,4 +30,7 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B3D7FA9B-E7AA-4A2B-8D13-416D51577CB6}
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{1BCA5E0B-EF97-421C-AC72-0655BB7AEF7B} = {C10296D5-B348-4B12-B15C-226DD4F1C7EB}
EndGlobalSection
EndGlobal

2
123/Data/LocalData/Entity/Presence.cs
View File

@ -8,7 +8,7 @@ namespace _123.Data.LocalData.Entity
{
public class PresenceLocalEntity
{
public required Guid UserGuid { get; set; }
public required int UserID { get; set; }
public bool IsAttedance { get; set; } = true;
public required DateOnly Date { get; set; }

10
123/Data/LocalData/Entity/User.cs
View File

@ -6,16 +6,12 @@ using System.Threading.Tasks;
namespace _123.Data.LocalData.Entity
{
public class UserLocalEntity : IEquatable<UserLocalEntity>
public class UserLocalEntity
{
public required string UserFIO { get; set; }
public Guid UserGuid { get; set; }
public int UserId { get; set; }
public required int GroupID { get; set; }
public bool Equals(UserLocalEntity? other)
{
if (other == null) return false;
return this.UserGuid.Equals(other.UserGuid);
}
}
}

12
123/Data/LocalData/LocalStaticData.cs
View File

@ -18,12 +18,12 @@ namespace _123.Data.LocalData
};
public static List<UserLocalEntity> users => new List<UserLocalEntity>
{
new UserLocalEntity{UserGuid=Guid.Parse("e6b9964d-ea9f-420a-84b9-af9633bbfab9"), UserFIO = "RandomFio", GroupID = 1 },
new UserLocalEntity{UserGuid=Guid.Parse("8388d931-5bef-41be-a152-78f1aca980ed"), UserFIO = "RandomFio1", GroupID = 2 },
new UserLocalEntity{UserGuid=Guid.Parse("ed174548-49ed-4503-a902-c970cbf27173"), UserFIO = "RandomFio2", GroupID = 3 },
new UserLocalEntity{UserGuid=Guid.Parse("614c0a23-5bd5-43ae-b48e-d5750afbc282"), UserFIO = "RandomFio3", GroupID = 1 },
new UserLocalEntity{UserGuid=Guid.Parse("efcc1473-c116-4244-b3f7-f2341a5c3003"), UserFIO = "RandomFio4", GroupID = 2 },
new UserLocalEntity{UserGuid=Guid.Parse("60640fb3-ace2-4cad-81d5-a0a58bc2dbbd"), UserFIO = "RandomFio5", GroupID = 3 },
new UserLocalEntity{UserId = 1, UserFIO = "RandomFio", GroupID = 1 },
new UserLocalEntity{UserId = 2, UserFIO = "RandomFio1", GroupID = 2 },
new UserLocalEntity{UserId = 3, UserFIO = "RandomFio2", GroupID = 3 },
new UserLocalEntity{UserId = 4, UserFIO = "RandomFio3", GroupID = 1 },
new UserLocalEntity{UserId = 5, UserFIO = "RandomFio4", GroupID = 2 },
new UserLocalEntity{UserId = 6, UserFIO = "RandomFio5", GroupID = 3 },
};
public static List<PresenceLocalEntity> presences => new List<PresenceLocalEntity>
{

2
123/Data/RemoteData/RemoteDatabase/DAO/Presence.cs
View File

@ -13,7 +13,7 @@ namespace _123.Data.RemoteData.RemoteDatabase.DAO
public required int LessonNumber { get; set; }
public UserDao UserDao { get; set; }
public int UserId { get; set; }
public int UserDaoUserId { get; set; }
public int GroupId { get; set; }
}
}

8
123/Data/RemoteData/RemoteDatabase/RemoteDatabaseContext.cs
View File

@ -12,17 +12,17 @@ namespace _123.Data.RemoteData.RemoteDatabase
{
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
optionsBuilder.UseNpgsql();
optionsBuilder.UseNpgsql("Host = 45.67.56.214; Port = 5454; Username = user3; Database = user3; Password = VOTfZ8PQ");
}
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<GroupDao>().HasKey(group => group.ID);
modelBuilder.Entity<GroupDao>().Property(group => group.ID).ValueGeneratedOnAdd();
modelBuilder.Entity<UserDao>().HasKey(user => user.UserGuid);
modelBuilder.Entity<UserDao>().Property(user => user.UserGuid).ValueGeneratedOnAdd();
modelBuilder.Entity<UserDao>().HasKey(user => user.UserID);
modelBuilder.Entity<UserDao>().Property(user => user.UserID).ValueGeneratedOnAdd();
modelBuilder.Entity<PresenceDao>().HasKey(presence => new
{
presence.UserGuid,
presence.UserDaoUserId,
presence.Date,
presence.IsAttedance,
presence.LessonNumber

33
123/Data/ReportsHistory/GroupRepositoty.cs
View File

@ -1,33 +0,0 @@
using _123.Data.LocalData.Entity;
using _123.Data.LocalData;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace _123.Data.ReportsHistory
{
public class GroupRepositoryImpl
{
public List<GroupLocalEntity> GetAllGroups() => LocalStaticData.groups;
public GroupLocalEntity? UpdateGroup(String name)
{
GroupLocalEntity? groupLocal = GetAllGroups()
.Where(x => x.Name == name).FirstOrDefault();
if (groupLocal == null) return null;
groupLocal.Name = name;
return groupLocal;
}
public GroupLocalEntity AddGroup(String name, String id)
{
GroupLocalEntity? groupLocal = GetAllGroups().FirstOrDefault();
groupLocal.Name = name;
groupLocal.ID = int.Parse(id);
return groupLocal;
}
}
}

10
123/Data/Repository/GroupRepositoty.cs
View File

@ -50,6 +50,16 @@ namespace _123.Data.Repository
groupLocal.Name = name;
return true;
}
List<GroupDao> IGroupRepository.GetAllGroup()
{
throw new NotImplementedException();
}
GroupDao IGroupRepository.GetGroupById(int groupID)
{
throw new NotImplementedException();
}
}
}

2
123/Data/Repository/IGroupRepository.cs
View File

@ -8,7 +8,7 @@ using System.Threading.Tasks;
namespace _123.Data.Repository
{
internal interface IGroupRepository
public interface IGroupRepository
{
List<GroupDao> GetAllGroup();
bool RemoveGroupById(int groupID);

5
123/Data/Repository/IPresenceRepository.cs
View File

@ -1,4 +1,5 @@
using _123.Data.LocalData.Entity;
using _123.Data.RemoteData.RemoteDatabase.DAO;
using _123.Domain.Models;
using System;
using System.Collections.Generic;
@ -8,11 +9,11 @@ using System.Threading.Tasks;
namespace _123.Data.Repository
{
internal interface IPresenceRepository
public interface IPresenceRepository
{
List<PresenceDao> GetPresenceByGroup(int groupId);
List<PresenceDao> GetPresenceByGroupAndDate(int groupId, DateOnly date);
bool UnCheckAttendence (int firstClass, int lastClass, DateOnly date, Guid userGuid);
bool UnCheckAttendence (int firstClass, int lastClass, DateOnly date, int UserId);
void AddPresence (PresenceDao presence);
}

10
123/Data/Repository/IUserRepository.cs
View File

@ -8,13 +8,13 @@ using System.Threading.Tasks;
namespace _123.Data.Repository
{
internal interface IUserRepository
public interface IUserRepository
{
List<UserDao> GetAllUser();
bool RemoveUserByGuid(int userId);
UserDao FindUserByGuid(Guid userGuid);
UserDao? GetUserByGuid(int userId);
bool RemoveUserById(int userId);
UserDao FindUserById(int userId);
UserDao? GetUserById(int userId);
UserDao? UpdateUser(UserDao userUpdate);
UserDao? UpdateUserByGuid(int userId);
UserDao? UpdateUserById(int userId);
}
}

21
123/Data/Repository/PresenceRepository.cs
View File

@ -1,5 +1,6 @@
using _123.Data.LocalData;
using _123.Data.LocalData.Entity;
using _123.Data.RemoteData.RemoteDatabase.DAO;
using _123.Domain.Models;
using System;
using System.Collections.Generic;
@ -14,37 +15,33 @@ namespace _123.Data.Repository
public class PresenceRepositoryImpl : IPresenceRepository
{
public PresenceRepositoryImpl()
{
GetAllPresences = LocalStaticData.presences;
}
public List<PresenceLocalEntity> GetAllPresences
public List<PresenceDao> GetAllPresences
{ get; set; }
public void AddPresence(PresenceLocalEntity presence)
public void AddPresence(PresenceDao presence)
{
PresenceLocalEntity? presenceLocal = GetAllPresences.FirstOrDefault();
presenceLocal.UserGuid = presence.UserGuid;
PresenceDao? presenceLocal = GetAllPresences.FirstOrDefault();
presenceLocal.UserDaoUserId = presence.UserDaoUserId;
presenceLocal.Date = presence.Date;
presenceLocal.IsAttedance = presence.IsAttedance;
presenceLocal.LessonNumber = presence.LessonNumber;
}
public List<PresenceLocalEntity> GetPresenceByGroup(int groupId)
public List<PresenceDao> GetPresenceByGroup(int groupId)
{
return GetAllPresences;
}
public List<PresenceLocalEntity> GetPresenceByGroupAndDate(int groupId, DateOnly date)
public List<PresenceDao> GetPresenceByGroupAndDate(int groupId, DateOnly date)
{
return GetAllPresences;
}
public bool UnCheckAttendence(int firstClass, int lastClass, DateOnly date, Guid userGuid)
public bool UnCheckAttendence(int firstClass, int lastClass, DateOnly date, int userId)
{
var presToUpdate = GetAllPresences
.Where(x => x.UserGuid == userGuid && x.LessonNumber >= firstClass
.Where(x => x.UserDaoUserId == userId && x.LessonNumber >= firstClass
&& x.LessonNumber <= lastClass && x.Date == date).ToList();
foreach (var presence in presToUpdate)
{

27
123/Data/Repository/SQLGroupRepository.cs
View File

@ -1,11 +1,13 @@
using _123.Data.LocalData;
using _123.Data.LocalData.Entity;
using _123.Data.RemoteData.RemoteDatabase;
using _123.Data.RemoteData.RemoteDatabase.DAO;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace _123.Data.Repository
{
@ -21,8 +23,8 @@ namespace _123.Data.Repository
public List<GroupDao> GetAllGroups()
{
var groups = _remoteDatabaseContext.Groups
.Select(g => new GroupDao
{
.Select(g => new GroupDao
{
ID = g.ID,
Name = g.Name
})
@ -59,13 +61,19 @@ namespace _123.Data.Repository
{
var group = _remoteDatabaseContext.Groups
.FirstOrDefault(x => x.ID == groupID);
if (group == null) return null;
return new GroupDao
return new GroupDao
{
ID = group.ID,
Name = group.Name
Name = group.Name,
Users = group.Users?.Select(u => new UserDao
{
UserID = u.UserID,
UserFIO = u.UserFIO,
GroupID = group.ID
}).ToList() ?? new List<UserDao>()
};
}
@ -76,13 +84,12 @@ namespace _123.Data.Repository
var group = _remoteDatabaseContext.Groups
.FirstOrDefault(x => x.ID == groupID);
if (group == null) return false;
// Проверяем, есть ли связанные пользователи
if (group.Users != null && group.Users.Any())
{
return false; // Нельзя удалить группу с пользователями
return false;
}
_remoteDatabaseContext.Groups.Remove(group);
_remoteDatabaseContext.SaveChanges();
return true;

13
123/Data/Repository/SQLPresenceRepository.cs
View File

@ -1,6 +1,7 @@
using _123.Data.LocalData;
using _123.Data.LocalData.Entity;
using _123.Data.RemoteData.RemoteDatabase;
using _123.Data.RemoteData.RemoteDatabase.DAO;
using System;
using System.Collections.Generic;
using System.Linq;
@ -20,28 +21,28 @@ namespace _123.Data.Repository
public void AddPresence(PresenceDao presence)
{
_remoteDatabaseContext.Presences.Add(presence);
_remoteDatabaseContext.PresencesDaos.Add(presence);
_remoteDatabaseContext.SaveChanges();
}
public List<PresenceDao> GetPresenceByGroup(int groupId)
{
return _remoteDatabaseContext.Presences
return _remoteDatabaseContext.PresencesDaos
.Where(p => p.GroupId == groupId)
.ToList();
}
public List<PresenceDao> GetPresenceByGroupAndDate(int groupId, DateOnly date)
{
return _remoteDatabaseContext.Presences
return _remoteDatabaseContext.PresencesDaos
.Where(p => p.GroupId == groupId && p.Date == date)
.ToList();
}
public bool UnCheckAttendence(int firstClass, int lastClass, DateOnly date, Guid userGuid)
public bool UnCheckAttendence(int firstClass, int lastClass, DateOnly date, int userId)
{
var presToUpdate = _remoteDatabaseContext.Presences
.Where(x => x.UserGuid == userGuid && x.LessonNumber >= firstClass
var presToUpdate = _remoteDatabaseContext.PresencesDaos
.Where(x => x.UserDaoUserId == userId && x.LessonNumber >= firstClass
&& x.LessonNumber <= lastClass && x.Date == date).ToList();
foreach (var presence in presToUpdate)

13
123/Data/Repository/SQLUserRepository.cs
View File

@ -1,6 +1,7 @@
using _123.Data.LocalData;
using _123.Data.LocalData.Entity;
using _123.Data.RemoteData.RemoteDatabase;
using _123.Data.RemoteData.RemoteDatabase.DAO;
using System;
using System.Collections.Generic;
using System.Linq;
@ -18,14 +19,14 @@ namespace _123.Data.Repository
_remoteDatabaseContext = remoteDatabaseContext;
}
public UserDao FindUserByGuid(Guid userGuid)
public UserDao FindUserById(int userId)
{
var user = _remoteDatabaseContext.Users
.FirstOrDefault(x => x.UserID == userGuid);
.FirstOrDefault(x => x.UserID == userId);
if (user == null) throw new Exception("Пользователь не найден");
return user;
}
public List<UserDao> GetAllUser()
{
return _remoteDatabaseContext.Users
@ -39,13 +40,13 @@ namespace _123.Data.Repository
.ToList();
}
public UserDao? GetUserByGuid(int userId)
public UserDao? GetUserById(int userId)
{
return _remoteDatabaseContext.Users
.FirstOrDefault(x => x.UserID == userId);
}
public bool RemoveUserByGuid(int userId)
public bool RemoveUserById(int userId)
{
try
{
@ -83,7 +84,7 @@ namespace _123.Data.Repository
}
}
public UserDao? UpdateUserByGuid(int userId)
public UserDao? UpdateUserById(int userId)
{
return _remoteDatabaseContext.Users
.FirstOrDefault(x => x.UserID == userId);

40
123/Data/Repository/UserRepositoty.cs
View File

@ -16,55 +16,55 @@ namespace _123.Data.ReportsHistory
public UserRepositoryImpl()
{
GetAllUsers = LocalStaticData.users;
GetAllUsers = LocalStaticData.users.Select(it => new UserDao { GroupID = it.GroupID, UserFIO = it.UserFIO, UserID = it.UserId}).ToList();
}
public List<UserLocalEntity> GetAllUsers
public List<UserDao> GetAllUsers
{ get; set; }
public List<UserLocalEntity> GetAllUser()
public List<UserDao> GetAllUser()
{
return GetAllUsers;
}
public bool RemoveUserByGuid(Guid userGuid)
public bool RemoveUserById(int userId)
{
UserLocalEntity? userLocal = GetAllUsers
.Where(x => x.UserGuid == userGuid).FirstOrDefault();
UserDao? userLocal = GetAllUsers
.Where(x => x.UserID == userId).FirstOrDefault();
if (userLocal == null) return false;
return GetAllUsers.Remove(userLocal);
}
public UserLocalEntity FindUserByGuid(Guid userGuid)
public UserDao FindUserById(int userId)
{
UserLocalEntity? userLocal = GetAllUsers
.Where(x => x.UserGuid == userGuid).FirstOrDefault();
UserDao? userLocal = GetAllUsers
.Where(x => x.UserID == userId).FirstOrDefault();
if (userLocal == null) throw new Exception("Пользователь не найден");
return userLocal;
}
public UserLocalEntity? GetUserByGuid(Guid userGuid)
public UserDao? GetUserById(int userId)
{
UserLocalEntity? userLocal = GetAllUsers
.Where(x => x.UserGuid == userGuid).FirstOrDefault();
UserDao? userLocal = GetAllUsers
.Where(x => x.UserID == userId).FirstOrDefault();
if (userLocal == null) return null;
return userLocal;
}
public UserLocalEntity? UpdateUser(UserLocalEntity userUpdateLocalEnity)
public UserDao? UpdateUser(UserDao userUpdateDao)
{
UserLocalEntity? userLocal = GetAllUsers
.Where(x => x.UserGuid == userUpdateLocalEnity.UserGuid).FirstOrDefault();
UserDao? userLocal = GetAllUsers
.Where(x => x.UserID == userUpdateDao.UserID).FirstOrDefault();
if (userLocal == null) return null;
userLocal.UserFIO = userUpdateLocalEnity.UserFIO;
userLocal.GroupID = userUpdateLocalEnity.GroupID;
userLocal.UserFIO = userUpdateDao.UserFIO;
userLocal.GroupID = userUpdateDao.GroupID;
return userLocal;
}
public UserLocalEntity? UpdateUserByGuid(Guid userGuid)
public UserDao? UpdateUserById(int userId)
{
UserLocalEntity? userLocal = GetAllUsers
.Where(x => x.UserGuid == userGuid).FirstOrDefault();
UserDao? userLocal = GetAllUsers
.Where(x => x.UserID == userId).FirstOrDefault();
if (userLocal == null) return null;
return userLocal;

1
123/Demo.csproj
View File

@ -9,6 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ClosedXML" Version="0.104.2" />
<PackageReference Include="Microsoft.EntityFrameworkcore" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkcore.Design" Version="8.0.10">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

2
123/Domain/Models/User.cs
View File

@ -9,7 +9,7 @@ namespace _123.Domain.Models
public class User
{
public required string UserFIO { get; set; }
public Guid UserGuid { get; set; }
public int UserID { get; set; }
public required Group UserGroup { get; set; }
}

10
123/Domain/UseCase/GroupUseCase.cs
View File

@ -12,13 +12,13 @@ namespace _123.Domain.UseCase
{
public class GroupUseCase
{
private readonly SQLGroupRepositoryImpl _repositoryGroupImpl;
public GroupUseCase(SQLGroupRepositoryImpl repositoryGroupImpl)
private readonly IGroupRepository _repositoryGroupImpl;
public GroupUseCase(IGroupRepository repositoryGroupImpl)
{
_repositoryGroupImpl = repositoryGroupImpl;
}
public List<Group> GetAllGroups() => _repositoryGroupImpl.GetAllGroups()
public List<Group> GetAllGroups() => _repositoryGroupImpl.GetAllGroup()
.Select(it => new Group { ID = it.ID, Name = it.Name }).ToList();
public bool UpdateGroupName(string id, string name)
@ -42,9 +42,5 @@ namespace _123.Domain.UseCase
{
return _repositoryGroupImpl.RemoveGroupById(id);
}
public GroupLocalEntity AddGroup(String name, string id)
{
return _repositoryGroupImpl.AddGroup(name, id);
}
}
}

68
123/Domain/UseCase/PresenceUseCase.cs
View File

@ -13,50 +13,50 @@ namespace _123.Domain.UseCase
{
public class PresenceUseCase
{
private readonly SQLPresenceRepositoryImpl _presenceRepositoryImpl;
private readonly SQLGroupRepositoryImpl _groupRepositoryImpl;
private readonly SQLUserRepositoryImpl _userRepositoryImpl;
private readonly IPresenceRepository _presenceRepositoryImpl;
private readonly IGroupRepository _groupRepositoryImpl;
private readonly IUserRepository _userRepositoryImpl;
public List<Presence> GetPresenceByGroup(int groupId)
{
var users = _userRepositoryImpl.GetAllUsers.Where(x => x.GroupID == groupId).ToList();
var users = _userRepositoryImpl.GetAllUser().Where(x => x.GroupID == groupId).ToList();
var presenceByGroup = _presenceRepositoryImpl.GetPresenceByGroup(groupId)
.Where(x => users.Any(user => user.UserGuid == x.UserGuid))
.Where(x => users.Any(user => user.UserID == x.UserDaoUserId))
.Select(presence => new Presence
{
User = new User
{
UserGuid = presence.UserGuid,
UserID = presence.UserDaoUserId,
UserGroup = new Group
{
ID = groupId,
Name = _groupRepositoryImpl.GetAllGroups().First(group => group.ID == groupId).Name
Name = _groupRepositoryImpl.GetAllGroup().First(group => group.ID == groupId).Name
},
UserFIO = users.First(user => user.UserGuid == presence.UserGuid).UserFIO,
UserFIO = users.First(user => user.UserID == presence.UserDaoUserId).UserFIO,
},
ClassNum = presence.LessonNumber,
Date = presence.Date,
IsAttedance = presence.IsAttedance,
}).ToList();
return presenceByGroup;
return (List<Presence>)presenceByGroup;
}
public List<Presence> GetPresenceByGroupAndDate(int groupId, DateOnly date)
{
var users = _userRepositoryImpl.GetAllUsers.Where(x => x.GroupID == groupId).ToList();
var users = _userRepositoryImpl.GetAllUser().Where(x => x.GroupID == groupId).ToList();
var presenceByGroup = _presenceRepositoryImpl.GetPresenceByGroup(groupId)
.Where(x => users.Any(user => user.UserGuid == x.UserGuid && x.Date == date))
.Where(x => users.Any(user => user.UserID == x.UserDaoUserId && x.Date == date))
.Select(presence => new Presence
{
User = new User
{
UserGuid = presence.UserGuid,
UserID = presence.UserDaoUserId,
UserGroup = new Group
{
ID = groupId,
Name = _groupRepositoryImpl.GetAllGroups().First(group => group.ID == groupId).Name
Name = _groupRepositoryImpl.GetAllGroup().First(group => group.ID == groupId).Name
},
UserFIO = users.First(user => user.UserGuid == presence.UserGuid).UserFIO,
UserFIO = users.First(user => user.UserID == presence.UserDaoUserId).UserFIO,
},
ClassNum = presence.LessonNumber,
Date = presence.Date,
@ -64,10 +64,44 @@ namespace _123.Domain.UseCase
}).ToList();
return presenceByGroup;
}
public bool UnCheckAttendance(int firstClass, int lastClass, DateOnly date, Guid userGuid)
public bool UnCheckAttendance(int firstClass, int lastClass, DateOnly date, int userID)
{
return _presenceRepositoryImpl.UnCheckAttendence(firstClass, lastClass, date, userGuid);
return _presenceRepositoryImpl.UnCheckAttendence(firstClass, lastClass, date, userID);
}
public Dictionary<string, int> GetPresenceStatsByGroup(int groupId)
{
var stats = new Dictionary<string, int>();
// Получаем всех студентов группы
var users = _userRepositoryImpl.GetAllUser().Where(x => x.GroupID == groupId).ToList();
stats["Количество студентов"] = users.Count;
// Получаем все записи посещаемости для группы
var presences = _presenceRepositoryImpl.GetPresenceByGroup(groupId);
// Считаем количество уникальных занятий
var uniqueLessons = presences
.Select(p => new { p.Date, p.LessonNumber })
.Distinct()
.Count();
stats["Количество занятий"] = uniqueLessons;
// Считаем общую посещаемость
var totalAttendances = presences.Count(p => p.IsAttedance);
var totalPossibleAttendances = users.Count * uniqueLessons;
if (totalPossibleAttendances > 0)
{
var attendancePercentage = (totalAttendances * 100) / totalPossibleAttendances;
stats["Процент посещаемости"] = attendancePercentage;
}
else
{
stats["Процент посещаемости"] = 0;
}
return stats;
}
}
}

4
123/Domain/UseCase/UseCaseGeneratePresence.cs
View File

@ -32,7 +32,7 @@ namespace _123.Domain.UseCase
{
foreach (var user in users)
{
PresenceLocalEntity pres = new PresenceLocalEntity { LessonNumber = i, UserGuid = user.UserGuid, Date = date };
PresenceLocalEntity pres = new PresenceLocalEntity { LessonNumber = i, UserID = user.UserID, Date = date };
}
}
}
@ -53,7 +53,7 @@ namespace _123.Domain.UseCase
PresenceLocalEntity pres = new PresenceLocalEntity
{
LessonNumber = i,
UserGuid = user.UserGuid,
UserID = user.UserID,
Date = date
};
presence.Add(pres);

30
123/Domain/UseCase/UserUseCase.cs
View File

@ -13,34 +13,34 @@ namespace _123.Domain.UseCase
{
public class UserUseCase
{
private readonly SQLUserRepositoryImpl _repositoryUserImpl;
private readonly SQLGroupRepositoryImpl _repositoryGroupImpl;
private readonly IUserRepository _repositoryUserImpl;
private readonly IGroupRepository _repositoryGroupImpl;
public UserUseCase(SQLUserRepositoryImpl repositoryImpl, SQLGroupRepositoryImpl repositoryGroupImpl)
public UserUseCase(IUserRepository repositoryImpl, IGroupRepository repositoryGroupImpl)
{
_repositoryUserImpl = repositoryImpl;
_repositoryGroupImpl = repositoryGroupImpl;
}
public List<Group> GetAllGroups() => _repositoryGroupImpl.GetAllGroups()
public List<Group> GetAllGroups() => _repositoryGroupImpl.GetAllGroup()
.Select(it => new Group { ID = it.ID, Name = it.Name }).ToList();
public List<User> GetAllUsers() => _repositoryUserImpl.GetAllUser()
.Join(_repositoryGroupImpl.GetAllGroups(),
.Join(_repositoryGroupImpl.GetAllGroup(),
user => user.GroupID,
group => group.ID,
(user, group) =>
new User
{
UserFIO = user.UserFIO,
UserGuid = user.UserID,
UserID = user.UserID,
UserGroup = new Group { ID = group.ID, Name = group.Name }
}
).ToList();
public bool RemoveUserByGuid(int userId)
{
return _repositoryUserImpl.RemoveUserByGuid(userId);
return _repositoryUserImpl.RemoveUserById(userId);
}
public User UpdateUser(User user)
@ -48,23 +48,29 @@ namespace _123.Domain.UseCase
UserDao userDao = new UserDao {
UserFIO = user.UserFIO,
GroupID = user.UserGroup.ID,
UserID = user.UserGuid
UserID = user.UserID
};
UserDao? result = _repositoryUserImpl.UpdateUser(userDao);
if (result == null) throw new Exception("Не удалось обновить пользователя");
Group? group = GetAllGroups().FirstOrDefault(it => it.ID == result.GroupID);
if (group == null) throw new Exception("Группа не найдена");
return new User { UserFIO = user.UserFIO, UserGuid = user.UserGuid, UserGroup = group };
return new User { UserFIO = user.UserFIO, UserID = user.UserID, UserGroup = group };
}
public UserDao FindUserByGuid(int userId)
public User FindUserByGuid(int userId)
{
return _repositoryUserImpl.FindUserByGuid(userId);
var userDao = _repositoryUserImpl.FindUserById(userId);
return new User
{
UserID = userDao.UserID,
UserFIO = userDao.UserFIO,
UserGroup = GetAllGroups().FirstOrDefault(g => g.ID == userDao.GroupID)
};
}
public UserDao UpdateUserByGuid(int userId, string name, string groupId)
{
UserDao? result = _repositoryUserImpl.UpdateUserByGuid(userId);
UserDao? result = _repositoryUserImpl.UpdateUserById(userId);
if (result == null) throw new Exception("Пользователь не найден");
Group? group = GetAllGroups().FirstOrDefault(it => it.ID == int.Parse(groupId));
if (group == null) throw new Exception("Группа не найдена");

118
123/Migrations/20241118090715_InitialCreate.Designer.cs generated Normal file
View File

@ -0,0 +1,118 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using _123.Data.RemoteData.RemoteDatabase;
#nullable disable
namespace _123.Migrations
{
[DbContext(typeof(RemoteDatabaseContext))]
[Migration("20241118090715_InitialCreate")]
partial class InitialCreate
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.10")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("_123.Data.RemoteData.RemoteDatabase.DAO.GroupDao", b =>
{
b.Property<int>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ID"));
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text");
b.HasKey("ID");
b.ToTable("Groups");
});
modelBuilder.Entity("_123.Data.RemoteData.RemoteDatabase.DAO.PresenceDao", b =>
{
b.Property<int>("UserDaoUserId")
.HasColumnType("integer");
b.Property<DateOnly>("Date")
.HasColumnType("date");
b.Property<bool>("IsAttedance")
.HasColumnType("boolean");
b.Property<int>("LessonNumber")
.HasColumnType("integer");
b.Property<int>("GroupId")
.HasColumnType("integer");
b.HasKey("UserDaoUserId", "Date", "IsAttedance", "LessonNumber");
b.ToTable("PresencesDaos");
});
modelBuilder.Entity("_123.Data.RemoteData.RemoteDatabase.DAO.UserDao", b =>
{
b.Property<int>("UserID")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UserID"));
b.Property<int>("GroupID")
.HasColumnType("integer");
b.Property<string>("UserFIO")
.IsRequired()
.HasColumnType("text");
b.HasKey("UserID");
b.HasIndex("GroupID");
b.ToTable("Users");
});
modelBuilder.Entity("_123.Data.RemoteData.RemoteDatabase.DAO.PresenceDao", b =>
{
b.HasOne("_123.Data.RemoteData.RemoteDatabase.DAO.UserDao", "UserDao")
.WithMany()
.HasForeignKey("UserDaoUserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("UserDao");
});
modelBuilder.Entity("_123.Data.RemoteData.RemoteDatabase.DAO.UserDao", b =>
{
b.HasOne("_123.Data.RemoteData.RemoteDatabase.DAO.GroupDao", "Group")
.WithMany("Users")
.HasForeignKey("GroupID")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Group");
});
modelBuilder.Entity("_123.Data.RemoteData.RemoteDatabase.DAO.GroupDao", b =>
{
b.Navigation("Users");
});
#pragma warning restore 612, 618
}
}
}

88
123/Migrations/20241118090715_InitialCreate.cs Normal file
View File

@ -0,0 +1,88 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace _123.Migrations
{
/// <inheritdoc />
public partial class InitialCreate : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "Groups",
columns: table => new
{
ID = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
Name = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_Groups", x => x.ID);
});
migrationBuilder.CreateTable(
name: "Users",
columns: table => new
{
UserID = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
UserFIO = table.Column<string>(type: "text", nullable: false),
GroupID = table.Column<int>(type: "integer", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_Users", x => x.UserID);
table.ForeignKey(
name: "FK_Users_Groups_GroupID",
column: x => x.GroupID,
principalTable: "Groups",
principalColumn: "ID",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "PresencesDaos",
columns: table => new
{
IsAttedance = table.Column<bool>(type: "boolean", nullable: false),
Date = table.Column<DateOnly>(type: "date", nullable: false),
LessonNumber = table.Column<int>(type: "integer", nullable: false),
UserDaoUserId = table.Column<int>(type: "integer", nullable: false),
GroupId = table.Column<int>(type: "integer", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_PresencesDaos", x => new { x.UserDaoUserId, x.Date, x.IsAttedance, x.LessonNumber });
table.ForeignKey(
name: "FK_PresencesDaos_Users_UserDaoUserId",
column: x => x.UserDaoUserId,
principalTable: "Users",
principalColumn: "UserID",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_Users_GroupID",
table: "Users",
column: "GroupID");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "PresencesDaos");
migrationBuilder.DropTable(
name: "Users");
migrationBuilder.DropTable(
name: "Groups");
}
}
}

115
123/Migrations/RemoteDatabaseContextModelSnapshot.cs Normal file
View File

@ -0,0 +1,115 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using _123.Data.RemoteData.RemoteDatabase;
#nullable disable
namespace _123.Migrations
{
[DbContext(typeof(RemoteDatabaseContext))]
partial class RemoteDatabaseContextModelSnapshot : ModelSnapshot
{
protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.10")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("_123.Data.RemoteData.RemoteDatabase.DAO.GroupDao", b =>
{
b.Property<int>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ID"));
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text");
b.HasKey("ID");
b.ToTable("Groups");
});
modelBuilder.Entity("_123.Data.RemoteData.RemoteDatabase.DAO.PresenceDao", b =>
{
b.Property<int>("UserDaoUserId")
.HasColumnType("integer");
b.Property<DateOnly>("Date")
.HasColumnType("date");
b.Property<bool>("IsAttedance")
.HasColumnType("boolean");
b.Property<int>("LessonNumber")
.HasColumnType("integer");
b.Property<int>("GroupId")
.HasColumnType("integer");
b.HasKey("UserDaoUserId", "Date", "IsAttedance", "LessonNumber");
b.ToTable("PresencesDaos");
});
modelBuilder.Entity("_123.Data.RemoteData.RemoteDatabase.DAO.UserDao", b =>
{
b.Property<int>("UserID")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UserID"));
b.Property<int>("GroupID")
.HasColumnType("integer");
b.Property<string>("UserFIO")
.IsRequired()
.HasColumnType("text");
b.HasKey("UserID");
b.HasIndex("GroupID");
b.ToTable("Users");
});
modelBuilder.Entity("_123.Data.RemoteData.RemoteDatabase.DAO.PresenceDao", b =>
{
b.HasOne("_123.Data.RemoteData.RemoteDatabase.DAO.UserDao", "UserDao")
.WithMany()
.HasForeignKey("UserDaoUserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("UserDao");
});
modelBuilder.Entity("_123.Data.RemoteData.RemoteDatabase.DAO.UserDao", b =>
{
b.HasOne("_123.Data.RemoteData.RemoteDatabase.DAO.GroupDao", "Group")
.WithMany("Users")
.HasForeignKey("GroupID")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Group");
});
modelBuilder.Entity("_123.Data.RemoteData.RemoteDatabase.DAO.GroupDao", b =>
{
b.Navigation("Users");
});
#pragma warning restore 612, 618
}
}
}

11
123/Program.cs
View File

@ -15,15 +15,8 @@ services
.AddDbContext<RemoteDatabaseContext>()
.AddSingleton<IPresenceRepository, SQLPresenceRepositoryImpl>()
.AddSingleton<IUserRepository, SQLUserRepositoryImpl>()
.AddSingleton<IGroupRepository, SQLGroupRepositoryImpl>()
.AddSingleton<IGroupRepository, SQLGroupRepositoryImpl>();
var serviceProvider = services.BuildServiceProvider ();
GroupRepositoryImpl groupRepositoryImpl = new GroupRepositoryImpl();
UserRepositoryImpl userRepositoryImpl = new UserRepositoryImpl();
UserUseCase userUseCase = new UserUseCase(userRepositoryImpl, groupRepositoryImpl);
GroupUseCase groupUseCase = new GroupUseCase(groupRepositoryImpl);
PresenceRepositoryImpl presenceRepositoryImpl = new PresenceRepositoryImpl();
PresenceUseCase presenceUseCase = new PresenceUseCase();
MainMenuUI mainMenuUI = new MainMenuUI(userUseCase, groupUseCase, presenceUseCase);
var mainMenuUI = serviceProvider.GetRequiredService<MainMenuUI>();

12
123/UI/GroupConsole.cs
View File

@ -31,16 +31,10 @@ namespace _123.UI
}
public void AddGroup (String name, String id)
{
StringBuilder groupOutput = new StringBuilder();
var group = _groupUseCase.AddGroup(name,id);
<<<<<<< HEAD
=======
{
groupOutput.AppendLine($"{group.Name}\t{group.ID}");
}
Console.WriteLine(groupOutput);
>>>>>>> b274d8f88d0df85505fa497de11d07625bde956d
string output = _groupUseCase.AddGroup(name , id) ? "Группа добавлена" : "Группа не добавлена";
Console.WriteLine(output);
}
}
}

4
123/UI/MainMenu.cs
View File

@ -33,7 +33,7 @@ namespace _123.UI
switch (Console.ReadLine())
{
case "1": _userConsoleUI.DisplayAllUsers(); break;
case "2": _userConsoleUI.RemoveUserByGuid(Guid.Parse(Console.ReadLine())); break;
case "2": _userConsoleUI.RemoveUserById(int.Parse(Console.ReadLine())); break;
case "3": _groupConsoleUI.DisplayAllGroups(); break;
case "4": _userConsoleUI.FindUserById(int.Parse(Console.ReadLine())); break;
case "5": _userConsoleUI.UpdateUserById(int.Parse(Console.ReadLine()), Console.ReadLine(), Console.ReadLine()); break;
@ -41,7 +41,7 @@ namespace _123.UI
case "7": _groupConsoleUI.AddGroup(Console.ReadLine(), Console.ReadLine()); break;
case "8": _presenceConsoleUI.GetPresenceByGroup(int.Parse(Console.ReadLine())); break;
case "9": _presenceConsoleUI.GetPresenceByGroupAndDAte(int.Parse(Console.ReadLine()), DateOnly.Parse(Console.ReadLine())); break;
case "10": _presenceConsoleUI.UnCheckAttendence(int.Parse(Console.ReadLine()), int.Parse(Console.ReadLine()), DateOnly.Parse(Console.ReadLine()), Guid.Parse(Console.ReadLine())); break;
case "10": _presenceConsoleUI.UnCheckAttendence(int.Parse(Console.ReadLine()), int.Parse(Console.ReadLine()), DateOnly.Parse(Console.ReadLine()), int.Parse(Console.ReadLine())); break;
case "11": _presenceConsoleUI.AddPresence(int.Parse(Console.ReadLine()), int.Parse(Console.ReadLine()), int.Parse(Console.ReadLine()), DateOnly.Parse(Console.ReadLine())); break;
default:

135
123/UI/PresenceConsole.cs
View File

@ -11,6 +11,7 @@ namespace _123.UI
{
PresenceUseCase _presenceUseCase;
UseCaseGeneratePresence _useCaseGeneratePresence;
private PresenceUseCase presenceUseCase;
public PresenceConsoleUI(PresenceUseCase presenceUseCase, UseCaseGeneratePresence useCaseGeneratePresence)
{
@ -18,13 +19,18 @@ namespace _123.UI
_useCaseGeneratePresence = useCaseGeneratePresence;
}
public PresenceConsoleUI(PresenceUseCase presenceUseCase)
{
this.presenceUseCase = presenceUseCase;
}
public void GetPresenceByGroup(int groupId)
{
StringBuilder presenceOutput = new StringBuilder();
var presence = _presenceUseCase.GetPresenceByGroup(groupId);
foreach (var p in presence)
{
presenceOutput.AppendLine($"{p.LessonNumber}\t{p.UserGuid}\t{p.Date}");
presenceOutput.AppendLine($"{p.ClassNum}\t{p.User}\t{p.Date}");
}
Console.WriteLine(presenceOutput);
}
@ -35,14 +41,14 @@ namespace _123.UI
var presence = _presenceUseCase.GetPresenceByGroupAndDate(groupId, date);
foreach (var p in presence)
{
presenceOutput.AppendLine($"{p.LessonNumber}\t{p.UserGuid}\t{p.Date}");
presenceOutput.AppendLine($"{p.ClassNum}\t{p.User}\t{p.Date}");
}
Console.WriteLine(presenceOutput);
}
public void UnCheckAttendence(int firstClass, int lastClass, DateOnly date, Guid userGuid)
public void UnCheckAttendence(int firstClass, int lastClass, DateOnly date, int userId)
{
var result = _presenceUseCase.UnCheckAttendance(firstClass, lastClass, date, userGuid);
var result = _presenceUseCase.UnCheckAttendance(firstClass, lastClass, date, userId);
Console.WriteLine(result ? "Посещаемость успешно обновлена" : "Ошибка при обновлении посещаемости");
}
@ -58,28 +64,111 @@ namespace _123.UI
Console.WriteLine($"Ошибка при добавлении посещаемости: {ex.Message}");
}
}
public void GetGroupAttendanceStats(int groupId)
public void GetPresenceStatsByGroup(int groupId)
{
StringBuilder statsOutput = new StringBuilder();
var groupStats = _presenceUseCase.GetGroupStats(groupId);
statsOutput.AppendLine($"Информация о группе {groupStats.GroupName}:");
statsOutput.AppendLine($"Количество студентов: {groupStats.StudentsCount}");
statsOutput.AppendLine($"Количество проведенных занятий: {groupStats.TotalLessons}");
statsOutput.AppendLine($"Общий процент посещаемости: {groupStats.TotalAttendancePercent:F1}%");
statsOutput.AppendLine("\nСтатистика по студентам:");
statsOutput.AppendLine("ФИО\tПосещено\tПропущено\tПроцент посещаемости");
foreach(var student in groupStats.StudentStats)
var stats = _presenceUseCase.GetPresenceStatsByGroup(groupId);
StringBuilder output = new StringBuilder();
output.AppendLine($"Информация о группе {groupId}:");
output.AppendLine($"Количество студентов: {stats["Количество студентов"]}");
output.AppendLine($"Количество занятий: {stats["Количество занятий"]}");
output.AppendLine($"Общий процент посещаемости: {stats["Процент посещаемости"]}%");
output.AppendLine("\nСтатистика по студентам:");
var presence = _presenceUseCase.GetPresenceByGroup(groupId);
var students = presence.GroupBy(p => p.User)
.Select(g => new {
Student = g.Key,
Total = stats["Количество занятий"],
Attended = g.Count(p => p.IsAttedance),
Missed = stats["Количество занятий"] - g.Count(p => p.IsAttedance),
Percentage = (g.Count(p => p.IsAttedance) * 100) / stats["Количество занятий"]
});
foreach (var student in students)
{
statsOutput.AppendLine(
$"{student.StudentName}\t{student.AttendedLessons}\t" +
$"{student.MissedLessons}\t{student.AttendancePercent:F1}%"
);
output.AppendLine($"\nСтудент: {student.Student.UserFIO}");
output.AppendLine($"Посещено занятий: {student.Attended}");
output.AppendLine($"Пропущено занятий: {student.Missed}");
output.AppendLine($"Процент посещаемости: {student.Percentage}%");
}
Console.WriteLine(output.ToString());
}
public void ExportPresenceToExcel(string groupId, string filePath)
{
int Id;
bool isParsed = int.TryParse(groupId, out Id);
if (!isParsed)
{
Console.WriteLine("Введено не число");
}
var presence = _presenceUseCase.GetPresenceByGroup(Id);
var stats = _presenceUseCase.GetPresenceStatsByGroup(Id);
using (var workbook = new XLWorkbook())
{
var worksheet = workbook.Worksheets.Add("Посещаемость");
// Заголовок листа
worksheet.Cell(1, 1).Value = $"Группа {groupId}";
worksheet.Range(1, 1, 1, 3).Merge();
worksheet.Cell(1, 1).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
// Заголовки столбцов
worksheet.Cell(3, 1).Value = "№";
worksheet.Cell(3, 2).Value = "ФИО";
// Получаем все уникальные даты
var dates = presence.Select(p => p.Date).Distinct().OrderBy(d => d).ToList();
int col = 3;
foreach (var date in dates)
{
worksheet.Cell(3, col).Value = date.ToString("dd.MM.yyyy");
col++;
}
// Группируем данные по студентам
var studentGroups = presence.GroupBy(p => p.User);
int row = 4;
int studentNumber = 1;
foreach (var studentGroup in studentGroups)
{
// Номер и ФИО студента
worksheet.Cell(row, 1).Value = studentNumber++;
worksheet.Cell(row, 2).Value = studentGroup.Key.FIO;
// Заполняем посещаемость по датам
col = 3;
foreach (var date in dates)
{
var presenceOnDate = studentGroup.FirstOrDefault(p => p.Date == date);
worksheet.Cell(row, col).Value = presenceOnDate?.IsAttendence == true ? "+" : "н";
worksheet.Cell(row, col).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
col++;
}
row++;
}
// Форматирование
var tableRange = worksheet.Range(3, 1, row - 1, dates.Count + 2);
tableRange.Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
tableRange.Style.Border.InsideBorder = XLBorderStyleValues.Thin;
worksheet.Columns().AdjustToContents();
try
{
workbook.SaveAs(filePath);
Console.WriteLine($"Данные успешно экспортированы в файл: {filePath}");
}
catch (Exception ex)
{
Console.WriteLine($"Ошибка при сохранении файла: {ex.Message}");
}
}
Console.WriteLine(statsOutput.ToString());
}
}
}

2
123/UI/UserConsole.cs
View File

@ -37,7 +37,7 @@ namespace _123.UI
{
StringBuilder userOutput = new StringBuilder();
var user = _userUseCase.FindUserByGuid(userId);
userOutput.AppendLine($"{user.UserID}\t{user.UserFIO}\t{user.GroupID}");
userOutput.AppendLine($"{user.UserID}\t{user.UserFIO}\t{user.UserGroup}");
Console.WriteLine(userOutput);
}

6
123/presence/console/Class1.cs Normal file
View File

@ -0,0 +1,6 @@
namespace console;
public class Class1
{
}

9
123/presence/console/console.csproj Normal file
View File

@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>

10
123/presence_api/Controllers/GroupController.cs/GroupController.cs Normal file
View File

@ -0,0 +1,10 @@
namespace presence_api.Controllers;
[ApiConytoller]
[Route("api/[apicontroller]")]
public class GroupController(): ControllerBaswe {
private readonly GroupUseCase _groupUserCase;
GroupController(GroupUseCase groupUseCase){
_groupUserCase = groupUseCase();
}
}

44
123/presence_api/Program.cs Normal file
View File

@ -0,0 +1,44 @@
var builder = WebApplication.CreateBuilder(args);
// Add services to the container.
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen();
var app = builder.Build();
// Configure the HTTP request pipeline.
if (app.Environment.IsDevelopment())
{
app.UseSwagger();
app.UseSwaggerUI();
}
app.UseHttpsRedirection();
var summaries = new[]
{
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
};
app.MapGet("/weatherforecast", () =>
{
var forecast = Enumerable.Range(1, 5).Select(index =>
new WeatherForecast
(
DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
Random.Shared.Next(-20, 55),
summaries[Random.Shared.Next(summaries.Length)]
))
.ToArray();
return forecast;
})
.WithName("GetWeatherForecast")
.WithOpenApi();
app.Run();
record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary)
{
public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
}

41
123/presence_api/Properties/launchSettings.json Normal file
View File

@ -0,0 +1,41 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:6036",
"sslPort": 44357
}
},
"profiles": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "http://localhost:5013",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:7117;http://localhost:5013",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}

8
123/presence_api/appsettings.Development.json Normal file
View File

@ -0,0 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}

9
123/presence_api/appsettings.json Normal file
View File

@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*"
}

18
123/presence_api/presence_api.csproj Normal file
View File

@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Domain\Domain.csproj" />
</ItemGroup>
</Project>

6
123/presence_api/presence_api.http Normal file
View File

@ -0,0 +1,6 @@
@presence_api_HostAddress = http://localhost:5013
GET {{presence_api_HostAddress}}/weatherforecast/
Accept: application/json
###