Keeping Order

Jugenddienst Stunden/Models/Gemeinde.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jugenddienst_Stunden.Models {
-	internal class Gemeinde {
-		public int Id { get; set; }
-		public string Name { get; set; }
-
-		public Gemeinde(int id, string name) {
-			Id = id;
-			Name = name;
-		}
-	}
-}

Jugenddienst Stunden/Models/Hours.cs

@@ -1,8 +1,10 @@
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using Jugenddienst_Stunden.Types;
 using Newtonsoft.Json;
 
-namespace Jugenddienst_Stunden.Models {
+namespace Jugenddienst_Stunden.Models
+{
     public class Hours : ObservableObject {
 		public string zeit;
 		public string nominal;

Jugenddienst Stunden/Models/NominalWeek.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jugenddienst_Stunden.Models {
-	public class NominalWeek {
-		public int week_number;
-		public decimal hours;
-	}
-}

Jugenddienst Stunden/Models/Projekt.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jugenddienst_Stunden.Models {
-	internal class Projekt {
-		public int Id { get; set; }
-		public string Name { get; set; }
-	}
-}

Jugenddienst Stunden/Models/TimeDay.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jugenddienst_Stunden.Models {
-	public class TimeDay {
-		public int Day { get; set; }
-		public decimal Hours { get; set; }
-	}
-}

Jugenddienst Stunden/Models/Timetable.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jugenddienst_Stunden.Models {
-	internal class Timetable {
-		public List<TimetableEntry> timetable;
-		public decimal wochensumme;
-	}
-}

Jugenddienst Stunden/Models/TimetableEntry.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jugenddienst_Stunden.Models {
-	internal class TimetableEntry {
-		public List<TimeOnly>? von;
-		public List<TimeOnly>? bis;
-		public decimal summe { get; set; }
-	}
-}

Jugenddienst Stunden/Types/Gemeinde.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Types
+{
+    internal class Gemeinde
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+
+        public Gemeinde(int id, string name)
+        {
+            Id = id;
+            Name = name;
+        }
+    }
+}

Jugenddienst Stunden/Types/NominalWeek.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Types
+{
+    public class NominalWeek
+    {
+        public int week_number;
+        public decimal hours;
+    }
+}

Jugenddienst Stunden/Types/Projekt.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Types
+{
+    internal class Projekt
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}

Jugenddienst Stunden/Types/TimeDay.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Types
+{
+    public class TimeDay
+    {
+        public int Day { get; set; }
+        public decimal Hours { get; set; }
+    }
+}

Jugenddienst Stunden/Types/Timetable.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Types
+{
+    internal class Timetable
+    {
+        public List<TimetableEntry> timetable;
+        public decimal wochensumme;
+    }
+}

Jugenddienst Stunden/Types/TimetableEntry.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Types
+{
+    internal class TimetableEntry
+    {
+        public List<TimeOnly>? von;
+        public List<TimeOnly>? bis;
+        public decimal summe { get; set; }
+    }
+}

Jugenddienst Stunden/ViewModels/StundenViewModel.cs

@@ -6,10 +6,11 @@ using Microsoft.Maui.Networking;
 using ZXing.Net.Maui;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using Jugenddienst_Stunden.Models;
+using Jugenddienst_Stunden.Types;
 
 
-namespace Jugenddienst_Stunden.ViewModels {
+namespace Jugenddienst_Stunden.ViewModels
+{
     internal class StundenViewModel : ObservableObject {
 		public string Name => AppInfo.Name;
 		public string Surname => AppInfo.VersionString;
@@ -42,7 +43,7 @@ namespace Jugenddienst_Stunden.ViewModels {
 		//	get => _hour.zeit_total_daily;
 		//}
 
-		public List<Models.TimeDay> ZeitTotalDaily {
+		public List<TimeDay> ZeitTotalDaily {
 			get => _hour.zeit_total_daily_api;
 		}