bekodeg/Cop.Borovkov.Var3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

фиксы небольших моментов

Browse Source
This commit is contained in:
bekodeg 2024-11-24 13:20:49 +04:00
parent 7ca62ddb1d
commit 2bb8b42453
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cop.Borovkov.Var3/Lab3.Database/Repository/Implementations/StudentRepository.cs
View File

@ -57,7 +57,7 @@ namespace Lab3.Database.Repository.Implementations
return _mapper.Map<StudentDTO>( return _mapper.Map<StudentDTO>(
await _context.Students await _context.Students
.Include(s => s.StudentSessions) .Include(s => s.StudentSessions)
.FirstOrDefaultAsync()); .FirstOrDefaultAsync(s =>s.Id == id));
} }
public async Task<StudentDTO?> UpdateAsync(StudentDTO studentDTO) public async Task<StudentDTO?> UpdateAsync(StudentDTO studentDTO)

19
Cop.Borovkov.Var3/Lab3/Forms/MainForm.cs
View File

@ -1,13 +1,9 @@
using AutoMapper; using AutoMapper;
using ComponentsLibrary.entities; using ComponentsLibrary.entities;
using ComponentsLibrary.entities.enums; using ComponentsLibrary.entities.enums;
using DocumentFormat.OpenXml.Bibliography;
using DocumentFormat.OpenXml.Drawing;
using DocumentFormat.OpenXml.Spreadsheet;
using Lab3.Database.DTO; using Lab3.Database.DTO;
using Lab3.Database.Repository.Interfaces; using Lab3.Database.Repository.Interfaces;
using Lab3.Models; using Lab3.Models;
using NPOI.OpenXml4Net.OPC.Internal;
namespace Lab3.Forms namespace Lab3.Forms
{ {
@ -16,18 +12,21 @@ namespace Lab3.Forms
private readonly IStudentRepository _studentRepository; private readonly IStudentRepository _studentRepository;
private readonly IMapper _mapper; private readonly IMapper _mapper;
private readonly Func<Guid?, CreateForm> _getCreateOrUpdateForm; private readonly Func<Guid?, CreateForm> _getCreateOrUpdateForm;
private readonly CatalogForm _catalogForm;
private bool _cont = false; private bool _cont = false;
public MainForm( public MainForm(
IStudentRepository repository, IStudentRepository repository,
IMapper mapper, IMapper mapper,
Func<Guid?, CreateForm> getCreateOrUpdateForm) Func<Guid?, CreateForm> getCreateOrUpdateForm,
CatalogForm catalogForm)
{ {
_studentRepository = repository; _studentRepository = repository;
_mapper = mapper; _mapper = mapper;
_getCreateOrUpdateForm = getCreateOrUpdateForm; _getCreateOrUpdateForm = getCreateOrUpdateForm;
_catalogForm = catalogForm;
InitializeComponent(); InitializeComponent();
} }
@ -232,16 +231,20 @@ namespace Lab3.Forms
{ {
CreateWordDocAsync(); CreateWordDocAsync();
} }
else if (_cont && keyData == Keys.G)
{
_catalogForm.ShowDialog(this);
}
if (keyData == Keys.A || if (keyData == Keys.A ||
keyData == Keys.U || keyData == Keys.U ||
keyData == Keys.D || keyData == Keys.D ||
keyData == Keys.S || keyData == Keys.S ||
keyData == Keys.T || keyData == Keys.T ||
keyData == Keys.C) _cont = false; keyData == Keys.C ||
//if (keyData != Keys.None && keyData != (System.Windows.Forms.Keys.ControlKey | System.Windows.Forms.Keys.Control)) cont = false; keyData == Keys.G) _cont = false;
return true; return true;
return base.ProcessCmdKey(ref msg, keyData);
} }
} }
} }