ns.potapov/piaps-course-work-university
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

потихоньку привожу модели в божеский вид. ну и делаю сёрчи для моделей

Browse Source
This commit is contained in:
Елена Бакальская
2025-06-08 13:50:20 +04:00
parent c4889aaa73
commit 24da47b509
16 changed files with 413 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

299
contingent_report_desktop/App_contingent_university/Forms/FormMain.Designer.cs generated
View File

@@ -37,19 +37,39 @@
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.menuStrip2 = new System.Windows.Forms.MenuStrip();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.добавитьНаправлениеToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.GroupsPage = new System.Windows.Forms.TabPage();
this.dataGridView2 = new System.Windows.Forms.DataGridView();
this.menuStrip3 = new System.Windows.Forms.MenuStrip();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.OrdersPage = new System.Windows.Forms.TabPage();
this.добавитьНаправлениеToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.добавитьГруппуToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.OrdersPage = new System.Windows.Forms.TabPage();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPageAddStudent = new System.Windows.Forms.TabPage();
this.tabPageExpulsion = new System.Windows.Forms.TabPage();
this.tabPageAcademicLeave = new System.Windows.Forms.TabPage();
this.tabPageNextCourse = new System.Windows.Forms.TabPage();
this.tabPageOtherSpec = new System.Windows.Forms.TabPage();
this.dataGridView = new System.Windows.Forms.DataGridView();
this.menuStrip4 = new System.Windows.Forms.MenuStrip();
this.создатьПриказToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.создатьПриказToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.dataGridView3 = new System.Windows.Forms.DataGridView();
this.menuStrip5 = new System.Windows.Forms.MenuStrip();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
this.dataGridView4 = new System.Windows.Forms.DataGridView();
this.menuStrip6 = new System.Windows.Forms.MenuStrip();
this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
this.dataGridView5 = new System.Windows.Forms.DataGridView();
this.menuStrip7 = new System.Windows.Forms.MenuStrip();
this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem();
this.dataGridView6 = new System.Windows.Forms.DataGridView();
this.menuStrip8 = new System.Windows.Forms.MenuStrip();
this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripMenuItem();
this.SpecializationsPage.SuspendLayout();
this.StudentsPage.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridViewStudents)).BeginInit();
@@ -62,6 +82,21 @@
this.menuStrip3.SuspendLayout();
this.OrdersPage.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPageAddStudent.SuspendLayout();
this.tabPageExpulsion.SuspendLayout();
this.tabPageAcademicLeave.SuspendLayout();
this.tabPageNextCourse.SuspendLayout();
this.tabPageOtherSpec.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.menuStrip4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView3)).BeginInit();
this.menuStrip5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView4)).BeginInit();
this.menuStrip6.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView5)).BeginInit();
this.menuStrip7.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView6)).BeginInit();
this.menuStrip8.SuspendLayout();
this.SuspendLayout();
//
// SpecializationsPage
@@ -160,6 +195,12 @@
this.toolStripMenuItem1.Size = new System.Drawing.Size(108, 24);
this.toolStripMenuItem1.Text = "Фильтрация";
//
// добавитьНаправлениеToolStripMenuItem
//
this.добавитьНаправлениеToolStripMenuItem.Name = "добавитьНаправлениеToolStripMenuItem";
this.добавитьНаправлениеToolStripMenuItem.Size = new System.Drawing.Size(187, 24);
this.добавитьНаправлениеToolStripMenuItem.Text = "Добавить направление";
//
// GroupsPage
//
this.GroupsPage.Controls.Add(this.dataGridView2);
@@ -201,6 +242,12 @@
this.toolStripMenuItem2.Size = new System.Drawing.Size(108, 24);
this.toolStripMenuItem2.Text = "Фильтрация";
//
// добавитьГруппуToolStripMenuItem
//
this.добавитьГруппуToolStripMenuItem.Name = "добавитьГруппуToolStripMenuItem";
this.добавитьГруппуToolStripMenuItem.Size = new System.Drawing.Size(141, 24);
this.добавитьГруппуToolStripMenuItem.Text = "Добавить группу";
//
// OrdersPage
//
this.OrdersPage.Controls.Add(this.tabControl1);
@@ -211,18 +258,6 @@
this.OrdersPage.Text = "Приказы";
this.OrdersPage.UseVisualStyleBackColor = true;
//
// добавитьНаправлениеToolStripMenuItem
//
this.добавитьНаправлениеToolStripMenuItem.Name = "добавитьНаправлениеToolStripMenuItem";
this.добавитьНаправлениеToolStripMenuItem.Size = new System.Drawing.Size(187, 24);
this.добавитьНаправлениеToolStripMenuItem.Text = "Добавить направление";
//
// добавитьГруппуToolStripMenuItem
//
this.добавитьГруппуToolStripMenuItem.Name = "добавитьГруппуToolStripMenuItem";
this.добавитьГруппуToolStripMenuItem.Size = new System.Drawing.Size(141, 24);
this.добавитьГруппуToolStripMenuItem.Text = "Добавить группу";
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPageAddStudent);
@@ -239,6 +274,8 @@
//
// tabPageAddStudent
//
this.tabPageAddStudent.Controls.Add(this.dataGridView);
this.tabPageAddStudent.Controls.Add(this.menuStrip4);
this.tabPageAddStudent.Location = new System.Drawing.Point(4, 25);
this.tabPageAddStudent.Name = "tabPageAddStudent";
this.tabPageAddStudent.Padding = new System.Windows.Forms.Padding(3);
@@ -249,6 +286,8 @@
//
// tabPageExpulsion
//
this.tabPageExpulsion.Controls.Add(this.dataGridView3);
this.tabPageExpulsion.Controls.Add(this.menuStrip5);
this.tabPageExpulsion.Location = new System.Drawing.Point(4, 25);
this.tabPageExpulsion.Name = "tabPageExpulsion";
this.tabPageExpulsion.Padding = new System.Windows.Forms.Padding(3);
@@ -259,6 +298,8 @@
//
// tabPageAcademicLeave
//
this.tabPageAcademicLeave.Controls.Add(this.dataGridView4);
this.tabPageAcademicLeave.Controls.Add(this.menuStrip6);
this.tabPageAcademicLeave.Location = new System.Drawing.Point(4, 25);
this.tabPageAcademicLeave.Name = "tabPageAcademicLeave";
this.tabPageAcademicLeave.Size = new System.Drawing.Size(1066, 543);
@@ -268,6 +309,8 @@
//
// tabPageNextCourse
//
this.tabPageNextCourse.Controls.Add(this.dataGridView5);
this.tabPageNextCourse.Controls.Add(this.menuStrip7);
this.tabPageNextCourse.Location = new System.Drawing.Point(4, 25);
this.tabPageNextCourse.Name = "tabPageNextCourse";
this.tabPageNextCourse.Size = new System.Drawing.Size(1066, 543);
@@ -277,6 +320,8 @@
//
// tabPageOtherSpec
//
this.tabPageOtherSpec.Controls.Add(this.dataGridView6);
this.tabPageOtherSpec.Controls.Add(this.menuStrip8);
this.tabPageOtherSpec.Location = new System.Drawing.Point(4, 25);
this.tabPageOtherSpec.Name = "tabPageOtherSpec";
this.tabPageOtherSpec.Size = new System.Drawing.Size(1066, 543);
@@ -284,6 +329,186 @@
this.tabPageOtherSpec.Text = "Перевод на другое направление";
this.tabPageOtherSpec.UseVisualStyleBackColor = true;
//
// dataGridView
//
this.dataGridView.BackgroundColor = System.Drawing.Color.LightSteelBlue;
this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView.Location = new System.Drawing.Point(3, 31);
this.dataGridView.Name = "dataGridView";
this.dataGridView.RowHeadersWidth = 51;
this.dataGridView.RowTemplate.Height = 24;
this.dataGridView.Size = new System.Drawing.Size(1060, 509);
this.dataGridView.TabIndex = 0;
//
// menuStrip4
//
this.menuStrip4.ImageScalingSize = new System.Drawing.Size(20, 20);
this.menuStrip4.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.создатьПриказToolStripMenuItem,
this.создатьПриказToolStripMenuItem1});
this.menuStrip4.Location = new System.Drawing.Point(3, 3);
this.menuStrip4.Name = "menuStrip4";
this.menuStrip4.Size = new System.Drawing.Size(1060, 28);
this.menuStrip4.TabIndex = 1;
this.menuStrip4.Text = "menuStrip4";
//
// создатьПриказToolStripMenuItem
//
this.создатьПриказToolStripMenuItem.Name = "создатьПриказToolStripMenuItem";
this.создатьПриказToolStripMenuItem.Size = new System.Drawing.Size(108, 26);
this.создатьПриказToolStripMenuItem.Text = "Фильтрация";
//
// создатьПриказToolStripMenuItem1
//
this.создатьПриказToolStripMenuItem1.Name = "создатьПриказToolStripMenuItem1";
this.создатьПриказToolStripMenuItem1.Size = new System.Drawing.Size(131, 26);
this.создатьПриказToolStripMenuItem1.Text = "Создать приказ";
//
// dataGridView3
//
this.dataGridView3.BackgroundColor = System.Drawing.Color.LightSteelBlue;
this.dataGridView3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView3.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView3.Location = new System.Drawing.Point(3, 31);
this.dataGridView3.Name = "dataGridView3";
this.dataGridView3.RowHeadersWidth = 51;
this.dataGridView3.RowTemplate.Height = 24;
this.dataGridView3.Size = new System.Drawing.Size(1060, 509);
this.dataGridView3.TabIndex = 2;
//
// menuStrip5
//
this.menuStrip5.ImageScalingSize = new System.Drawing.Size(20, 20);
this.menuStrip5.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripMenuItem3,
this.toolStripMenuItem4});
this.menuStrip5.Location = new System.Drawing.Point(3, 3);
this.menuStrip5.Name = "menuStrip5";
this.menuStrip5.Size = new System.Drawing.Size(1060, 28);
this.menuStrip5.TabIndex = 3;
this.menuStrip5.Text = "menuStrip5";
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(108, 24);
this.toolStripMenuItem3.Text = "Фильтрация";
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(131, 24);
this.toolStripMenuItem4.Text = "Создать приказ";
//
// dataGridView4
//
this.dataGridView4.BackgroundColor = System.Drawing.Color.LightSteelBlue;
this.dataGridView4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView4.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView4.Location = new System.Drawing.Point(0, 28);
this.dataGridView4.Name = "dataGridView4";
this.dataGridView4.RowHeadersWidth = 51;
this.dataGridView4.RowTemplate.Height = 24;
this.dataGridView4.Size = new System.Drawing.Size(1066, 515);
this.dataGridView4.TabIndex = 2;
//
// menuStrip6
//
this.menuStrip6.ImageScalingSize = new System.Drawing.Size(20, 20);
this.menuStrip6.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripMenuItem5,
this.toolStripMenuItem6});
this.menuStrip6.Location = new System.Drawing.Point(0, 0);
this.menuStrip6.Name = "menuStrip6";
this.menuStrip6.Size = new System.Drawing.Size(1066, 28);
this.menuStrip6.TabIndex = 3;
this.menuStrip6.Text = "menuStrip6";
//
// toolStripMenuItem5
//
this.toolStripMenuItem5.Name = "toolStripMenuItem5";
this.toolStripMenuItem5.Size = new System.Drawing.Size(108, 24);
this.toolStripMenuItem5.Text = "Фильтрация";
//
// toolStripMenuItem6
//
this.toolStripMenuItem6.Name = "toolStripMenuItem6";
this.toolStripMenuItem6.Size = new System.Drawing.Size(131, 24);
this.toolStripMenuItem6.Text = "Создать приказ";
//
// dataGridView5
//
this.dataGridView5.BackgroundColor = System.Drawing.Color.LightSteelBlue;
this.dataGridView5.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView5.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView5.Location = new System.Drawing.Point(0, 28);
this.dataGridView5.Name = "dataGridView5";
this.dataGridView5.RowHeadersWidth = 51;
this.dataGridView5.RowTemplate.Height = 24;
this.dataGridView5.Size = new System.Drawing.Size(1066, 515);
this.dataGridView5.TabIndex = 2;
//
// menuStrip7
//
this.menuStrip7.ImageScalingSize = new System.Drawing.Size(20, 20);
this.menuStrip7.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripMenuItem7,
this.toolStripMenuItem8});
this.menuStrip7.Location = new System.Drawing.Point(0, 0);
this.menuStrip7.Name = "menuStrip7";
this.menuStrip7.Size = new System.Drawing.Size(1066, 28);
this.menuStrip7.TabIndex = 3;
this.menuStrip7.Text = "menuStrip7";
//
// toolStripMenuItem7
//
this.toolStripMenuItem7.Name = "toolStripMenuItem7";
this.toolStripMenuItem7.Size = new System.Drawing.Size(108, 24);
this.toolStripMenuItem7.Text = "Фильтрация";
//
// toolStripMenuItem8
//
this.toolStripMenuItem8.Name = "toolStripMenuItem8";
this.toolStripMenuItem8.Size = new System.Drawing.Size(131, 24);
this.toolStripMenuItem8.Text = "Создать приказ";
//
// dataGridView6
//
this.dataGridView6.BackgroundColor = System.Drawing.Color.LightSteelBlue;
this.dataGridView6.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView6.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView6.Location = new System.Drawing.Point(0, 28);
this.dataGridView6.Name = "dataGridView6";
this.dataGridView6.RowHeadersWidth = 51;
this.dataGridView6.RowTemplate.Height = 24;
this.dataGridView6.Size = new System.Drawing.Size(1066, 515);
this.dataGridView6.TabIndex = 2;
//
// menuStrip8
//
this.menuStrip8.ImageScalingSize = new System.Drawing.Size(20, 20);
this.menuStrip8.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripMenuItem9,
this.toolStripMenuItem10});
this.menuStrip8.Location = new System.Drawing.Point(0, 0);
this.menuStrip8.Name = "menuStrip8";
this.menuStrip8.Size = new System.Drawing.Size(1066, 28);
this.menuStrip8.TabIndex = 3;
this.menuStrip8.Text = "menuStrip8";
//
// toolStripMenuItem9
//
this.toolStripMenuItem9.Name = "toolStripMenuItem9";
this.toolStripMenuItem9.Size = new System.Drawing.Size(108, 24);
this.toolStripMenuItem9.Text = "Фильтрация";
//
// toolStripMenuItem10
//
this.toolStripMenuItem10.Name = "toolStripMenuItem10";
this.toolStripMenuItem10.Size = new System.Drawing.Size(131, 24);
this.toolStripMenuItem10.Text = "Создать приказ";
//
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
@@ -291,6 +516,7 @@
this.AutoSize = true;
this.ClientSize = new System.Drawing.Size(1082, 601);
this.Controls.Add(this.SpecializationsPage);
this.MainMenuStrip = this.menuStrip4;
this.Name = "FormMain";
this.Text = "FormMain";
this.SpecializationsPage.ResumeLayout(false);
@@ -311,6 +537,31 @@
this.menuStrip3.PerformLayout();
this.OrdersPage.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPageAddStudent.ResumeLayout(false);
this.tabPageAddStudent.PerformLayout();
this.tabPageExpulsion.ResumeLayout(false);
this.tabPageExpulsion.PerformLayout();
this.tabPageAcademicLeave.ResumeLayout(false);
this.tabPageAcademicLeave.PerformLayout();
this.tabPageNextCourse.ResumeLayout(false);
this.tabPageNextCourse.PerformLayout();
this.tabPageOtherSpec.ResumeLayout(false);
this.tabPageOtherSpec.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.menuStrip4.ResumeLayout(false);
this.menuStrip4.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView3)).EndInit();
this.menuStrip5.ResumeLayout(false);
this.menuStrip5.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView4)).EndInit();
this.menuStrip6.ResumeLayout(false);
this.menuStrip6.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView5)).EndInit();
this.menuStrip7.ResumeLayout(false);
this.menuStrip7.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView6)).EndInit();
this.menuStrip8.ResumeLayout(false);
this.menuStrip8.PerformLayout();
this.ResumeLayout(false);
}
@@ -339,5 +590,25 @@
private System.Windows.Forms.TabPage tabPageAcademicLeave;
private System.Windows.Forms.TabPage tabPageNextCourse;
private System.Windows.Forms.TabPage tabPageOtherSpec;
private System.Windows.Forms.DataGridView dataGridView;
private System.Windows.Forms.MenuStrip menuStrip4;
private System.Windows.Forms.ToolStripMenuItem создатьПриказToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem создатьПриказToolStripMenuItem1;
private System.Windows.Forms.DataGridView dataGridView3;
private System.Windows.Forms.MenuStrip menuStrip5;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem4;
private System.Windows.Forms.DataGridView dataGridView4;
private System.Windows.Forms.MenuStrip menuStrip6;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem6;
private System.Windows.Forms.DataGridView dataGridView5;
private System.Windows.Forms.MenuStrip menuStrip7;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem7;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem8;
private System.Windows.Forms.DataGridView dataGridView6;
private System.Windows.Forms.MenuStrip menuStrip8;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem9;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem10;
}
}

