[feat:] frontend to edit courses (ai-slop)

Reviewed-on: #5

MainWindow.axaml

@@ -3,7 +3,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="spplus.MainWindow" WindowState="Maximized"
+        x:Class="spplus.MainWindow" WindowState="Maximized" Icon="res/logo.ico"
         Title="spplus">
     <Border>
         <Grid RowDefinitions="30,*">
@@ -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">
@@ -195,8 +196,20 @@
                             </Grid>
                             <Line />
                             <Grid ColumnDefinitions="*,3*">
-                                <Label  Content="Maximale Sportkursanzahl pro Semester"></Label>
+                                <Label  Content="Maximale Sportkursanzahl Semester 1"></Label>
-                                <NumericUpDown Grid.Column="1" x:Name="NudSportMaxPerSemester" ValueChanged="NudSportMaxPerSemester_OnValueChanged"></NumericUpDown>
+                                <NumericUpDown Grid.Column="1" x:Name="NudSportMaxPerSemester1" ValueChanged="NudSportMaxPerSemester1_OnValueChanged"></NumericUpDown>
+                            </Grid>
+                            <Grid ColumnDefinitions="*,3*">
+                                <Label  Content="Maximale Sportkursanzahl Semester 2"></Label>
+                                <NumericUpDown Grid.Column="1" x:Name="NudSportMaxPerSemester2" ValueChanged="NudSportMaxPerSemester2_OnValueChanged"></NumericUpDown>
+                            </Grid>
+                            <Grid ColumnDefinitions="*,3*">
+                                <Label  Content="Maximale Sportkursanzahl Semester 3"></Label>
+                                <NumericUpDown Grid.Column="1" x:Name="NudSportMaxPerSemester3" ValueChanged="NudSportMaxPerSemester3_OnValueChanged"></NumericUpDown>
+                            </Grid>
+                            <Grid ColumnDefinitions="*,3*">
+                                <Label  Content="Maximale Sportkursanzahl Semester 4"></Label>
+                                <NumericUpDown Grid.Column="1" x:Name="NudSportMaxPerSemester4" ValueChanged="NudSportMaxPerSemester4_OnValueChanged"></NumericUpDown>
                             </Grid>
                         </StackPanel>
                     </Grid>
@@ -210,7 +223,13 @@
                         </StackPanel>
                     </TabItem.Header>
                     <Grid ColumnDefinitions="*,*" RowDefinitions="50,2*,*">
-                        <ListBox Grid.RowSpan="2" x:Name="LbResult" Margin="0,10,10,10"></ListBox>
+                        <ListBox Grid.RowSpan="2" x:Name="LbResult" Margin="0,10,10,10" PointerPressed="LbResult_OnPointerPressed">
+                            <ListBox.ContextMenu>
+                                <ContextMenu>
+                                    <MenuItem Header="Ändern" x:Name="MnuChange" />
+                                </ContextMenu>
+                            </ListBox.ContextMenu>
+                        </ListBox>
                         <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">

