Compare commits

..

18 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
6 changed files with 675 additions and 478 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>
@@ -188,6 +193,11 @@
</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,14 +210,23 @@
</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="*,*">
<StackPanel Orientation="Horizontal"> <Button Grid.Column="0" Margin="0,10,0,0" x:Name="BtnExportCoursePDF" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnExportCoursePDF_OnClick" HorizontalContentAlignment="Center">
<LucideIcon Kind="FileText" Width="24" Height="24" /> <StackPanel Orientation="Horizontal">
<Label Content="Export (PDF)..." VerticalContentAlignment="Center" FontSize="12" <LucideIcon Kind="FileText" Width="24" Height="24" />
FontWeight="Bold" /> <Label Content="Export (PDF)..." VerticalContentAlignment="Center" FontSize="12"
</StackPanel> FontWeight="Bold" />
</Button> </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"> <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>

View File

@@ -1,387 +1,445 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Platform.Storage; using Avalonia.Platform.Storage;
namespace spplus; 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 MainWindow() public static string ApplicationVersion = "v1.2.24";
{ public MainWindow()
InitializeComponent(); {
Settings.ImportInitial(); InitializeComponent();
Instance = this; Settings.ImportInitial();
RefreshCoursesList(); Instance = this;
} RefreshCoursesList();
try
private void MnuExpSettings_OnClick(object? sender, RoutedEventArgs e) {
{ NudSportMaxPerSemester.Value = Settings.Instance.NumCoursesPerSemester;
var res = MessageBox.Show(this, "Dieses Feature ist noch nicht implementiert", "Fehlend"); } catch {}
} }
private void MnuExit_OnClick(object? sender, RoutedEventArgs e) private void MnuExpSettings_OnClick(object? sender, RoutedEventArgs e)
{ {
Environment.Exit(0); var res = MessageBox.Show(this, "Dieses Feature ist noch nicht implementiert", "Fehlend");
} }
private void MnuHelp_OnClick(object? sender, RoutedEventArgs e) private void MnuExit_OnClick(object? sender, RoutedEventArgs e)
{ {
try Environment.Exit(0);
{ }
Process.Start(new ProcessStartInfo
{ private void MnuHelp_OnClick(object? sender, RoutedEventArgs e)
FileName = "https://git.mypapercloud.de/fierke/spplus/wiki", {
UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen try
}); {
} Process.Start(new ProcessStartInfo
catch (Exception ex) {
{ FileName = "https://git.mypapercloud.de/fierke/spplus/wiki",
Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}"); UseShellExecute = true
} });
} }
catch (Exception ex)
private void MnuGit_OnClick(object? sender, RoutedEventArgs e) {
{ Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
try }
{ }
Process.Start(new ProcessStartInfo
{ private void MnuGit_OnClick(object? sender, RoutedEventArgs e)
FileName = "https://git.mypapercloud.de/fierke/spplus", {
UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen try
}); {
} Process.Start(new ProcessStartInfo
catch (Exception ex) {
{ FileName = "https://git.mypapercloud.de/fierke/spplus",
Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}"); UseShellExecute = true
} });
} }
catch (Exception ex)
private void MnuAbout_OnClick(object? sender, RoutedEventArgs e) {
{ Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
Window w = new(); }
w.WindowState = WindowState.Normal; }
w.WindowStartupLocation = WindowStartupLocation.CenterScreen;
w.Width = 300; private void MnuAbout_OnClick(object? sender, RoutedEventArgs e)
w.Height = 120; {
Grid g = new(); Window w = new();
TextBlock tb = new() w.WindowState = WindowState.Normal;
{ w.WindowStartupLocation = WindowStartupLocation.CenterScreen;
Text = "spplus v1.0.0\n(c)2026 MyPapertown, Elias Fierke" w.Width = 300;
}; w.Height = 120;
g.Children.Add(tb); Grid g = new();
w.Content = g; TextBlock tb = new()
w.Show(); {
} Text = $"spplus {MainWindow.ApplicationVersion}\n(c)2026 MyPapertown, Elias Fierke"
};
private async void BtnImport_OnClick(object? sender, RoutedEventArgs e) g.Children.Add(tb);
{ w.Content = g;
var topLevel = GetTopLevel(this); w.Show();
var file = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions }
{
Title = "CSV-Datei auswählen", private async void BtnImport_OnClick(object? sender, RoutedEventArgs e)
AllowMultiple = false, {
FileTypeFilter = new[] var topLevel = GetTopLevel(this);
{ var file = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
new FilePickerFileType(".csv-Datei") {
{ Title = "CSV-Datei auswählen",
Patterns = new[] { "*.csv" } AllowMultiple = false,
} FileTypeFilter = new[]
} {
}); new FilePickerFileType(".csv-Datei")
{
if (file == null) return; Patterns = new[] { "*.csv" }
if (file.Count == 0) return; }
}
var imported_students = import.ImportStudentsFromFile(file[0].Path.LocalPath.ToString()); });
foreach (var s in imported_students)
{ if (file == null) return;
Settings.Instance.Students.Add(s); if (file.Count == 0) return;
}
RefreshImportedStudentList(); var imported_students = import.ImportStudentsFromFile(file[0].Path.LocalPath.ToString());
foreach (var s in imported_students)
} {
Settings.Instance.Students.Add(s);
private void RefreshImportedStudentList() }
{ RefreshImportedStudentList();
LbStudentsImported.Items.Clear();
int count_selected = 0; }
foreach (var s in Settings.Instance.Students)
{ private void RefreshImportedStudentList()
LbStudentsImported.Items.Add(s); {
count_selected += s.SelectedCourseNames.Count; LbStudentsImported.Items.Clear();
} int count_selected = 0;
LblStudentAmount.Content = Settings.Instance.Students.Count.ToString(); foreach (var s in Settings.Instance.Students)
LblSelectedAmount.Content = count_selected.ToString(); {
LbStudentsImported.Items.Add(s);
} count_selected += s.SelectedCourseNames.Count;
}
private void BtnCraftCourses_OnClick(object? sender, RoutedEventArgs e) LblStudentAmount.Content = Settings.Instance.Students.Count.ToString();
{ LblSelectedAmount.Content = count_selected.ToString();
// Craft courses here / call course-crafter
CourseCrafter.Craft(); List<(Sport, List<string>)> initial_sportlist = new();
RefreshResultView(); foreach (var sp in Settings.Instance.Sports)
TbiResults.Focus(); {
} initial_sportlist.Add((sp, new()));
}
private void RefreshResultView() foreach (Student s in Settings.Instance.Students)
{ {
LbResult.Items.Clear(); foreach (var sp in s.SelectedCourseNames)
foreach (Student s in Settings.Instance.Students) {
{ foreach (var item in initial_sportlist)
try {
{ if (item.Item1.AlternativeNames.Contains(sp))
for(int i = 0; i<s.Result.Count;i++) {
{ item.Item2.Add(s.ID);
LbResult.Items.Add($"{s.Name} ({s.ID}) - {i+1}. Semester: {s.Result[i]}"); break;
} }
} }
catch (Exception ex) }
{ }
Console.WriteLine(ex.StackTrace);
} LblNumVoted.Content = "";
} foreach (var s in initial_sportlist)
{
TbResultStatistics.Text = CourseCrafter.GenerateStatistics(); LblNumVoted.Content += $"{s.Item1.Name}: {s.Item2.Count}\n";
} }
private void LbStudentsImported_OnSelectionChanged(object? sender, SelectionChangedEventArgs e) }
{
Prepare(); private void BtnCraftCourses_OnClick(object? sender, RoutedEventArgs e)
var stud = (Student)LbStudentsImported.SelectedItem; {
if (stud == null) CourseCrafter.Craft();
{ RefreshResultView();
TbStudentName.Text = string.Empty; TclMainView.SelectedIndex = 2;
TbStudentID.Text = string.Empty; //TbiResults.Focus();
SetEmpty(); }
return;
}; private void RefreshResultView()
{
try LbResult.Items.Clear();
{ foreach (Student s in Settings.Instance.Students)
TbStudentName.Text = stud.Name; {
TbStudentID.Text = stud.ID; try
LblSport1.Content = stud.SelectedCourseNames[0]; {
LblSport2.Content = stud.SelectedCourseNames[1]; for(int i = 0; i<s.Result.Length;i++)
LblSport3.Content = stud.SelectedCourseNames[2]; {
LblSport4.Content = stud.SelectedCourseNames[3]; LbResult.Items.Add($"{s.Name} ({s.ID}) - {i+1}. Semester: {s.Result[i]}");
} }
catch }
{ catch (Exception ex)
SetEmpty(); {
} Console.WriteLine(ex.StackTrace);
}
return; }
void SetEmpty() TbResultStatistics.Text = CourseCrafter.GenerateStatistics();
{ }
if(LblSport1.Content == "null") LblSport1.Content = "ungewählt";
if(LblSport2.Content == "null") LblSport2.Content = "ungewählt"; private void LbStudentsImported_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
if(LblSport3.Content == "null") LblSport3.Content = "ungewählt"; {
if(LblSport4.Content == "null") LblSport4.Content = "ungewählt"; Prepare();
} var stud = (Student)LbStudentsImported.SelectedItem;
if (stud == null)
void Prepare() {
{ TbStudentName.Text = string.Empty;
LblSport1.Content = "null"; TbStudentID.Text = string.Empty;
LblSport2.Content = "null"; SetEmpty();
LblSport3.Content = "null"; return;
LblSport4.Content = "null"; };
}
try
} {
TbStudentName.Text = stud.Name;
private void TbStudentName_OnTextChanged(object? sender, TextChangedEventArgs e) TbStudentID.Text = stud.ID;
{ LblSport1.Content = stud.SelectedCourseNames[0];
try LblSport2.Content = stud.SelectedCourseNames[1];
{ LblSport3.Content = stud.SelectedCourseNames[2];
((Student)LbStudentsImported.SelectedItem).Name = TbStudentName.Text; LblSport4.Content = stud.SelectedCourseNames[3];
} }
catch catch
{ {
SetEmpty();
} }
}
private void TbStudentID_OnTextChanged(object? sender, TextChangedEventArgs e) return;
{
try void SetEmpty()
{ {
((Student)LbStudentsImported.SelectedItem).ID = TbStudentID.Text; if(LblSport1.Content == "null") LblSport1.Content = "ungewählt";
} if(LblSport2.Content == "null") LblSport2.Content = "ungewählt";
catch if(LblSport3.Content == "null") LblSport3.Content = "ungewählt";
{ if(LblSport4.Content == "null") LblSport4.Content = "ungewählt";
}
}
} void Prepare()
{
private void BtnImportDefaultCourses_OnClick(object? sender, RoutedEventArgs e) LblSport1.Content = "null";
{ LblSport2.Content = "null";
Settings.ImportInitial(); LblSport3.Content = "null";
RefreshCoursesList(); LblSport4.Content = "null";
} }
private void RefreshCoursesList() }
{
LbSportCourses.Items.Clear(); private void TbStudentName_OnTextChanged(object? sender, TextChangedEventArgs e)
foreach (var sp in Settings.Instance.Sports) {
{ try
LbSportCourses.Items.Add(sp); {
} ((Student)LbStudentsImported.SelectedItem).Name = TbStudentName.Text;
} }
catch
{
private void LbSportCourses_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
{ }
if (LbSportCourses.SelectedItem != null) }
{ private void TbStudentID_OnTextChanged(object? sender, TextChangedEventArgs e)
if (LbSportCourses.SelectedItem is Sport item) {
{ try
LblSportID.Content = item.ID; {
TbSportName.Text = item.Name; ((Student)LbStudentsImported.SelectedItem).ID = TbStudentID.Text;
NudSportMaxStudents.Value = item.MaxStudents; }
NudSportMinStudents.Value = item.MinStudents; catch
NudAmountCoursesSem1.Value = item.Semester[0]; {
NudAmountCoursesSem2.Value = item.Semester[1];
NudAmountCoursesSem3.Value = item.Semester[2]; }
NudAmountCoursesSem4.Value = item.Semester[3]; }
// LbAlternativeCourses.Items.Clear();
// foreach (var alternative in item.AlternativeCourses) private void BtnImportDefaultCourses_OnClick(object? sender, RoutedEventArgs e)
// { {
// LbAlternativeCourses.Items.Add(Settings.GetSportNameFromID(alternative)); Settings.ImportInitial();
// } RefreshCoursesList();
LbAlternativeNames.Items.Clear(); }
foreach (var alternative in item.AlternativeNames)
{ private void RefreshCoursesList()
LbAlternativeNames.Items.Add(alternative); {
} LbSportCourses.Items.Clear();
} foreach (var sp in Settings.Instance.Sports)
} {
} LbSportCourses.Items.Add(sp);
}
private void TbSportName_OnTextChanged(object? sender, TextChangedEventArgs e) }
{
try
{ private void LbSportCourses_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
((Sport)LbSportCourses.SelectedItem).Name = TbSportName.Text; {
} catch {} if (LbSportCourses.SelectedItem != null)
} {
if (LbSportCourses.SelectedItem is Sport item)
private void NudSportMaxStudents_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e) {
{ LblSportID.Content = item.ID;
try TbSportName.Text = item.Name;
{ NudSportMaxStudents.Value = item.MaxStudents;
((Sport)LbSportCourses.SelectedItem).MaxStudents = Convert.ToInt32(NudSportMaxStudents.Value); NudSportMinStudents.Value = item.MinStudents;
} catch {} NudAmountCoursesSem1.Value = item.Semester[0];
} NudAmountCoursesSem2.Value = item.Semester[1];
NudAmountCoursesSem3.Value = item.Semester[2];
private void NudSportMinStudents_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e) NudAmountCoursesSem4.Value = item.Semester[3];
{ // LbAlternativeCourses.Items.Clear();
try // foreach (var alternative in item.AlternativeCourses)
{ // {
((Sport)LbSportCourses.SelectedItem).MinStudents = Convert.ToInt32(NudSportMinStudents.Value); // LbAlternativeCourses.Items.Add(Settings.GetSportNameFromID(alternative));
} catch {} // }
} LbAlternativeNames.Items.Clear();
foreach (var alternative in item.AlternativeNames)
private void NudAmountCoursesSem1_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e) {
{ LbAlternativeNames.Items.Add(alternative);
try }
{ }
((Sport)LbSportCourses.SelectedItem).Semester[0] = Convert.ToInt32(NudAmountCoursesSem1.Value); }
} catch {} }
}
private void TbSportName_OnTextChanged(object? sender, TextChangedEventArgs e)
private void NudAmountCoursesSem2_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e) {
{ try
try {
{ ((Sport)LbSportCourses.SelectedItem).Name = TbSportName.Text;
((Sport)LbSportCourses.SelectedItem).Semester[1] = Convert.ToInt32(NudAmountCoursesSem2.Value); } catch {}
} catch {} }
}
private void NudSportMaxStudents_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
private void NudAmountCoursesSem3_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e) {
{ try
try {
{ ((Sport)LbSportCourses.SelectedItem).MaxStudents = Convert.ToInt32(NudSportMaxStudents.Value);
((Sport)LbSportCourses.SelectedItem).Semester[2] = Convert.ToInt32(NudAmountCoursesSem3.Value); } catch {}
} catch {} }
}
private void NudSportMinStudents_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
private void NudAmountCoursesSem4_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e) {
{ try
try {
{ ((Sport)LbSportCourses.SelectedItem).MinStudents = Convert.ToInt32(NudSportMinStudents.Value);
((Sport)LbSportCourses.SelectedItem).Semester[3] = Convert.ToInt32(NudAmountCoursesSem4.Value); } catch {}
} catch {} }
}
private void NudAmountCoursesSem1_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
private void BtnAlternativeCourseAdd_OnClick(object? sender, RoutedEventArgs e) {
{ try
try {
{ ((Sport)LbSportCourses.SelectedItem).Semester[0] = Convert.ToInt32(NudAmountCoursesSem1.Value);
//((Sport)LbSportCourses.SelectedItem).AlternativeNames.Add(TbSportAlternativeName.Text); } catch {}
//TbSportAlternativeCourse.Text = ""; }
} catch {}
} private void NudAmountCoursesSem2_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
{
private void BtnAlternativeNameAdd_OnClick(object? sender, RoutedEventArgs e) try
{ {
try ((Sport)LbSportCourses.SelectedItem).Semester[1] = Convert.ToInt32(NudAmountCoursesSem2.Value);
{ } catch {}
((Sport)LbSportCourses.SelectedItem).AlternativeNames.Add(TbSportAlternativeName.Text); }
LbAlternativeNames.Items.Add(TbSportAlternativeName.Text);
TbSportAlternativeName.Text = ""; private void NudAmountCoursesSem3_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
{
int curr_selected = LbSportCourses.SelectedIndex; try
RefreshCoursesList(); {
LbSportCourses.SelectedIndex = curr_selected; ((Sport)LbSportCourses.SelectedItem).Semester[2] = Convert.ToInt32(NudAmountCoursesSem3.Value);
} catch {} } catch {}
} }
private void BtnAlternativeNameRemove_OnClick(object? sender, RoutedEventArgs e) private void NudAmountCoursesSem4_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
{ {
//try try
//{ {
LbAlternativeNames.Items.Remove(LbAlternativeNames.SelectedItem); ((Sport)LbSportCourses.SelectedItem).Semester[3] = Convert.ToInt32(NudAmountCoursesSem4.Value);
((Sport)LbSportCourses.SelectedItem).AlternativeNames.Clear(); } catch {}
foreach (string s in LbAlternativeNames.Items) }
{
((Sport)LbSportCourses.SelectedItem).AlternativeNames.Add(s); private void BtnAlternativeCourseAdd_OnClick(object? sender, RoutedEventArgs e)
} {
try
int curr_selected = LbSportCourses.SelectedIndex; {
RefreshCoursesList(); //((Sport)LbSportCourses.SelectedItem).AlternativeNames.Add(TbSportAlternativeName.Text);
LbSportCourses.SelectedIndex = curr_selected; //TbSportAlternativeCourse.Text = "";
//} catch (Exception ex) {} } catch {}
} }
private async void BtnClearCourseList_OnClick(object? sender, RoutedEventArgs e) private void BtnAlternativeNameAdd_OnClick(object? sender, RoutedEventArgs e)
{ {
var result = await MessageBox.Show(this, try
"Möchten Sie wirklich alle Kurse löschen?\n Dies kann nicht rückgängig gemacht werden.", {
"Wirklich fortfahren?", MessageBoxButton.YesNo); ((Sport)LbSportCourses.SelectedItem).AlternativeNames.Add(TbSportAlternativeName.Text);
if (result == MessageBoxResult.Yes) LbAlternativeNames.Items.Add(TbSportAlternativeName.Text);
{ TbSportAlternativeName.Text = "";
Settings.Instance.Sports.Clear();
RefreshCoursesList(); int curr_selected = LbSportCourses.SelectedIndex;
} RefreshCoursesList();
LbSportCourses.SelectedIndex = curr_selected;
} } catch {}
}
private void BtnDeleteSinleCourse_OnClick(object? sender, RoutedEventArgs e)
{ private void BtnAlternativeNameRemove_OnClick(object? sender, RoutedEventArgs e)
try {
{ //try
Settings.Instance.Sports.Remove(LbSportCourses.SelectedItem as Sport); //{
RefreshCoursesList(); LbAlternativeNames.Items.Remove(LbAlternativeNames.SelectedItem);
} catch (Exception ex){} ((Sport)LbSportCourses.SelectedItem).AlternativeNames.Clear();
} foreach (string s in LbAlternativeNames.Items)
{
private void BtnExportCoursePDF_OnClick(object? sender, RoutedEventArgs e) ((Sport)LbSportCourses.SelectedItem).AlternativeNames.Add(s);
{ }
// Export as PDF
} int curr_selected = LbSportCourses.SelectedIndex;
RefreshCoursesList();
LbSportCourses.SelectedIndex = curr_selected;
//} catch (Exception ex) {}
}
private async void BtnClearCourseList_OnClick(object? sender, RoutedEventArgs e)
{
var result = await MessageBox.Show(this,
"Möchten Sie wirklich alle Kurse löschen?\n Dies kann nicht rückgängig gemacht werden.",
"Wirklich fortfahren?", MessageBoxButton.YesNo);
if (result == MessageBoxResult.Yes)
{
Settings.Instance.Sports.Clear();
RefreshCoursesList();
}
}
private void BtnDeleteSinleCourse_OnClick(object? sender, RoutedEventArgs e)
{
try
{
Settings.Instance.Sports.Remove(LbSportCourses.SelectedItem as Sport);
RefreshCoursesList();
} catch (Exception ex){}
}
private void BtnExportCoursePDF_OnClick(object? sender, RoutedEventArgs e)
{
// 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,8 +80,8 @@ 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: ;
@@ -120,8 +120,8 @@ 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");
} }
} }
@@ -192,26 +192,7 @@ public class CourseCrafter
} }
} while (changed && iteration < maxIterations); } while (changed && iteration < maxIterations);
int getSemester()
{
//int sem = 0;
if (GeneratedCourses.Count == 0) return 1; // zunächst im ersten Semester beginnen
int[] semcount = new int[4] {0,0,0,0}; // Anzahl der generierten Kurse im jeweiligen Semester
foreach (var inst in GeneratedCourses)
{
semcount[inst.Semester - 1]++; // ...füllen
}
for (int i = 0; i<semcount.Length; i++) // durchlaufen und prüfen
{
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)
{ {
@@ -244,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;
} }
@@ -253,35 +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);
if (sportCoursesInSemester >= sp.Semester[i])
continue;
if (semcount[i] < Settings.Instance.NumCoursesPerSemester &&
semcount[i] < minCourses)
{ {
return i + 1; minCourses = semcount[i];
bestSem = i + 1;
} }
} }
return 0; 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() 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)
{ {
@@ -293,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;
}
}
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 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()
{ {