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

Reviewed-on: #5

MainWindow.axaml

@@ -4,7 +4,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="spplus.MainWindow" WindowState="Maximized"
-        Title="SP+">
+        Title="spplus">
     <Border>
         <Grid RowDefinitions="30,*">
             <Menu Background="#50888888">
@@ -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">
@@ -20,7 +21,7 @@
                     <MenuItem Header="Über" x:Name="MnuAbout" Click="MnuAbout_OnClick"  />
                 </MenuItem>
             </Menu>
-            <TabControl x:Name="TclMainView" Grid.Row="1">
+            <TabControl x:Name="TclMainView" Grid.Row="1" TabStripPlacement="Left">
                 <TabItem>
                     <TabItem.Header>
                         <StackPanel Orientation="Horizontal">
@@ -88,6 +89,11 @@
                                 <Label  Content="Anzahl gewählte Kurse"></Label>
                                 <Label Grid.Column="1" x:Name="LblSelectedAmount"></Label>
                             </Grid>
+                            
+                            <Grid ColumnDefinitions="*,3*">
+                                <Label  Content="Wahlzahlen"></Label>
+                                <Label Grid.Column="1" x:Name="LblNumVoted"></Label>
+                            </Grid>
                         </StackPanel>
                         
 
@@ -188,6 +194,11 @@
                                 </StackPanel>
 
                             </Grid>
+                            <Line />
+                            <Grid ColumnDefinitions="*,3*">
+                                <Label  Content="Maximale Sportkursanzahl pro Semester"></Label>
+                                <NumericUpDown Grid.Column="1" x:Name="NudSportMaxPerSemester" ValueChanged="NudSportMaxPerSemester_OnValueChanged"></NumericUpDown>
+                            </Grid>
                         </StackPanel>
                     </Grid>
                 </TabItem>
@@ -200,14 +211,23 @@
                         </StackPanel>
                     </TabItem.Header>
                     <Grid ColumnDefinitions="*,*" RowDefinitions="50,2*,*">
-                        <ListBox Grid.RowSpan="2" x:Name="LbResult" Margin="10,10,10,10"></ListBox>
+                        <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,12 +11,17 @@ namespace spplus;
 public partial class MainWindow : Window
 {
     public static MainWindow Instance { get; set; }
+    public static string ApplicationVersion = "v1.2.24";
     public MainWindow()
     {
         InitializeComponent();
         Settings.ImportInitial();
         Instance = this;
         RefreshCoursesList();
+        try
+        {
+            NudSportMaxPerSemester.Value = Settings.Instance.NumCoursesPerSemester;
+        } catch {}
     }
 
     private void MnuExpSettings_OnClick(object? sender, RoutedEventArgs e)
@@ -36,7 +41,7 @@ public partial class MainWindow : Window
             Process.Start(new ProcessStartInfo
             {
                 FileName = "https://git.mypapercloud.de/fierke/spplus/wiki",
-                UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen
+                UseShellExecute = true 
             });
         }
         catch (Exception ex)
@@ -52,7 +57,7 @@ public partial class MainWindow : Window
             Process.Start(new ProcessStartInfo
             {
                 FileName = "https://git.mypapercloud.de/fierke/spplus",
-                UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen
+                UseShellExecute = true 
             });
         }
         catch (Exception ex)
@@ -71,7 +76,7 @@ public partial class MainWindow : Window
         Grid g = new();
         TextBlock tb = new()
         {
-            Text = "spplus v1.0.0\n(c)2026 MyPapertown, Elias Fierke"
+            Text = $"spplus {MainWindow.ApplicationVersion}\n(c)2026 MyPapertown, Elias Fierke"
         };
         g.Children.Add(tb);
         w.Content = g;
@@ -118,14 +123,40 @@ public partial class MainWindow : Window
         LblStudentAmount.Content =  Settings.Instance.Students.Count.ToString();
         LblSelectedAmount.Content =  count_selected.ToString();
         
+        List<(Sport, List<string>)> initial_sportlist = new();
+        foreach (var sp in Settings.Instance.Sports)
+        {
+            initial_sportlist.Add((sp, new()));
+        }
+        foreach (Student s in Settings.Instance.Students)
+        {
+            foreach (var sp in s.SelectedCourseNames)
+            {
+                foreach (var item in initial_sportlist)
+                {
+                    if (item.Item1.AlternativeNames.Contains(sp))
+                    {
+                        item.Item2.Add(s.ID);
+                        break;
+                    }
+                }
+            }
+        }
+
+        LblNumVoted.Content = "";
+        foreach (var s in initial_sportlist)
+        {
+            LblNumVoted.Content += $"{s.Item1.Name}: {s.Item2.Count}\n";
+        }
+        
     }
 
     private void BtnCraftCourses_OnClick(object? sender, RoutedEventArgs e)
     {
-        // Craft courses here / call course-crafter
         CourseCrafter.Craft();
         RefreshResultView();
-        TbiResults.Focus();
+        TclMainView.SelectedIndex = 2;
+        //TbiResults.Focus();
     }
 
     private void RefreshResultView()
