Merge pull request '[chore:] better crafting' (#5) from bettercrafting into main

Reviewed-on: #5

MainWindow.axaml

@@ -12,6 +12,7 @@
                     <!-- <MenuItem Click="MnuSettings_OnClick" x:Name="MnuSettings" Header="Einstellungen" /> -->
                     <!-- <Separator /> -->
                     <MenuItem x:Name="MnuExpSettings" Header="Einstellungen exportieren" Click="MnuExpSettings_OnClick" />
+                    <MenuItem x:Name="MnuImpResult" Header="Berechnung importieren" Click="MnuImpResult_OnClick" />
                     <MenuItem x:Name="MnuExit" Header="Beenden" Click="MnuExit_OnClick"/>
                 </MenuItem>
                 <MenuItem Header="Hilfe">
@@ -211,13 +212,22 @@
                     </TabItem.Header>
                     <Grid ColumnDefinitions="*,*" RowDefinitions="50,2*,*">
                         <ListBox Grid.RowSpan="2" x:Name="LbResult" Margin="0,10,10,10"></ListBox>
-                        <Button Grid.Row="0" Grid.Column="1" Margin="0,10,0,0" x:Name="BtnExportCoursePDF" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnExportCoursePDF_OnClick" HorizontalContentAlignment="Center">
+                        <Grid Grid.Row="0" Grid.Column="1" Grid.ColumnDefinitions="*,*">
-                            <StackPanel Orientation="Horizontal">
+                            <Button Grid.Column="0" Margin="0,10,0,0" x:Name="BtnExportCoursePDF" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnExportCoursePDF_OnClick" HorizontalContentAlignment="Center">
-                                <LucideIcon Kind="FileText" Width="24" Height="24" />
+                                <StackPanel Orientation="Horizontal">
-                                <Label Content="Export (PDF)..." VerticalContentAlignment="Center" FontSize="12"
+                                    <LucideIcon Kind="FileText" Width="24" Height="24" />
-                                       FontWeight="Bold" />
+                                    <Label Content="Export (PDF)..." VerticalContentAlignment="Center" FontSize="12"
-                            </StackPanel>
+                                           FontWeight="Bold" />
-                        </Button>
+                                </StackPanel>
+                            </Button>
+                            <Button Grid.Column="1" Margin="5,10,0,0" x:Name="BtnExportCourseCSV" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnExportCourseCSV_OnClick" HorizontalContentAlignment="Center">
+                                <StackPanel Orientation="Horizontal">
+                                    <LucideIcon Kind="FileJson" Width="24" Height="24" />
+                                    <Label Content="Export (CSV)..." VerticalContentAlignment="Center" FontSize="12"
+                                           FontWeight="Bold" />
+                                </StackPanel>
+                            </Button>
+                        </Grid>
                         <ScrollViewer Grid.Row="1" Grid.Column="1" Margin="0,5,0,10" Background="#44CCCCCC">
                             <TextBlock x:Name="TbResultStatistics"></TextBlock>
                         </ScrollViewer>

MainWindow.axaml.cs

@@ -11,7 +11,7 @@ namespace spplus;
 public partial class MainWindow : Window
 {
     public static MainWindow Instance { get; set; }
-    public static string ApplicationVersion = "v1.1.17";
+    public static string ApplicationVersion = "v1.2.24";
     public MainWindow()
     {
         InitializeComponent();
@@ -166,7 +166,7 @@ public partial class MainWindow : Window
         {
             try
             {
-                for(int i = 0; i<s.Result.Count;i++)
+                for(int i = 0; i<s.Result.Length;i++)
                 {
                     LbResult.Items.Add($"{s.Name} ({s.ID}) - {i+1}. Semester: {s.Result[i]}");
                 }
@@ -423,4 +423,40 @@ public partial class MainWindow : Window
             Settings.Instance.NumCoursesPerSemester = Convert.ToInt32(NudSportMaxPerSemester.Value);
         } catch {}
     }
+
+    private async void BtnExportCourseCSV_OnClick(object? sender, RoutedEventArgs e)
+    {
+        var topLevel = GetTopLevel(this);
+        var file = await topLevel!.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
+        {
+            Title = "CSV-Datei speichern",
+            SuggestedFileType = new FilePickerFileType(".csv-Datei")
+            {
+                Patterns = new[] { "*.csv" }
+            }
+            
+        });
+
+        if (file == null) return;
+
+        ExportUtility.ExportToCSV(file.Path.AbsolutePath);
+
+    }
+
+    private async void MnuImpResult_OnClick(object? sender, RoutedEventArgs e)
+    {
+        // Hier importieren
+        var topLevel = GetTopLevel(this);
+        var file = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+        {
+            Title = "CSV-Datei laden",
+            SuggestedFileType = new FilePickerFileType(".csv-Datei")
+            {
+                Patterns = new[] { "*.csv" }
+            }
+            
+        });
+
+        if (file == null) return;
+    }
 }

