Очистка using
This commit is contained in:
parent
435e5f2aee
commit
f4420c12f0
@ -1,10 +1,4 @@
|
|||||||
using System;
|
namespace StudentProgressRecord.Entity.Enums
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity.Enums
|
|
||||||
{
|
{
|
||||||
[Flags]
|
[Flags]
|
||||||
public enum Direction
|
public enum Direction
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
using System;
|
namespace StudentProgressRecord.Entity.Enums
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity.Enums
|
|
||||||
{
|
{
|
||||||
public enum Operations
|
public enum Operations
|
||||||
{
|
{
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
using System;
|
namespace StudentProgressRecord.Entity
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity
|
|
||||||
{
|
{
|
||||||
public class Marks
|
public class Marks
|
||||||
{
|
{
|
||||||
|
@ -1,11 +1,4 @@
|
|||||||
using System;
|
namespace StudentProgressRecord.Entity
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity
|
|
||||||
{
|
{
|
||||||
public class Statement
|
public class Statement
|
||||||
{
|
{
|
||||||
@ -19,7 +12,7 @@ namespace StudentProgressRecord.Entity
|
|||||||
|
|
||||||
public IEnumerable<Marks> Marks { get; set; } = [];
|
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)
|
DateTime timeStamp, IEnumerable<Marks> marks)
|
||||||
{
|
{
|
||||||
return new Statement
|
return new Statement
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
using System;
|
namespace StudentProgressRecord.Entity
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity
|
|
||||||
{
|
{
|
||||||
public class Student
|
public class Student
|
||||||
{
|
{
|
||||||
@ -18,7 +12,7 @@ namespace StudentProgressRecord.Entity
|
|||||||
public bool Domitory { get; set; }
|
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)
|
bool domitory)
|
||||||
{
|
{
|
||||||
return new Student
|
return new Student
|
||||||
|
@ -1,9 +1,4 @@
|
|||||||
using StudentProgressRecord.Entity.Enums;
|
using StudentProgressRecord.Entity.Enums;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity
|
namespace StudentProgressRecord.Entity
|
||||||
{
|
{
|
||||||
|
@ -1,9 +1,4 @@
|
|||||||
using StudentProgressRecord.Entity.Enums;
|
using StudentProgressRecord.Entity.Enums;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity
|
namespace StudentProgressRecord.Entity
|
||||||
{
|
{
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
using System;
|
namespace StudentProgressRecord.Entity
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity
|
|
||||||
{
|
{
|
||||||
public class Teacher
|
public class Teacher
|
||||||
{
|
{
|
||||||
|
@ -1,14 +1,4 @@
|
|||||||
using StudentProgressRecord.Repositories;
|
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;
|
using Unity;
|
||||||
|
|
||||||
namespace StudentProgressRecord.Forms.FormViewEntities
|
namespace StudentProgressRecord.Forms.FormViewEntities
|
||||||
|
@ -1,16 +1,4 @@
|
|||||||
using StudentProgressRecord.IRepositories;
|
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;
|
using Unity;
|
||||||
|
|
||||||
namespace StudentProgressRecord.Forms.FormViewEntities
|
namespace StudentProgressRecord.Forms.FormViewEntities
|
||||||
@ -25,7 +13,7 @@ namespace StudentProgressRecord.Forms.FormViewEntities
|
|||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
_container = container ?? throw new ArgumentNullException(nameof(container));
|
_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)
|
private void FormViewStudentTransition_Load(object sender, EventArgs e)
|
||||||
|
@ -1,14 +1,4 @@
|
|||||||
using StudentProgressRecord.Repositories;
|
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;
|
using Unity;
|
||||||
|
|
||||||
namespace StudentProgressRecord.Forms.FormViewEntities
|
namespace StudentProgressRecord.Forms.FormViewEntities
|
||||||
|
@ -1,14 +1,4 @@
|
|||||||
using StudentProgressRecord.Repositories;
|
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;
|
using Unity;
|
||||||
|
|
||||||
namespace StudentProgressRecord.Forms.FormViewEntities
|
namespace StudentProgressRecord.Forms.FormViewEntities
|
||||||
|
@ -1,13 +1,4 @@
|
|||||||
using StudentProgressRecord.Repositories;
|
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;
|
using Unity;
|
||||||
|
|
||||||
namespace StudentProgressRecord.Forms.FormViewEntities
|
namespace StudentProgressRecord.Forms.FormViewEntities
|
||||||
@ -74,7 +65,8 @@ namespace StudentProgressRecord.Forms.FormViewEntities
|
|||||||
|
|
||||||
private void buttonDelete_Click(object sender, EventArgs e)
|
private void buttonDelete_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if(!TryGetIdFromSelectesRow(out var findId)){
|
if (!TryGetIdFromSelectesRow(out var findId))
|
||||||
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (MessageBox.Show("Удалить запись?", "Удаление",
|
if (MessageBox.Show("Удалить запись?", "Удаление",
|
||||||
|
@ -1,14 +1,5 @@
|
|||||||
using StudentProgressRecord.Entity;
|
using StudentProgressRecord.Entity;
|
||||||
using StudentProgressRecord.Repositories;
|
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
|
namespace StudentProgressRecord.Forms
|
||||||
{
|
{
|
||||||
@ -34,10 +25,10 @@ namespace StudentProgressRecord.Forms
|
|||||||
comboBoxSubject.ValueMember = "Id";
|
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.ValueType = typeof(int);
|
||||||
columnMark.DataSource = list;
|
columnMark.DataSource = list;
|
||||||
|
|
||||||
columnStudent.DataSource = studentRepository.ReadStudents();
|
columnStudent.DataSource = studentRepository.ReadStudents();
|
||||||
columnStudent.DisplayMember = "Name";
|
columnStudent.DisplayMember = "Name";
|
||||||
columnStudent.ValueMember = "Id";
|
columnStudent.ValueMember = "Id";
|
||||||
|
@ -1,15 +1,5 @@
|
|||||||
using StudentProgressRecord.Entity;
|
using StudentProgressRecord.Entity;
|
||||||
using StudentProgressRecord.Repositories;
|
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
|
namespace StudentProgressRecord.Forms
|
||||||
{
|
{
|
||||||
|
@ -1,18 +1,7 @@
|
|||||||
using Microsoft.VisualBasic.FileIO;
|
using StudentProgressRecord.Entity;
|
||||||
using StudentProgressRecord.Entity;
|
|
||||||
using StudentProgressRecord.Entity.Enums;
|
using StudentProgressRecord.Entity.Enums;
|
||||||
using StudentProgressRecord.IRepositories;
|
using StudentProgressRecord.IRepositories;
|
||||||
using StudentProgressRecord.Repositories;
|
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
|
namespace StudentProgressRecord.Forms
|
||||||
{
|
{
|
||||||
@ -51,7 +40,7 @@ namespace StudentProgressRecord.Forms
|
|||||||
Console.Write(comboBoxOperations.SelectedItem);
|
Console.Write(comboBoxOperations.SelectedItem);
|
||||||
_studentTransitionRepository.CreateStudentTransition(
|
_studentTransitionRepository.CreateStudentTransition(
|
||||||
StudentTransition.CreateOperation(
|
StudentTransition.CreateOperation(
|
||||||
0L,
|
0L,
|
||||||
(long)comboBoxStudent.SelectedValue!,
|
(long)comboBoxStudent.SelectedValue!,
|
||||||
(Operations)comboBoxOperations.SelectedItem!,
|
(Operations)comboBoxOperations.SelectedItem!,
|
||||||
dateTimePicker.Value)
|
dateTimePicker.Value)
|
||||||
|
@ -1,16 +1,6 @@
|
|||||||
using Microsoft.VisualBasic.FileIO;
|
using StudentProgressRecord.Entity;
|
||||||
using StudentProgressRecord.Entity;
|
|
||||||
using StudentProgressRecord.Entity.Enums;
|
using StudentProgressRecord.Entity.Enums;
|
||||||
using StudentProgressRecord.Repositories;
|
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
|
namespace StudentProgressRecord
|
||||||
{
|
{
|
||||||
@ -62,7 +52,7 @@ namespace StudentProgressRecord
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(textBoxSubject.Text) ||
|
if (string.IsNullOrWhiteSpace(textBoxSubject.Text) ||
|
||||||
checkedListBoxDir.CheckedItems.Count == 0)
|
checkedListBoxDir.CheckedItems.Count == 0)
|
||||||
{
|
{
|
||||||
throw new Exception("Имя не может быть пустым");
|
throw new Exception("Имя не может быть пустым");
|
||||||
|
@ -1,15 +1,5 @@
|
|||||||
using StudentProgressRecord.Entity;
|
using StudentProgressRecord.Entity;
|
||||||
using StudentProgressRecord.Repositories;
|
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
|
namespace StudentProgressRecord.Forms
|
||||||
{
|
{
|
||||||
|
@ -1,13 +1,4 @@
|
|||||||
using StudentProgressRecord.Forms.FormViewEntities;
|
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;
|
using Unity;
|
||||||
|
|
||||||
namespace StudentProgressRecord
|
namespace StudentProgressRecord
|
||||||
@ -87,6 +78,6 @@ namespace StudentProgressRecord
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
using System;
|
namespace StudentProgressRecord.IRepositories
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.IRepositories
|
|
||||||
{
|
{
|
||||||
public interface IConnectionString
|
public interface IConnectionString
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,7 @@ namespace StudentProgressRecord.Repositories
|
|||||||
{
|
{
|
||||||
public interface IStatementRepository
|
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 CreateStatement(Statement statement);
|
||||||
void DeleteStatement(long id);
|
void DeleteStatement(long id);
|
||||||
|
@ -1,15 +1,10 @@
|
|||||||
using StudentProgressRecord.Entity;
|
using StudentProgressRecord.Entity;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Repositories
|
namespace StudentProgressRecord.Repositories
|
||||||
{
|
{
|
||||||
public interface IStudentRepository
|
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);
|
Student ReadStudentById(long id);
|
||||||
void CreateStudent(Student student);
|
void CreateStudent(Student student);
|
||||||
void UpdateStudent(Student student);
|
void UpdateStudent(Student student);
|
||||||
|
@ -1,9 +1,4 @@
|
|||||||
using StudentProgressRecord.Entity;
|
using StudentProgressRecord.Entity;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.IRepositories
|
namespace StudentProgressRecord.IRepositories
|
||||||
{
|
{
|
||||||
|
@ -1,9 +1,4 @@
|
|||||||
using StudentProgressRecord.Entity;
|
using StudentProgressRecord.Entity;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Repositories
|
namespace StudentProgressRecord.Repositories
|
||||||
{
|
{
|
||||||
|
@ -1,9 +1,4 @@
|
|||||||
using StudentProgressRecord.Entity;
|
using StudentProgressRecord.Entity;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Repositories
|
namespace StudentProgressRecord.Repositories
|
||||||
{
|
{
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
|
|
||||||
using StudentProgressRecord.Forms;
|
|
||||||
using StudentProgressRecord.IRepositories;
|
using StudentProgressRecord.IRepositories;
|
||||||
using StudentProgressRecord.Repositories;
|
using StudentProgressRecord.Repositories;
|
||||||
using StudentProgressRecord.RepositoryImp;
|
using StudentProgressRecord.RepositoryImp;
|
||||||
@ -30,7 +28,7 @@ namespace StudentProgressRecord
|
|||||||
|
|
||||||
container.AddExtension(new LoggingExtension(CreateLoggerFactory()));
|
container.AddExtension(new LoggingExtension(CreateLoggerFactory()));
|
||||||
|
|
||||||
container.RegisterType<IConnectionString,ConnectionString>(new SingletonLifetimeManager());
|
container.RegisterType<IConnectionString, ConnectionString>(new SingletonLifetimeManager());
|
||||||
|
|
||||||
container.RegisterType<IStatementRepository, StatementRepository>
|
container.RegisterType<IStatementRepository, StatementRepository>
|
||||||
(new TransientLifetimeManager());
|
(new TransientLifetimeManager());
|
||||||
@ -40,7 +38,7 @@ namespace StudentProgressRecord
|
|||||||
|
|
||||||
container.RegisterType<ISubjectRepository, SubjectRepository>
|
container.RegisterType<ISubjectRepository, SubjectRepository>
|
||||||
(new TransientLifetimeManager());
|
(new TransientLifetimeManager());
|
||||||
|
|
||||||
container.RegisterType<ITeacherRepository, TeacherRepository>
|
container.RegisterType<ITeacherRepository, TeacherRepository>
|
||||||
(new TransientLifetimeManager());
|
(new TransientLifetimeManager());
|
||||||
|
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
using Microsoft.VisualBasic.ApplicationServices;
|
using StudentProgressRecord.IRepositories;
|
||||||
using StudentProgressRecord.IRepositories;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.RepositoryImp
|
namespace StudentProgressRecord.RepositoryImp
|
||||||
{
|
{
|
||||||
|
@ -5,7 +5,6 @@ using Npgsql;
|
|||||||
using StudentProgressRecord.Entity;
|
using StudentProgressRecord.Entity;
|
||||||
using StudentProgressRecord.IRepositories;
|
using StudentProgressRecord.IRepositories;
|
||||||
using StudentProgressRecord.Repositories;
|
using StudentProgressRecord.Repositories;
|
||||||
using System.Data.SqlClient;
|
|
||||||
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.RepositoryImp
|
namespace StudentProgressRecord.RepositoryImp
|
||||||
@ -32,18 +31,18 @@ namespace StudentProgressRecord.RepositoryImp
|
|||||||
connection.Open();
|
connection.Open();
|
||||||
|
|
||||||
using var transaction = connection.BeginTransaction();
|
using var transaction = connection.BeginTransaction();
|
||||||
|
|
||||||
var queryInsert = @"
|
var queryInsert = @"
|
||||||
INSERT INTO Statement (SubjectId, TeacherId, Date)
|
INSERT INTO Statement (SubjectId, TeacherId, Date)
|
||||||
VALUES (@SubjectId, @TeacherId, @Date);
|
VALUES (@SubjectId, @TeacherId, @Date);
|
||||||
SELECT MAX(Id) FROM Statement";
|
SELECT MAX(Id) FROM Statement";
|
||||||
|
|
||||||
var statementID = connection.QueryFirst<int>(queryInsert, statement, transaction);
|
var statementID = connection.QueryFirst<int>(queryInsert, statement, transaction);
|
||||||
|
|
||||||
var querySubInsert = @"
|
var querySubInsert = @"
|
||||||
INSERT INTO Marks (StatementId, StudentId, Mark)
|
INSERT INTO Marks (StatementId, StudentId, Mark)
|
||||||
VALUES (@StatementId, @StudentId,@Mark)";
|
VALUES (@StatementId, @StudentId,@Mark)";
|
||||||
|
|
||||||
foreach (var elem in statement.Marks)
|
foreach (var elem in statement.Marks)
|
||||||
{
|
{
|
||||||
connection.Execute(querySubInsert, new
|
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)
|
DateTime? dateFrom = null, DateTime? dateTo = null)
|
||||||
{
|
{
|
||||||
_logger.LogInformation("Получение всех объектов");
|
_logger.LogInformation("Получение всех объектов");
|
||||||
|
@ -2,15 +2,9 @@
|
|||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
using Serilog.Core;
|
|
||||||
using StudentProgressRecord.Entity;
|
using StudentProgressRecord.Entity;
|
||||||
using StudentProgressRecord.IRepositories;
|
using StudentProgressRecord.IRepositories;
|
||||||
using StudentProgressRecord.Repositories;
|
using StudentProgressRecord.Repositories;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.RepositoryImp
|
namespace StudentProgressRecord.RepositoryImp
|
||||||
{
|
{
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
using StudentProgressRecord.Entity;
|
using Dapper;
|
||||||
using StudentProgressRecord.IRepositories;
|
using Microsoft.Extensions.Logging;
|
||||||
using StudentProgressRecord.Entity.Enums;
|
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
using Microsoft.Extensions.Logging;
|
using StudentProgressRecord.Entity;
|
||||||
using Dapper;
|
using StudentProgressRecord.IRepositories;
|
||||||
namespace StudentProgressRecord.RepositoryImp
|
namespace StudentProgressRecord.RepositoryImp
|
||||||
{
|
{
|
||||||
public class StudentTransitionRepository : IStudentTransitionRepository
|
public class StudentTransitionRepository : IStudentTransitionRepository
|
||||||
|
@ -3,7 +3,6 @@ using Microsoft.Extensions.Logging;
|
|||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Npgsql;
|
using Npgsql;
|
||||||
using StudentProgressRecord.Entity;
|
using StudentProgressRecord.Entity;
|
||||||
using StudentProgressRecord.Entity.Enums;
|
|
||||||
using StudentProgressRecord.IRepositories;
|
using StudentProgressRecord.IRepositories;
|
||||||
using StudentProgressRecord.Repositories;
|
using StudentProgressRecord.Repositories;
|
||||||
|
|
||||||
|
@ -5,12 +5,6 @@ using Npgsql;
|
|||||||
using StudentProgressRecord.Entity;
|
using StudentProgressRecord.Entity;
|
||||||
using StudentProgressRecord.IRepositories;
|
using StudentProgressRecord.IRepositories;
|
||||||
using StudentProgressRecord.Repositories;
|
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
|
namespace StudentProgressRecord.RepositoryImp
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user