Compare commits

...

23 Commits

Author SHA1 Message Date
a1bf573a07 [chore:] updated version 2026-03-19 08:53:53 +01:00
525f3fb4ae Update README.md 2026-03-19 07:52:11 +00:00
9f298d8ce8 [chore:] implemented csv-export access from gui 2026-03-19 08:49:03 +01:00
11d9c641a6 [chore:] cleanup 2026-03-19 08:48:51 +01:00
c2f7adc1d0 [fix:] typo 2026-03-19 08:48:34 +01:00
c19f96ea37 [chore:] added results to Student.Result 2026-03-19 08:48:24 +01:00
9bbde62d70 [feat:] csv-exporter (basic implementation) 2026-03-19 08:48:01 +01:00
a83f97828c [chore:] changed Student.Result-Field-Type to array 2026-03-19 08:47:38 +01:00
44654dd784 [gui:] added csv-export placeholder button 2026-03-18 14:37:23 +01:00
410055c9f2 [chore:] tiny improvements for ux 2026-03-18 14:33:45 +01:00
ce75d8aa0b [gui:] re-renamed to spplus since it looks better :D 2026-03-18 14:33:33 +01:00
be436f1b1c [feat:] voting numbers (total count) visible after importing 2026-03-18 14:24:49 +01:00
14c11b81b6 [gui:] added label for voting numbers 2026-03-18 14:24:31 +01:00
dd38b91d68 [fix:] inconsistent gui 2026-03-18 14:19:12 +01:00
987f27fcbc [fix]: inconsistent course creation when changing NumCoursePerSemester 2026-03-18 14:13:16 +01:00
42ecde799c [chore:] removed some dirt 2026-03-18 08:36:00 +01:00
ce70d86fd3 [fix:] semester delivery updated to perform better results 2026-03-18 08:35:48 +01:00
ea280ea05d [feat:] max courses per semester changeable 2026-03-17 14:34:24 +01:00
c2e230ca48 [fix:] gui-inconsistencies 2026-03-17 14:15:35 +01:00
30317dd1bb [fix:] course list refreshing after automated default loading 2026-03-17 14:10:13 +01:00
6753acc04f [chore:] working ai-slop movement for better compensation 2026-03-17 14:08:19 +01:00
4468651373 [chore:] removed some unneccessary comments 2026-03-17 13:56:48 +01:00
b6de508ea0 [chore:] removed ai-slop-test-crafting-function 2026-03-17 13:55:07 +01:00
6 changed files with 722 additions and 580 deletions

View File