README.md

@@ -1,13 +1,17 @@
 # SP+
 
-Interaktiver Sportkursplaner für Oberstufen auf Basis einer Sportkurswahl durch SuS.
+Plattformunabhängiger (Windows, Linux, Mac), interaktiver Sportkursplaner für Oberstufen auf Basis einer Sportkurswahl durch SuS.
+
+![spplus-Hauptbildschirm](img/spplus_planung.png)
 
 ## Features
 * \+ Import von CSV-Dateien mit Kurswahl
 * \+ Wahlansicht 
 * \+ Statistiken
 * \+ Pflege von Sportkursen (inkl. Kürzel/ alternativen Bezeichnungen)
+* \+ CSV-Export
 * ~ Fehleransicht für nicht-existente, aber gewählte Kurse
+* ~ PDF-Export
 
 \+ Vorhanden, ~ Pending
 
@@ -19,3 +23,5 @@ Interaktiver Sportkursplaner für Oberstufen auf Basis einer Sportkurswahl durch
     * Suche `spplus` bzw. `spplus.exe` und führe aus
     * Linux/MacOS evl.: `chmod +x spplus`
 
+
+![spplus-Sportkursübersicht](img/spplus_sport.png)

exporter.cs

@@ -0,0 +1,19 @@
+using System.IO;
+
+namespace spplus;
+
+public static class ExportUtility
+{
+    public static void ExportToCSV(string filepath)
+    {
+        char separator = ',';
+        string header = $"SchuelerID{separator}Sem1{separator}Sem2{separator}Sem3{separator}Sem4";
+        string output = header + "\n";
+        foreach (var student in Settings.Instance.Students)
+        {
+            output += $"{student.ID}{separator}{student.Result[0]}{separator}{student.Result[1]}{separator}{student.Result[2]}{separator}{student.Result[3]}\n";
+        }
+        
+        File.WriteAllText(filepath, output);
+    }
+}

import.cs

@@ -47,4 +47,45 @@ public static class import
 
         return result;
     }
+    
+    public static List<Student> ImportResultFromFile(string path)
+    {
+        var dict = new Dictionary<string, (string Name, List<string> Courses)>();
+
+        foreach (var line in File.ReadLines(path).Skip(1)) // Header überspringen
+        {
+            if (string.IsNullOrWhiteSpace(line))
+                continue;
+
+            var parts = line.Split(',');
+            if (parts.Length < 3)
+                continue;
+
+            string nameWithId = parts[0].Trim();
+            string course = parts[2].Replace("(2)", "").Replace("(3)", "").Replace("(4)", "").Trim();
+
+            int open = nameWithId.LastIndexOf('(');
+            int close = nameWithId.LastIndexOf(')');
+            if (open < 0 || close < 0 || close <= open)
+                continue;
+
+            string name = nameWithId[..open].Trim();
+            string id = nameWithId[(open + 1)..close].Trim();
+
+            if (!dict.ContainsKey(id))
+                dict[id] = (name, new List<string>());
+
+            dict[id].Courses.Add(course);
+        }
+
+        var result = new List<Student>();
+
+        foreach (var (id, data) in dict)
+        {
+            var student = new Student(id, data.Name, data.Courses);
+            result.Add(student);
+        }
+
+        return result;
+    }
 }

structs.cs

@@ -59,7 +59,7 @@ public class Student
     public string ID { get; set; } = "";        // ID des Schüler (z.B. NolteSeb)
     public string Name { get; set; } = "";        // Name des Schülers
     public List<string> SelectedCourseNames { get; set; } = new();
-    public List<string>? Result { get; set; } = null;
+    public string[] Result { get; set; } = new string[4];
 
     public Student()
     {
@@ -85,7 +85,7 @@ public class Settings
 
     public List<Student> Students { get; set; } = [];
     public List<Sport> Sports { get; set; } = [];
-    public int NumCoursesPerSemester { get; set; } = 10;
+    public int NumCoursesPerSemester { get; set; } = 10; // Exact Amount of courses, not a maximum
 
     public Settings()
     {