diff --git a/ProjectSession/ProjectSession/Entities/Enums/DisciplineType.cs b/ProjectSession/ProjectSession/Entities/Enums/DisciplineType.cs new file mode 100644 index 0000000..2800e79 --- /dev/null +++ b/ProjectSession/ProjectSession/Entities/Enums/DisciplineType.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectSession.Entities.Enums; + +[Flags] +public enum DisciplineType +{ + None = 0, + Mathematics = 1, + Physics = 2, + Chemistry = 4, + Biology = 8, + History = 16, + Literature = 32, + Programming = 64, +} diff --git a/ProjectSession/ProjectSession/Forms/FormStudentEdit.Designer.cs b/ProjectSession/ProjectSession/Forms/FormStudentEdit.Designer.cs index 2b8c6a0..d4a6366 100644 --- a/ProjectSession/ProjectSession/Forms/FormStudentEdit.Designer.cs +++ b/ProjectSession/ProjectSession/Forms/FormStudentEdit.Designer.cs @@ -42,9 +42,9 @@ labelName.AutoSize = true; labelName.Location = new Point(14, 27); labelName.Name = "labelName"; - labelName.Size = new Size(42, 20); + labelName.Size = new Size(45, 20); labelName.TabIndex = 0; - labelName.Text = "Имя:"; + labelName.Text = "ФИО:"; // // textBoxName // diff --git a/ProjectSession/ProjectSession/Forms/FormSubmissionEdit.Designer.cs b/ProjectSession/ProjectSession/Forms/FormSubmissionEdit.Designer.cs index 02010fa..51c1f32 100644 --- a/ProjectSession/ProjectSession/Forms/FormSubmissionEdit.Designer.cs +++ b/ProjectSession/ProjectSession/Forms/FormSubmissionEdit.Designer.cs @@ -97,7 +97,7 @@ // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(256, 207); + ClientSize = new Size(255, 202); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(dateTimePickerDate); diff --git a/ProjectSession/ProjectSession/Forms/FormTeacherEdit.Designer.cs b/ProjectSession/ProjectSession/Forms/FormTeacherEdit.Designer.cs index b50ed5e..8cc8968 100644 --- a/ProjectSession/ProjectSession/Forms/FormTeacherEdit.Designer.cs +++ b/ProjectSession/ProjectSession/Forms/FormTeacherEdit.Designer.cs @@ -37,24 +37,26 @@ // labelName // labelName.AutoSize = true; - labelName.Location = new Point(12, 20); + labelName.Location = new Point(14, 27); labelName.Name = "labelName"; - labelName.Size = new Size(37, 15); + labelName.Size = new Size(45, 20); labelName.TabIndex = 0; - labelName.Text = "Имя:"; + labelName.Text = "ФИО:"; // // textBoxName // - textBoxName.Location = new Point(12, 38); + textBoxName.Location = new Point(14, 51); + textBoxName.Margin = new Padding(3, 4, 3, 4); textBoxName.Name = "textBoxName"; - textBoxName.Size = new Size(200, 23); + textBoxName.Size = new Size(228, 27); textBoxName.TabIndex = 1; // // buttonSave // - buttonSave.Location = new Point(12, 70); + buttonSave.Location = new Point(14, 93); + buttonSave.Margin = new Padding(3, 4, 3, 4); buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(75, 23); + buttonSave.Size = new Size(86, 31); buttonSave.TabIndex = 2; buttonSave.Text = "Сохранить"; buttonSave.UseVisualStyleBackColor = true; @@ -62,9 +64,10 @@ // // buttonCancel // - buttonCancel.Location = new Point(93, 70); + buttonCancel.Location = new Point(106, 93); + buttonCancel.Margin = new Padding(3, 4, 3, 4); buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(75, 23); + buttonCancel.Size = new Size(86, 31); buttonCancel.TabIndex = 3; buttonCancel.Text = "Отмена"; buttonCancel.UseVisualStyleBackColor = true; @@ -72,13 +75,14 @@ // // FormTeacherEdit // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(224, 105); + ClientSize = new Size(256, 140); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(textBoxName); Controls.Add(labelName); + Margin = new Padding(3, 4, 3, 4); Name = "FormTeacherEdit"; Text = "Редактирование преподавателя"; ResumeLayout(false); diff --git a/ProjectSession/ProjectSession/Forms/FormTeacherEdit.resx b/ProjectSession/ProjectSession/Forms/FormTeacherEdit.resx index 1af7de1..af32865 100644 --- a/ProjectSession/ProjectSession/Forms/FormTeacherEdit.resx +++ b/ProjectSession/ProjectSession/Forms/FormTeacherEdit.resx @@ -1,17 +1,17 @@  - diff --git a/ProjectSession/ProjectSession/Repositories/IDisciplineRepository.cs b/ProjectSession/ProjectSession/Repositories/IDisciplineRepository.cs index b79b097..f0fe883 100644 --- a/ProjectSession/ProjectSession/Repositories/IDisciplineRepository.cs +++ b/ProjectSession/ProjectSession/Repositories/IDisciplineRepository.cs @@ -15,4 +15,4 @@ public interface IDisciplineRepository void CreateDiscipline(Discipline discipline); void UpdateDiscipline(Discipline discipline); void DeleteDiscipline(int id); -} +} \ No newline at end of file diff --git a/ProjectSession/ProjectSession/Repositories/Implementations/DisciplineRepository.cs b/ProjectSession/ProjectSession/Repositories/Implementations/DisciplineRepository.cs index 68f13be..e87fe74 100644 --- a/ProjectSession/ProjectSession/Repositories/Implementations/DisciplineRepository.cs +++ b/ProjectSession/ProjectSession/Repositories/Implementations/DisciplineRepository.cs @@ -11,7 +11,7 @@ public class DisciplineRepository : IDisciplineRepository { public void CreateDiscipline(Discipline discipline) { } public void DeleteDiscipline(int id) { } - public Discipline ReadDisciplineById(int id) { return Discipline.CreateEntity(0, string.Empty); } + public Discipline ReadDisciplineById(int id) => Discipline.CreateEntity(0, string.Empty); public IEnumerable ReadDisciplines() { return new List(); } public void UpdateDiscipline(Discipline discipline) { } -} +} \ No newline at end of file