@@ -135,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]}");
                 }
@@ -384,4 +415,48 @@ public partial class MainWindow : Window
     {
         // Export as PDF
     }
+
+    private void NudSportMaxPerSemester_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
+    {
+        try
+        {
+            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)

crafter.cs

@@ -48,12 +48,11 @@ public class CourseCrafter
         {
             if (item.Item2.Count >= item.Item1.MinStudents)
             {
-                    int semester = getSemesterForSport(item.Item1);
+                int semester = getSemesterForSport(item.Item1, item.Item2);
                 if (semester <= 0) goto semeq0;
                 var inst = new CourseInstance();
                 inst.Sport = item.Item1;
                 inst.Students = new List<string>();
-                    // int dist = 1;
                 for (int i = item.Item2.Count - 1; i >= 0; i--)
                 {
                     if (inst.Students.Count >= inst.Sport.MaxStudents)
@@ -68,7 +67,7 @@ public class CourseCrafter
                         item.Item2.RemoveAt(i);
                     }
                 }
-                    if (inst.Students.Count < inst.Sport.MinStudents)
+                if (inst.Students.Count < getEffectiveMinStudents(inst.Sport, semester))
                 {
                     // Rückgängig machen
                     foreach (var s in inst.Students)
@@ -79,55 +78,14 @@ public class CourseCrafter
                     continue; // Kurs nicht erstellen
                 }
                 GeneratedCourses.Add((semester, inst));
-                    
-                    MainWindow.Instance.TbResultLog.Text += ($"{semester} -> {inst.Students.Count}\n");
-                    MainWindow.Instance.TbResultLog.Text += ($"{students_in_semester[0].Count} - {students_in_semester[1].Count} - {students_in_semester[2].Count} - {students_in_semester[3].Count}\n\n");
             }
 
             semeq0: ;
         }
-            
-            
     }
 
-        // Kurse auffüllen (mit restl. Leuten)
+    FillExistingCourses();
-        foreach (var item in initial_sportlist)
-        {
-            if (item.Item2.Count > 0)
-            {
-                foreach (var ci in GeneratedCourses)
-                {
 
-                    if (item.Item1.ID == ci.Instance.Sport.ID)
-                    {
-                        int semester = ci.Semester;
-                        List<string> added = new();
-                        foreach (string stud in item.Item2)
-                        {
-                            if (ci.Instance.Students.Count >= ci.Instance.Sport.MaxStudents) break;
-                            if (!students_in_semester[semester-1].Contains(stud))
-                            {
-                                ci.Instance.Students.Add(stud);
-                                students_in_semester[semester-1].Add(stud);
-                                //ci.Instance.Students.Add(stud);
-                                added.Add(stud);
-                            }
-                        }
-
-                        // Hinzugefügte aus Initialkurs entfernen
-                        foreach (string s in added)
-                        {
-                            item.Item2.Remove(s);    
-                        }
-                    }
-                    MainWindow.Instance.TbResultLog.Text += ($"{ci.Semester} -> {ci.Instance.Students.Count}\n");
-                    MainWindow.Instance.TbResultLog.Text += ($"{students_in_semester[0].Count} - {students_in_semester[1].Count} - {students_in_semester[2].Count} - {students_in_semester[3].Count}\n\n");
-                }
-            }
-            
-        }
-        
-        // Kurs umdisponieren (besser verteilen)
     // Kurs umdisponieren (besser verteilen)
     bool changed;
     int maxIterations = 20;
@@ -138,15 +96,13 @@ public class CourseCrafter
         changed = false;
         iteration++;
 
-            // nach Sport gruppieren
         var sports = GeneratedCourses
