minor code changes

aditydcp · Jun 11, 2023 · 3eb9237 · 3eb9237
1 parent 6be2db0
commit 3eb9237
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/TestSuiteWpf/App.xaml.cs b/TestSuiteWpf/App.xaml.cs
@@ -54,7 +54,7 @@ public static void ResetBlockData()
         /// </summary>
         public static void SaveSubjectData()
         {
-            string path = ConfigurationManager.AppSettings.Get("RunDataPath") + "SubjectRecords.csv";
+            string path = ConfigurationManager.AppSettings.Get("RunDataPath") + "SubjectRecords_Trier.csv";
             //var hollow = new { something = string.Empty }; // needed to make extra space in the file
             List<RecordSubject> subject = new()
             {
@@ -118,7 +118,7 @@ public static void SaveRunData(string filename = "default")
             }
 
             var path = ConfigurationManager.AppSettings.Get("RunDataPath");
-            using var writer = new StreamWriter(path + filename + ".csv");
+            using var writer = new StreamWriter(path + filename + "_Trier.csv");
             using var csv = new CsvWriter(writer, CultureInfo.InvariantCulture);
             csv.WriteRecords(records);
         }

diff --git a/TestSuiteWpf/Controllers/BlockViewController.cs b/TestSuiteWpf/Controllers/BlockViewController.cs
@@ -54,6 +54,15 @@ public void SubmitAnswer(int answer)
             }
         }
 
+        /// <summary>
+        /// Start necessary initial timers
+        /// </summary>
+        public void StartBlock()
+        {
+            StartBlockTimer();
+            StartQuestionTimer();
+        }
+
         private void FinishBlock()
         {
             StopAllTimer();

diff --git a/TestSuiteWpf/Pages/BlockView.xaml.cs b/TestSuiteWpf/Pages/BlockView.xaml.cs
@@ -28,8 +28,7 @@ private void OnPageLoaded(object sender, RoutedEventArgs e)
             controller = new BlockViewController(this);
             ControlButtons();
             controller.ControlView();
-            controller.StartBlockTimer();
-            controller.StartQuestionTimer();
+            controller.StartBlock();
 
             // debug only
             window = App.FindParentOfType<MainWindow>(this) as MainWindow;
@@ -59,6 +58,7 @@ public void FinishBlock()
             NavigationService.Navigate(new BlockResult());
         }
 
+        #region UI Setters
         public void SetScoreText(string score) { ScoreLabel.Text = score; }
         public void SetScoreText(int score) { ScoreLabel.Text = score.ToString(); }
 
@@ -75,6 +75,7 @@ public void ShowFeedback(bool show)
             else { FeedbackContainer.Visibility = Visibility.Collapsed; }
         }
 
+        // debug only
         public void SetBlockTimerText(string timeString) { BlockTimerLabel.Text = timeString; }
 
         /// <summary>
@@ -175,5 +176,6 @@ private void ControlButtons()
                     verticalScaleFactor * 2
                 );
         }
+        #endregion
     }
 }