15
contingent_report_desktop/App_contingent_university/Forms/FormMain.resx
View File

@@ -126,6 +126,21 @@
<metadata name="menuStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>289, 17</value>
</metadata>
<metadata name="menuStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>425, 17</value>
</metadata>
<metadata name="menuStrip5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>561, 17</value>
</metadata>
<metadata name="menuStrip6.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>697, 17</value>
</metadata>
<metadata name="menuStrip7.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>833, 17</value>
</metadata>
<metadata name="menuStrip8.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>969, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>

7
contingent_report_desktop/Controller/Contracts/FacultSearch.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace Controller.Contracts
{
public class FacultSearch
{
public string? Name { get; set; } = string.Empty;
}
}

11
contingent_report_desktop/Controller/Contracts/GroupSearch.cs Normal file
View File

@@ -0,0 +1,11 @@
namespace Controller.Contracts
{
public class GroupSearch
{
public string? Name { get; set; } = string.Empty;
public int? Number { get; set; }
public int? Course { get; set; }
public int? MaxStudentCount { get; set; };
public int? SpecializationId { get; set; }
}
}

12
contingent_report_desktop/Controller/Contracts/OrderSearch.cs Normal file
View File

@@ -0,0 +1,12 @@
using DataModels.Enums;
namespace Controller.Contracts
{
public class OrderSearch
{
public OrderType? OrderType { get; set; }
public int? Number { get; set; }
public DateTime? Date { get; set; } = DateTime.Now;
}
}

