-ненужные 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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
@ -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
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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,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;
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
@ -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
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
|
@ -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