[fix:] course amount per semester synchronized with NumCoursesPerSemester, fixing #1

MainWindow.axaml

@@ -211,13 +211,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="*,*">
+                            <Button Grid.Column="0" Margin="0,10,0,0" x:Name="BtnExportCoursePDF" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnExportCoursePDF_OnClick" HorizontalContentAlignment="Center">
                                 <StackPanel Orientation="Horizontal">
                                     <LucideIcon Kind="FileText" Width="24" Height="24" />
                                     <Label Content="Export (PDF)..." VerticalContentAlignment="Center" FontSize="12"
                                            FontWeight="Bold" />
                                 </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,23 @@ 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);
+
+    }
 }

README.md

@@ -1,13 +1,15 @@
 # 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.
 
 ## 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
 

crafter.cs

@@ -193,6 +193,94 @@ public class CourseCrafter
 
         } while (changed && iteration < maxIterations);
         
+        // // --- Kurse nachträglich aufteilen, um NumCoursesPerSemester exakt zu erreichen ---
+        // foreach (var course in GeneratedCourses)
+        // {
+        //     int sem_count_total = GeneratedCourses.Count(tuple => tuple.Semester == course.Semester);
+        //     if (sem_count_total >= Settings.Instance.NumCoursesPerSemester) break;
+        //     
+        //     int sem_count = GeneratedCourses.Count(tuple => tuple.Semester == course.Semester && tuple.Instance.Sport.Name == course.Instance.Sport.Name);
+        //     
+        //
+        //     if (sem_count < course.Instance.Sport.Semester[course.Semester - 1] && course.Instance.Students.Count >= course.Instance.Sport.MinStudents *2)
+        //     {
+        //         // hier aufteilen
+        //         Console.WriteLine("Könnte aufgeteilt werden.");
+        //     }
+        // }
+        //
+        // --- Kurse nachträglich aufteilen, um NumCoursesPerSemester exakt zu erreichen ---
+        for (int semester = 1; semester <= 4; semester++)
+        {
+            int cancel = 0;
+            while (GeneratedCourses.Count(c => c.Semester == semester) < Settings.Instance.NumCoursesPerSemester)
+            {
+                cancel++;
+                if (cancel >= 5) break;
+                // Kandidaten suchen: splittbare Kurse, deren Sport noch Kapazität hat
+                var candidate = GeneratedCourses
+                    .Where(c => c.Semester == semester)
+                    .Where(c => c.Instance.Students.Count >= c.Instance.Sport.MinStudents * 2)
+                    .Where(c =>
+                    {
+                        int sportCount = GeneratedCourses.Count(g =>
+                            g.Semester == semester &&
+                            g.Instance.Sport.Name == c.Instance.Sport.Name);
+
+                        int allowed = c.Instance.Sport.Semester[semester - 1];
+                        return sportCount < allowed;
+                    })
+                    .OrderByDescending(c => c.Instance.Students.Count)
+                    .FirstOrDefault();
+
+                try
+                {
+
+                    var students = candidate.Instance.Students;
+
+                    var newCourse = new CourseInstance
+                    {
+                        Sport = candidate.Instance.Sport,
+                        Students = new List<string>()
+                    };
+
+                    List<string> moved = new();
+
+                    for (int i = students.Count - 1; i >= 0; i--)
+                    {
+                        string stud = students[i];
+
+                        if (newCourse.Students.Count >= candidate.Instance.Sport.MaxStudents)
+                            break;
+
+                        // Sicherstellen, dass beide Kurse >= MinStudents bleiben
+                        if (students.Count - moved.Count <= candidate.Instance.Sport.MinStudents)
+                            break;
+
+                        newCourse.Students.Add(stud);
+                        moved.Add(stud);
+                    }
+
+                    // Validierung
+                    if (newCourse.Students.Count < candidate.Instance.Sport.MinStudents)
+                        break;
+
+                    // Move durchführen
+                    foreach (var s in moved)
+                    {
+                        candidate.Instance.Students.Remove(s);
+                    }
+
+                    GeneratedCourses.Add((semester, newCourse));
+                }
+                catch
+                {
+                    
+                }
+                
+            }
+        }
+        
 
         bool isStudentFree(int semester, string studentID)
         {
@@ -314,7 +402,7 @@ public class CourseCrafter
 
         if (errors.Count == 0)
         {
-            MainWindow.Instance.TbResultLog.Text = "Alles generierten Kursen erfüllen die gegebenen Voraussetzungen.";
+            MainWindow.Instance.TbResultLog.Text = "--- Alle generierten Kursen erfüllen die gegebenen Voraussetzungen ---";
         }
         else
         {
@@ -323,6 +411,17 @@ public class CourseCrafter
                 MainWindow.Instance.TbResultLog.Text += e + "\n";
         }
         
+        foreach (var course in GeneratedCourses)
+        {
+            foreach (var student in Settings.Instance.Students)
+            {
+                if (course.Instance.Students.Contains(student.ID))
+                {
+                    student.Result[course.Semester-1] = course.Instance.Sport.Name;
+                }
+            }
+        }
+        
     }
 
     public static string GenerateStatistics()
@@ -339,67 +438,6 @@ public class CourseCrafter
         return sb;
     }
     
-    public static string GenerateStatisticsOld()
-    {
-        var settings = Settings.Instance;
-        var students = settings.Students;
-
-        if (GeneratedCourses == null || GeneratedCourses.Count == 0)
-            return "Keine Kurse generiert.";
-
-        int semesterCount = students
-            .Where(s => s.Result != null)
-            .Select(s => s.Result!.Count)
-            .DefaultIfEmpty(0)
-            .Max();
-
-        var sb = new System.Text.StringBuilder();
-
-        sb.AppendLine($"Anzahl generierter Kurse: {GeneratedCourses.Count}");
-        sb.AppendLine("Übersicht:");
-
-        // ===== Kursübersicht =====
-        var grouped = GeneratedCourses
-            .GroupBy(g => new { g.Semester, g.Instance.Sport.Name })
-            .OrderBy(g => g.Key.Semester)
-            .ThenBy(g => g.Key.Name);
-
-        foreach (var group in grouped)
-        {
-            int counter = 1;
-
-            foreach (var entry in group)
-            {
-                int semester = group.Key.Semester + 1;
-                string sportName = group.Key.Name;
-                string number = counter.ToString("D2");
-                int count = entry.Instance.Students.Count;
-
-                sb.AppendLine(
-                    $"Semester {semester}: {sportName} {number}: {count} Schüler*innen"
-                );
-
-                counter++;
-            }
-        }
-
-        sb.AppendLine();
-        sb.AppendLine("Fehlerübersicht:");
-
-        // ===== Fehler pro Semester =====
-        for (int sem = 0; sem < semesterCount; sem++)
-        {
-            int errors = students.Count(st =>
-                st.Result != null &&
-                st.Result.Count > sem &&
-                st.Result[sem] == "Fehler");
-
-            sb.AppendLine($"Semester {sem + 1}: {errors} Fehler");
-        }
-
-        return sb.ToString();
-    }
-    
     public static List<string> ValidateCourses(List<(int Semester, CourseInstance Instance)> courses)
     {
         List<string> errors = new();

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);
+    }
+}

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()
     {