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

Очистка using

Browse Source
This commit is contained in:
funa4i 2024-12-07 15:38:07 +04:00
parent 435e5f2aee
commit f4420c12f0
32 changed files with 33 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
StudentProgressRecord/Entity/Enums/Direction.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.Entity.Enums
namespace StudentProgressRecord.Entity.Enums
{
[Flags]
public enum Direction

8
StudentProgressRecord/Entity/Enums/Operations.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.Entity.Enums
namespace StudentProgressRecord.Entity.Enums
{
public enum Operations
{

8
StudentProgressRecord/Entity/Marks.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.Entity
namespace StudentProgressRecord.Entity
{
public class Marks
{

11
StudentProgressRecord/Entity/Statement.cs
View File

@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.Entity
namespace StudentProgressRecord.Entity
{
public class Statement
{
@ -19,7 +12,7 @@ namespace StudentProgressRecord.Entity
public IEnumerable<Marks> Marks { get; set; } = [];
public static Statement CreateOperation(long id, long subjectId, long teacherId,
public static Statement CreateOperation(long id, long subjectId, long teacherId,
DateTime timeStamp, IEnumerable<Marks> marks)
{
return new Statement

10
StudentProgressRecord/Entity/Student.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.Entity
namespace StudentProgressRecord.Entity
{
public class Student
{
@ -18,7 +12,7 @@ namespace StudentProgressRecord.Entity
public bool Domitory { get; set; }
public static Student CreateEntity(long id, string name, bool familyPos,
public static Student CreateEntity(long id, string name, bool familyPos,
bool domitory)
{
return new Student

5
StudentProgressRecord/Entity/StudentTransition.cs
View File

@ -1,9 +1,4 @@
using StudentProgressRecord.Entity.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.Entity
{

5
StudentProgressRecord/Entity/Subject.cs
View File

@ -1,9 +1,4 @@
using StudentProgressRecord.Entity.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.Entity
{

8
StudentProgressRecord/Entity/Teacher.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.Entity
namespace StudentProgressRecord.Entity
{
public class Teacher
{

10
StudentProgressRecord/Forms/FormViewEntities/FormViewStatement.cs
View File

@ -1,14 +1,4 @@
using StudentProgressRecord.Repositories;
using StudentProgressRecord.RepositoryImp;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Unity;
namespace StudentProgressRecord.Forms.FormViewEntities

14
StudentProgressRecord/Forms/FormViewEntities/FormViewStudentTransition.cs
View File

@ -1,16 +1,4 @@
using StudentProgressRecord.IRepositories;
using StudentProgressRecord.Repositories;
using StudentProgressRecord.RepositoryImp;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Xml.Linq;
using Unity;
namespace StudentProgressRecord.Forms.FormViewEntities
@ -25,7 +13,7 @@ namespace StudentProgressRecord.Forms.FormViewEntities
{
InitializeComponent();
_container = container ?? throw new ArgumentNullException(nameof(container));
_studentTransitionRepository= studentTransitionRepository ?? throw new ArgumentNullException(nameof(studentTransitionRepository));
_studentTransitionRepository = studentTransitionRepository ?? throw new ArgumentNullException(nameof(studentTransitionRepository));
}
private void FormViewStudentTransition_Load(object sender, EventArgs e)

10
StudentProgressRecord/Forms/FormViewEntities/FormViewStudents.cs
View File

@ -1,14 +1,4 @@
using StudentProgressRecord.Repositories;
using StudentProgressRecord.RepositoryImp;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Unity;
namespace StudentProgressRecord.Forms.FormViewEntities

10
StudentProgressRecord/Forms/FormViewEntities/FormViewSubjects.cs
View File

@ -1,14 +1,4 @@
using StudentProgressRecord.Repositories;
using StudentProgressRecord.RepositoryImp;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Unity;
namespace StudentProgressRecord.Forms.FormViewEntities

12
StudentProgressRecord/Forms/FormViewEntities/FormViewTeachers.cs
View File

@ -1,13 +1,4 @@
using StudentProgressRecord.Repositories;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Unity;
namespace StudentProgressRecord.Forms.FormViewEntities
@ -74,7 +65,8 @@ namespace StudentProgressRecord.Forms.FormViewEntities
private void buttonDelete_Click(object sender, EventArgs e)
{
if(!TryGetIdFromSelectesRow(out var findId)){
if (!TryGetIdFromSelectesRow(out var findId))
{
return;
}
if (MessageBox.Show("Удалить запись?", "Удаление",

13
StudentProgressRecord/Forms/FormsEntity/FormStatement.cs
View File

@ -1,14 +1,5 @@
using StudentProgressRecord.Entity;
using StudentProgressRecord.Repositories;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace StudentProgressRecord.Forms
{
@ -34,10 +25,10 @@ namespace StudentProgressRecord.Forms
comboBoxSubject.ValueMember = "Id";
var list = new List<int>() {1,2,3,4,5};
var list = new List<int>() { 1, 2, 3, 4, 5 };
columnMark.ValueType = typeof(int);
columnMark.DataSource = list;
columnStudent.DataSource = studentRepository.ReadStudents();
columnStudent.DisplayMember = "Name";
columnStudent.ValueMember = "Id";

10
StudentProgressRecord/Forms/FormsEntity/FormStudent.cs
View File

@ -1,15 +1,5 @@
using StudentProgressRecord.Entity;
using StudentProgressRecord.Repositories;
using StudentProgressRecord.RepositoryImp;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace StudentProgressRecord.Forms
{

15
StudentProgressRecord/Forms/FormsEntity/FormStudentTransition.cs
View File

@ -1,18 +1,7 @@
using Microsoft.VisualBasic.FileIO;
using StudentProgressRecord.Entity;
using StudentProgressRecord.Entity;
using StudentProgressRecord.Entity.Enums;
using StudentProgressRecord.IRepositories;
using StudentProgressRecord.Repositories;
using StudentProgressRecord.RepositoryImp;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace StudentProgressRecord.Forms
{
@ -51,7 +40,7 @@ namespace StudentProgressRecord.Forms
Console.Write(comboBoxOperations.SelectedItem);
_studentTransitionRepository.CreateStudentTransition(
StudentTransition.CreateOperation(
0L,
0L,
(long)comboBoxStudent.SelectedValue!,
(Operations)comboBoxOperations.SelectedItem!,
dateTimePicker.Value)

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

@ -1,16 +1,6 @@
using Microsoft.VisualBasic.FileIO;
using StudentProgressRecord.Entity;
using StudentProgressRecord.Entity;
using StudentProgressRecord.Entity.Enums;
using StudentProgressRecord.Repositories;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace StudentProgressRecord
{
@ -62,7 +52,7 @@ namespace StudentProgressRecord
{
try
{
if (string.IsNullOrWhiteSpace(textBoxSubject.Text) ||
if (string.IsNullOrWhiteSpace(textBoxSubject.Text) ||
checkedListBoxDir.CheckedItems.Count == 0)
{
throw new Exception("Имя не может быть пустым");

10
StudentProgressRecord/Forms/FormsEntity/FormTeacher.cs
View File

@ -1,15 +1,5 @@
using StudentProgressRecord.Entity;
using StudentProgressRecord.Repositories;
using StudentProgressRecord.RepositoryImp;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace StudentProgressRecord.Forms
{

11
StudentProgressRecord/Forms/FormsEntity/FormUniversity.cs
View File

@ -1,13 +1,4 @@
using StudentProgressRecord.Forms.FormViewEntities;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Unity;
namespace StudentProgressRecord
@ -87,6 +78,6 @@ namespace StudentProgressRecord
}
}
}
}

8
StudentProgressRecord/IRepositories/IConnectionString.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.IRepositories
namespace StudentProgressRecord.IRepositories
{
public interface IConnectionString
{

2
StudentProgressRecord/IRepositories/IStatementRepository.cs
View File

@ -4,7 +4,7 @@ namespace StudentProgressRecord.Repositories
{
public interface IStatementRepository
{
IEnumerable<Statement> ReadStatements(long? subjectId = null, long? teacherId = null, DateTime? dateFrom = null, DateTime? dateTo=null);
IEnumerable<Statement> ReadStatements(long? subjectId = null, long? teacherId = null, DateTime? dateFrom = null, DateTime? dateTo = null);
void CreateStatement(Statement statement);
void DeleteStatement(long id);

7
StudentProgressRecord/IRepositories/IStudentRepository.cs
View File

@ -1,15 +1,10 @@
using StudentProgressRecord.Entity;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.Repositories
{
public interface IStudentRepository
{
IEnumerable<Student> ReadStudents(bool? familyPos=null, bool? domitory=null);
IEnumerable<Student> ReadStudents(bool? familyPos = null, bool? domitory = null);
Student ReadStudentById(long id);
void CreateStudent(Student student);
void UpdateStudent(Student student);

5
StudentProgressRecord/IRepositories/IStudentTransitionRepository.cs
View File

@ -1,9 +1,4 @@
using StudentProgressRecord.Entity;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.IRepositories
{

5
StudentProgressRecord/IRepositories/ISubjectRepository.cs
View File

@ -1,9 +1,4 @@
using StudentProgressRecord.Entity;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.Repositories
{

5
StudentProgressRecord/IRepositories/ITeacherRepository.cs
View File

@ -1,9 +1,4 @@
using StudentProgressRecord.Entity;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.Repositories
{

6
StudentProgressRecord/Program.cs
View File

@ -1,8 +1,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Serilog;
using StudentProgressRecord.Forms;
using StudentProgressRecord.IRepositories;
using StudentProgressRecord.Repositories;
using StudentProgressRecord.RepositoryImp;
@ -30,7 +28,7 @@ namespace StudentProgressRecord
container.AddExtension(new LoggingExtension(CreateLoggerFactory()));
container.RegisterType<IConnectionString,ConnectionString>(new SingletonLifetimeManager());
container.RegisterType<IConnectionString, ConnectionString>(new SingletonLifetimeManager());
container.RegisterType<IStatementRepository, StatementRepository>
(new TransientLifetimeManager());
@ -40,7 +38,7 @@ namespace StudentProgressRecord
container.RegisterType<ISubjectRepository, SubjectRepository>
(new TransientLifetimeManager());
container.RegisterType<ITeacherRepository, TeacherRepository>
(new TransientLifetimeManager());

8
StudentProgressRecord/RepositoryImp/ConnectionString.cs
View File

@ -1,10 +1,4 @@
using Microsoft.VisualBasic.ApplicationServices;
using StudentProgressRecord.IRepositories;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using StudentProgressRecord.IRepositories;
namespace StudentProgressRecord.RepositoryImp
{

11
StudentProgressRecord/RepositoryImp/StatementRepository.cs
View File

@ -5,7 +5,6 @@ using Npgsql;
using StudentProgressRecord.Entity;
using StudentProgressRecord.IRepositories;
using StudentProgressRecord.Repositories;
using System.Data.SqlClient;
namespace StudentProgressRecord.RepositoryImp
@ -32,18 +31,18 @@ namespace StudentProgressRecord.RepositoryImp
connection.Open();
using var transaction = connection.BeginTransaction();
var queryInsert = @"
INSERT INTO Statement (SubjectId, TeacherId, Date)
VALUES (@SubjectId, @TeacherId, @Date);
SELECT MAX(Id) FROM Statement";
var statementID = connection.QueryFirst<int>(queryInsert, statement, transaction);
var querySubInsert = @"
INSERT INTO Marks (StatementId, StudentId, Mark)
VALUES (@StatementId, @StudentId,@Mark)";
foreach (var elem in statement.Marks)
{
connection.Execute(querySubInsert, new
@ -82,7 +81,7 @@ namespace StudentProgressRecord.RepositoryImp
}
}
public IEnumerable<Statement> ReadStatements(long? subjectId = null, long? teacherId = null,
public IEnumerable<Statement> ReadStatements(long? subjectId = null, long? teacherId = null,
DateTime? dateFrom = null, DateTime? dateTo = null)
{
_logger.LogInformation("Получение всех объектов");

6
StudentProgressRecord/RepositoryImp/StudentRepository.cs
View File

@ -2,15 +2,9 @@
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Npgsql;
using Serilog.Core;
using StudentProgressRecord.Entity;
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
{

9
StudentProgressRecord/RepositoryImp/StudentTransitionRepository.cs
View File

@ -1,10 +1,9 @@
using StudentProgressRecord.Entity;
using StudentProgressRecord.IRepositories;
using StudentProgressRecord.Entity.Enums;
using Dapper;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Npgsql;
using Microsoft.Extensions.Logging;
using Dapper;
using StudentProgressRecord.Entity;
using StudentProgressRecord.IRepositories;
namespace StudentProgressRecord.RepositoryImp
{
public class StudentTransitionRepository : IStudentTransitionRepository

1
StudentProgressRecord/RepositoryImp/SubjectRepository.cs
View File

@ -3,7 +3,6 @@ using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Npgsql;
using StudentProgressRecord.Entity;
using StudentProgressRecord.Entity.Enums;
using StudentProgressRecord.IRepositories;
using StudentProgressRecord.Repositories;

6
StudentProgressRecord/RepositoryImp/TeacherRepository.cs
View File

@ -5,12 +5,6 @@ using Npgsql;
using StudentProgressRecord.Entity;
using StudentProgressRecord.IRepositories;
using StudentProgressRecord.Repositories;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
namespace StudentProgressRecord.RepositoryImp
{