Merge pull request '[chore:] better crafting' (#5) from bettercrafting into main

Reviewed-on: #5

MainWindow.axaml

@@ -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">
@@ -12,6 +12,7 @@
                     <!-- <MenuItem Click="MnuSettings_OnClick" x:Name="MnuSettings" Header="Einstellungen" /> -->
                     <!-- <Separator /> -->
                     <MenuItem x:Name="MnuExpSettings" Header="Einstellungen exportieren" Click="MnuExpSettings_OnClick" />
+                    <MenuItem x:Name="MnuImpResult" Header="Berechnung importieren" Click="MnuImpResult_OnClick" />
                     <MenuItem x:Name="MnuExit" Header="Beenden" Click="MnuExit_OnClick"/>
                 </MenuItem>
                 <MenuItem Header="Hilfe">
@@ -20,7 +21,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 +89,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>
                         
 
@@ -165,46 +171,34 @@
                                 <NumericUpDown Grid.Column="1" x:Name="NudAmountCoursesSem4" ValueChanged="NudAmountCoursesSem4_OnValueChanged"></NumericUpDown>
                             </Grid>
                             
-                            <Grid ColumnDefinitions="*,3*">
-                                <Label  Content="Alternativkurse"></Label>
-                                <StackPanel Grid.Column="1" Orientation="Vertical">
-                                    <Grid ColumnDefinitions="*,50">
-                                        <ComboBox Height="35" HorizontalAlignment="Stretch" x:Name="CbAlternativCourse"></ComboBox>
-                                        <Button Grid.Column="1" Margin="0,10,0,0" x:Name="BtnAlternativeCourseAdd" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnAlternativeCourseAdd_OnClick" HorizontalContentAlignment="Center">
-                                            <StackPanel Orientation="Horizontal">
-                                                <LucideIcon Kind="Plus" Width="24" Height="24" />
-                                            </StackPanel>
-                                        </Button>
-                                    </Grid>
-                                    <ListBox x:Name="LbAlternativeCourses">
-
-                                    </ListBox>
-                                </StackPanel>
-
-                            </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="0,10,0,0" x:Name="BtnAlternativeNameAdd" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnAlternativeNameAdd_OnClick" HorizontalContentAlignment="Center">
+                                        <Button Grid.Column="1" Margin="5,0,0,0" x:Name="BtnAlternativeNameAdd" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnAlternativeNameAdd_OnClick" HorizontalContentAlignment="Center">
                                             <StackPanel Orientation="Horizontal">
                                                 <LucideIcon Kind="Plus" Width="24" Height="24" />
                                             </StackPanel>
                                         </Button>
-                                        <Button Grid.Column="2" Margin="0,10,0,0" x:Name="BtnAlternativeNameRemove" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnAlternativeNameRemove_OnClick" HorizontalContentAlignment="Center">
+                                        <Button Grid.Column="2" Margin="5,0,0,0" x:Name="BtnAlternativeNameRemove" VerticalAlignment="Top" Height="35" HorizontalAlignment="Stretch" Click="BtnAlternativeNameRemove_OnClick" HorizontalContentAlignment="Center">
                                             <StackPanel Orientation="Horizontal">
                                                 <LucideIcon Kind="Minus" Width="24" Height="24" />
                                             </StackPanel>
                                         </Button>
                                     </Grid>
-                                    <ListBox x:Name="LbAlternativeNames">
+                                    <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>
                 </TabItem>
@@ -216,11 +210,33 @@
                             <Label FontSize="20" Content="Ergebnisse" VerticalContentAlignment="Center" />
                         </StackPanel>
                     </TabItem.Header>
-                    <Grid ColumnDefinitions="*,*">
+                    <Grid ColumnDefinitions="*,*" RowDefinitions="50,2*,*">
-                        <ListBox x:Name="LbResult" Margin="10,10,10,10"></ListBox>
+                        <ListBox Grid.RowSpan="2" x:Name="LbResult" Margin="0,10,10,10"></ListBox>
-                        <ScrollViewer Grid.Column="1">
+                        <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>
                 </TabItem>
             </TabControl>

MainWindow.axaml.cs

@@ -10,9 +10,18 @@ namespace spplus;
 
 public partial class MainWindow : Window
 {
+    public static MainWindow Instance { get; set; }
+    public static string ApplicationVersion = "v1.2.24";
     public MainWindow()
     {
         InitializeComponent();
+        Settings.ImportInitial();
+        Instance = this;
+        RefreshCoursesList();
+        try
+        {
+            NudSportMaxPerSemester.Value = Settings.Instance.NumCoursesPerSemester;
+        } catch {}
     }
 
     private void MnuExpSettings_OnClick(object? sender, RoutedEventArgs e)
@@ -32,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)
@@ -48,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)
@@ -67,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;
@@ -114,15 +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()
@@ -132,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]}");
                 }