MainWindow.axaml.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -12,6 +13,26 @@ public partial class MainWindow : Window
 {
     public static MainWindow Instance { get; set; }
     public static string ApplicationVersion = "v1.2.24";
+
+    private sealed class ResultEntry
+    {
+        public Student Student { get; }
+        public int Semester { get; }
+        public string CourseName { get; }
+
+        public ResultEntry(Student student, int semester, string? courseName)
+        {
+            Student = student;
+            Semester = semester;
+            CourseName = courseName ?? string.Empty;
+        }
+
+        public override string ToString()
+        {
+            return $"{Student.Name} ({Student.ID}) - {Semester}. Semester: {CourseName}";
+        }
+    }
+
     public MainWindow()
     {
         InitializeComponent();
@@ -20,10 +41,108 @@ public partial class MainWindow : Window
         RefreshCoursesList();
         try
         {
-            NudSportMaxPerSemester.Value = Settings.Instance.NumCoursesPerSemester;
+            NudSportMaxPerSemester1.Value = Settings.Instance.NumCoursesPerSemester[0];
+            NudSportMaxPerSemester2.Value = Settings.Instance.NumCoursesPerSemester[1];
+            NudSportMaxPerSemester3.Value = Settings.Instance.NumCoursesPerSemester[2];
+            NudSportMaxPerSemester4.Value = Settings.Instance.NumCoursesPerSemester[3];
         } catch {}
     }
 
+    private void RegenerateContextMenu()
+    {
+        MnuChange.Items.Clear();
+        foreach (var sport in Settings.Instance.Sports)
+        {
+            var item = new MenuItem { Header = sport.Name };
+            item.Click += (_, _) => ChangeStudentCourse(sport);
+            MnuChange.Items.Add(item);
+        }
+    }
+
+    private void ChangeStudentCourse(Sport targetSport)
+    {
+        if (LbResult.SelectedItem is not ResultEntry selectedEntry)
+            return;
+
+        try
+        {
+            if (ApplyStudentCourseChange(selectedEntry.Student, selectedEntry.Semester, targetSport))
+            {
+                CourseCrafter.ReloadResult();
+                RefreshResultView();
+                RegenerateContextMenu();
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex.Message + "\n" + ex.StackTrace);
+        }
+    }
+
+    private bool ApplyStudentCourseChange(Student student, int semester, Sport targetSport)
+    {
+        if (semester < 1 || semester > 4)
+            return false;
+
+        var semesterCourses = CourseCrafter.GeneratedCourses
+            .Where(course => course.Semester == semester)
+            .ToList();
+
+        var currentCourses = semesterCourses
+            .Where(course => course.Instance.Students.Contains(student.ID))
+            .ToList();
+
+        CourseCrafter.CourseInstance? targetCourse = currentCourses
+            .FirstOrDefault(course => course.Instance.Sport.Name == targetSport.Name)
+            .Instance;
+
+        if (targetCourse == null)
+        {
+            targetCourse = semesterCourses
+                .Where(course => course.Instance.Sport.Name == targetSport.Name)
+                .OrderBy(course => course.Instance.Students.Count)
+                .Select(course => course.Instance)
+                .FirstOrDefault();
+        }
+
+        bool changed = false;
+
+        foreach (var course in currentCourses)
+        {
+            if (targetCourse != null && ReferenceEquals(course.Instance, targetCourse))
+                continue;
+
+            if (course.Instance.Students.Remove(student.ID))
+                changed = true;
+        }
+
+        int removedEmptyCourses = CourseCrafter.GeneratedCourses.RemoveAll(course =>
+            course.Semester == semester &&
+            course.Instance.Students.Count == 0 &&
+            !ReferenceEquals(course.Instance, targetCourse));
+        if (removedEmptyCourses > 0)
+            changed = true;
+
+        if (targetCourse == null)
+        {
+            var newCourse = new CourseCrafter.CourseInstance
+            {
+                Sport = targetSport,
+                Students = new List<string> { student.ID }
+            };
+
+            CourseCrafter.GeneratedCourses.Add((semester, newCourse));
+            changed = true;
+        }
+        else if (!targetCourse.Students.Contains(student.ID))
+        {
+            targetCourse.Students.Add(student.ID);
+            changed = true;
+        }
+
+        return changed;
+    }
+
     private void MnuExpSettings_OnClick(object? sender, RoutedEventArgs e)
     {
         var res = MessageBox.Show(this, "Dieses Feature ist noch nicht implementiert", "Fehlend");
@@ -159,6 +278,21 @@ public partial class MainWindow : Window
         //TbiResults.Focus();
     }
 
+    private void LbResult_OnPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (!e.GetCurrentPoint(LbResult).Properties.IsRightButtonPressed)
+            return;
+
+        if (e.Source is Control control && control.DataContext is ResultEntry entry)
+        {
+            LbResult.SelectedItem = entry;
+        }
+        else
+        {
+            LbResult.SelectedItem = null;
+        }
+    }
+
     private void RefreshResultView()
     {
         LbResult.Items.Clear();
@@ -168,7 +302,7 @@ public partial class MainWindow : Window
             {
                 for(int i = 0; i<s.Result.Length;i++)
                 {
-                    LbResult.Items.Add($"{s.Name} ({s.ID}) - {i+1}. Semester: {s.Result[i]}");
+                    LbResult.Items.Add(new ResultEntry(s, i + 1, s.Result[i]));
                 }
             }
             catch (Exception ex)
@@ -262,6 +396,7 @@ public partial class MainWindow : Window
         {
             LbSportCourses.Items.Add(sp);
         }
+        RegenerateContextMenu();
     }
 
 