-                .GroupBy(c => c.Instance.Sport.ID);
+            .GroupBy(c => c.Instance.Sport.Name);
 
         foreach (var sportGroup in sports)
         {
             var courses = sportGroup.ToList();
 
-                // paarweise vergleichen
             for (int i = 0; i < courses.Count; i++)
             {
                 for (int j = 0; j < courses.Count; j++)
@@ -156,28 +112,23 @@ public class CourseCrafter
                     var cA = courses[i];
                     var cB = courses[j];
 
-                        // nur sinnvoll, wenn Unterschied
                     if (cA.Instance.Students.Count <= cB.Instance.Students.Count + 1)
                         continue;
 
-                        // Kandidaten aus A nach B verschieben
                     for (int k = cA.Instance.Students.Count - 1; k >= 0; k--)
                     {
                         string stud = cA.Instance.Students[k];
 
-                            // 1. Zielsemester frei?
                         if (!isStudentFree(cB.Semester, stud))
                             continue;
 
-                            // 2. Zielkurs hat noch Platz?
                         if (cB.Instance.Students.Count >= cB.Instance.Sport.MaxStudents)
                             continue;
 
-                            // 3. Quellkurs darf nicht unter Min fallen
+                        // Quellkurs darf nicht unter effektives Min fallen
-                            if (cA.Instance.Students.Count - 1 < cA.Instance.Sport.MinStudents)
+                        if (cA.Instance.Students.Count - 1 < getEffectiveMinStudents(cA.Instance.Sport, cA.Semester))
                             continue;
 
-                            // --- MOVE durchführen ---
                         cA.Instance.Students.RemoveAt(k);
                         students_in_semester[cA.Semester - 1].Remove(stud);
 
@@ -185,7 +136,7 @@ public class CourseCrafter
                         students_in_semester[cB.Semester - 1].Add(stud);
 
                         changed = true;
-                            break; // nach jedem Move neu bewerten
+                        break;
                     }
                 }
             }
@@ -193,24 +144,193 @@ public class CourseCrafter
 
     } while (changed && iteration < maxIterations);
 