@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="spplus.MainWindow" WindowState="Maximized" x:Class="spplus.MainWindow" WindowState="Maximized"
Title="SP+"> Title="spplus">
<Border> <Border>
<Grid RowDefinitions="30,*"> <Grid RowDefinitions="30,*">
<Menu Background="#50888888"> <Menu Background="#50888888">
@@ -20,7 +20,7 @@
<MenuItem Header="Über" x:Name="MnuAbout" Click="MnuAbout_OnClick" /> <MenuItem Header="Über" x:Name="MnuAbout" Click="MnuAbout_OnClick" />
</MenuItem> </MenuItem>
</Menu> </Menu>
<TabControl x:Name="TclMainView" Grid.Row="1"> <TabControl x:Name="TclMainView" Grid.Row="1" TabStripPlacement="Left">
<TabItem> <TabItem>
<TabItem.Header> <TabItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@@ -88,6 +88,11 @@
<Label Content="Anzahl gewählte Kurse"></Label> <Label Content="Anzahl gewählte Kurse"></Label>
<Label Grid.Column="1" x:Name="LblSelectedAmount"></Label> <Label Grid.Column="1" x:Name="LblSelectedAmount"></Label>
</Grid> </Grid>
<Grid ColumnDefinitions="*,3*">
<Label Content="Wahlzahlen"></Label>
<Label Grid.Column="1" x:Name="LblNumVoted"></Label>
</Grid>
</StackPanel> </StackPanel>
@@ -171,23 +176,28 @@
<StackPanel Grid.Column="1" Orientation="Vertical"> <StackPanel Grid.Column="1" Orientation="Vertical">
<Grid ColumnDefinitions="*,50,50"> <Grid ColumnDefinitions="*,50,50">
<TextBox Grid.Column="0" Height="35" HorizontalAlignment="Stretch" x:Name="TbSportAlternativeName"></TextBox> <TextBox Grid.Column="0" Height="35" HorizontalAlignment="Stretch" x:Name="TbSportAlternativeName"></TextBox>
<Button Grid.Column="1" Margin="0,10,0,0" x:Name="BtnAlternativeNameAdd" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnAlternativeNameAdd_OnClick" HorizontalContentAlignment="Center"> <Button Grid.Column="1" Margin="5,0,0,0" x:Name="BtnAlternativeNameAdd" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnAlternativeNameAdd_OnClick" HorizontalContentAlignment="Center">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<LucideIcon Kind="Plus" Width="24" Height="24" /> <LucideIcon Kind="Plus" Width="24" Height="24" />
</StackPanel> </StackPanel>
</Button> </Button>
<Button Grid.Column="2" Margin="0,10,0,0" x:Name="BtnAlternativeNameRemove" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnAlternativeNameRemove_OnClick" HorizontalContentAlignment="Center"> <Button Grid.Column="2" Margin="5,0,0,0" x:Name="BtnAlternativeNameRemove" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnAlternativeNameRemove_OnClick" HorizontalContentAlignment="Center">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<LucideIcon Kind="Minus" Width="24" Height="24" /> <LucideIcon Kind="Minus" Width="24" Height="24" />
</StackPanel> </StackPanel>
</Button> </Button>
</Grid> </Grid>
<ListBox x:Name="LbAlternativeNames"> <ListBox Margin="0,5,0,0" x:Name="LbAlternativeNames">
</ListBox> </ListBox>
</StackPanel> </StackPanel>
</Grid> </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> </StackPanel>
</Grid> </Grid>
</TabItem> </TabItem>
@@ -200,21 +210,30 @@
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
<Grid ColumnDefinitions="*,*" RowDefinitions="50,2*,*"> <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"> <StackPanel Orientation="Horizontal">
<LucideIcon Kind="FileText" Width="24" Height="24" /> <LucideIcon Kind="FileText" Width="24" Height="24" />
<Label Content="Export (PDF)..." VerticalContentAlignment="Center" FontSize="12" <Label Content="Export (PDF)..." VerticalContentAlignment="Center" FontSize="12"
FontWeight="Bold" /> FontWeight="Bold" />
</StackPanel> </StackPanel>
</Button> </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"> <ScrollViewer Grid.Row="1" Grid.Column="1" Margin="0,5,0,10" Background="#44CCCCCC">
<TextBlock x:Name="TbResultStatistics"></TextBlock> <TextBlock x:Name="TbResultStatistics"></TextBlock>
</ScrollViewer> </ScrollViewer>
<ScrollViewer Grid.Row="2" Grid.Column="1" Margin="0" Background="#44CCCCCC"> <ScrollViewer Grid.Row="2" Grid.Column="1" Margin="0,0,0,10" Background="#44CCCCCC">
<TextBlock x:Name="TbResultTextout" FontFamily="Consolas"></TextBlock> <TextBlock x:Name="TbResultTextout" FontFamily="Consolas"></TextBlock>
</ScrollViewer> </ScrollViewer>
<ScrollViewer Grid.Row="2" Grid.Column="0" Margin="0" Background="#44CCCCCC"> <ScrollViewer Grid.Row="2" Grid.Column="0" Margin="0,0,10,10" Background="#44CCCCCC">
<TextBlock x:Name="TbResultLog" FontFamily="Consolas"></TextBlock> <TextBlock x:Name="TbResultLog" FontFamily="Consolas"></TextBlock>
</ScrollViewer> </ScrollViewer>
</Grid> </Grid>

View File