8
contingent_report_desktop/Controller/Contracts/SearchStudentModel.cs
View File

@@ -1,8 +0,0 @@
namespace Controller.Contracts
{
public class SearchStudentModel
{
public int Id { get; set; }
public string? FIO { get; set; } = string.Empty;
}
}

8
contingent_report_desktop/Controller/Contracts/SpecializationSearch.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace Controller.Contracts
{
public class SpecializationSearch
{
public string? Name { get; set; } = string.Empty;
public string? Code { get; set; } = string.Empty;
}
}

11
contingent_report_desktop/Controller/Contracts/StudentSearch.cs Normal file
View File

@@ -0,0 +1,11 @@
namespace Controller.Contracts
{
public class StudentSearch
{
public string? LastName { get; set; } = string.Empty;
public string? Name { get; set; } = string.Empty;
public string? Patronymic { get; set; } = string.Empty;
public int? SpecializationId { get; set; }
public int? GroupId { get; set; }
}
}

18
contingent_report_desktop/DataModels/Models/AbstractOrder.cs
View File

@@ -5,28 +5,28 @@ namespace DataModels.Models
{
public abstract class AbstractOrder : Model
{
protected AbstractOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
protected AbstractOrder(OrderType orderType, Reason reason, int number, int? currentDean, DateTime date, List<Student?> students)
{
OrderType = orderType;
Reason = reason;
Number = number;
CurrentDean = currentDean;
CurrentDeanId = currentDean;
Date = date;
Students = students;
}
protected AbstractOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
protected AbstractOrder(int id, OrderType orderType, Reason reason, int number, int? currentDean, DateTime date, List<Student?> students)
: this(orderType, reason, number, currentDean, date, students)
{
Id = id;
}
public List<Student> Students { get; set; }
public OrderType OrderType { get; set; }
public Reason Reason { get; set; }
public int Number { get; set; }
public Dean? CurrentDean { get; set; }
public DateTime Date { get; set; } = DateTime.Now;
public List<Student?>? Students { get; set; }
public OrderType? OrderType { get; set; }
public Reason? Reason { get; set; }
public int? Number { get; set; }
public int? CurrentDeanId { get; set; }
public DateTime? Date { get; set; } = DateTime.Now;
public abstract string TemplatePath { get; }
public abstract void FillTemplate(DocX doc);

19
contingent_report_desktop/DataModels/Models/ContingentReport.cs
View File

@@ -2,13 +2,26 @@
namespace DataModels.Models
{
public class ContingentReport<T> where T : class
public class ContingentReport<T> : Model where T : class
{
public ContingentReport(List<T?>? contingent, int? currentDeanId, DateTime? date)
{
Contingent = contingent;
CurrentDeanId = currentDeanId;
Date = date;
}
public ContingentReport(int id, List<T?>? contingent, int? currentDeanId, DateTime? date)
: this(contingent, currentDeanId, date)
{
Id = id;
}
public List<T?>? Contingent { get; set; }
public Dean? CurrentDean { get; set; }
public int? CurrentDeanId { get; set; }
public DateTime? Date { get; set; } = DateTime.Now;
public string TemplatePath { get; } = string.Empty;
private string TemplatePath { get; } = string.Empty;
private int GetStudentsCount()
{
return 1;

12
contingent_report_desktop/DataModels/Models/Dean.cs
View File

@@ -2,17 +2,13 @@
{
public class Dean : User
{
public Dean(string fIO, string email, string password, int code2FA, DateTime date2FA)
: base(fIO, email, password, code2FA, date2FA)
public Dean(string lastName, string name, string patronymic, string email, string password, int code2FA, DateTime date2FA)
: base(lastName, name, patronymic, email, password, code2FA, date2FA)
{
FIO = fIO;
Email = email;
Password = password;
Code2FA = code2FA;
}
public Dean(int id, string fio, string email, string password, int code2FA, DateTime date2FA)
: base(id, fio, email, password, code2FA, date2FA)
public Dean(int id, string lastName, string name, string patronymic, string email, string password, int code2FA, DateTime date2FA)
: base(id, lastName, name, patronymic, email, password, code2FA, date2FA)
{
Id = id;
}

10
contingent_report_desktop/DataModels/Models/Facult.cs
View File

@@ -2,18 +2,20 @@
{
public class Facult : Model
{
public Facult(string name, Dean dean)
public List<Specialization?>? Specializations { get; set; }
public Facult(string name, int dean, List<Specialization> specializations)
{
Name = name;
Dean = dean;
DeanId = dean;
Specializations = specializations;
}
public Facult(int id, string name, Dean dean) : this(name, dean)
public Facult(int id, string name, int dean, List<Specialization> specs) : this(name, dean, specs)
{
Id = id;
}
public string Name { get; set; } = string.Empty;
public Dean? Dean { get; set; }
public int? DeanId { get; set; }
}
}

12
contingent_report_desktop/DataModels/Models/Group.cs
View File

@@ -7,19 +7,19 @@
public int Number { get; set; }
public int Course { get; set; }
public int MaxStudentCount { get; set; } = 30;
public Specialization? Specialization { get; set; }
public int? SpecializationId { get; set; }
public Group(string name, int num, int course, Specialization spec)
public Group(string name, int num, int course, int specId, int maxStudentCount)
{
Name = name;
Number = num;
Course = course;
Specialization = spec;
MaxStudentCount = 30;
MaxStudentCount = maxStudentCount;
SpecializationId = specId;
}
public Group(int id, string name, int num, int course, Specialization spec)
: this(name, num, course, spec)
public Group(int id, string name, int num, int course, int specId, int maxStudentCount)
: this(name, num, course, specId, maxStudentCount)
{
Id = id;
}

2
contingent_report_desktop/DataModels/Models/LearningPlan.cs
View File

@@ -2,6 +2,6 @@
{
public class LearningPlan
{
public Specialization? Specialization { get; set; }
public int? SpecializationId { get; set; }
}
}

23
contingent_report_desktop/DataModels/Models/Student.cs
View File

@@ -3,26 +3,23 @@ namespace DataModels.Models
{
public class Student : User
{
public Student(string fIO, string email, string password, int code2FA, DateTime date2FA, Specialization spec, Group group)
: base(fIO, email, password, code2FA, date2FA)
public Student(string lastName, string name, string patronymic, string email,
string password, int code2FA, DateTime date2FA, int specId, int groupId)
: base(lastName, name, patronymic, email, password, code2FA, date2FA)
{
FIO = fIO;
Email = email;
Password = password;
Code2FA = code2FA;
Date2FA = date2FA;
Specialization = spec;
Group = group;
SpecializationId = specId;
GroupId = groupId;
}
public Student(int id, string fio, string email, string password, int code2FA, DateTime date2FA)
: base(id,fio, email, password, code2FA, date2FA)
public Student(int id, string lastName, string name, string patronymic,
string email, string password, int code2FA, DateTime date2FA)
: base(id, lastName, name, patronymic, email, password, code2FA, date2FA)
{
Id = id;
}
public Specialization? Specialization { get; set; }
public Group? Group { get; set; }
public int? SpecializationId { get; set; }
public int? GroupId { get; set; }
}
}

20
contingent_report_desktop/DataModels/Models/User.cs
View File

@@ -2,25 +2,29 @@
{
public class User : Model
{
public User(string fIO, string email, string password, int code2FA, DateTime date2FA)
public User(string lastName, string name, string patronymic, string email, string password, int code2FA, DateTime date2FA)
{
FIO = fIO;
LastName = lastName;
Name = name;
Patronymic = patronymic;
Email = email;
Password = password;
Code2FA = code2FA;
Date2FA = date2FA;
}
public User(int id, string fio, string email, string password, int code2FA, DateTime date2FA)
: this(fio, email, password, code2FA, date2FA)
public User(int id, string lastName, string name, string patronymic, string email, string password, int code2FA, DateTime date2FA)
: this(lastName, name, patronymic, email, password, code2FA, date2FA)
{
Id = id;
}
public string FIO { get; set; } = string.Empty;
public string Email { get; set; } = string.Empty;
public string Password { get; set; } = string.Empty;
public int Code2FA { get; set; }
public string? LastName { get; set; } = string.Empty;
public string? Name { get; set; } = string.Empty;
public string? Patronymic { get; set; } = string.Empty;
public string? Email { get; set; } = string.Empty;
public string? Password { get; set; } = string.Empty;
public int? Code2FA { get; set; }
public DateTime? Date2FA { get; set; }
}