Merge pull request #3 from KusalPriyanka/master

Get Changes
KusalPriyanka · Oct 1, 2020 · 148b575 · 148b575
2 parents 4bbdbde + aeae7b7
commit 148b575
Show file tree

Hide file tree

Showing 8 changed files with 312 additions and 273 deletions.
diff --git a/TimeTable_App/Forms/SubForms/LecStatisticsSubForm.Designer.cs b/TimeTable_App/Forms/SubForms/LecStatisticsSubForm.Designer.cs
diff --git a/TimeTable_App/Forms/SubForms/LecStatisticsSubForm.cs b/TimeTable_App/Forms/SubForms/LecStatisticsSubForm.cs
@@ -16,15 +16,14 @@ public partial class LecStatisticsSubForm : UserControl
         private static LecStatisticsSubForm _instance;
         private FormCtrl formCtrl;
         private int buildingId = 0;
+
         public LecStatisticsSubForm()
         {
             InitializeComponent();
             formCtrl = new FormCtrl();
             initForm();
         }
 
-
-
         private void initForm()
         {
 

diff --git a/TimeTable_App/Forms/SubForms/RoomsSubForm.cs b/TimeTable_App/Forms/SubForms/RoomsSubForm.cs
@@ -56,10 +56,12 @@ private void initForm()
             }
 
             ActionResult TagsResult = formCtrl._getFormData(typeof(TagsModel), "Tags");
+            count = 1;
             if (TagsResult.State)
             {
                 List<TagsModel> tagsList = TagsResult.Data;
-                tagsList.ForEach(tag => comboTag.Items.Insert(tag.TagId, tag.Tag));
+                tagsList.ForEach(tag => comboTag.Items.Insert(count, tag.Tag));
+                ++count;
             }
 
             comboBuilding.SelectedIndex = 0;

diff --git a/TimeTable_App/Forms/SubForms/StuStatisticsSubForm.Designer.cs b/TimeTable_App/Forms/SubForms/StuStatisticsSubForm.Designer.cs