Klausurvarianten, Bonuspunkte und Wiederholungen ergänzen
This commit is contained in:
1 parent
54ad7f7419
commit
431d023c1a
22 files changed
+522
-40
No files matched your search
@@ -52,6 +52,29 @@
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
||||
<StackPanel Spacing="4">
|
||||
<TextBlock Text="Wiederholung einer Arbeit (optional)" FontSize="12" Opacity="0.7"/>
|
||||
<Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
|
||||
<ComboBox ItemsSource="{Binding AvailableOriginalExams}" SelectedItem="{Binding SelectedOriginalExam}"
|
||||
PlaceholderText="Keine Wiederholung" HorizontalAlignment="Stretch">
|
||||
<ComboBox.ItemTemplate>
|
||||
<DataTemplate x:DataType="models:Exam">
|
||||
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||
<TextBlock Text="{Binding Date}"/>
|
||||
<TextBlock Text="{Binding Title}"/>
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ComboBox.ItemTemplate>
|
||||
</ComboBox>
|
||||
<Button Grid.Column="1" Content="Auswahl löschen" Command="{Binding ClearOriginalExamCommand}"
|
||||
IsVisible="{Binding HasSelectedOriginalExam}"/>
|
||||
</Grid>
|
||||
<ComboBox ItemsSource="{Binding RepeatRuleOptions}" SelectedItem="{Binding RepeatRuleName}"
|
||||
IsVisible="{Binding HasSelectedOriginalExam}"/>
|
||||
<TextBlock Text="{Binding RepeatError}" Foreground="Red" FontSize="11"
|
||||
IsVisible="{Binding RepeatError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Spacing="4">
|
||||
<TextBlock Text="Notizen" FontSize="12" Opacity="0.7"/>
|
||||
<TextBox Text="{Binding Notes}" AcceptsReturn="True" Height="56" TextWrapping="Wrap"/>
|
||||
@@ -72,6 +95,8 @@
|
||||
<TextBlock Grid.Column="1" Text="Achtung: noch keine Punkte vergeben" Foreground="Red" FontSize="12"
|
||||
IsVisible="{Binding TotalPointsWarning}" VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
<TextBlock Text="{Binding TaskPointsError}" Foreground="Red" FontSize="11"
|
||||
IsVisible="{Binding TaskPointsError, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
|
||||
|
||||
<ItemsControl ItemsSource="{Binding Tasks}">
|
||||
<ItemsControl.ItemTemplate>
|
||||
@@ -95,6 +120,15 @@
|
||||
ToolTip.Tip="Entfernen" Margin="4,0,0,0"/>
|
||||
</Grid>
|
||||
|
||||
<StackPanel Orientation="Horizontal" Spacing="12">
|
||||
<StackPanel Orientation="Horizontal" Spacing="5" VerticalAlignment="Center">
|
||||
<TextBlock Text="Fassung" VerticalAlignment="Center" FontSize="11"/>
|
||||
<ComboBox ItemsSource="{Binding VariantOptions}" SelectedItem="{Binding VariantName}" Width="90"/>
|
||||
</StackPanel>
|
||||
<CheckBox Content="Bonusaufgabe" IsChecked="{Binding IsBonus}"
|
||||
ToolTip.Tip="Erreichte Bonuspunkte erhöhen die Punktzahl; die Maximalpunkte zählen nicht zum Grundwert."/>
|
||||
</StackPanel>
|
||||
|
||||
<Button Content="{Binding CompetencySummary}" Command="{Binding ToggleCompetencyPanelCommand}"
|
||||
HorizontalAlignment="Left" FontSize="11" Padding="6,2"/>
|
||||
|
||||
|
||||
@@ -111,6 +111,31 @@
|
||||
|
||||
<Separator/>
|
||||
|
||||
<StackPanel Spacing="6" IsVisible="{Binding HasRepeatComparison}">
|
||||
<TextBlock Text="Vergleich mit der Wiederholung" FontSize="14" FontWeight="SemiBold"/>
|
||||
<TextBlock Text="{Binding RepeatComparisonTitle}" FontSize="11" Opacity="0.65"/>
|
||||
<Grid ColumnDefinitions="2*,*,*,*">
|
||||
<TextBlock Text="Schüler" FontWeight="Bold" FontSize="11"/>
|
||||
<TextBlock Grid.Column="1" Text="Erste" FontWeight="Bold" FontSize="11"/>
|
||||
<TextBlock Grid.Column="2" Text="Wiederholung" FontWeight="Bold" FontSize="11"/>
|
||||
<TextBlock Grid.Column="3" Text="Zählt" FontWeight="Bold" FontSize="11"/>
|
||||
</Grid>
|
||||
<ItemsControl ItemsSource="{Binding RepeatComparison}">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate x:DataType="vm:RepeatComparisonItem">
|
||||
<Grid ColumnDefinitions="2*,*,*,*" Margin="0,2">
|
||||
<TextBlock Text="{Binding StudentName}"/>
|
||||
<TextBlock Grid.Column="1" Text="{Binding OriginalGrade}"/>
|
||||
<TextBlock Grid.Column="2" Text="{Binding RepeatGrade}"/>
|
||||
<TextBlock Grid.Column="3" Text="{Binding EffectiveGrade}" FontWeight="Bold"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</StackPanel>
|
||||
|
||||
<Separator IsVisible="{Binding HasRepeatComparison}"/>
|
||||
|
||||
<!-- Notenschlüssel verschieben -->
|
||||
<Grid ColumnDefinitions="*,Auto">
|
||||
<TextBlock Grid.Column="0" Text="Notenschlüssel verschieben" FontSize="14" FontWeight="SemiBold" VerticalAlignment="Center"/>
|
||||
|
||||
@@ -41,12 +41,27 @@ public partial class ExamGradingDialog : Window
|
||||
Width = new DataGridLength(170, DataGridLengthUnitType.Pixel),
|
||||
});
|
||||
|
||||
if (vm.HasVariants)
|
||||
grid.Columns.Add(new DataGridTemplateColumn
|
||||
{
|
||||
Header = "Fassung", Width = new DataGridLength(82, DataGridLengthUnitType.Pixel),
|
||||
CellTemplate = new FuncDataTemplate<ExamResultRow>((row, _) =>
|
||||
{
|
||||
if (row is null) return new TextBlock();
|
||||
var choice = new ComboBox { ItemsSource = row.VariantOptions, SelectedItem = row.VariantName };
|
||||
choice.SelectionChanged += (_, _) => row.VariantName = choice.SelectedItem as string ?? "A";
|
||||
return choice;
|
||||
}),
|
||||
});
|
||||
|
||||
for (var i = 0; i < vm.Tasks.Count; i++)
|
||||
{
|
||||
var task = vm.Tasks[i];
|
||||
grid.Columns.Add(new DataGridTemplateColumn
|
||||
{
|
||||
Header = string.IsNullOrWhiteSpace(task.Title) ? $"Aufg. {task.Nr}" : $"{task.Nr}. {task.Title}",
|
||||
Header = (string.IsNullOrWhiteSpace(task.Title) ? $"Aufg. {task.Nr}" : $"{task.Nr}. {task.Title}")
|
||||
+ (task.Variant is null ? "" : $" ({task.Variant})")
|
||||
+ (task.IsBonus ? " ★ Bonus" : ""),
|
||||
Width = new DataGridLength(1, DataGridLengthUnitType.Star),
|
||||
CellTemplate = BuildPointsCellTemplate(i, grid, vm.Tasks.Count),
|
||||
});
|
||||
@@ -91,6 +106,7 @@ public partial class ExamGradingDialog : Window
|
||||
Background = Brushes.Transparent,
|
||||
Padding = new Thickness(6, 4),
|
||||
HorizontalContentAlignment = HorizontalAlignment.Center,
|
||||
IsEnabled = cell.IsApplicable,
|
||||
};
|
||||
ToolTip.SetTip(tb, $"max. {FormatPoints(cell.MaxPoints)} Punkte");
|
||||
UpdateInvalidVisual(tb, cell.IsInvalid);
|
||||
@@ -99,6 +115,8 @@ public partial class ExamGradingDialog : Window
|
||||
{
|
||||
if (pe.PropertyName == nameof(PointsCell.IsInvalid))
|
||||
UpdateInvalidVisual(tb, cell.IsInvalid);
|
||||
if (pe.PropertyName == nameof(PointsCell.IsApplicable))
|
||||
tb.IsEnabled = cell.IsApplicable;
|
||||
};
|
||||
|
||||
tb.LostFocus += (_, _) => CommitPointsCell(tb, cell);
|
||||
|
||||
@@ -145,6 +145,7 @@
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="Datum" Binding="{Binding Date}" Width="110"/>
|
||||
<DataGridTextColumn Header="Titel" Binding="{Binding Title}" Width="*"/>
|
||||
<DataGridTextColumn Header="Art" Binding="{Binding TypeLabel}" Width="105"/>
|
||||
<DataGridTextColumn Header="Niveau" Binding="{Binding NiveauLabel}" Width="80"
|
||||
IsVisible="{Binding IsDifferentiated}"/>
|
||||
<DataGridTemplateColumn Header="Status" Width="150">
|
||||
|
||||
@@ -255,7 +255,8 @@ public partial class GroupDetailView : UserControl
|
||||
App.Services.GetRequiredService<GradingService>(),
|
||||
groupId, vm.Group.SubjectId, vm.Group.GradeLevel, vm.Group.GradingSystem,
|
||||
vm.SubjectName, vm.Group.IsDifferentiated, editingExam, duplicateSource,
|
||||
competencyCatalogVersionId);
|
||||
competencyCatalogVersionId,
|
||||
App.Services.GetRequiredService<IExamResultRepository>());
|
||||
|
||||
var dialog = new ExamDialog { DataContext = dialogVm };
|
||||
var owner = TopLevel.GetTopLevel(this) as Window;
|
||||
@@ -295,7 +296,8 @@ public partial class GroupDetailView : UserControl
|
||||
App.Services.GetRequiredService<IExamRepository>(),
|
||||
App.Services.GetRequiredService<IExamResultRepository>(),
|
||||
App.Services.GetRequiredService<GradingService>(),
|
||||
exam, vm.Group.GradingSystem);
|
||||
exam, vm.Group.GradingSystem,
|
||||
App.Services.GetRequiredService<IStudentRepository>());
|
||||
|
||||
var dialog = new ExamEvaluationDialog { DataContext = dialogVm };
|
||||
var owner = TopLevel.GetTopLevel(this) as Window;
|
||||
|
||||
Reference in new issue
Block a user