fix semester score

phanxuanquang · Jun 9, 2022 · ee8eb69 · ee8eb69
1 parent 6eb6c08
commit ee8eb69
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/studMin/GUI/Main Windows/Tab/Dashboard/Base/SubTab/GradeModify_SubTab.cs b/studMin/GUI/Main Windows/Tab/Dashboard/Base/SubTab/GradeModify_SubTab.cs
@@ -395,6 +395,16 @@ private void Class_ComboBox_SelectedIndexChanged(object sender, EventArgs e)
             ResetDataGridView();
             className = Class_ComboBox.SelectedItem.ToString();
 
+            var listSemester = Database.DataProvider.Instance.Database.TEACHes.Where(item => item.IDTEACHER == studMin.Database.LoginServices.LoginServices.Instance.CurrentTeacher.ID && item.CLASS.CLASSNAME == className && item.SCHOOLYEAR == schoolYear).Select(item => item.SEMESTER.NAME).ToList();
+
+            string temp = listSemester[0];
+            listSemester.Remove(temp);
+            listSemester.Add(temp);
+
+            listSemester = listSemester.Select(item => Methods.HocKy(int.Parse(item))).ToList();
+
+            SemesterComboBox.DataSource = listSemester;
+
             List<STUDENT> students = studMin.Database.ClassServices.Instance.GetListStudentOfClass(className, schoolYear, semester);
             sTUDENTBindingSource.DataSource = students.Select(student => new STUDENT4GRIDVIEW(student.ID, student.INFOR.FIRSTNAME, student.INFOR.LASTNAME)).ToList();
 
@@ -425,16 +435,6 @@ private void SchoolYear_ComboBox_SelectedIndexChanged(object sender, EventArgs e
 
             isAllowEdit = lastestSchoolYear == int.Parse(schoolYear);
 
-            var listSemester = Database.DataProvider.Instance.Database.SEMESTERs.ToList().Select(item => item.NAME).ToList();
-
-            string temp = listSemester[0];
-            listSemester.Remove(temp);
-            listSemester.Add(temp);
-
-            listSemester = listSemester.Select(item => Methods.HocKy(int.Parse(item))).ToList();
-
-            SemesterComboBox.DataSource = listSemester;
-
             if (!String.IsNullOrEmpty(schoolYear))
             {
                 List<string> @class = studMin.Database.DataProvider.Instance.Database.TEACHes.Where(item => item.SCHOOLYEAR == schoolYear && item.IDTEACHER == studMin.Database.LoginServices.LoginServices.Instance.CurrentTeacher.ID).Select(item => item.CLASS.CLASSNAME).Distinct().ToList();