@@ -11,11 +11,17 @@ namespace spplus;
public partial class MainWindow : Window 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 MainWindow() public MainWindow()
{ {
InitializeComponent(); InitializeComponent();
Settings.ImportInitial(); Settings.ImportInitial();
Instance = this; Instance = this;
RefreshCoursesList();
try
{
NudSportMaxPerSemester.Value = Settings.Instance.NumCoursesPerSemester;
} catch {}
} }
private void MnuExpSettings_OnClick(object? sender, RoutedEventArgs e) private void MnuExpSettings_OnClick(object? sender, RoutedEventArgs e)
@@ -35,7 +41,7 @@ public partial class MainWindow : Window
Process.Start(new ProcessStartInfo Process.Start(new ProcessStartInfo
{ {
FileName = "https://git.mypapercloud.de/fierke/spplus/wiki", FileName = "https://git.mypapercloud.de/fierke/spplus/wiki",
UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen UseShellExecute = true
}); });
} }
catch (Exception ex) catch (Exception ex)
@@ -51,7 +57,7 @@ public partial class MainWindow : Window
Process.Start(new ProcessStartInfo Process.Start(new ProcessStartInfo
{ {
FileName = "https://git.mypapercloud.de/fierke/spplus", FileName = "https://git.mypapercloud.de/fierke/spplus",
UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen UseShellExecute = true
}); });
} }
catch (Exception ex) catch (Exception ex)
@@ -70,7 +76,7 @@ public partial class MainWindow : Window
Grid g = new(); Grid g = new();
TextBlock tb = 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); g.Children.Add(tb);
w.Content = g; w.Content = g;
@@ -117,14 +123,40 @@ public partial class MainWindow : Window
LblStudentAmount.Content = Settings.Instance.Students.Count.ToString(); LblStudentAmount.Content = Settings.Instance.Students.Count.ToString();
LblSelectedAmount.Content = count_selected.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) private void BtnCraftCourses_OnClick(object? sender, RoutedEventArgs e)
{ {
// Craft courses here / call course-crafter
CourseCrafter.Craft(); CourseCrafter.Craft();
RefreshResultView(); RefreshResultView();
TbiResults.Focus(); TclMainView.SelectedIndex = 2;
//TbiResults.Focus();
} }
private void RefreshResultView() private void RefreshResultView()
@@ -134,7 +166,7 @@ public partial class MainWindow : Window
{ {
try 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]}"); LbResult.Items.Add($"{s.Name} ({s.ID}) - {i+1}. Semester: {s.Result[i]}");
} }
@@ -383,4 +415,31 @@ public partial class MainWindow : Window
{ {
// Export as PDF // 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);
}
} }

View File

@@ -1,13 +1,15 @@
# SP+ # SP+
Interaktiver Sportkursplaner für Oberstufen auf Basis einer Sportkurswahl durch SuS. Plattformunabhängiger (Windows, Linux, Mac), interaktiver Sportkursplaner für Oberstufen auf Basis einer Sportkurswahl durch SuS.
## Features ## Features
* \+ Import von CSV-Dateien mit Kurswahl * \+ Import von CSV-Dateien mit Kurswahl
* \+ Wahlansicht * \+ Wahlansicht
* \+ Statistiken * \+ Statistiken
* \+ Pflege von Sportkursen (inkl. Kürzel/ alternativen Bezeichnungen) * \+ Pflege von Sportkursen (inkl. Kürzel/ alternativen Bezeichnungen)
* \+ CSV-Export
* ~ Fehleransicht für nicht-existente, aber gewählte Kurse * ~ Fehleransicht für nicht-existente, aber gewählte Kurse
* ~ PDF-Export
\+ Vorhanden, ~ Pending \+ Vorhanden, ~ Pending

View File