@@ -245,11 +279,11 @@ public partial class MainWindow : Window
                 NudAmountCoursesSem2.Value = item.Semester[1];
                 NudAmountCoursesSem3.Value = item.Semester[2];
                 NudAmountCoursesSem4.Value = item.Semester[3];
-                LbAlternativeCourses.Items.Clear();
+                // LbAlternativeCourses.Items.Clear();
-                foreach (var alternative in item.AlternativeCourses)
+                // foreach (var alternative in item.AlternativeCourses)
-                {
+                // {
-                    LbAlternativeCourses.Items.Add(Settings.GetSportNameFromID(alternative));
+                //     LbAlternativeCourses.Items.Add(Settings.GetSportNameFromID(alternative));
-                }
+                // }
                 LbAlternativeNames.Items.Clear();
                 foreach (var alternative in item.AlternativeNames)
                 {
@@ -376,4 +410,53 @@ public partial class MainWindow : Window
             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);
+
+    }
+
+    private async void MnuImpResult_OnClick(object? sender, RoutedEventArgs e)
+    {
+        // Hier importieren
+        var topLevel = GetTopLevel(this);
+        var file = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+        {
+            Title = "CSV-Datei laden",
+            SuggestedFileType = new FilePickerFileType(".csv-Datei")
+            {
+                Patterns = new[] { "*.csv" }
+            }
+            
+        });
+
+        if (file == null) return;
+    }
 }

README.md

@@ -1,13 +1,17 @@
 # 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.
+
+![spplus-Hauptbildschirm](img/spplus_planung.png)
 
 ## Features
 * \+ Import von CSV-Dateien mit Kurswahl
-* ~ Wahlansicht 
+* \+ Wahlansicht 
 * \+ 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
+* ~ PDF-Export
 
 \+ Vorhanden, ~ Pending
 
@@ -19,3 +23,5 @@ Interaktiver Sportkursplaner für Oberstufen auf Basis einer Sportkurswahl durch
     * Suche `spplus` bzw. `spplus.exe` und führe aus
     * Linux/MacOS evl.: `chmod +x spplus`
 
+
+![spplus-Sportkursübersicht](img/spplus_sport.png)

exporter.cs

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

import.cs

@@ -47,4 +47,45 @@ public static class import
 
         return result;
     }
+    
+    public static List<Student> ImportResultFromFile(string path)
+    {
+        var dict = new Dictionary<string, (string Name, List<string> Courses)>();
+
+        foreach (var line in File.ReadLines(path).Skip(1)) // Header überspringen
+        {
+            if (string.IsNullOrWhiteSpace(line))
+                continue;
+
+            var parts = line.Split(',');
+            if (parts.Length < 3)
+                continue;
+
+            string nameWithId = parts[0].Trim();
+            string course = parts[2].Replace("(2)", "").Replace("(3)", "").Replace("(4)", "").Trim();
+
+            int open = nameWithId.LastIndexOf('(');
+            int close = nameWithId.LastIndexOf(')');
+            if (open < 0 || close < 0 || close <= open)
+                continue;
+
+            string name = nameWithId[..open].Trim();
+            string id = nameWithId[(open + 1)..close].Trim();
+
+            if (!dict.ContainsKey(id))
+                dict[id] = (name, new List<string>());
+
+            dict[id].Courses.Add(course);
+        }
+
+        var result = new List<Student>();
+
+        foreach (var (id, data) in dict)
+        {
+            var student = new Student(id, data.Name, data.Courses);
+            result.Add(student);
+        }
+
+        return result;
+    }
 }

structs.cs

@@ -12,7 +12,7 @@ public class Sport
     public int MinStudents  { get; set; } = 5;          // Minimale Anzahl an Schülern pro Kurs
     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();
+    //public List<int> AlternativeCourses { get; set; } = new();
 
     protected Sport()
     {
@@ -33,15 +33,15 @@ public class Sport
         AlternativeNames = alternativeNames;
     }
 
-    public void AddAlternativeSport(int id)
+    // public void AddAlternativeSport(int id)
-    {
+    // {
-        AlternativeCourses.Add(id);
+    //     AlternativeCourses.Add(id);
-    }
+    // }
-
+    //
-    public void ClearAlternativeSport()
+    // public void ClearAlternativeSport()
-    {
+    // {
-        AlternativeCourses.Clear();
+    //     AlternativeCourses.Clear();
-    }
+    // }
 
     public override string ToString()
     {
@@ -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()
     {
@@ -85,7 +85,7 @@ public class Settings
 
     public List<Student> Students { get; set; } = [];
     public List<Sport> Sports { get; set; } = [];
-    public int NumCoursesPerSemester { get; set; } = 10;
+    public int NumCoursesPerSemester { get; set; } = 10; // Exact Amount of courses, not a maximum
 
     public Settings()
     {