Add animated classroom grouping with saved editable plans
CI / build-and-test (push) Canceled after 0s

This commit is contained in:
admin committed 2026-09-29 22:17:49 +02:00
1 parent d4b1419f9a
commit f0462bd2a1
27 files changed
+775 -46

No files matched your search

@@ -1,12 +1,21 @@
<Window xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:LehrerApp.Desktop.ViewModels.Groups"
xmlns:models="clr-namespace:LehrerApp.Core.Models;assembly=LehrerApp.Core"
xmlns:lottie="clr-namespace:Avalonia.Labs.Lottie;assembly=Avalonia.Labs.Lottie"
x:Class="LehrerApp.Desktop.Views.Groups.StudentGroupGeneratorWindow"
x:DataType="vm:StudentGroupGeneratorViewModel"
Title="Gruppen zusammenstellen"
Width="780" Height="650" MinWidth="620" MinHeight="480"
WindowStartupLocation="CenterScreen">
<Window.Styles>
<Style Selector="Border.studentgroup.droptarget">
<Setter Property="BorderBrush" Value="{DynamicResource AppAccentTextBrush}"/>
<Setter Property="BorderThickness" Value="2"/>
</Style>
</Window.Styles>
<Grid RowDefinitions="Auto,*,Auto,Auto" Margin="24">
<StackPanel Grid.Row="0" Spacing="3" Margin="0,0,0,16">
<TextBlock Text="Gruppen zusammenstellen" Classes="dialogtitle"/>
@@ -14,7 +23,7 @@
FontSize="12" Opacity="0.55"/>
</StackPanel>
<ScrollViewer Grid.Row="1">
<ScrollViewer Grid.Row="1" x:Name="ResultsScrollViewer">
<Grid x:Name="GroupResults">
<Grid.Transitions>
<Transitions>
@@ -40,17 +49,26 @@
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="vm:GeneratedStudentGroup">
<Border Width="220" Margin="7" Padding="16"
<Border Width="220" Margin="7" Padding="16" Classes="studentgroup"
Classes.droptarget="{Binding IsDropTarget}"
Background="{DynamicResource AppCardBackgroundBrush}"
BorderBrush="{DynamicResource AppCardBorderBrush}"
BorderThickness="1" CornerRadius="12">
BorderThickness="1" CornerRadius="12"
DragDrop.AllowDrop="True" DragDrop.DragEnter="OnGroupDragEnter"
DragDrop.DragLeave="OnGroupDragLeave" DragDrop.DragOver="OnGroupDragOver"
DragDrop.Drop="OnGroupDrop">
<StackPanel Spacing="9">
<TextBlock Text="{Binding Title}" FontSize="16" FontWeight="SemiBold"
Foreground="{DynamicResource AppAccentTextBrush}"/>
<ItemsControl ItemsSource="{Binding Members}">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="vm:StudentGroupMember">
<TextBlock Text="{Binding Name}" Margin="0,3" TextWrapping="Wrap"/>
<Border Background="{DynamicResource AppChipBackgroundBrush}"
CornerRadius="6" Padding="8,5" Margin="0,3"
PointerPressed="OnMemberPressed" PointerMoved="OnMemberMoved"
PointerReleased="OnMemberReleased">
<TextBlock Text="{Binding Name}" TextWrapping="Wrap"/>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
@@ -61,11 +79,41 @@
</ItemsControl>
</Grid>
</ScrollViewer>
<lottie:Lottie Grid.Row="1" x:Name="TeamworkAnimation"
Path="/Assets/Animations/Teamwork.json"
RepeatCount="-1" AutoPlay="False"
Width="270" Height="270" HorizontalAlignment="Center"
VerticalAlignment="Center" IsVisible="False"/>
<StackPanel Grid.Row="2" Spacing="8" Margin="0,12,0,10">
<Button Content="Gruppen zusammenstellen" Click="OnGenerate"
<Button x:Name="GenerateButton" Content="Gruppen zusammenstellen" Click="OnGenerate"
IsEnabled="{Binding CanGenerate}" HorizontalAlignment="Stretch"
HorizontalContentAlignment="Center" Height="48" FontSize="16" FontWeight="SemiBold"/>
<StackPanel x:Name="PlanActions" Spacing="8">
<TextBlock Text="Schüler zwischen den Gruppenkarten ziehen, um die Einteilung anzupassen."
FontSize="11" Opacity="0.65" IsVisible="{Binding HasGeneratedGroups}"/>
<Grid ColumnDefinitions="*,10,Auto,8,Auto" IsVisible="{Binding HasSavedPlans}">
<ComboBox ItemsSource="{Binding SavedPlans}" SelectedItem="{Binding SelectedSavedPlan}"
PlaceholderText="Gespeicherte Einteilung auswählen">
<ComboBox.ItemTemplate>
<DataTemplate x:DataType="models:StudentGroupPlan">
<TextBlock Text="{Binding Name}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<Button Grid.Column="2" Content="Laden" Click="OnLoadSavedPlan"
IsEnabled="{Binding CanLoadSavedPlan}"/>
<Button Grid.Column="4" Content="Löschen" Click="OnDeleteSavedPlan"
IsEnabled="{Binding CanDeleteSavedPlan}"/>
</Grid>
<Grid ColumnDefinitions="*,10,Auto" IsVisible="{Binding HasGeneratedGroups}">
<TextBox Text="{Binding PlanName, Mode=TwoWay}" PlaceholderText="Name der Einteilung"/>
<Button Grid.Column="2" Content="Speichern" Command="{Binding SavePlanCommand}"/>
</Grid>
<TextBlock Text="{Binding SaveStatus}" FontSize="11" Opacity="0.7" TextWrapping="Wrap"
IsVisible="{Binding SaveStatus, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
</StackPanel>
<StackPanel x:Name="ResultSummary" Spacing="8">
<TextBlock Text="{Binding StatusText}" HorizontalAlignment="Center" Opacity="0.65"
IsVisible="{Binding HasGeneratedGroups}"/>
<Border Background="{DynamicResource AppChipBackgroundBrush}" CornerRadius="8" Padding="10,7"
@@ -73,9 +121,10 @@
<TextBlock Text="{Binding WarningText}" TextWrapping="Wrap" FontSize="12"
Foreground="{DynamicResource AppStatusWarningBrush}"/>
</Border>
</StackPanel>
</StackPanel>
<Expander Grid.Row="3" Header="Optionen" IsExpanded="False">
<Expander Grid.Row="3" x:Name="OptionsExpander" Header="Optionen" IsExpanded="False">
<ScrollViewer MaxHeight="340">
<StackPanel Spacing="11" Margin="0,10,6,4">
<Grid ColumnDefinitions="*,16,*">