Compare commits

...

15 Commits

6 changed files with 658 additions and 460 deletions

View File

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

View File

@@ -11,6 +11,7 @@ namespace spplus;
public partial class MainWindow : Window
{
public static MainWindow Instance { get; set; }
public static string ApplicationVersion = "v1.2.24";
public MainWindow()
{
InitializeComponent();
@@ -40,7 +41,7 @@ public partial class MainWindow : Window
Process.Start(new ProcessStartInfo
{
FileName = "https://git.mypapercloud.de/fierke/spplus/wiki",
UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen
UseShellExecute = true
});
}
catch (Exception ex)
@@ -56,7 +57,7 @@ public partial class MainWindow : Window
Process.Start(new ProcessStartInfo
{
FileName = "https://git.mypapercloud.de/fierke/spplus",
UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen
UseShellExecute = true
});
}
catch (Exception ex)
@@ -75,7 +76,7 @@ public partial class MainWindow : Window
Grid g = new();
TextBlock tb = new()
{
Text = "spplus v1.0.0\n(c)2026 MyPapertown, Elias Fierke"
Text = $"spplus {MainWindow.ApplicationVersion}\n(c)2026 MyPapertown, Elias Fierke"
};
g.Children.Add(tb);
w.Content = g;
@@ -122,14 +123,40 @@ public partial class MainWindow : Window
LblStudentAmount.Content = Settings.Instance.Students.Count.ToString();
LblSelectedAmount.Content = count_selected.ToString();
List<(Sport, List<string>)> initial_sportlist = new();
foreach (var sp in Settings.Instance.Sports)
{
initial_sportlist.Add((sp, new()));
}
foreach (Student s in Settings.Instance.Students)
{
foreach (var sp in s.SelectedCourseNames)
{
foreach (var item in initial_sportlist)
{
if (item.Item1.AlternativeNames.Contains(sp))
{
item.Item2.Add(s.ID);
break;
}
}
}
}
LblNumVoted.Content = "";
foreach (var s in initial_sportlist)
{
LblNumVoted.Content += $"{s.Item1.Name}: {s.Item2.Count}\n";
}
}
private void BtnCraftCourses_OnClick(object? sender, RoutedEventArgs e)
{
// Craft courses here / call course-crafter
CourseCrafter.Craft();
RefreshResultView();
TbiResults.Focus();
TclMainView.SelectedIndex = 2;
//TbiResults.Focus();
}
private void RefreshResultView()
@@ -139,7 +166,7 @@ public partial class MainWindow : Window
{
try
{
for(int i = 0; i<s.Result.Count;i++)
for(int i = 0; i<s.Result.Length;i++)
{
LbResult.Items.Add($"{s.Name} ({s.ID}) - {i+1}. Semester: {s.Result[i]}");
}
@@ -396,4 +423,23 @@ public partial class MainWindow : Window
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+
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
* \+ Import von CSV-Dateien mit Kurswahl
* \+ Wahlansicht
* \+ Statistiken
* \+ Pflege von Sportkursen (inkl. Kürzel/ alternativen Bezeichnungen)
* \+ CSV-Export
* ~ Fehleransicht für nicht-existente, aber gewählte Kurse
* ~ PDF-Export
\+ Vorhanden, ~ Pending

View File

@@ -80,8 +80,8 @@ public class CourseCrafter
}
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");
//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: ;
@@ -120,8 +120,8 @@ public class CourseCrafter
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");
//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");
}
}
@@ -234,7 +234,8 @@ public class CourseCrafter
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];
@@ -248,6 +249,13 @@ public class CourseCrafter
{
if (sp.Semester[i] == 0) continue;
// 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 &&
semcount[i] < minCourses)
{
@@ -259,11 +267,78 @@ public class CourseCrafter
return bestSem;
}
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;
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)
continue;
// e) Wähle das Semester mit bisher insgesamt den wenigsten Kursen
if (totalCoursesPerSemester[i] < minCourses)
{
minCourses = totalCoursesPerSemester[i];
bestSem = semesterNumber;
}
}
return bestSem; // 0, falls kein zulässiges Semester gefunden
}
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()
{
GeneratedCourses.Sort((x,y) => x.Semester.CompareTo(y.Semester) );
string sb = $"Generierte Kurse: {GeneratedCourses.Count}\n\n";
foreach (var genc in GeneratedCourses)
{
@@ -275,64 +350,106 @@ public class CourseCrafter
return sb;
}
public static string GenerateStatisticsOld()
public static List<string> ValidateCourses(List<(int Semester, CourseInstance Instance)> courses)
{
var settings = Settings.Instance;
var students = settings.Students;
List<string> errors = new();
if (GeneratedCourses == null || GeneratedCourses.Count == 0)
return "Keine Kurse generiert.";
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)
// --- 1. Min/Max + Semester erlaubt ---
foreach (var tuple in courses)
{
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;
string sportName = group.Key.Name;
string number = counter.ToString("D2");
int count = entry.Instance.Students.Count;
errors.Add($"[Min] {sport.Name} (Sem {semester}): {inst.Students.Count} < {sport.MinStudents}");
}
sb.AppendLine(
$"Semester {semester}: {sportName} {number}: {count} Schüler*innen"
);
if (inst.Students.Count > sport.MaxStudents)
{
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();
sb.AppendLine("Fehlerübersicht:");
// ===== Fehler pro Semester =====
for (int sem = 0; sem < semesterCount; sem++)
// --- 2. Schüler doppelt im Semester ---
for (int sem = 1; sem <= 4; sem++)
{
int errors = students.Count(st =>
st.Result != null &&
st.Result.Count > sem &&
st.Result[sem] == "Fehler");
List<string> students = new();
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;
}
}
if (exists)
{
errors.Add($"[Doppelt] Schüler {stud} doppelt in Semester {sem}");
}
else
{
students.Add(stud);
}
}
}
}
return sb.ToString();
// --- 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 Name { get; set; } = ""; // Name des Schülers
public List<string> SelectedCourseNames { get; set; } = new();
public List<string>? Result { get; set; } = null;
public string[] Result { get; set; } = new string[4];
public Student()
{