Compare commits
56 Commits
8b0703f25e
...
spplus1.2.
| Author | SHA1 | Date | |
|---|---|---|---|
| a1bf573a07 | |||
| 525f3fb4ae | |||
| 9f298d8ce8 | |||
| 11d9c641a6 | |||
| c2f7adc1d0 | |||
| c19f96ea37 | |||
| 9bbde62d70 | |||
| a83f97828c | |||
| 44654dd784 | |||
| 410055c9f2 | |||
| ce75d8aa0b | |||
| be436f1b1c | |||
| 14c11b81b6 | |||
| dd38b91d68 | |||
| 987f27fcbc | |||
| 42ecde799c | |||
| ce70d86fd3 | |||
| ea280ea05d | |||
| c2e230ca48 | |||
| 30317dd1bb | |||
| 6753acc04f | |||
| 4468651373 | |||
| b6de508ea0 | |||
| d70770e2f0 | |||
| 2c2f2d2d94 | |||
| c5a234cea7 | |||
| c6f9994c25 | |||
| 6f1ffd40b6 | |||
| 8ab928be7c | |||
| 30c8b2ef92 | |||
| 24416dc345 | |||
| 8bfa22451e | |||
| 8be9a9a925 | |||
| d1f5444caf | |||
| aec57d7d9d | |||
| 2f18629e83 | |||
| 5f44e63129 | |||
| 0df27f7e50 | |||
| df282d1164 | |||
| af2ad3dab7 | |||
| 8672b09ff0 | |||
| d23c8870ed | |||
| 1bfd2f5219 | |||
| 77ca5aa1ff | |||
| 12606d45fb | |||
| ce1eeab166 | |||
| 4ac8182cf2 | |||
| 3cdfb61586 | |||
| e3d504ceb7 | |||
| 99a6bdd473 | |||
| 8b92b32e60 | |||
| 5868ca882b | |||
| b3e8c7ee5e | |||
| 6b769f413c | |||
| b772e29084 | |||
| 8a8803395f |
136
MainWindow.axaml
136
MainWindow.axaml
@@ -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 Grid.Row="1">
|
<TabControl x:Name="TclMainView" Grid.Row="1" TabStripPlacement="Left">
|
||||||
<TabItem>
|
<TabItem>
|
||||||
<TabItem.Header>
|
<TabItem.Header>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<ListBox Grid.RowSpan="2" x:Name="LbStudentsImported" SelectionChanged="LbStudentsImported_OnSelectionChanged" Margin="0,70,0,70" Background="MintCream" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"></ListBox>
|
<ListBox Grid.RowSpan="2" x:Name="LbStudentsImported" SelectionChanged="LbStudentsImported_OnSelectionChanged" Margin="0,70,0,70" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"></ListBox>
|
||||||
|
|
||||||
<StackPanel Grid.Column="1" Grid.Row="0" Margin="10,10,10,10" Orientation="Vertical" Spacing="10">
|
<StackPanel Grid.Column="1" Grid.Row="0" Margin="10,10,10,10" Orientation="Vertical" Spacing="10">
|
||||||
<Grid ColumnDefinitions="*,3*">
|
<Grid ColumnDefinitions="*,3*">
|
||||||
@@ -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>
|
||||||
|
|
||||||
|
|
||||||
@@ -100,22 +105,137 @@
|
|||||||
<Label FontSize="20" Content="Kurse" VerticalContentAlignment="Center" />
|
<Label FontSize="20" Content="Kurse" VerticalContentAlignment="Center" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</TabItem.Header>
|
</TabItem.Header>
|
||||||
<Grid RowDefinitions="2*,*,*">
|
<Grid ColumnDefinitions="*,2*">
|
||||||
|
<StackPanel Grid.ColumnSpan="2" Orientation="Horizontal" Spacing="10">
|
||||||
|
<Button Margin="0,10,0,0" x:Name="BtnImportDefaultCourses" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnImportDefaultCourses_OnClick" HorizontalContentAlignment="Center">
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="Import" Width="24" Height="24" />
|
||||||
|
<Label Content="Standardkurse importieren..." VerticalContentAlignment="Center" FontSize="12"
|
||||||
|
FontWeight="Bold" />
|
||||||
|
</StackPanel>
|
||||||
|
</Button>
|
||||||
|
<Button Margin="0,10,0,0" x:Name="BtnDeleteSinleCourse" Background="#99963434" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnDeleteSinleCourse_OnClick" HorizontalContentAlignment="Center">
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="Trash2" Width="24" Height="24" />
|
||||||
|
<Label Content="Ausgewähltes entfernen" VerticalContentAlignment="Center" FontSize="12"
|
||||||
|
FontWeight="Bold" />
|
||||||
|
</StackPanel>
|
||||||
|
</Button>
|
||||||
|
<Button Margin="0,10,0,0" x:Name="BtnClearCourseList" Background="#99963434" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnClearCourseList_OnClick" HorizontalContentAlignment="Center">
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="Trash" Width="24" Height="24" />
|
||||||
|
<Label Content="Liste leeren" VerticalContentAlignment="Center" FontSize="12"
|
||||||
|
FontWeight="Bold" />
|
||||||
|
</StackPanel>
|
||||||
|
</Button>
|
||||||
|
</StackPanel>
|
||||||
|
<ListBox Grid.Column="0" x:Name="LbSportCourses" SelectionChanged="LbSportCourses_OnSelectionChanged" Margin="0,55,0,0" />
|
||||||
|
<StackPanel Grid.Column="1" Grid.Row="0" Margin="10,10,10,10" Orientation="Vertical" Spacing="10">
|
||||||
|
<Grid ColumnDefinitions="*,3*">
|
||||||
|
<Label Content="ID"></Label>
|
||||||
|
<Label Grid.Column="1" x:Name="LblSportID"></Label>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="*,3*">
|
||||||
|
<Label Content="Name"></Label>
|
||||||
|
<TextBox Grid.Column="1" x:Name="TbSportName" TextChanged="TbSportName_OnTextChanged"></TextBox>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Grid ColumnDefinitions="*,3*">
|
||||||
|
<Label Content="Maximale Schüler*innenanzahl"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudSportMaxStudents" ValueChanged="NudSportMaxStudents_OnValueChanged"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Grid ColumnDefinitions="*,3*">
|
||||||
|
<Label Content="Minimale Schüler*innenanzahl"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudSportMinStudents" ValueChanged="NudSportMinStudents_OnValueChanged"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Grid ColumnDefinitions="*,3*">
|
||||||
|
<Label Content="Anzahl Angebote Semester 1"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudAmountCoursesSem1" ValueChanged="NudAmountCoursesSem1_OnValueChanged"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Grid ColumnDefinitions="*,3*">
|
||||||
|
<Label Content="Anzahl Angebote Semester 2"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudAmountCoursesSem2" ValueChanged="NudAmountCoursesSem2_OnValueChanged"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Grid ColumnDefinitions="*,3*">
|
||||||
|
<Label Content="Anzahl Angebote Semester 3"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudAmountCoursesSem3" ValueChanged="NudAmountCoursesSem3_OnValueChanged"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Grid ColumnDefinitions="*,3*">
|
||||||
|
<Label Content="Anzahl Angebote Semester 4"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudAmountCoursesSem4" ValueChanged="NudAmountCoursesSem4_OnValueChanged"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
|
||||||
|
<Grid ColumnDefinitions="*,3*">
|
||||||
|
<Label Content="Alternativbezeichnungen"></Label>
|
||||||
|
<StackPanel Grid.Column="1" Orientation="Vertical">
|
||||||
|
<Grid ColumnDefinitions="*,50,50">
|
||||||
|
<TextBox Grid.Column="0" Height="35" HorizontalAlignment="Stretch" x:Name="TbSportAlternativeName"></TextBox>
|
||||||
|
<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">
|
||||||
|
<LucideIcon Kind="Plus" Width="24" Height="24" />
|
||||||
|
</StackPanel>
|
||||||
|
</Button>
|
||||||
|
<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">
|
||||||
|
<LucideIcon Kind="Minus" Width="24" Height="24" />
|
||||||
|
</StackPanel>
|
||||||
|
</Button>
|
||||||
|
</Grid>
|
||||||
|
<ListBox Margin="0,5,0,0" x:Name="LbAlternativeNames">
|
||||||
|
|
||||||
|
</ListBox>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
</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>
|
||||||
</Grid>
|
</Grid>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
<TabItem>
|
<TabItem x:Name="TbiResults">
|
||||||
<TabItem.Header>
|
<TabItem.Header>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="Sparkles" Width="32" Height="32" Size="32" />
|
<LucideIcon Kind="Sparkles" Width="32" Height="32" Size="32" />
|
||||||
<Label FontSize="20" Content="Ergebnisse" VerticalContentAlignment="Center" />
|
<Label FontSize="20" Content="Ergebnisse" VerticalContentAlignment="Center" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</TabItem.Header>
|
</TabItem.Header>
|
||||||
<Grid RowDefinitions="2*,*,*">
|
<Grid ColumnDefinitions="*,*" RowDefinitions="50,2*,*">
|
||||||
|
<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>
|
||||||
|
<ScrollViewer Grid.Row="2" Grid.Column="1" Margin="0,0,0,10" Background="#44CCCCCC">
|
||||||
|
<TextBlock x:Name="TbResultTextout" FontFamily="Consolas"></TextBlock>
|
||||||
|
</ScrollViewer>
|
||||||
|
<ScrollViewer Grid.Row="2" Grid.Column="0" Margin="0,0,10,10" Background="#44CCCCCC">
|
||||||
|
<TextBlock x:Name="TbResultLog" FontFamily="Consolas"></TextBlock>
|
||||||
|
</ScrollViewer>
|
||||||
</Grid>
|
</Grid>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
</TabControl>
|
</TabControl>
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ 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.Interactivity;
|
using Avalonia.Interactivity;
|
||||||
using Avalonia.Platform.Storage;
|
using Avalonia.Platform.Storage;
|
||||||
|
|
||||||
@@ -9,9 +10,18 @@ namespace spplus;
|
|||||||
|
|
||||||
public partial class MainWindow : Window
|
public partial class MainWindow : Window
|
||||||
{
|
{
|
||||||
|
public static MainWindow Instance { get; set; }
|
||||||
|
public static string ApplicationVersion = "v1.2.24";
|
||||||
public MainWindow()
|
public MainWindow()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
Settings.ImportInitial();
|
||||||
|
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)
|
||||||
@@ -31,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)
|
||||||
@@ -47,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)
|
||||||
@@ -66,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;
|
||||||
@@ -90,6 +100,7 @@ public partial class MainWindow : Window
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (file == null) return;
|
if (file == null) return;
|
||||||
|
if (file.Count == 0) return;
|
||||||
|
|
||||||
var imported_students = import.ImportStudentsFromFile(file[0].Path.LocalPath.ToString());
|
var imported_students = import.ImportStudentsFromFile(file[0].Path.LocalPath.ToString());
|
||||||
foreach (var s in imported_students)
|
foreach (var s in imported_students)
|
||||||
@@ -112,12 +123,61 @@ 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();
|
||||||
|
RefreshResultView();
|
||||||
|
TclMainView.SelectedIndex = 2;
|
||||||
|
//TbiResults.Focus();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RefreshResultView()
|
||||||
|
{
|
||||||
|
LbResult.Items.Clear();
|
||||||
|
foreach (Student s in Settings.Instance.Students)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
for(int i = 0; i<s.Result.Length;i++)
|
||||||
|
{
|
||||||
|
LbResult.Items.Add($"{s.Name} ({s.ID}) - {i+1}. Semester: {s.Result[i]}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine(ex.StackTrace);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
TbResultStatistics.Text = CourseCrafter.GenerateStatistics();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LbStudentsImported_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
|
private void LbStudentsImported_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
|
||||||
@@ -171,9 +231,6 @@ public partial class MainWindow : Window
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
((Student)LbStudentsImported.SelectedItem).Name = TbStudentName.Text;
|
((Student)LbStudentsImported.SelectedItem).Name = TbStudentName.Text;
|
||||||
//int current = LbStudentsImported.SelectedIndex;
|
|
||||||
//RefreshImportedStudentList();
|
|
||||||
//LbStudentsImported.SelectedIndex = current;
|
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -184,14 +241,205 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
((Student)LbStudentsImported.SelectedItem).Name = TbStudentID.Text;
|
((Student)LbStudentsImported.SelectedItem).ID = TbStudentID.Text;
|
||||||
//int current = LbStudentsImported.SelectedIndex;
|
|
||||||
//RefreshImportedStudentList();
|
|
||||||
//LbStudentsImported.SelectedIndex = current;
|
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void BtnImportDefaultCourses_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
Settings.ImportInitial();
|
||||||
|
RefreshCoursesList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RefreshCoursesList()
|
||||||
|
{
|
||||||
|
LbSportCourses.Items.Clear();
|
||||||
|
foreach (var sp in Settings.Instance.Sports)
|
||||||
|
{
|
||||||
|
LbSportCourses.Items.Add(sp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void LbSportCourses_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
|
||||||
|
{
|
||||||
|
if (LbSportCourses.SelectedItem != null)
|
||||||
|
{
|
||||||
|
if (LbSportCourses.SelectedItem is Sport item)
|
||||||
|
{
|
||||||
|
LblSportID.Content = item.ID;
|
||||||
|
TbSportName.Text = item.Name;
|
||||||
|
NudSportMaxStudents.Value = item.MaxStudents;
|
||||||
|
NudSportMinStudents.Value = item.MinStudents;
|
||||||
|
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)
|
||||||
|
// {
|
||||||
|
// LbAlternativeCourses.Items.Add(Settings.GetSportNameFromID(alternative));
|
||||||
|
// }
|
||||||
|
LbAlternativeNames.Items.Clear();
|
||||||
|
foreach (var alternative in item.AlternativeNames)
|
||||||
|
{
|
||||||
|
LbAlternativeNames.Items.Add(alternative);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void TbSportName_OnTextChanged(object? sender, TextChangedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
((Sport)LbSportCourses.SelectedItem).Name = TbSportName.Text;
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void NudSportMaxStudents_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
((Sport)LbSportCourses.SelectedItem).MaxStudents = Convert.ToInt32(NudSportMaxStudents.Value);
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void NudSportMinStudents_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
((Sport)LbSportCourses.SelectedItem).MinStudents = Convert.ToInt32(NudSportMinStudents.Value);
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void NudAmountCoursesSem1_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
((Sport)LbSportCourses.SelectedItem).Semester[0] = Convert.ToInt32(NudAmountCoursesSem1.Value);
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void NudAmountCoursesSem2_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
((Sport)LbSportCourses.SelectedItem).Semester[1] = Convert.ToInt32(NudAmountCoursesSem2.Value);
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void NudAmountCoursesSem3_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
((Sport)LbSportCourses.SelectedItem).Semester[2] = Convert.ToInt32(NudAmountCoursesSem3.Value);
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void NudAmountCoursesSem4_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
((Sport)LbSportCourses.SelectedItem).Semester[3] = Convert.ToInt32(NudAmountCoursesSem4.Value);
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnAlternativeCourseAdd_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
//((Sport)LbSportCourses.SelectedItem).AlternativeNames.Add(TbSportAlternativeName.Text);
|
||||||
|
//TbSportAlternativeCourse.Text = "";
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnAlternativeNameAdd_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
((Sport)LbSportCourses.SelectedItem).AlternativeNames.Add(TbSportAlternativeName.Text);
|
||||||
|
LbAlternativeNames.Items.Add(TbSportAlternativeName.Text);
|
||||||
|
TbSportAlternativeName.Text = "";
|
||||||
|
|
||||||
|
int curr_selected = LbSportCourses.SelectedIndex;
|
||||||
|
RefreshCoursesList();
|
||||||
|
LbSportCourses.SelectedIndex = curr_selected;
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnAlternativeNameRemove_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
//try
|
||||||
|
//{
|
||||||
|
LbAlternativeNames.Items.Remove(LbAlternativeNames.SelectedItem);
|
||||||
|
((Sport)LbSportCourses.SelectedItem).AlternativeNames.Clear();
|
||||||
|
foreach (string s in LbAlternativeNames.Items)
|
||||||
|
{
|
||||||
|
((Sport)LbSportCourses.SelectedItem).AlternativeNames.Add(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
mc:Ignorable="d" SizeToContent="WidthAndHeight"
|
mc:Ignorable="d" SizeToContent="WidthAndHeight"
|
||||||
x:Class="spplus.MessageBox"
|
x:Class="spplus.MessageBox" WindowStartupLocation="CenterScreen"
|
||||||
Title="MessageBox">
|
Title="MessageBox">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock Name="Text" Margin="10" TextWrapping="Wrap" />
|
<TextBlock Name="Text" Margin="10" TextWrapping="Wrap" />
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
455
crafter.cs
Normal file
455
crafter.cs
Normal file
@@ -0,0 +1,455 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
|
namespace spplus;
|
||||||
|
|
||||||
|
public class CourseCrafter
|
||||||
|
{
|
||||||
|
public class CourseInstance
|
||||||
|
{
|
||||||
|
public Sport Sport = null!;
|
||||||
|
public int Remaining;
|
||||||
|
public List<string> Students = new();
|
||||||
|
}
|
||||||
|
public static List<(int Semester, CourseInstance Instance)> GeneratedCourses
|
||||||
|
= new();
|
||||||
|
|
||||||
|
public static void Craft()
|
||||||
|
{
|
||||||
|
GeneratedCourses = new();
|
||||||
|
int globalCount = 0;
|
||||||
|
List<(Sport, List<string>)> initial_sportlist = new();
|
||||||
|
List<string>[] students_in_semester = new List<string>[4] { new(), new(), new(), 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
while (!requestExit())
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Calculating... ({globalCount})");
|
||||||
|
foreach (var item in initial_sportlist)
|
||||||
|
{
|
||||||
|
if (item.Item2.Count >= item.Item1.MinStudents)
|
||||||
|
{
|
||||||
|
int semester = getSemesterForSport(item.Item1);
|
||||||
|
if (semester <= 0) goto semeq0;
|
||||||
|
var inst = new CourseInstance();
|
||||||
|
inst.Sport = item.Item1;
|
||||||
|
inst.Students = new List<string>();
|
||||||
|
// int dist = 1;
|
||||||
|
for (int i = item.Item2.Count - 1; i >= 0; i--)
|
||||||
|
{
|
||||||
|
if (inst.Students.Count >= inst.Sport.MaxStudents)
|
||||||
|
break;
|
||||||
|
|
||||||
|
string stud = item.Item2[i];
|
||||||
|
|
||||||
|
if (!students_in_semester[semester - 1].Contains(stud))
|
||||||
|
{
|
||||||
|
inst.Students.Add(stud);
|
||||||
|
students_in_semester[semester - 1].Add(stud);
|
||||||
|
item.Item2.RemoveAt(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (inst.Students.Count < inst.Sport.MinStudents)
|
||||||
|
{
|
||||||
|
// Rückgängig machen
|
||||||
|
foreach (var s in inst.Students)
|
||||||
|
{
|
||||||
|
students_in_semester[semester-1].Remove(s);
|
||||||
|
item.Item2.Add(s);
|
||||||
|
}
|
||||||
|
continue; // Kurs nicht erstellen
|
||||||
|
}
|
||||||
|
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");
|
||||||
|
}
|
||||||
|
|
||||||
|
semeq0: ;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Kurse auffüllen (mit restl. Leuten)
|
||||||
|
foreach (var item in initial_sportlist)
|
||||||
|
{
|
||||||
|
if (item.Item2.Count > 0)
|
||||||
|
{
|
||||||
|
foreach (var ci in GeneratedCourses)
|
||||||
|
{
|
||||||
|
|
||||||
|
if (item.Item1.ID == ci.Instance.Sport.ID)
|
||||||
|
{
|
||||||
|
int semester = ci.Semester;
|
||||||
|
List<string> added = new();
|
||||||
|
foreach (string stud in item.Item2)
|
||||||
|
{
|
||||||
|
if (ci.Instance.Students.Count >= ci.Instance.Sport.MaxStudents) break;
|
||||||
|
if (!students_in_semester[semester-1].Contains(stud))
|
||||||
|
{
|
||||||
|
ci.Instance.Students.Add(stud);
|
||||||
|
students_in_semester[semester-1].Add(stud);
|
||||||
|
//ci.Instance.Students.Add(stud);
|
||||||
|
added.Add(stud);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hinzugefügte aus Initialkurs entfernen
|
||||||
|
foreach (string s in added)
|
||||||
|
{
|
||||||
|
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");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Kurs umdisponieren (besser verteilen)
|
||||||
|
// Kurs umdisponieren (besser verteilen)
|
||||||
|
bool changed;
|
||||||
|
int maxIterations = 20;
|
||||||
|
int iteration = 0;
|
||||||
|
|
||||||
|
do
|
||||||
|
{
|
||||||
|
changed = false;
|
||||||
|
iteration++;
|
||||||
|
|
||||||
|
// nach Sport gruppieren
|
||||||
|
var sports = GeneratedCourses
|
||||||
|
.GroupBy(c => c.Instance.Sport.ID);
|
||||||
|
|
||||||
|
foreach (var sportGroup in sports)
|
||||||
|
{
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} while (changed && iteration < maxIterations);
|
||||||
|
|
||||||
|
|
||||||
|
bool isStudentFree(int semester, string studentID)
|
||||||
|
{
|
||||||
|
foreach (var inst in GeneratedCourses)
|
||||||
|
{
|
||||||
|
if (semester != inst.Semester) continue;
|
||||||
|
foreach (string stud in inst.Instance.Students)
|
||||||
|
{
|
||||||
|
if (stud == studentID) return false; // Schüler in genanntem Semester bereits gefunden
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Schüler nicht gefunden:
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool requestExit()
|
||||||
|
{
|
||||||
|
globalCount++;
|
||||||
|
// max Kursanzahl
|
||||||
|
if (GeneratedCourses.Count >= Settings.Instance.NumCoursesPerSemester * 4) return true;
|
||||||
|
|
||||||
|
|
||||||
|
int low = 0;
|
||||||
|
foreach (var item in initial_sportlist)
|
||||||
|
{
|
||||||
|
if (item.Item2.Count < item.Item1.MinStudents) low++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (low >= initial_sportlist.Count) return true;
|
||||||
|
|
||||||
|
if (globalCount >= 20) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var tuple in initial_sportlist)
|
||||||
|
{
|
||||||
|
MainWindow.Instance.TbResultTextout.Text += $"{tuple.Item1}: {tuple.Item2.Count} remaining\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
// ...existing code...
|
||||||
|
int getSemesterForSport2(Sport sp)
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
|
||||||
|
// 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)
|
||||||
|
{
|
||||||
|
minCourses = semcount[i];
|
||||||
|
bestSem = i + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
sb += $"Sem. {genc.Semester}: {genc.Instance.Sport.Name} ({genc.Instance.Students.Count} SuS)\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
return sb;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<string> ValidateCourses(List<(int Semester, CourseInstance Instance)> courses)
|
||||||
|
{
|
||||||
|
List<string> errors = new();
|
||||||
|
|
||||||
|
// --- 1. Min/Max + Semester erlaubt ---
|
||||||
|
foreach (var tuple in courses)
|
||||||
|
{
|
||||||
|
int semester = tuple.Semester;
|
||||||
|
var inst = tuple.Instance;
|
||||||
|
var sport = inst.Sport;
|
||||||
|
|
||||||
|
if (inst.Students.Count < sport.MinStudents)
|
||||||
|
{
|
||||||
|
errors.Add($"[Min] {sport.Name} (Sem {semester}): {inst.Students.Count} < {sport.MinStudents}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (inst.Students.Count > sport.MaxStudents)
|
||||||
|
{
|
||||||
|
errors.Add($"[Max] {sport.Name} (Sem {semester}): {inst.Students.Count} > {sport.MaxStudents}");
|
||||||
|
}
|
||||||
|
|
||||||
|
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})");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- 2. Schüler doppelt im Semester ---
|
||||||
|
for (int sem = 1; sem <= 4; sem++)
|
||||||
|
{
|
||||||
|
List<string> students = new();
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- 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
19
exporter.cs
Normal 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
70
structs.cs
70
structs.cs
@@ -1,32 +1,56 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Avalonia.Data;
|
||||||
|
|
||||||
namespace spplus;
|
namespace spplus;
|
||||||
|
|
||||||
public class Sport
|
public class Sport
|
||||||
{
|
{
|
||||||
|
public int ID { get; set; } = 0;
|
||||||
public string Name { get; set; } = "Neuer Kurs"; // Kursname
|
public string Name { get; set; } = "Neuer Kurs"; // Kursname
|
||||||
public int MaxCoursesPerSemester { get; set; } = 1; // Maximale Anzahl an Kursen pro Semester
|
|
||||||
public int MaxStudents { get; set; } = 20; // Maximale Anzahl an Schülern pro Kurs
|
public int MaxStudents { get; set; } = 25; // Maximale Anzahl an Schülern pro Kurs
|
||||||
public int MinStudents { get; set; } = 5; // Minimale Anzahl an Schülern pro Kurs
|
public int MinStudents { get; set; } = 5; // Minimale Anzahl an Schülern pro Kurs
|
||||||
public int[] Semester { get; set; } = [1, 2, 3, 4]; // Angebot in diesen Semestern
|
public int[] Semester { get; set; } = [2, 2, 2, 2]; // Maximale Anzahl an Angeboten in den jeweiligen Index-Semestern (0 => 1. Semester)
|
||||||
|
public List<string> AlternativeNames { get; set; } = new();
|
||||||
|
//public List<int> AlternativeCourses { get; set; } = new();
|
||||||
|
|
||||||
protected Sport()
|
protected Sport()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Sport(string name)
|
public Sport(string name)
|
||||||
{
|
{
|
||||||
Name = name;
|
Name = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Sport(string name, int maxCoursesPerSemester, int maxStudents, int minStudents, int[] semester)
|
public Sport(string name, int maxCoursesPerSemester, int maxStudents, int minStudents, int[] semester, List<string> alternativeNames)
|
||||||
{
|
{
|
||||||
Name = name;
|
Name = name;
|
||||||
MaxCoursesPerSemester = maxCoursesPerSemester;
|
|
||||||
MaxStudents = maxStudents;
|
MaxStudents = maxStudents;
|
||||||
MinStudents = minStudents;
|
MinStudents = minStudents;
|
||||||
Semester = semester;
|
Semester = semester;
|
||||||
|
AlternativeNames = alternativeNames;
|
||||||
|
}
|
||||||
|
|
||||||
|
// public void AddAlternativeSport(int id)
|
||||||
|
// {
|
||||||
|
// AlternativeCourses.Add(id);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// public void ClearAlternativeSport()
|
||||||
|
// {
|
||||||
|
// AlternativeCourses.Clear();
|
||||||
|
// }
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
var alt = "";
|
||||||
|
foreach (var s in AlternativeNames)
|
||||||
|
{
|
||||||
|
alt += s + ", ";
|
||||||
|
}
|
||||||
|
return $"{Name} ({alt})";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,9 +58,8 @@ 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 Sport[] SelectedCourses { get; set; } = new Sport[4]; // Kurswahl
|
|
||||||
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()
|
||||||
{
|
{
|
||||||
@@ -62,6 +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;
|
||||||
|
|
||||||
public Settings()
|
public Settings()
|
||||||
{
|
{
|
||||||
@@ -72,4 +96,34 @@ public class Settings
|
|||||||
{
|
{
|
||||||
// Hier importieren...
|
// Hier importieren...
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void ImportInitial()
|
||||||
|
{
|
||||||
|
Instance.Sports.Add(new Sport("Tischtennis"){ AlternativeNames = {"Sport_TT"}});
|
||||||
|
Instance.Sports.Add(new Sport("Badminton"){ AlternativeNames = {"Sport_BM"}});
|
||||||
|
Instance.Sports.Add(new Sport("Gymnastik/Tanz"){ AlternativeNames = {"Sport_Gym"}});
|
||||||
|
Instance.Sports.Add(new Sport("Schwimmen"){ AlternativeNames = {"Sport_SW"}, Semester = [1, 1, 1, 1], MaxStudents = 18});
|
||||||
|
Instance.Sports.Add(new Sport("Bouldern"){ AlternativeNames = {"Sport_BO"}, Semester = [1, 1, 1, 1]});
|
||||||
|
Instance.Sports.Add(new Sport("Basketball"){ AlternativeNames = {"Sport_BS"}});
|
||||||
|
Instance.Sports.Add(new Sport("Fitness"){ AlternativeNames = {"Sport_Fit"}});
|
||||||
|
Instance.Sports.Add(new Sport("Fußball"){ AlternativeNames = {"Sport_Fuß"}, Semester = [1, 0, 1, 0]});
|
||||||
|
Instance.Sports.Add(new Sport("Handball"){ AlternativeNames = {"Sport_HB"}});
|
||||||
|
Instance.Sports.Add(new Sport("Leichtathletik"){ AlternativeNames = {"Sport_LA"}, Semester = [1, 0, 1, 0], MaxStudents = 18});
|
||||||
|
Instance.Sports.Add(new Sport("Tennis"){ AlternativeNames = {"Sport_Te"}});
|
||||||
|
Instance.Sports.Add(new Sport("Turnen"){ AlternativeNames = {"Sport_Tur"}});
|
||||||
|
Instance.Sports.Add(new Sport("Volleyball"){ AlternativeNames = {"Sport_VB"}});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string? GetSportNameFromID(int id)
|
||||||
|
{
|
||||||
|
foreach (var s in Instance.Sports)
|
||||||
|
{
|
||||||
|
if (s.ID == id)
|
||||||
|
{
|
||||||
|
return s.Name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user