1.1

yarre-uk · Aug 20, 2022 · d1c2552 · d1c2552
1 parent 5bcb65f
commit d1c2552
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/UI/MainWindow.xaml b/UI/MainWindow.xaml
@@ -15,7 +15,7 @@
             </ListView.View>
         </ListView>
 
-        <Button x:Name="Update" Content="Update List" Margin="497,0,0,10" Click="Button_Click" HorizontalAlignment="Left" Width="79" Height="50" VerticalAlignment="Bottom"/>
+        <Button x:Name="Update" Content="Update" Margin="497,0,0,10" Click="Button_Click" HorizontalAlignment="Left" Width="53" Height="50" VerticalAlignment="Bottom"/>
         <TextBox x:Name="Input" TextWrapping="Wrap" Width="135" HorizontalAlignment="Left" Margin="357,0,0,10" FontSize="16" TextChanged="Input_TextChanged" Height="50" VerticalAlignment="Bottom" TextAlignment="Center"/>
 
         <ListView x:Name="WatchTasks" Margin="10,10,248,10" SelectionChanged="WatchTasks_SelectionChanged">
@@ -28,5 +28,6 @@
                 </GridView>
             </ListView.View>
         </ListView>
+        <CheckBox x:Name="Check" Content="" HorizontalAlignment="Left" Margin="556,392,0,0" VerticalAlignment="Top"/>
     </Grid>
 </Window>
diff --git a/UI/MainWindow.xaml.cs b/UI/MainWindow.xaml.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace UI;
 
@@ -63,20 +64,20 @@ private void Input_TextChanged(object sender, System.Windows.Controls.TextChange
         UpdateList(true);
     }
 
-    private void WatchTasks_SelectionChanged(object sender, dynamic e)
+    private void WatchTasks_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        if (e.AddedItems.Length > 0)
+        if (e.AddedItems.Count > 0 && Check.IsChecked == true)
         {
-            taskService.Delete(e.AddedItems[0].Name);
+            taskService.Delete(((Task)e.AddedItems[0]!).Name);
             UpdateList(false);
         }
     }
 
-    private void CurrentTasks_SelectionChanged(object sender, dynamic e)
+    private void CurrentTasks_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        if (e.AddedItems.Length > 0)
+        if (e.AddedItems.Count > 0 && Check.IsChecked == true)
         {
-            taskService.Add(e.AddedItems[0].Name);
+            taskService.Add(((ProcessDTO)e.AddedItems[0]!).Name);
             UpdateList(false);
             Input.Text = "";
         }

diff --git a/UI/TaskService.cs b/UI/TaskService.cs
@@ -17,7 +17,7 @@ public TaskService()
         try
         {
             using var sr = new StreamReader(path);
-            tasks = JsonConvert.DeserializeObject<List<Task>>(sr.ReadToEnd())!;
+            tasks = JsonConvert.DeserializeObject<List<Task>>(sr.ReadToEnd(), new JsonSerializerSettings() { Formatting = Formatting.Indented })!;
 
             if (tasks.Count == 0)
             {
@@ -35,7 +35,7 @@ public TaskService()
             };
 
             using var sw = new StreamWriter(path);
-            sw.WriteLine(JsonConvert.SerializeObject(tasks));
+            sw.WriteLine(JsonConvert.SerializeObject(tasks, new JsonSerializerSettings() { Formatting = Formatting.Indented }));
         }
 
         System.Threading.Tasks.Task.Run(() =>
@@ -88,7 +88,7 @@ public void Start()
 
             using (var sw = new StreamWriter(path))
             {
-                sw.WriteLine(JsonConvert.SerializeObject(tasks));
+                sw.WriteLine(JsonConvert.SerializeObject(tasks, new JsonSerializerSettings() { Formatting = Formatting.Indented }));
             }
 
             wait.Wait();
@@ -113,7 +113,7 @@ public void CheckState()
 
         using (var sw = new StreamWriter(path))
         {
-            sw.WriteLine(JsonConvert.SerializeObject(tasks));
+            sw.WriteLine(JsonConvert.SerializeObject(tasks, new JsonSerializerSettings() { Formatting = Formatting.Indented }));
         }
     }
 
@@ -133,7 +133,7 @@ public void Add(string name)
 
         using (var sw = new StreamWriter(path))
         {
-            sw.WriteLine(JsonConvert.SerializeObject(tasks));
+            sw.WriteLine(JsonConvert.SerializeObject(tasks, new JsonSerializerSettings() { Formatting = Formatting.Indented }));
         }
     }
 
@@ -142,6 +142,6 @@ public void Delete(string name)
         tasks = tasks.Where(x => x.Name != name).ToList();
 
         using var sw = new StreamWriter(path);
-        sw.WriteLine(JsonConvert.SerializeObject(tasks));
+        sw.WriteLine(JsonConvert.SerializeObject(tasks, new JsonSerializerSettings() { Formatting = Formatting.Indented }));
     }
 }