@@ -298,6 +433,7 @@ public partial class MainWindow : Window
         try
         {
             ((Sport)LbSportCourses.SelectedItem).Name = TbSportName.Text;
+            RegenerateContextMenu();
         } catch {}
     }
 
@@ -416,11 +552,35 @@ public partial class MainWindow : Window
         // Export as PDF
     }
 
-    private void NudSportMaxPerSemester_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
+    private void NudSportMaxPerSemester1_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
     {
         try
         {
-            Settings.Instance.NumCoursesPerSemester = Convert.ToInt32(NudSportMaxPerSemester.Value);
+            Settings.Instance.NumCoursesPerSemester[0] = Convert.ToInt32(NudSportMaxPerSemester1.Value);
+        } catch {}
+    }
+    
+    private void NudSportMaxPerSemester2_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
+    {
+        try
+        {
+            Settings.Instance.NumCoursesPerSemester[1] = Convert.ToInt32(NudSportMaxPerSemester2.Value);
+        } catch {}
+    }
+    
+    private void NudSportMaxPerSemester3_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
+    {
+        try
+        {
+            Settings.Instance.NumCoursesPerSemester[2] = Convert.ToInt32(NudSportMaxPerSemester3.Value);
+        } catch {}
+    }
+    
+    private void NudSportMaxPerSemester4_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
+    {
+        try
+        {
+            Settings.Instance.NumCoursesPerSemester[3] = Convert.ToInt32(NudSportMaxPerSemester4.Value);
         } catch {}
     }
 
@@ -442,4 +602,21 @@ public partial class MainWindow : Window
         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;
+    }
 }

MessageBox.axaml

@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" SizeToContent="WidthAndHeight"
+        mc:Ignorable="d" SizeToContent="WidthAndHeight" Icon="res/logo.ico"
         x:Class="spplus.MessageBox" WindowStartupLocation="CenterScreen"
         Title="MessageBox">
     <StackPanel>

README.md

@@ -2,6 +2,8 @@
 
 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 
@@ -21,3 +23,5 @@ Plattformunabhängiger (Windows, Linux, Mac), interaktiver Sportkursplaner für
     * Suche `spplus` bzw. `spplus.exe` und führe aus
     * Linux/MacOS evl.: `chmod +x spplus`
 
+
+![spplus-Sportkursübersicht](img/spplus_sport.png)

crafter.cs

@@ -16,7 +16,7 @@ public class CourseCrafter
         = new();
 
     public static void Craft()
-    {
+{
     GeneratedCourses = new();
     int globalCount = 0;
     List<(Sport, List<string>)> initial_sportlist = new();
@@ -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,66 +67,25 @@ 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)
                     {
-                            students_in_semester[semester-1].Remove(s);
+                        students_in_semester[semester - 1].Remove(s);
                         item.Item2.Add(s);
                     }
                     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,6 +144,194 @@ public class CourseCrafter
 
     } while (changed && iteration < maxIterations);
 
+    // --- 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[semester-1])
+        {
+            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;
+            }
+
+            var newCourse = new CourseInstance
+            {
+                Sport = candidate.Instance.Sport,
+                Students = new List<string>()
+            };
+
+            var moved = students
+                .Skip(remainingCount)
+                .Take(movedCount)
+                .ToList();
+
+            foreach (var s in moved)
+            {
+                candidate.Instance.Students.Remove(s);
+                newCourse.Students.Add(s);
+            }
+
+            GeneratedCourses.Add((semester, newCourse));
+        }
+    }
+
+    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)
     {
@@ -201,21 +340,18 @@ 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
+        int sum = Settings.Instance.NumCoursesPerSemester[0] + Settings.Instance.NumCoursesPerSemester[1] +
-            if (GeneratedCourses.Count >= Settings.Instance.NumCoursesPerSemester * 4) return true;
+                  Settings.Instance.NumCoursesPerSemester[2] + Settings.Instance.NumCoursesPerSemester[3];
-            
+        if (GeneratedCourses.Count >= sum) return true;
 
         int low = 0;
         foreach (var item in initial_sportlist)
@@ -224,92 +360,359 @@ public class CourseCrafter
         }
 
         if (low >= initial_sportlist.Count) return true;
-
         if (globalCount >= 20) 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++;
+                }
+            }
         }
 
-        // ...existing code...
+        MainWindow.Instance.TbResultTextout.Text +=
-        int getSemesterForSport2(Sport sp)
+            $"{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];
+        bool changed = false;
 
