senya 5 місяців тому
батько
коміт
b70bdf4bd4

+ 5 - 0
EntranseTesting/ViewModels/MainWindowViewModel.cs

@@ -232,6 +232,9 @@ namespace EntranseTesting.ViewModels
                             return;
                         }
                 }
+
+                foreach (var item in TestMain.TestPages.ProgressButtons)
+                    item.Check = false;
                 ButtonVisible = false;
                 Response.timer.Stop();
             }
@@ -424,6 +427,8 @@ namespace EntranseTesting.ViewModels
             if (reSave) return;
             try
             {
+                foreach (var item in TestMain.TestPages.ProgressButtons)
+                    item.Check = false;
                 ButtonVisible = false;
                 TestMain.changeResponse();//сохраняем ответ последнего задания
                 EntranceTestingContext connection = new EntranceTestingContext();

+ 20 - 3
EntranseTesting/ViewModels/TestingViewModel/TestPageViewModel.cs

@@ -35,7 +35,7 @@ namespace EntranseTesting.ViewModels
         bool visibleHint = false;
         List<QuestionHint> hints = new List<QuestionHint>();
         [ObservableProperty] List<Question> questionsCollection;
-        [ObservableProperty] List<ItemProgressButton> progressButtons = new List<ItemProgressButton>();
+        List<ItemProgressButton> progressButtons = new List<ItemProgressButton>();
         int takeItem = 5;
         int skipItem = 0;
         List<ItemProgressButton> takeProgressButtons = new List<ItemProgressButton>();
@@ -49,8 +49,21 @@ namespace EntranseTesting.ViewModels
         [ObservableProperty] TestMatchTheValueViewModel testMV;//ñîîòíîøåíèå âåëè÷èí
         public TestPageViewModel()
         {
-            EntranceTestingContext baseConnection = new EntranceTestingContext();
-            SettingTest = baseConnection.AppSettings.ToList().Last();
+            EntranceTestingContext baseConnection = new EntranceTestingContext();            
+            SettingTest = baseConnection.AppSettings.ToList().LastOrDefault();
+            if (SettingTest == null)
+            {
+                SettingTest = new AppSetting()
+                {
+                    Time = new TimeSpan(0, 45, 0),
+                    CountOfQuestions = 30,
+                    HintVisibility = false,
+                    CountOfHints = 0,
+                    Raiting5 = 30,
+                    Raiting4 = 23,
+                    Raiting3 = 16
+                };
+            }
             CountQuestion = SettingTest.CountOfQuestions;
 
             //ïîëó÷àåì âåñü ñïèñîê âîïðîñîâ èç áàçû
@@ -62,6 +75,8 @@ namespace EntranseTesting.ViewModels
 
             //êíîïêè íàâèãàöèè
             CountQuestion = (QuestionsCollection.Count == SettingTest.CountOfQuestions) ? SettingTest.CountOfQuestions : (QuestionsCollection.Count > SettingTest.CountOfQuestions) ? SettingTest.CountOfQuestions : QuestionsCollection.Count;
+
+            ProgressButtons.Clear();
             for (int i = 0; i < CountQuestion; i++)
                 ProgressButtons.Add(new ItemProgressButton(i + 1));
             ProgressButtons[0].Active = true;
@@ -93,6 +108,8 @@ namespace EntranseTesting.ViewModels
         public bool NoVisibleHint { get => !visibleHint; }
         public string ButtonValue { get => buttonValue; set { buttonValue = value; OnPropertyChanged("ButtonValue"); } }
 
+        public List<ItemProgressButton> ProgressButtons { get => progressButtons; set {progressButtons = value; OnPropertyChanged("ProgressButtons"); } }
+
         public void Next()
         {
             if (TakeProgressButtons.Last() != ProgressButtons.Last())