Исправил ошибки решения мерж конфликта

Students-of-the-city-of-Kostroma · May 26, 2019 · 436d9a7 · 436d9a7
1 parent 5102cf4
commit 436d9a7
Showing 1 changed file with 27 additions and 28 deletions.
diff --git a/TimetableOfClasses/AddAcademicDegree.cs b/TimetableOfClasses/AddAcademicDegree.cs
@@ -41,14 +41,17 @@ private void Button1_Click(object sender, EventArgs e)  // Создать и о
 				{
 					if (FullName.Text.Length != 0)
 					{
-						MAcademicDegree AcademicDegree = new MAcademicDegree(FullName.Text, Reduction.Text);
-						RefData.CAcademicDegree.Insert(AcademicDegree);
-						FullName.Text = "";
-						Reduction.Text = "";
-					}
-					catch (Exception)
-					{
-						MessageBox.Show("Некорректно заполнены поля", "Ошибка");
+						try
+						{
+							MAcademicDegree AcademicDegree = new MAcademicDegree(FullName.Text, Reduction.Text);
+							RefData.CAcademicDegree.Insert(AcademicDegree);
+							FullName.Text = "";
+							Reduction.Text = "";
+						}
+						catch (Exception)
+						{
+							MessageBox.Show("Некорректно заполнены поля", "Ошибка");
+						}
 					}
 					else MessageBox.Show("Заполните полe 'Полная запись учёной степени'", "Попробуйте снова", MessageBoxButtons.OK);
 				}
@@ -66,15 +69,19 @@ private void Button2_Click(object sender, EventArgs e) //Создать и за
 					{
 						if (FullName.Text.Length != 0)
 						{
-							MAcademicDegree AcademicDegree = new MAcademicDegree(FullName.Text, Reduction.Text);
-							RefData.CAcademicDegree.Update(AcademicDegree);
-							FullName.Text = "";
-							Reduction.Text = "";
-							Close();
-						}
-						catch (Exception)
-						{
-							MessageBox.Show("Некорректно заполнены поля", "Ошибка");
+							try
+							{
+								MAcademicDegree AcademicDegree = new MAcademicDegree(FullName.Text, Reduction.Text);
+								RefData.CAcademicDegree.Update(AcademicDegree);
+								FullName.Text = "";
+								Reduction.Text = "";
+								Close();
+							}
+							catch (Exception)
+							{
+								MessageBox.Show("Некорректно заполнены поля", "Ошибка");
+							}
+
 						}
 						else MessageBox.Show("Заполните полe 'Полная запись учёной степени'", "Попробуйте снова", MessageBoxButtons.OK);
 					}
@@ -83,26 +90,18 @@ private void Button2_Click(object sender, EventArgs e) //Создать и за
 				else MessageBox.Show("Заполните поля", "Попробуйте снова", MessageBoxButtons.OK);
 			}
 			else
-			{
+{
 
 				if ((Reduction.Text.Length != 0) || (FullName.Text.Length != 0))
 				{
 					if (Reduction.Text.Length != 0)
 					{
-						try
-						{
-							MAcademicDegree AcademicDegree = new MAcademicDegree(FullName.Text, Reduction.Text);
-							RefData.CAcademicDegree.Insert(AcademicDegree);
-							FullName.Text = "";
-							Reduction.Text = "";
-							Close();
-						}
-						catch (Exception)
+						if (FullName.Text.Length != 0)
 						{
 							try
 							{
 								MAcademicDegree AcademicDegree = new MAcademicDegree(FullName.Text, Reduction.Text);
-								Controllers.CAcademicDegree.Insert(AcademicDegree);
+								RefData.CAcademicDegree.Insert(AcademicDegree);
 								FullName.Text = "";
 								Reduction.Text = "";
 								Close();