-        int getSemester()
+    // --- Kurse nachträglich aufteilen, um NumCoursesPerSemester exakt zu erreichen ---
+    for (int semester = 1; semester <= 4; semester++)
     {
-            //int sem = 0;
+        int cancel = 0;
-            if (GeneratedCourses.Count == 0) return 1; // zunächst im ersten Semester beginnen
+        while (GeneratedCourses.Count(c => c.Semester == semester) < Settings.Instance.NumCoursesPerSemester)
-            int[] semcount = new int[4] {0,0,0,0}; // Anzahl der generierten Kurse im jeweiligen Semester
-            foreach (var inst in GeneratedCourses) 
         {
-                semcount[inst.Semester - 1]++; // ...füllen
+            cancel++;
+            if (cancel >= 20) break;
+
+            var candidate = GeneratedCourses
+                .Where(c => c.Semester == semester)
+                .Where(c => c.Instance.Students.Count >= getEffectiveMinStudents(c.Instance.Sport, c.Semester) * 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();
+
+            if (candidate.Instance == null)
+                break;
+
+            var students = candidate.Instance.Students;
+            int totalStudents = students.Count;
+            int movedCount = totalStudents / 2;
+            int remainingCount = totalStudents - movedCount;
+
+            if (movedCount < getEffectiveMinStudents(candidate.Instance.Sport, candidate.Semester) ||
+                remainingCount < getEffectiveMinStudents(candidate.Instance.Sport, candidate.Semester))
+            {
+                break;
             }
 
-            for (int i = 0; i<semcount.Length; i++) // durchlaufen und prüfen
+            var newCourse = new CourseInstance
             {
-                if (semcount[i] < Settings.Instance.NumCoursesPerSemester)
+                Sport = candidate.Instance.Sport,
+                Students = new List<string>()
+            };
+
+            var moved = students
+                .Skip(remainingCount)
+                .Take(movedCount)
+                .ToList();
+
+            foreach (var s in moved)
             {
-                    return i+1; // Semester zurückgeben, wenn genug da sind
+                candidate.Instance.Students.Remove(s);
+                newCourse.Students.Add(s);
+            }
+
+            GeneratedCourses.Add((semester, newCourse));
         }
     }
-            return 0;
+
+    bool rescueChanged;
+    do
+    {
+        rescueChanged = FillExistingCourses();
+
+        foreach (var item in initial_sportlist)
+        {
+            if (TryCreateRescueCourse(item.Item1, item.Item2))
+            {
+                rescueChanged = true;
+            }
+        }
+    } while (rescueChanged);
+
+    OptimizeStudentWishCoverage();
+
+    // --- Ringtausch: Schüler mit 4 Wünschen aber < 4 Zuteilungen neu zuordnen ---
+    foreach (var student in Settings.Instance.Students)
+    {
+        if (student.SelectedCourseNames.Count < 4)
+            continue;
+
+        var currentAssignments = GetAssignmentsBySemester(student.ID);
+        int currentCount = currentAssignments.Count(a => a != null);
+
+        if (currentCount >= 4)
+            continue;
+
+        // Alle aktuellen Zuteilungen entfernen (temporär)
+        foreach (var assignment in currentAssignments)
+        {
+            if (assignment == null) continue;
+            assignment.Value.Instance.Students.Remove(student.ID);
+            students_in_semester[assignment.Value.Semester - 1].Remove(student.ID);
+        }
+
+        // Alle gewünschten Sports ermitteln
+        var desiredSports = student.SelectedCourseNames
+            .Select(ResolveSportFromSelection)
+            .Where(s => s != null)
+            .DistinctBy(s => s!.Name)
+            .Select(s => s!)
+            .ToList();
+
+        // Kandidatenkurse pro Semester: Kurse mit freiem Platz, die einem Wunschsport entsprechen
+        var candidatesPerSemester = new List<(int Semester, CourseInstance Instance)>[4];
+        for (int si = 0; si < 4; si++)
+        {
+            candidatesPerSemester[si] = GeneratedCourses
+                .Where(c => c.Semester == si + 1)
+                .Where(c => c.Instance.Students.Count < c.Instance.Sport.MaxStudents)
+                .Where(c => desiredSports.Any(ds => ds.Name == c.Instance.Sport.Name))
+                .ToList();
+            candidatesPerSemester[si].Insert(0, default); // default = kein Kurs
+        }
+
+        (int Semester, CourseInstance Instance)?[] bestAssignment = currentAssignments;
+        int bestScore = currentCount;
+
+        int s0 = candidatesPerSemester[0].Count;
+        int s1 = candidatesPerSemester[1].Count;
+        int s2 = candidatesPerSemester[2].Count;
+        int s3 = candidatesPerSemester[3].Count;
+
+        var sportSelectedCounts = student.SelectedCourseNames
+            .Select(ResolveSportFromSelection)
+            .Where(sp => sp != null)
+            .GroupBy(sp => sp!.Name)
+            .ToDictionary(g => g.Key, g => g.Count());
+
+        for (int i0 = 0; i0 < s0; i0++)
+        for (int i1 = 0; i1 < s1; i1++)
+        for (int i2 = 0; i2 < s2; i2++)
+        for (int i3 = 0; i3 < s3; i3++)
+        {
+            var c0 = candidatesPerSemester[0][i0];
+            var c1 = candidatesPerSemester[1][i1];
+            var c2 = candidatesPerSemester[2][i2];
+            var c3 = candidatesPerSemester[3][i3];
+
+            var chosen = new (int Semester, CourseInstance Instance)?[]
+            {
+                c0.Instance != null ? (c0.Semester, c0.Instance) : null,
+                c1.Instance != null ? (c1.Semester, c1.Instance) : null,
+                c2.Instance != null ? (c2.Semester, c2.Instance) : null,
+                c3.Instance != null ? (c3.Semester, c3.Instance) : null
+            };
+
+            bool valid = true;
+            var sportUsageCounts = new Dictionary<string, int>();
+
+            for (int si = 0; si < 4; si++)
+            {
+                if (chosen[si] == null) continue;
+                string sportName = chosen[si]!.Value.Instance.Sport.Name;
+                sportUsageCounts.TryGetValue(sportName, out int used);
+                int allowed = sportSelectedCounts.GetValueOrDefault(sportName, 0);
+                if (used >= allowed) { valid = false; break; }
+                sportUsageCounts[sportName] = used + 1;
+            }
+
+            if (!valid) continue;
+
+            int score = chosen.Count(c => c != null);
+            if (score > bestScore)
+            {
+                bestScore = score;
+                bestAssignment = chosen;
+            }
+        }
+
+        // Beste Zuteilung anwenden
+        foreach (var assignment in bestAssignment)
+        {
+            if (assignment == null) continue;
+            assignment.Value.Instance.Students.Add(student.ID);
+            students_in_semester[assignment.Value.Semester - 1].Add(student.ID);
+        }
+    }
+
+    // ---------------------------------------------------------------------------
+    // Lokale Hilfsfunktionen
+    // ---------------------------------------------------------------------------
+
+    int getEffectiveMinStudents(Sport sport, int semester)
+    {
+        int reduction = (semester >= 3) ? 2 : 0;
+        return Math.Max(1, sport.MinStudents - reduction);
     }
 
     bool isStudentFree(int semester, string studentID)
@@ -220,22 +340,17 @@ public class CourseCrafter
             if (semester != inst.Semester) continue;
             foreach (string stud in inst.Instance.Students)
             {
-                    if (stud == studentID) return false; // Schüler in genanntem Semester bereits gefunden
+                if (stud == studentID) return false;
             }
         }
