-ненужные using
This commit is contained in:
parent
c94a9bb8d3
commit
c81ecdca2c
@ -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,11 +1,4 @@
|
|||||||
using System;
|
namespace StudentProgressRecord.Entity
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity
|
|
||||||
{
|
{
|
||||||
public class Marks
|
public class Marks
|
||||||
{
|
{
|
||||||
@ -19,7 +12,7 @@ namespace StudentProgressRecord.Entity
|
|||||||
|
|
||||||
public string StudentName { get; set; } = string.Empty;
|
public string StudentName { get; set; } = string.Empty;
|
||||||
|
|
||||||
public static Marks CreateElement(long statementId, long studentId, int mark, string studentName="")
|
public static Marks CreateElement(long statementId, long studentId, int mark, string studentName = "")
|
||||||
{
|
{
|
||||||
return new Marks
|
return new Marks
|
||||||
{
|
{
|
||||||
|
@ -1,10 +1,4 @@
|
|||||||
using System;
|
using System.ComponentModel;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity
|
namespace StudentProgressRecord.Entity
|
||||||
{
|
{
|
||||||
@ -27,7 +21,7 @@ namespace StudentProgressRecord.Entity
|
|||||||
[DisplayName("Преподователь")]
|
[DisplayName("Преподователь")]
|
||||||
public string TeacherName { get; set; } = string.Empty;
|
public string TeacherName { get; set; } = string.Empty;
|
||||||
|
|
||||||
public IEnumerable<Marks> Marks { get;private set; } = [];
|
public IEnumerable<Marks> Marks { get; private set; } = [];
|
||||||
|
|
||||||
|
|
||||||
public void SetMarks(IEnumerable<Marks> marks)
|
public void SetMarks(IEnumerable<Marks> marks)
|
||||||
@ -55,20 +49,5 @@ namespace StudentProgressRecord.Entity
|
|||||||
Marks = marks
|
Marks = marks
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Statement CreateOperation(TempStatement statement, IEnumerable<Marks> marks)
|
|
||||||
{
|
|
||||||
return new Statement
|
|
||||||
{
|
|
||||||
Id = statement.Id,
|
|
||||||
SubjectId = statement.SubjectId,
|
|
||||||
TeacherId = statement.TeacherId,
|
|
||||||
SubjectName = statement.SubjectName,
|
|
||||||
TeacherName = statement.TeacherName,
|
|
||||||
Date = statement.Date,
|
|
||||||
Marks = marks
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,4 @@
|
|||||||
using System;
|
using System.ComponentModel;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity
|
namespace StudentProgressRecord.Entity
|
||||||
{
|
{
|
||||||
|
@ -1,10 +1,5 @@
|
|||||||
using StudentProgressRecord.Entity.Enums;
|
using StudentProgressRecord.Entity.Enums;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity
|
namespace StudentProgressRecord.Entity
|
||||||
{
|
{
|
||||||
|
@ -1,10 +1,5 @@
|
|||||||
using StudentProgressRecord.Entity.Enums;
|
using StudentProgressRecord.Entity.Enums;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity
|
namespace StudentProgressRecord.Entity
|
||||||
{
|
{
|
||||||
|
@ -1,9 +1,4 @@
|
|||||||
using System;
|
using System.ComponentModel;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Entity
|
namespace StudentProgressRecord.Entity
|
||||||
{
|
{
|
||||||
|
@ -1,13 +1,4 @@
|
|||||||
using StudentProgressRecord.Reports;
|
using StudentProgressRecord.Reports;
|
||||||
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
|
namespace StudentProgressRecord.Forms
|
||||||
|
@ -1,14 +1,5 @@
|
|||||||
using StudentProgressRecord.Reports;
|
using StudentProgressRecord.Reports;
|
||||||
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
|
namespace StudentProgressRecord.Forms
|
||||||
|
@ -1,13 +1,4 @@
|
|||||||
using StudentProgressRecord.Reports;
|
using StudentProgressRecord.Reports;
|
||||||
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
|
namespace StudentProgressRecord.Forms
|
||||||
|
@ -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,7 +25,7 @@ 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;
|
||||||
|
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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,14 +1,5 @@
|
|||||||
using StudentProgressRecord.Forms;
|
using StudentProgressRecord.Forms;
|
||||||
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
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -6,7 +6,7 @@ namespace StudentProgressRecord.Repositories
|
|||||||
{
|
{
|
||||||
IEnumerable<Statement> ReadStatements(long? subjectId = null,
|
IEnumerable<Statement> ReadStatements(long? subjectId = null,
|
||||||
long? teacherId = null, DateTime? dateFrom = null,
|
long? teacherId = null, DateTime? dateFrom = null,
|
||||||
DateTime? dateTo=null, long? studentId = null);
|
DateTime? dateTo = null, long? studentId = null);
|
||||||
|
|
||||||
void CreateStatement(Statement statement);
|
void CreateStatement(Statement statement);
|
||||||
|
|
||||||
|
@ -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);
|
||||||
|
|
||||||
|
@ -1,10 +1,5 @@
|
|||||||
using StudentProgressRecord.Entity;
|
using StudentProgressRecord.Entity;
|
||||||
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.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());
|
||||||
|
@ -1,11 +1,5 @@
|
|||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using StudentProgressRecord.Repositories;
|
using StudentProgressRecord.Repositories;
|
||||||
using StudentProgressRecord.RepositoryImp;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Reports
|
namespace StudentProgressRecord.Reports
|
||||||
{
|
{
|
||||||
@ -42,7 +36,8 @@ namespace StudentProgressRecord.Reports
|
|||||||
return _statementRepository
|
return _statementRepository
|
||||||
.ReadStatements(dateFrom: dateTimeStart, dateTo: dateTimeEnd)
|
.ReadStatements(dateFrom: dateTimeStart, dateTo: dateTimeEnd)
|
||||||
.SelectMany(x => x.Marks)
|
.SelectMany(x => x.Marks)
|
||||||
.GroupBy(x => x.Mark, (key, group) => new {
|
.GroupBy(x => x.Mark, (key, group) => new
|
||||||
|
{
|
||||||
Id = key,
|
Id = key,
|
||||||
Count = group.Count()
|
Count = group.Count()
|
||||||
})
|
})
|
||||||
|
@ -1,10 +1,5 @@
|
|||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using StudentProgressRecord.Repositories;
|
using StudentProgressRecord.Repositories;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Reports
|
namespace StudentProgressRecord.Reports
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
using DocumentFormat.OpenXml.Packaging;
|
using DocumentFormat.OpenXml;
|
||||||
|
using DocumentFormat.OpenXml.Packaging;
|
||||||
using DocumentFormat.OpenXml.Spreadsheet;
|
using DocumentFormat.OpenXml.Spreadsheet;
|
||||||
using DocumentFormat.OpenXml;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Reports
|
namespace StudentProgressRecord.Reports
|
||||||
{
|
{
|
||||||
@ -175,17 +175,17 @@ namespace StudentProgressRecord.Reports
|
|||||||
var borders = new Borders() { Count = 2 };
|
var borders = new Borders() { Count = 2 };
|
||||||
borders.Append(new Border
|
borders.Append(new Border
|
||||||
{
|
{
|
||||||
LeftBorder = new LeftBorder (),
|
LeftBorder = new LeftBorder(),
|
||||||
RightBorder = new RightBorder (),
|
RightBorder = new RightBorder(),
|
||||||
TopBorder = new TopBorder (),
|
TopBorder = new TopBorder(),
|
||||||
BottomBorder = new BottomBorder (),
|
BottomBorder = new BottomBorder(),
|
||||||
DiagonalBorder = new DiagonalBorder()
|
DiagonalBorder = new DiagonalBorder()
|
||||||
});
|
});
|
||||||
borders.Append(new Border
|
borders.Append(new Border
|
||||||
{
|
{
|
||||||
LeftBorder = new LeftBorder{ Style = BorderStyleValues.Thin },
|
LeftBorder = new LeftBorder { Style = BorderStyleValues.Thin },
|
||||||
RightBorder = new RightBorder { Style = BorderStyleValues.Thin },
|
RightBorder = new RightBorder { Style = BorderStyleValues.Thin },
|
||||||
TopBorder = new TopBorder {Style = BorderStyleValues.Thin},
|
TopBorder = new TopBorder { Style = BorderStyleValues.Thin },
|
||||||
BottomBorder = new BottomBorder { Style = BorderStyleValues.Thin },
|
BottomBorder = new BottomBorder { Style = BorderStyleValues.Thin },
|
||||||
DiagonalBorder = new DiagonalBorder()
|
DiagonalBorder = new DiagonalBorder()
|
||||||
});
|
});
|
||||||
|
@ -1,11 +1,6 @@
|
|||||||
using MigraDoc.DocumentObjectModel;
|
using MigraDoc.DocumentObjectModel;
|
||||||
using MigraDoc.DocumentObjectModel.Shapes.Charts;
|
using MigraDoc.DocumentObjectModel.Shapes.Charts;
|
||||||
using MigraDoc.Rendering;
|
using MigraDoc.Rendering;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Reports
|
namespace StudentProgressRecord.Reports
|
||||||
{
|
{
|
||||||
|
@ -2,11 +2,6 @@
|
|||||||
using StudentProgressRecord.Entity.Enums;
|
using StudentProgressRecord.Entity.Enums;
|
||||||
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.Reports
|
namespace StudentProgressRecord.Reports
|
||||||
{
|
{
|
||||||
@ -18,7 +13,7 @@ namespace StudentProgressRecord.Reports
|
|||||||
internal static readonly string[] item = ["Дата", "Оценка", "Операция"];
|
internal static readonly string[] item = ["Дата", "Оценка", "Операция"];
|
||||||
public TableReport(IStudentTransitionRepository studentTransitionRepository, IStatementRepository statementRepository, ILogger<TableReport> logger)
|
public TableReport(IStudentTransitionRepository studentTransitionRepository, IStatementRepository statementRepository, ILogger<TableReport> logger)
|
||||||
{
|
{
|
||||||
_statementRepository = statementRepository?? throw new ArgumentNullException(nameof(statementRepository));
|
_statementRepository = statementRepository ?? throw new ArgumentNullException(nameof(statementRepository));
|
||||||
_studentTransitionRepository = studentTransitionRepository ?? throw new ArgumentNullException(nameof(studentTransitionRepository));
|
_studentTransitionRepository = studentTransitionRepository ?? throw new ArgumentNullException(nameof(studentTransitionRepository));
|
||||||
_logger = logger ??
|
_logger = logger ??
|
||||||
throw new ArgumentNullException(nameof(logger));
|
throw new ArgumentNullException(nameof(logger));
|
||||||
@ -46,7 +41,8 @@ namespace StudentProgressRecord.Reports
|
|||||||
{
|
{
|
||||||
var data = _statementRepository
|
var data = _statementRepository
|
||||||
.ReadStatements(dateFrom: startDate, dateTo: endDate, studentId: studentId)
|
.ReadStatements(dateFrom: startDate, dateTo: endDate, studentId: studentId)
|
||||||
.Select(x => new {
|
.Select(x => new
|
||||||
|
{
|
||||||
Date = x.Date,
|
Date = x.Date,
|
||||||
Mark = x.Marks.FirstOrDefault(y => y.StudentId == studentId)?.Mark,
|
Mark = x.Marks.FirstOrDefault(y => y.StudentId == studentId)?.Mark,
|
||||||
Operation = (Operations?)null
|
Operation = (Operations?)null
|
||||||
@ -55,7 +51,8 @@ namespace StudentProgressRecord.Reports
|
|||||||
_studentTransitionRepository
|
_studentTransitionRepository
|
||||||
.ReadStudentTransitions()
|
.ReadStudentTransitions()
|
||||||
.Where(x => x.Date >= startDate && x.Date <= endDate && x.StudentId == studentId)
|
.Where(x => x.Date >= startDate && x.Date <= endDate && x.StudentId == studentId)
|
||||||
.Select(x => new {
|
.Select(x => new
|
||||||
|
{
|
||||||
Date = x.Date,
|
Date = x.Date,
|
||||||
Mark = (int?)null,
|
Mark = (int?)null,
|
||||||
Operation = (Operations?)x.Operation
|
Operation = (Operations?)x.Operation
|
||||||
@ -68,7 +65,7 @@ namespace StudentProgressRecord.Reports
|
|||||||
.Select(x => new string[] {
|
.Select(x => new string[] {
|
||||||
x.Date.ToString(), x.Mark?.ToString() ?? string.Empty, x.Operation.ToString() ?? string.Empty}))
|
x.Date.ToString(), x.Mark?.ToString() ?? string.Empty, x.Operation.ToString() ?? string.Empty}))
|
||||||
.Union(
|
.Union(
|
||||||
[["Всего",data.Where((x) => x.Mark.HasValue).Average(x => x.Mark).ToString(), data.Count(x => x.Operation.HasValue).ToString()]]).ToList();
|
[["Всего", data.Where((x) => x.Mark.HasValue).Average(x => x.Mark).ToString(), data.Count(x => x.Operation.HasValue).ToString()]]).ToList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,6 @@
|
|||||||
using DocumentFormat.OpenXml.Packaging;
|
using DocumentFormat.OpenXml;
|
||||||
|
using DocumentFormat.OpenXml.Packaging;
|
||||||
using DocumentFormat.OpenXml.Wordprocessing;
|
using DocumentFormat.OpenXml.Wordprocessing;
|
||||||
using DocumentFormat.OpenXml;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StudentProgressRecord.Reports
|
namespace StudentProgressRecord.Reports
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
using System;
|
using System.Text;
|
||||||
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
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
@ -102,7 +96,7 @@ namespace StudentProgressRecord.RepositoryImp
|
|||||||
using var connection = new NpgsqlConnection(_connectionString.GetConnectionString());
|
using var connection = new NpgsqlConnection(_connectionString.GetConnectionString());
|
||||||
var querySelect = @$"SELECT st.* FROM Student st
|
var querySelect = @$"SELECT st.* FROM Student st
|
||||||
{builder.Build()}";
|
{builder.Build()}";
|
||||||
var objs = connection.Query<Student>(querySelect, new {familyPos, domitory});
|
var objs = connection.Query<Student>(querySelect, new { familyPos, domitory });
|
||||||
_logger.LogDebug("Полученные объекты: {json}",
|
_logger.LogDebug("Полученные объекты: {json}",
|
||||||
JsonConvert.SerializeObject(objs));
|
JsonConvert.SerializeObject(objs));
|
||||||
return objs;
|
return objs;
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
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.Entity.Enums;
|
||||||
|
using StudentProgressRecord.IRepositories;
|
||||||
namespace StudentProgressRecord.RepositoryImp
|
namespace StudentProgressRecord.RepositoryImp
|
||||||
{
|
{
|
||||||
public class StudentTransitionRepository : IStudentTransitionRepository
|
public class StudentTransitionRepository : IStudentTransitionRepository
|
||||||
@ -79,7 +79,7 @@ namespace StudentProgressRecord.RepositoryImp
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEnumerable<StudentTransition> ReadStudentTransitions(long? sudentId = null ,Operations? operations = null,
|
public IEnumerable<StudentTransition> ReadStudentTransitions(long? sudentId = null, Operations? operations = null,
|
||||||
DateTime? dateFrom = null, DateTime? dateTo = null)
|
DateTime? dateFrom = null, DateTime? dateTo = null)
|
||||||
{
|
{
|
||||||
_logger.LogInformation("Получение всех объектов");
|
_logger.LogInformation("Получение всех объектов");
|
||||||
|
@ -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