Это еще фиксить и фиксить
This commit is contained in:
gg12 darfren
parent
90d80a7c9a
commit
bdd4869d77
146
SchoolSchedule/SchoolSchedule/MainForm.Designer.cs
generated
Normal file
146
SchoolSchedule/SchoolSchedule/MainForm.Designer.cs
generated
Normal file
@ -0,0 +1,146 @@
|
||||
namespace SchoolSchedule
|
||||
{
|
||||
partial class MainForm
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
comboBox1 = new ComboBox();
|
||||
dataGridView1 = new DataGridView();
|
||||
RefreshButton = new Button();
|
||||
menuStrip1 = new MenuStrip();
|
||||
менюToolStripMenuItem = new ToolStripMenuItem();
|
||||
ученикиToolStripMenuItem = new ToolStripMenuItem();
|
||||
занятияToolStripMenuItem = new ToolStripMenuItem();
|
||||
предметыToolStripMenuItem = new ToolStripMenuItem();
|
||||
учителяToolStripMenuItem = new ToolStripMenuItem();
|
||||
((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit();
|
||||
menuStrip1.SuspendLayout();
|
||||
SuspendLayout();
|
||||
//
|
||||
// comboBox1
|
||||
//
|
||||
comboBox1.FormattingEnabled = true;
|
||||
comboBox1.Location = new Point(12, 32);
|
||||
comboBox1.Name = "comboBox1";
|
||||
comboBox1.Size = new Size(241, 23);
|
||||
comboBox1.TabIndex = 0;
|
||||
comboBox1.SelectedIndexChanged += comboBox1_SelectedIndexChanged;
|
||||
//
|
||||
// dataGridView1
|
||||
//
|
||||
dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dataGridView1.Location = new Point(12, 61);
|
||||
dataGridView1.Name = "dataGridView1";
|
||||
dataGridView1.Size = new Size(776, 377);
|
||||
dataGridView1.TabIndex = 1;
|
||||
//
|
||||
// RefreshButton
|
||||
//
|
||||
RefreshButton.Location = new Point(259, 32);
|
||||
RefreshButton.Name = "RefreshButton";
|
||||
RefreshButton.Size = new Size(75, 23);
|
||||
RefreshButton.TabIndex = 3;
|
||||
RefreshButton.Text = "Обновить";
|
||||
RefreshButton.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// menuStrip1
|
||||
//
|
||||
menuStrip1.Items.AddRange(new ToolStripItem[] { менюToolStripMenuItem });
|
||||
menuStrip1.Location = new Point(0, 0);
|
||||
menuStrip1.Name = "menuStrip1";
|
||||
menuStrip1.Size = new Size(800, 24);
|
||||
menuStrip1.TabIndex = 4;
|
||||
menuStrip1.Text = "menuStrip1";
|
||||
//
|
||||
// менюToolStripMenuItem
|
||||
//
|
||||
менюToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ученикиToolStripMenuItem, занятияToolStripMenuItem, предметыToolStripMenuItem, учителяToolStripMenuItem });
|
||||
менюToolStripMenuItem.Name = "менюToolStripMenuItem";
|
||||
менюToolStripMenuItem.Size = new Size(51, 20);
|
||||
менюToolStripMenuItem.Text = "меню";
|
||||
//
|
||||
// ученикиToolStripMenuItem
|
||||
//
|
||||
ученикиToolStripMenuItem.Name = "ученикиToolStripMenuItem";
|
||||
ученикиToolStripMenuItem.Size = new Size(180, 22);
|
||||
ученикиToolStripMenuItem.Text = "ученики";
|
||||
ученикиToolStripMenuItem.Click += ученикиToolStripMenuItem_Click;
|
||||
//
|
||||
// занятияToolStripMenuItem
|
||||
//
|
||||
занятияToolStripMenuItem.Name = "занятияToolStripMenuItem";
|
||||
занятияToolStripMenuItem.Size = new Size(180, 22);
|
||||
занятияToolStripMenuItem.Text = "занятия";
|
||||
занятияToolStripMenuItem.Click += занятияToolStripMenuItem_Click;
|
||||
//
|
||||
// предметыToolStripMenuItem
|
||||
//
|
||||
предметыToolStripMenuItem.Name = "предметыToolStripMenuItem";
|
||||
предметыToolStripMenuItem.Size = new Size(180, 22);
|
||||
предметыToolStripMenuItem.Text = "предметы";
|
||||
предметыToolStripMenuItem.Click += предметыToolStripMenuItem_Click;
|
||||
//
|
||||
// учителяToolStripMenuItem
|
||||
//
|
||||
учителяToolStripMenuItem.Name = "учителяToolStripMenuItem";
|
||||
учителяToolStripMenuItem.Size = new Size(180, 22);
|
||||
учителяToolStripMenuItem.Text = "учителя";
|
||||
учителяToolStripMenuItem.Click += учителяToolStripMenuItem_Click;
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(800, 450);
|
||||
Controls.Add(RefreshButton);
|
||||
Controls.Add(dataGridView1);
|
||||
Controls.Add(comboBox1);
|
||||
Controls.Add(menuStrip1);
|
||||
MainMenuStrip = menuStrip1;
|
||||
Name = "MainForm";
|
||||
Text = "MainForm";
|
||||
Load += MainForm_Load;
|
||||
((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit();
|
||||
menuStrip1.ResumeLayout(false);
|
||||
menuStrip1.PerformLayout();
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private ComboBox comboBox1;
|
||||
private DataGridView dataGridView1;
|
||||
private Button RefreshButton;
|
||||
private MenuStrip menuStrip1;
|
||||
private ToolStripMenuItem менюToolStripMenuItem;
|
||||
private ToolStripMenuItem ученикиToolStripMenuItem;
|
||||
private ToolStripMenuItem занятияToolStripMenuItem;
|
||||
private ToolStripMenuItem предметыToolStripMenuItem;
|
||||
private ToolStripMenuItem учителяToolStripMenuItem;
|
||||
}
|
||||
}
|
||||
69
SchoolSchedule/SchoolSchedule/MainForm.cs
Normal file
69
SchoolSchedule/SchoolSchedule/MainForm.cs
Normal file
@ -0,0 +1,69 @@
|
||||
using SchoolScheduleContracts.BusinessLogicsContracts;
|
||||
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 SchoolSchedule
|
||||
{
|
||||
public partial class MainForm : Form
|
||||
{
|
||||
IStudentLogic _logic;
|
||||
public MainForm(IStudentLogic logic)
|
||||
{
|
||||
InitializeComponent();
|
||||
_logic = logic;
|
||||
}
|
||||
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
dataGridView1.DataSource = null;
|
||||
dataGridView1.Rows.Clear();
|
||||
}
|
||||
|
||||
private void MainForm_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void ученикиToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var service = Program.ServiceProvider?.GetService(typeof(StudentsForm));
|
||||
if (service is StudentsForm form)
|
||||
{
|
||||
form.ShowDialog();
|
||||
}
|
||||
}
|
||||
|
||||
private void занятияToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var service = Program.ServiceProvider?.GetService(typeof(LessonsForm));
|
||||
if (service is LessonsForm form)
|
||||
{
|
||||
form.ShowDialog();
|
||||
}
|
||||
}
|
||||
|
||||
private void предметыToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var service = Program.ServiceProvider?.GetService(typeof(SubjectsForm));
|
||||
if (service is SubjectsForm form)
|
||||
{
|
||||
form.ShowDialog();
|
||||
}
|
||||
}
|
||||
|
||||
private void учителяToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
var service = Program.ServiceProvider?.GetService(typeof(TeachersForm));
|
||||
if (service is TeachersForm form)
|
||||
{
|
||||
form.ShowDialog();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
123
SchoolSchedule/SchoolSchedule/MainForm.resx
Normal file
123
SchoolSchedule/SchoolSchedule/MainForm.resx
Normal file
@ -0,0 +1,123 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@ -20,7 +20,7 @@ namespace SchoolSchedule
|
||||
var services = new ServiceCollection();
|
||||
ConfigureServices(services);
|
||||
_serviceProvider = services.BuildServiceProvider();
|
||||
Application.Run(_serviceProvider.GetRequiredService<LessonsForm>());
|
||||
Application.Run(_serviceProvider.GetRequiredService<MainForm>());
|
||||
|
||||
}
|
||||
private static void ConfigureServices(ServiceCollection services)
|
||||
@ -49,6 +49,7 @@ namespace SchoolSchedule
|
||||
services.AddTransient<LessonsForm>();
|
||||
services.AddTransient<LessonForm>();
|
||||
services.AddTransient<EditStudentForm>();
|
||||
services.AddTransient<MainForm>();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -62,7 +62,7 @@ namespace SchoolScheduleDataBaseImplement.Implements
|
||||
using var transaction = context.Database.BeginTransaction();
|
||||
try
|
||||
{
|
||||
var component = context.Students.FirstOrDefault(x => x.Id ==
|
||||
var component = context.Students.Include(x => x.Lessons).FirstOrDefault(x => x.Id ==
|
||||
model.Id);
|
||||
if (component == null)
|
||||
{
|
||||
|
||||
@ -72,12 +72,16 @@ namespace SchoolScheduleDataBaseImplement.Models
|
||||
|
||||
public void UpdateAttendance(SchoolScheduleDataBase context, StudentBindingModel model)
|
||||
{
|
||||
var attendance = context.LessonStudents.Where(rec => rec.StudentId == model.Id).ToList();
|
||||
var attendance = context.LessonStudents.Where(rec => (rec.StudentId == model.Id)).ToList();
|
||||
if (attendance != null && attendance.Count > 0)
|
||||
{
|
||||
context.LessonStudents.RemoveRange(attendance.Where(rec
|
||||
=> !model.Attendance.ContainsKey(rec.Id)));
|
||||
=> !model.Attendance.ContainsKey(rec.LessonId)));
|
||||
context.SaveChanges();
|
||||
foreach (var updateComponent in attendance)
|
||||
{
|
||||
model.Attendance.Remove(updateComponent.LessonId);
|
||||
}
|
||||
}
|
||||
var student = context.Students.First(x => x.Id == Id);
|
||||
foreach (var pc in model.Attendance)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user