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

MainWindow.axaml

@@ -196,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>
@@ -211,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 {}
     }
 
@@ -459,4 +619,4 @@ public partial class MainWindow : Window
 
         if (file == null) return;
     }
-}
+}

crafter.cs

@@ -148,7 +148,7 @@ public class CourseCrafter
     for (int semester = 1; semester <= 4; semester++)
     {
         int cancel = 0;
-        while (GeneratedCourses.Count(c => c.Semester == semester) < Settings.Instance.NumCoursesPerSemester)
+        while (GeneratedCourses.Count(c => c.Semester == semester) < Settings.Instance.NumCoursesPerSemester[semester-1])
         {
             cancel++;
             if (cancel >= 20) break;
@@ -349,7 +349,9 @@ public class CourseCrafter
     bool requestExit()
     {
         globalCount++;
-        if (GeneratedCourses.Count >= Settings.Instance.NumCoursesPerSemester * 4) return true;
+        int sum = Settings.Instance.NumCoursesPerSemester[0] + Settings.Instance.NumCoursesPerSemester[1] +
+                  Settings.Instance.NumCoursesPerSemester[2] + Settings.Instance.NumCoursesPerSemester[3];
+        if (GeneratedCourses.Count >= sum) return true;
 
         int low = 0;
         foreach (var item in initial_sportlist)
@@ -440,7 +442,7 @@ public class CourseCrafter
             if (sportCoursesInSemester >= sport.Semester[semesterIndex])
                 continue;
 
-            if (GeneratedCourses.Count(c => c.Semester == semester) >= Settings.Instance.NumCoursesPerSemester)
+            if (GeneratedCourses.Count(c => c.Semester == semester) >= Settings.Instance.NumCoursesPerSemester[semester-1])
                 continue;
 
             var directlyPlaceable = remainingStudents
@@ -659,44 +661,6 @@ public class CourseCrafter
             .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++)
-        {
-            if (sp.Semester[i] == 0) continue;
-
-            int sportCoursesInSemester = GeneratedCourses
-                .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)
-            {
-                minCourses = semcount[i];
-                bestSem = i + 1;
-            }
-        }
-
-        return bestSem;
-    }
-
     int getSemesterForSport(Sport sp, List<string> interestedStudents)
     {
         int[] totalCoursesPerSemester = new int[4];
@@ -721,7 +685,7 @@ public class CourseCrafter
             if (sportCoursesInThisSemester >= sp.Semester[i])
                 continue;
 
-            if (totalCoursesPerSemester[i] >= Settings.Instance.NumCoursesPerSemester)
+            if (totalCoursesPerSemester[i] >= Settings.Instance.NumCoursesPerSemester[i])
                 continue;
 
             int freeInterestedStudents = interestedStudents
@@ -744,35 +708,40 @@ public class CourseCrafter
         return bestSem;
     }
 
-    var errors = ValidateCourses(GeneratedCourses);
+    ReloadResult();
+}
 
-    if (errors.Count == 0)
+    public static void ReloadResult()
     {
-        MainWindow.Instance.TbResultLog.Text = "--- Alle generierten Kursen erfüllen die gegebenen Voraussetzungen ---";
+        var errors = ValidateCourses(GeneratedCourses);
-    }
-    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)
+        if (errors.Count == 0)
-    {
+        {
-        student.Result = new string[4];
+            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 course in GeneratedCourses)
-    {
         foreach (var student in Settings.Instance.Students)
         {
-            if (course.Instance.Students.Contains(student.ID))
+            student.Result = new string[4];
+        }
+
+        foreach (var course in GeneratedCourses)
+        {
+            foreach (var student in Settings.Instance.Students)
             {
-                student.Result[course.Semester - 1] = course.Instance.Sport.Name;
+                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) );

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; // Exact Amount of courses, not a maximum
+    public int[] NumCoursesPerSemester { get; set; } = [10,10,11,11]; // Exact Amount of courses, not a maximum
 
     public Settings()
     {