@@ -80,17 +80,13 @@ public class CourseCrafter
} }
GeneratedCourses.Add((semester, inst)); GeneratedCourses.Add((semester, inst));
MainWindow.Instance.TbResultLog.Text += ($"{semester} -> {inst.Students.Count}\n"); //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"); //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: ; semeq0: ;
} }
// foreach (var item in initial_sportlist)
// {
// Console.WriteLine($"{item.Item1.Name}: {item.Item2.Count}x gewählt");
// }
} }
@@ -124,32 +120,79 @@ public class CourseCrafter
item.Item2.Remove(s); item.Item2.Remove(s);
} }
} }
MainWindow.Instance.TbResultLog.Text += ($"{ci.Semester} -> {ci.Instance.Students.Count}\n"); //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"); //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");
} }
} }
} }
int getSemester() // Kurs umdisponieren (besser verteilen)
// Kurs umdisponieren (besser verteilen)
bool changed;
int maxIterations = 20;
int iteration = 0;
do
{ {
//int sem = 0; changed = false;
if (GeneratedCourses.Count == 0) return 1; // zunächst im ersten Semester beginnen iteration++;
int[] semcount = new int[4] {0,0,0,0}; // Anzahl der generierten Kurse im jeweiligen Semester
foreach (var inst in GeneratedCourses) // nach Sport gruppieren
var sports = GeneratedCourses
.GroupBy(c => c.Instance.Sport.ID);
foreach (var sportGroup in sports)
{ {
semcount[inst.Semester - 1]++; // ...füllen var courses = sportGroup.ToList();
// paarweise vergleichen
for (int i = 0; i < courses.Count; i++)
{
for (int j = 0; j < courses.Count; j++)
{
if (i == j) continue;
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
if (cA.Instance.Students.Count - 1 < cA.Instance.Sport.MinStudents)
continue;
// --- MOVE durchführen ---
cA.Instance.Students.RemoveAt(k);
students_in_semester[cA.Semester - 1].Remove(stud);
cB.Instance.Students.Add(stud);
students_in_semester[cB.Semester - 1].Add(stud);
changed = true;
break; // nach jedem Move neu bewerten
}
}
}
} }
for (int i = 0; i<semcount.Length; i++) // durchlaufen und prüfen } while (changed && iteration < maxIterations);
{
if (semcount[i] < Settings.Instance.NumCoursesPerSemester)
{
return i+1; // Semester zurückgeben, wenn genug da sind
}
}
return 0;
}
bool isStudentFree(int semester, string studentID) bool isStudentFree(int semester, string studentID)
{ {
@@ -173,17 +216,6 @@ public class CourseCrafter
// max Kursanzahl // max Kursanzahl
if (GeneratedCourses.Count >= Settings.Instance.NumCoursesPerSemester * 4) return true; if (GeneratedCourses.Count >= Settings.Instance.NumCoursesPerSemester * 4) return true;
// // max Anzahl in allen Semestern
// foreach(int sem in new[]{1,2,3,4})
// {
// int count = 0;
// foreach (var inst in GeneratedCourses)
// {
// if (inst.Semester == sem) count++;
// }
//
// if (sem >= Settings.Instance.NumCoursesPerSemester);
// }
int low = 0; int low = 0;
foreach (var item in initial_sportlist) foreach (var item in initial_sportlist)
@@ -193,7 +225,7 @@ public class CourseCrafter
if (low >= initial_sportlist.Count) return true; if (low >= initial_sportlist.Count) return true;
if (globalCount >= 12) return true; if (globalCount >= 20) return true;
return false; return false;
} }
@@ -202,142 +234,111 @@ public class CourseCrafter
MainWindow.Instance.TbResultTextout.Text += $"{tuple.Item1}: {tuple.Item2.Count} remaining\n"; MainWindow.Instance.TbResultTextout.Text += $"{tuple.Item1}: {tuple.Item2.Count} remaining\n";
} }
int getSemesterForSport(Sport sp) // ...existing code...
int getSemesterForSport2(Sport sp)
{ {
int[] semcount = new int[4] {0,0,0,0}; int[] semcount = new int[4];
foreach (var inst in GeneratedCourses) foreach (var inst in GeneratedCourses)
{
semcount[inst.Semester - 1]++; semcount[inst.Semester - 1]++;
}
int bestSem = 0;
int minCourses = int.MaxValue;
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
// 1. Ist der Sport in diesem Semester erlaubt?
if (sp.Semester[i] == 0) continue; if (sp.Semester[i] == 0) continue;
// 2. Ist noch Platz für Kurse? // prüfen, ob für diesen Sport im Semester i schon die maximale Anzahl erreicht ist
if (semcount[i] < Settings.Instance.NumCoursesPerSemester) int sportCoursesInSemester = GeneratedCourses
{ .Count(g => g.Semester == i + 1 && g.Instance.Sport.ID == sp.ID);
return i + 1;
}
}
return 0; if (sportCoursesInSemester >= sp.Semester[i])
}
}
public static void CraftOld()
{
GeneratedCourses = new();
var settings = Settings.Instance;
var students = settings.Students;
var sports = settings.Sports;
if (students.Count == 0 || sports.Count == 0)
return;
int semesterCount = sports.Max(s => s.Semester.Length);
foreach (var st in students)
st.Result = Enumerable.Repeat("Fehler", semesterCount).ToList();
var nameMap = new Dictionary<string, Sport>(StringComparer.OrdinalIgnoreCase);
foreach (var sp in sports)
{
nameMap[sp.Name] = sp;
foreach (var alt in sp.AlternativeNames)
nameMap[alt] = sp;
}
// Nachfrage je Sport
var demand = new Dictionary<Sport, List<Student>>();
foreach (var sp in sports)
demand[sp] = new List<Student>();
foreach (var st in students)
{
foreach (var sel in st.SelectedCourseNames.Distinct())
{
if (nameMap.TryGetValue(sel, out var sp))
demand[sp].Add(st);
}
}
// ===== Semesterweise echte Verteilung =====
for (int sem = 0; sem < semesterCount; sem++)
{
int remainingSemesterSlots = settings.NumCoursesPerSemester;
foreach (var sp in sports)
{
if (sem >= sp.Semester.Length)
continue; continue;
if (remainingSemesterSlots <= 0) if (semcount[i] < Settings.Instance.NumCoursesPerSemester &&
break; semcount[i] < minCourses)
{
minCourses = semcount[i];
bestSem = i + 1;
}
}
var interested = demand[sp] return bestSem;
.Where(st => }
st.Result![sem] == "Fehler" &&
!st.Result.Contains(sp.Name))
.ToList();
if (interested.Count < sp.MinStudents) int getSemesterForSport(Sport sp)
{
// 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;
// 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; continue;
int maxInstances = Math.Min(sp.Semester[sem], remainingSemesterSlots); int semesterNumber = i + 1;
int instanceCount = 0;
int index = 0;
while (interested.Count - index >= sp.MinStudents && // b) Wie viele Kurse DIESES Sports gibt es schon in diesem Semester?
instanceCount < maxInstances) int sportCoursesInThisSemester = GeneratedCourses
{ .Count(g => g.Semester == semesterNumber &&
var inst = new CourseInstance g.Instance.Sport.Name == sp.Name);
{
Sport = sp,
Remaining = sp.MaxStudents
};
GeneratedCourses.Add((sem, inst)); // c) Pro-Sport-Limit erreicht?
remainingSemesterSlots--; if (sportCoursesInThisSemester >= sp.Semester[i])
instanceCount++;
int filled = 0;
while (filled < sp.MaxStudents &&
index < interested.Count)
{
var st = interested[index++];
if (st.Result![sem] != "Fehler")
continue; continue;
//inst.Students.Add(st); // d) Globales Limit pro Semester erreicht?
inst.Remaining--; if (totalCoursesPerSemester[i] >= Settings.Instance.NumCoursesPerSemester)
st.Result[sem] = sp.Name; continue;
filled++;
}
// Falls Mindestanzahl nicht erreicht → Instanz verwerfen // e) Wähle das Semester mit bisher insgesamt den wenigsten Kursen
if (inst.Students.Count < sp.MinStudents) if (totalCoursesPerSemester[i] < minCourses)
{ {
//foreach (var st in inst.Students) minCourses = totalCoursesPerSemester[i];
//st.Result[sem] = "Fehler"; bestSem = semesterNumber;
}
}
GeneratedCourses.Remove((sem, inst)); return bestSem; // 0, falls kein zulässiges Semester gefunden
remainingSemesterSlots++; }
break;
} 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 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() public static string GenerateStatistics()
{ {
GeneratedCourses.Sort((x,y) => x.Semester.CompareTo(y.Semester) );
string sb = $"Generierte Kurse: {GeneratedCourses.Count}\n\n"; string sb = $"Generierte Kurse: {GeneratedCourses.Count}\n\n";
foreach (var genc in GeneratedCourses) foreach (var genc in GeneratedCourses)
{ {
@@ -349,64 +350,106 @@ public class CourseCrafter
return sb; 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( if (inst.Students.Count > sport.MaxStudents)
$"Semester {semester}: {sportName} {number}: {count} Schüler*innen" {
); errors.Add($"[Max] {sport.Name} (Sem {semester}): {inst.Students.Count} > {sport.MaxStudents}");
}
counter++; 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})");
}
}
} }
} }
sb.AppendLine(); // --- 2. Schüler doppelt im Semester ---
sb.AppendLine("Fehlerübersicht:"); for (int sem = 1; sem <= 4; sem++)
// ===== Fehler pro Semester =====
for (int sem = 0; sem < semesterCount; sem++)
{ {
int errors = students.Count(st => List<string> students = new();
st.Result != null &&
st.Result.Count > sem &&
st.Result[sem] == "Fehler");
sb.AppendLine($"Semester {sem + 1}: {errors} Fehler"); 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;
}
} }
return sb.ToString(); 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;
} }
} }

19
exporter.cs Normal file
View File

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

View File

@@ -59,7 +59,7 @@ public class Student
public string ID { get; set; } = ""; // ID des Schüler (z.B. NolteSeb) public string ID { get; set; } = ""; // ID des Schüler (z.B. NolteSeb)
public string Name { get; set; } = ""; // Name des Schülers public string Name { get; set; } = ""; // Name des Schülers
public List<string> SelectedCourseNames { get; set; } = new(); public List<string> SelectedCourseNames { get; set; } = new();
public List<string>? Result { get; set; } = null; public string[] Result { get; set; } = new string[4];
public Student() public Student()
{ {