funa4i/Pibd-22_Lyakhov_T.I._Simple
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Pibd-22_Lyakhov_T_I_Lab2_Simple #3

Open
funa4i wants to merge 7 commits from LabWork2 into LabWrk01
pull from: LabWork2
merge into: funa4i:LabWrk01
Conversation 0 Commits 7 Files Changed 17 +9 -11
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa5c773d5a - Show all commits

3
StudentProgressRecord/Entity/Subject.cs
View File

@ -20,7 +20,8 @@ namespace StudentProgressRecord.Entity
return new Subject
{
Id = id,
Name = name
Name = name,
direction = direction
};
}
}

4
StudentProgressRecord/Forms/FormsEntity/FormSubject.cs
View File

@ -62,8 +62,8 @@ namespace StudentProgressRecord
{
try
{
if (string.IsNullOrWhiteSpace(textBoxSubject.Text) ||
string.IsNullOrWhiteSpace(textBoxSubject.Text))
if (string.IsNullOrWhiteSpace(textBoxSubject.Text) ||
checkedListBoxDir.CheckedItems.Count == 0)
{
throw new Exception("Имя не может быть пустым");
}

13
StudentProgressRecord/RepositoryImp/SubjectRepository.cs
View File

@ -3,13 +3,10 @@ using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Npgsql;
using StudentProgressRecord.Entity;
using StudentProgressRecord.Entity.Enums;
using StudentProgressRecord.IRepositories;
using StudentProgressRecord.Repositories;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.RepositoryImp
{
@ -32,8 +29,8 @@ namespace StudentProgressRecord.RepositoryImp
{
using var connection = new NpgsqlConnection(_connectionString.GetConnectionString());
var query = @"
INSERT INTO Subject (Name)
VALUES (@Name)";
INSERT INTO Subject (direction, Name)
VALUES (@direction ,@Name)";
connection.Execute(query, subject);
}
catch (Exception ex)
@ -64,7 +61,7 @@ namespace StudentProgressRecord.RepositoryImp
public Subject ReadSubjectById(long id)
{
return Subject.CreateEntity(0, string.Empty);
return Subject.CreateEntity(0, string.Empty, Direction.None);
}
public IEnumerable<Subject> ReadSubjects()