-            foreach (var inst in GeneratedCourses)
+        foreach (var item in initial_sportlist)
-                semcount[inst.Semester - 1]++;
-
-            int bestSem = 0;
-            int minCourses = int.MaxValue;
-
-            for (int i = 0; i < 4; i++)
         {
-                if (sp.Semester[i] == 0) continue;
+            if (item.Item2.Count == 0)
-
-                // prüfen, ob für diesen Sport im Semester i schon die maximale Anzahl erreicht ist
-                int sportCoursesInSemester = GeneratedCourses
-                    .Count(g => g.Semester == i + 1 && g.Instance.Sport.ID == sp.ID);
-
-                if (sportCoursesInSemester >= sp.Semester[i])
                 continue;
 
-                if (semcount[i] < Settings.Instance.NumCoursesPerSemester &&
+            foreach (var ci in GeneratedCourses
-                    semcount[i] < minCourses)
+                         .Where(ci => ci.Instance.Sport.Name == item.Item1.Name)
+                         .OrderBy(ci => ci.Instance.Students.Count))
             {
-                    minCourses = semcount[i];
+                int semester = ci.Semester;
-                    bestSem = i + 1;
+                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 bestSem;
+        return changed;
     }
 
-        int getSemesterForSport(Sport sp)
+    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[semester-1])
+                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 getSemesterForSport(Sport sp, List<string> interestedStudents)
     {
-            // 1. Zähle alle Kurse pro Semester (egal welche Sportart)
         int[] totalCoursesPerSemester = new int[4];
         foreach (var inst in GeneratedCourses)
             totalCoursesPerSemester[inst.Semester - 1]++;
 
         int bestSem = 0;
         int minCourses = int.MaxValue;
+        int maxFreeInterestedStudents = -1;
 
-            // 2. Kandidaten-Semester durchgehen
         for (int i = 0; i < 4; i++)
         {
-                // a) Sport darf in diesem Semester gar nicht stattfinden?
             if (sp.Semester[i] == 0)
                 continue;
 
             int semesterNumber = i + 1;
 
-                // b) Wie viele Kurse DIESES Sports gibt es schon in diesem Semester?
             int sportCoursesInThisSemester = GeneratedCourses
                 .Count(g => g.Semester == semesterNumber &&
                             g.Instance.Sport.Name == sp.Name);
 
-                // c) Pro-Sport-Limit erreicht?
             if (sportCoursesInThisSemester >= sp.Semester[i])
                 continue;
 
-                // d) Globales Limit pro Semester erreicht?
+            if (totalCoursesPerSemester[i] >= Settings.Instance.NumCoursesPerSemester[i])
-                if (totalCoursesPerSemester[i] >= Settings.Instance.NumCoursesPerSemester)
                 continue;
 
-                // e) Wähle das Semester mit bisher insgesamt den wenigsten Kursen
+            int freeInterestedStudents = interestedStudents
-                if (totalCoursesPerSemester[i] < minCourses)
+                .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; // 0, falls kein zulässiges Semester gefunden
+        return bestSem;
     }
 
+    ReloadResult();
+}
+
+    public static void ReloadResult()
+    {
         var errors = ValidateCourses(GeneratedCourses);
 
         if (errors.Count == 0)
@@ -323,19 +726,22 @@ public class CourseCrafter
                 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;
+                    student.Result[course.Semester - 1] = course.Instance.Sport.Name;
                 }
             }
         }
-        
     }
-
     public static string GenerateStatistics()
     {
         GeneratedCourses.Sort((x,y) => x.Semester.CompareTo(y.Semester) );

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

spplus.csproj

@@ -5,6 +5,7 @@
     <Nullable>enable</Nullable>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+    <ApplicationIcon>res/logo.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,4 +20,16 @@
     </PackageReference>
     <PackageReference Include="Lucide.Avalonia" Version="0.1.35"/>
   </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="res\logo.ico"/>
+    <AvaloniaResource Include="res\logo.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </AvaloniaResource>
+    <None Remove="res\logo.png"/>
+    <AvaloniaResource Include="res\logo.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </AvaloniaResource>
+  </ItemGroup>
+
 </Project>

structs.cs

@@ -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,10,11,11]; // Exact Amount of courses, not a maximum
 
     public Settings()
     {