3 Commits

Author SHA1 Message Date
fierke c5be9d2c6e [feat:] frontend to edit courses (ai-slop) 2026-06-01 17:00:55 +02:00
fierke c46417c56d [chore:] single-semester-side limiting of courses 2026-06-01 17:00:39 +02:00
fierke 895c55a52f [chore:] cleaned up some rubbish 2026-06-01 13:14:03 +02:00
4 changed files with 217 additions and 70 deletions
+21 -3
View File
@@ -196,8 +196,20 @@
</Grid> </Grid>
<Line /> <Line />
<Grid ColumnDefinitions="*,3*"> <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> </Grid>
</StackPanel> </StackPanel>
</Grid> </Grid>
@@ -211,7 +223,13 @@
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
<Grid ColumnDefinitions="*,*" RowDefinitions="50,2*,*"> <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="*,*"> <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"> <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"> <StackPanel Orientation="Horizontal">
+164 -4
View File
@@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
@@ -12,6 +13,26 @@ public partial class MainWindow : Window
{ {
public static MainWindow Instance { get; set; } public static MainWindow Instance { get; set; }
public static string ApplicationVersion = "v1.2.24"; 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() public MainWindow()
{ {
InitializeComponent(); InitializeComponent();
@@ -20,10 +41,108 @@ public partial class MainWindow : Window
RefreshCoursesList(); RefreshCoursesList();
try 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 {} } 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) private void MnuExpSettings_OnClick(object? sender, RoutedEventArgs e)
{ {
var res = MessageBox.Show(this, "Dieses Feature ist noch nicht implementiert", "Fehlend"); var res = MessageBox.Show(this, "Dieses Feature ist noch nicht implementiert", "Fehlend");
@@ -159,6 +278,21 @@ public partial class MainWindow : Window
//TbiResults.Focus(); //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() private void RefreshResultView()
{ {
LbResult.Items.Clear(); LbResult.Items.Clear();
@@ -168,7 +302,7 @@ public partial class MainWindow : Window
{ {
for(int i = 0; i<s.Result.Length;i++) 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) catch (Exception ex)
@@ -262,6 +396,7 @@ public partial class MainWindow : Window
{ {
LbSportCourses.Items.Add(sp); LbSportCourses.Items.Add(sp);
} }
RegenerateContextMenu();
} }
@@ -298,6 +433,7 @@ public partial class MainWindow : Window
try try
{ {
((Sport)LbSportCourses.SelectedItem).Name = TbSportName.Text; ((Sport)LbSportCourses.SelectedItem).Name = TbSportName.Text;
RegenerateContextMenu();
} catch {} } catch {}
} }
@@ -416,11 +552,35 @@ public partial class MainWindow : Window
// Export as PDF // Export as PDF
} }
private void NudSportMaxPerSemester_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e) private void NudSportMaxPerSemester1_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
{ {
try 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 {} } catch {}
} }
+12 -43
View File
@@ -148,7 +148,7 @@ public class CourseCrafter
for (int semester = 1; semester <= 4; semester++) for (int semester = 1; semester <= 4; semester++)
{ {
int cancel = 0; 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++; cancel++;
if (cancel >= 20) break; if (cancel >= 20) break;
@@ -349,7 +349,9 @@ public class CourseCrafter
bool requestExit() bool requestExit()
{ {
globalCount++; 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; int low = 0;
foreach (var item in initial_sportlist) foreach (var item in initial_sportlist)
@@ -440,7 +442,7 @@ public class CourseCrafter
if (sportCoursesInSemester >= sport.Semester[semesterIndex]) if (sportCoursesInSemester >= sport.Semester[semesterIndex])
continue; continue;
if (GeneratedCourses.Count(c => c.Semester == semester) >= Settings.Instance.NumCoursesPerSemester) if (GeneratedCourses.Count(c => c.Semester == semester) >= Settings.Instance.NumCoursesPerSemester[semester-1])
continue; continue;
var directlyPlaceable = remainingStudents var directlyPlaceable = remainingStudents
@@ -659,44 +661,6 @@ public class CourseCrafter
.FirstOrDefault(sport => sport.AlternativeNames.Contains(selectedCourseName)); .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 getSemesterForSport(Sport sp, List<string> interestedStudents)
{ {
int[] totalCoursesPerSemester = new int[4]; int[] totalCoursesPerSemester = new int[4];
@@ -721,7 +685,7 @@ public class CourseCrafter
if (sportCoursesInThisSemester >= sp.Semester[i]) if (sportCoursesInThisSemester >= sp.Semester[i])
continue; continue;
if (totalCoursesPerSemester[i] >= Settings.Instance.NumCoursesPerSemester) if (totalCoursesPerSemester[i] >= Settings.Instance.NumCoursesPerSemester[i])
continue; continue;
int freeInterestedStudents = interestedStudents int freeInterestedStudents = interestedStudents
@@ -744,6 +708,11 @@ public class CourseCrafter
return bestSem; return bestSem;
} }
ReloadResult();
}
public static void ReloadResult()
{
var errors = ValidateCourses(GeneratedCourses); var errors = ValidateCourses(GeneratedCourses);
if (errors.Count == 0) if (errors.Count == 0)
@@ -772,7 +741,7 @@ public class CourseCrafter
} }
} }
} }
} }
public static string GenerateStatistics() public static string GenerateStatistics()
{ {
GeneratedCourses.Sort((x,y) => x.Semester.CompareTo(y.Semester) ); GeneratedCourses.Sort((x,y) => x.Semester.CompareTo(y.Semester) );
+1 -1
View File
@@ -85,7 +85,7 @@ public class Settings
public List<Student> Students { get; set; } = []; public List<Student> Students { get; set; } = [];
public List<Sport> Sports { 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() public Settings()
{ {