-
-            // Schüler nicht gefunden:
         return true;
     }
 
-        
     bool requestExit()
     {
         globalCount++;
-            // max Kursanzahl
         if (GeneratedCourses.Count >= Settings.Instance.NumCoursesPerSemester * 4) return true;
 
-
         int low = 0;
         foreach (var item in initial_sportlist)
         {
@@ -243,45 +358,424 @@ public class CourseCrafter
         }
 
         if (low >= initial_sportlist.Count) return true;
-
+        if (globalCount >= 20) return true;
-            if (globalCount >= 12) return true;
         return false;
     }
 
+    int total_missing = 0;
     foreach (var tuple in initial_sportlist)
     {
-            MainWindow.Instance.TbResultTextout.Text += $"{tuple.Item1}: {tuple.Item2.Count} remaining\n";
+        int[] missingPerSemester = new int[4];
+        foreach (var studentId in tuple.Item2.Distinct())
+        {
+            for (int semesterIndex = 0; semesterIndex < 4; semesterIndex++)
+            {
+                if (!students_in_semester[semesterIndex].Contains(studentId))
+                {
+                    missingPerSemester[semesterIndex]++;
+                    total_missing++;
+                }
+            }
         }
 
-        int getSemesterForSport(Sport sp)
+        MainWindow.Instance.TbResultTextout.Text +=
+            $"{tuple.Item1}: {tuple.Item2.Count} remaining ({missingPerSemester[0]},{missingPerSemester[1]},{missingPerSemester[2]},{missingPerSemester[3]})\n";
+    }
+    MainWindow.Instance.TbResultTextout.Text += $"\n total remaining: {total_missing}";
+
+    bool FillExistingCourses()
     {
-            int[] semcount = new int[4] {0,0,0,0};
+        bool changed = false;
+
+        foreach (var item in initial_sportlist)
+        {
+            if (item.Item2.Count == 0)
+                continue;
+
+            foreach (var ci in GeneratedCourses
+                         .Where(ci => ci.Instance.Sport.Name == item.Item1.Name)
+                         .OrderBy(ci => ci.Instance.Students.Count))
+            {
+                int semester = ci.Semester;
+                List<string> added = new();
+
+                foreach (string stud in item.Item2)
+                {
+                    if (ci.Instance.Students.Count >= ci.Instance.Sport.MaxStudents)
+                        break;
+
+                    if (students_in_semester[semester - 1].Contains(stud))
+                        continue;
+
+                    ci.Instance.Students.Add(stud);
+                    students_in_semester[semester - 1].Add(stud);
+                    added.Add(stud);
+                }
+
+                foreach (string s in added)
+                {
+                    item.Item2.Remove(s);
+                    changed = true;
+                }
+            }
+        }
+
+        return changed;
+    }
+
+    bool TryCreateRescueCourse(Sport sport, List<string> remainingStudents)
+    {
+        if (remainingStudents.Count == 0)
+            return false;
+
+        for (int semester = 1; semester <= 4; semester++)
+        {
+            int semesterIndex = semester - 1;
+
+            if (sport.Semester[semesterIndex] == 0)
+                continue;
+
+            int sportCoursesInSemester = GeneratedCourses.Count(c =>
+                c.Semester == semester && c.Instance.Sport.Name == sport.Name);
+            if (sportCoursesInSemester >= sport.Semester[semesterIndex])
+                continue;
+
+            if (GeneratedCourses.Count(c => c.Semester == semester) >= Settings.Instance.NumCoursesPerSemester)
+                continue;
+
+            var directlyPlaceable = remainingStudents
+                .Distinct()
+                .Where(studentId => !students_in_semester[semesterIndex].Contains(studentId))
+                .ToList();
+
+            var donorMoves = new List<((int Semester, CourseInstance Instance) Course, string StudentId)>();
+            foreach (var course in GeneratedCourses
+                         .Where(c => c.Instance.Sport.Name == sport.Name && c.Semester != semester)
+                         .OrderByDescending(c => c.Instance.Students.Count))
+            {
+                int movableCount = course.Instance.Students.Count - getEffectiveMinStudents(sport, course.Semester);
+                if (movableCount <= 0)
+                    continue;
+
+                foreach (var studentId in course.Instance.Students.ToList())
+                {
+                    if (movableCount <= 0)
+                        break;
+
+                    if (students_in_semester[semesterIndex].Contains(studentId))
+                        continue;
+
+                    donorMoves.Add((course, studentId));
+                    movableCount--;
+                }
+            }
+
+            if (directlyPlaceable.Count + donorMoves.Count < getEffectiveMinStudents(sport, semester))
+                continue;
+
+            var newCourse = new CourseInstance
+            {
+                Sport = sport,
+                Students = new List<string>()
+            };
+
+            foreach (var studentId in directlyPlaceable)
+            {
+                if (newCourse.Students.Count >= sport.MaxStudents)
+                    break;
+
+                newCourse.Students.Add(studentId);
+            }
+
+            foreach (var move in donorMoves)
+            {
+                if (newCourse.Students.Count >= sport.MaxStudents)
+                    break;
+
+                if (newCourse.Students.Contains(move.StudentId))
+                    continue;
+
+                move.Course.Instance.Students.Remove(move.StudentId);
+                students_in_semester[move.Course.Semester - 1].Remove(move.StudentId);
+                newCourse.Students.Add(move.StudentId);
+            }
+
+            if (newCourse.Students.Count < getEffectiveMinStudents(sport, semester))
+                continue;
+
+            foreach (var studentId in newCourse.Students)
+            {
+                remainingStudents.Remove(studentId);
+                students_in_semester[semesterIndex].Add(studentId);
+            }
+
+            GeneratedCourses.Add((semester, newCourse));
+            return true;
+        }
+
+        return false;
+    }
+
+    void OptimizeStudentWishCoverage()
+    {
+        bool changed;
+        int iterations = 0;
+
+        do
+        {
+            changed = false;
+            iterations++;
+
+            foreach (var student in Settings.Instance.Students)
+            {
+                if (TryImproveStudentCoverage(student))
+                {
+                    changed = true;
+                }
+            }
+        } while (changed && iterations < 20);
+    }
+
+    bool TryImproveStudentCoverage(Student student)
+    {
+        var assignments = GetAssignmentsBySemester(student.ID);
+        if (assignments.All(a => a != null))
+            return false;
+
+        var openSemesters = Enumerable.Range(0, 4)
+            .Where(i => assignments[i] == null)
+            .Select(i => i + 1)
+            .ToList();
+        if (openSemesters.Count == 0)
+            return false;
+
+        var assignedSports = assignments
+            .Where(a => a != null)
+            .Select(a => a!.Value.Instance.Sport.Name)
+            .ToHashSet();
+
+        var preferredSports = student.SelectedCourseNames
+            .Select(ResolveSportFromSelection)
+            .Where(sport => sport != null)
+            .DistinctBy(sport => sport!.Name)
+            .Select(sport => sport!)
+            .Where(sport => !assignedSports.Contains(sport.Name))
+            .ToList();
+
+        foreach (var desiredSport in preferredSports)
+        {
+            for (int sourceSemester = 1; sourceSemester <= 4; sourceSemester++)
+            {
+                var currentCourse = assignments[sourceSemester - 1];
+                if (currentCourse == null)
+                    continue;
+
+                var currentCourseValue = currentCourse.Value;
+
+                var desiredCourse = GeneratedCourses
+                    .FirstOrDefault(course =>
+                        course.Semester == sourceSemester &&
+                        course.Instance.Sport.Name == desiredSport.Name &&
+                        course.Instance.Students.Count < course.Instance.Sport.MaxStudents);
+
+                if (desiredCourse.Instance == null)
+                    continue;
+
+                foreach (var targetSemester in openSemesters)
+                {
+                    var relocationTarget = GeneratedCourses
+                        .FirstOrDefault(course =>
+                            course.Semester == targetSemester &&
+                            course.Instance.Sport.Name == currentCourseValue.Instance.Sport.Name &&
+                            course.Instance.Students.Count < course.Instance.Sport.MaxStudents);
+
+                    if (relocationTarget.Instance == null)
+                        continue;
+
+                    if (!CanRelocateStudent(student.ID, currentCourseValue, relocationTarget))
+                        continue;
+
+                    currentCourseValue.Instance.Students.Remove(student.ID);
+                    students_in_semester[sourceSemester - 1].Remove(student.ID);
+
+                    relocationTarget.Instance.Students.Add(student.ID);
+                    students_in_semester[targetSemester - 1].Add(student.ID);
+
+                    desiredCourse.Instance.Students.Add(student.ID);
+                    students_in_semester[sourceSemester - 1].Add(student.ID);
+
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    bool CanRelocateStudent(
+        string studentId,
+        (int Semester, CourseInstance Instance) sourceCourse,
+        (int Semester, CourseInstance Instance) targetCourse)
+    {
+        if (sourceCourse.Semester == targetCourse.Semester)
+            return false;
+
+        if (sourceCourse.Instance.Students.Count - 1 < getEffectiveMinStudents(sourceCourse.Instance.Sport, sourceCourse.Semester))
+            return false;
+
+        if (targetCourse.Instance.Students.Count >= targetCourse.Instance.Sport.MaxStudents)
+            return false;
+
+        if (!isStudentFree(targetCourse.Semester, studentId))
+            return false;
+
+        return true;
+    }
+
+    (int Semester, CourseInstance Instance)?[] GetAssignmentsBySemester(string studentId)
+    {
+        var assignments = new (int Semester, CourseInstance Instance)?[4];
+
+        foreach (var course in GeneratedCourses)
+        {
+            if (course.Instance.Students.Contains(studentId))
+            {
+                assignments[course.Semester - 1] = course;
+            }
+        }
+
+        return assignments;
+    }
+
+    Sport? ResolveSportFromSelection(string selectedCourseName)
+    {
+        if (string.IsNullOrWhiteSpace(selectedCourseName) ||
+            string.Equals(selectedCourseName, "null", StringComparison.OrdinalIgnoreCase))
+        {
+            return null;
+        }
+
+        return Settings.Instance.Sports
+            .FirstOrDefault(sport => sport.AlternativeNames.Contains(selectedCourseName));
+    }
+
+    int getSemesterForSport2(Sport sp, List<string> interestedStudents)
+    {
+        int[] semcount = new int[4];
 
         foreach (var inst in GeneratedCourses)
-            {
             semcount[inst.Semester - 1]++;
-            }
+
+        int bestSem = 0;
+        int minCourses = int.MaxValue;
 
         for (int i = 0; i < 4; i++)
         {
-                // 1. Ist der Sport in diesem Semester erlaubt?
             if (sp.Semester[i] == 0) continue;
 
-                // 2. Ist noch Platz für Kurse?
+            int sportCoursesInSemester = GeneratedCourses
-                if (semcount[i] < Settings.Instance.NumCoursesPerSemester)
+                .Count(g => g.Semester == i + 1 && g.Instance.Sport.Name == sp.Name);
+
+            if (sportCoursesInSemester >= sp.Semester[i])
+                continue;
+
+            int freeInterestedStudents = interestedStudents
+                .Distinct()
+                .Count(studentId => !students_in_semester[i].Contains(studentId));
+
+            if (freeInterestedStudents < getEffectiveMinStudents(sp, i + 1))
+                continue;
+
+            if (semcount[i] < Settings.Instance.NumCoursesPerSemester &&
+                semcount[i] < minCourses)
             {
-                    return i + 1;
+                minCourses = semcount[i];
+                bestSem = i + 1;
             }
         }
 
-            return 0;
+        return bestSem;
     }
 
+    int getSemesterForSport(Sport sp, List<string> interestedStudents)
+    {
+        int[] totalCoursesPerSemester = new int[4];
+        foreach (var inst in GeneratedCourses)
+            totalCoursesPerSemester[inst.Semester - 1]++;
 
+        int bestSem = 0;
+        int minCourses = int.MaxValue;
+        int maxFreeInterestedStudents = -1;
+
+        for (int i = 0; i < 4; i++)
+        {
+            if (sp.Semester[i] == 0)
+                continue;
+
+            int semesterNumber = i + 1;
+
+            int sportCoursesInThisSemester = GeneratedCourses
+                .Count(g => g.Semester == semesterNumber &&
+                            g.Instance.Sport.Name == sp.Name);
+
+            if (sportCoursesInThisSemester >= sp.Semester[i])
+                continue;
+
+            if (totalCoursesPerSemester[i] >= Settings.Instance.NumCoursesPerSemester)
+                continue;
+
+            int freeInterestedStudents = interestedStudents
+                .Distinct()
+                .Count(studentId => !students_in_semester[i].Contains(studentId));
+
+            if (freeInterestedStudents < getEffectiveMinStudents(sp, semesterNumber))
+                continue;
+
+            if (freeInterestedStudents > maxFreeInterestedStudents ||
+                (freeInterestedStudents == maxFreeInterestedStudents &&
+                 totalCoursesPerSemester[i] < minCourses))
+            {
+                maxFreeInterestedStudents = freeInterestedStudents;
+                minCourses = totalCoursesPerSemester[i];
+                bestSem = semesterNumber;
+            }
         }
 
+        return bestSem;
+    }
+
+    var errors = ValidateCourses(GeneratedCourses);
+
+    if (errors.Count == 0)
+    {
+        MainWindow.Instance.TbResultLog.Text = "--- Alle generierten Kursen erfüllen die gegebenen Voraussetzungen ---";
+    }
+    else
+    {
+        MainWindow.Instance.TbResultLog.Text = "--- Bei der Generierung sind folgende Fehler aufgetreten: ---\n\n";
+        foreach (var e in errors)
+            MainWindow.Instance.TbResultLog.Text += e + "\n";
+    }
+
+    foreach (var student in Settings.Instance.Students)
+    {
+        student.Result = new string[4];
+    }
+
+    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()
     {
+        GeneratedCourses.Sort((x,y) => x.Semester.CompareTo(y.Semester) );
         string sb = $"Generierte Kurse: {GeneratedCourses.Count}\n\n";
         foreach (var genc in GeneratedCourses)
         {
@@ -293,64 +787,106 @@ public class CourseCrafter
         return sb;
     }
     
-    public static string GenerateStatisticsOld()
+    public static List<string> ValidateCourses(List<(int Semester, CourseInstance Instance)> courses)
     {
-        var settings = Settings.Instance;
+        List<string> errors = new();
-        var students = settings.Students;
 
-        if (GeneratedCourses == null || GeneratedCourses.Count == 0)
+        // --- 1. Min/Max + Semester erlaubt ---
-            return "Keine Kurse generiert.";
+        foreach (var tuple in courses)
-
-        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;
+            int semester = tuple.Semester;
+            var inst = tuple.Instance;
+            var sport = inst.Sport;
 
-            foreach (var entry in group)
+            if (inst.Students.Count < sport.MinStudents)
             {
-                int semester = group.Key.Semester + 1;
+                errors.Add($"[Min] {sport.Name} (Sem {semester}): {inst.Students.Count} < {sport.MinStudents}");
-                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();
+            if (inst.Students.Count > sport.MaxStudents)
-        sb.AppendLine("Fehlerübersicht:");
-
-        // ===== Fehler pro Semester =====
-        for (int sem = 0; sem < semesterCount; sem++)
             {
-            int errors = students.Count(st =>
+                errors.Add($"[Max] {sport.Name} (Sem {semester}): {inst.Students.Count} > {sport.MaxStudents}");
-                st.Result != null &&
-                st.Result.Count > sem &&
-                st.Result[sem] == "Fehler");
-
-            sb.AppendLine($"Semester {sem + 1}: {errors} Fehler");
             }
 
-        return sb.ToString();
+            if (sport.Semester[semester - 1] == 0)
+            {
+                errors.Add($"[Semester] {sport.Name} darf nicht in Semester {semester} stattfinden");
+            }
+
+            // --- doppelte Schüler im selben Kurs ---
+            for (int i = 0; i < inst.Students.Count; i++)
+            {
+                for (int j = i + 1; j < inst.Students.Count; j++)
+                {
+                    if (inst.Students[i] == inst.Students[j])
+                    {
+                        errors.Add($"[Kurs-Duplikat] {inst.Students[i]} mehrfach in {sport.Name} (Sem {semester})");
+                    }
+                }
+            }
+        }
+
+        // --- 2. Schüler doppelt im Semester ---
+        for (int sem = 1; sem <= 4; sem++)
+        {
+            List<string> students = new();
+
+            foreach (var tuple in courses)
+            {
+                if (tuple.Semester != sem) continue;
+
+                foreach (var stud in tuple.Instance.Students)
+                {
+                    // prüfen ob schon drin
+                    bool exists = false;
+                    foreach (var s in students)
+                    {
+                        if (s == stud)
+                        {
+                            exists = true;
+                            break;
+                        }
+                    }
+
+                    if (exists)
+                    {
+                        errors.Add($"[Doppelt] Schüler {stud} doppelt in Semester {sem}");
+                    }
+                    else
+                    {
+                        students.Add(stud);
+                    }
+                }
+            }
+        }
+
+        // --- 3. Sport-Angebote pro Semester zählen ---
+        // (ohne Dictionary: wir iterieren über alle Kurse und zählen jeweils erneut)
+
+        foreach (var tuple in courses)
+        {
+            int semester = tuple.Semester;
+            var sport = tuple.Instance.Sport;
+
+            int count = 0;
+
+            foreach (var other in courses)
+            {
+                if (other.Semester == semester &&
+                    other.Instance.Sport.Name == sport.Name)
+                {
+                    count++;
+                }
+            }
+
+            int allowed = sport.Semester[semester - 1];
+
+            if (count > allowed)
+            {
+                errors.Add($"[Sport-Semester] {sport.Name} in Sem {semester}: {count} Kurse > erlaubt {allowed}");
+            }
+        }
+
+        return errors;
     }
 }

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