Manuellen WebUntis-Abgleich für Unterrichtsnummern und Stundenplan ergänzen
CI / build-and-test (push) Canceled after 0s
CI / build-and-test (push) Canceled after 0s
This commit is contained in:
1 parent
d9eac0d1d2
commit
f56caced32
10 files changed
+273
-24
No files matched your search
@@ -383,7 +383,7 @@
|
||||
<ScrollViewer>
|
||||
<StackPanel Margin="32,20,32,28" Spacing="10">
|
||||
<StackPanel Orientation="Horizontal" Spacing="8" Margin="0,0,0,6">
|
||||
<Button Content="Aus WebUntis laden…" Command="{Binding ImportWebUntisTimetableCommand}"/>
|
||||
<Button Content="WebUntis-Zuordnung abgleichen…" Command="{Binding ImportWebUntisTimetableCommand}"/>
|
||||
<TextBlock Text="Importiert oder vergleicht eine typische Unterrichtswoche; Vertretungen bleiben im iCal-Abgleich."
|
||||
FontSize="11" Opacity="0.6" VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
|
||||
@@ -5,15 +5,15 @@
|
||||
xmlns:conv="clr-namespace:LehrerApp.Desktop.Converters"
|
||||
x:Class="LehrerApp.Desktop.Views.Planning.WebUntisTimetableImportDialog"
|
||||
x:DataType="vm:WebUntisTimetableImportViewModel"
|
||||
Title="Stundenplan aus WebUntis" Width="820" Height="650"
|
||||
Title="WebUntis-Zuordnung abgleichen" Width="980" Height="750"
|
||||
MinWidth="680" MinHeight="480" WindowStartupLocation="CenterOwner">
|
||||
<Grid RowDefinitions="Auto,Auto,*,Auto" Margin="24" RowSpacing="14">
|
||||
<Grid RowDefinitions="Auto,Auto,Auto,*,Auto" Margin="24" RowSpacing="14">
|
||||
<StackPanel Grid.Row="0" Spacing="4">
|
||||
<TextBlock Text="Stundenplan aus WebUntis" Classes="dialogtitle"/>
|
||||
<TextBlock Text="Wähle eine typische Unterrichtswoche. Vorhandene Einträge werden vorgeschlagen und erst nach Bestätigung ersetzt."
|
||||
<TextBlock Text="WebUntis-Zuordnung abgleichen" Classes="dialogtitle"/>
|
||||
<TextBlock Text="Wähle eine typische Unterrichtswoche und prüfe die Zuordnung. Unterrichtsnummern und dauerhafter Stundenplan werden nur beim Übernehmen angepasst."
|
||||
FontSize="12" Opacity="0.65" TextWrapping="Wrap"/>
|
||||
</StackPanel>
|
||||
<Grid Grid.Row="1" ColumnDefinitions="2*,*,Auto" ColumnSpacing="10">
|
||||
<Grid Grid.Row="1" ColumnDefinitions="2*,*,Auto" ColumnSpacing="10" IsEnabled="{Binding !Busy}">
|
||||
<ComboBox Grid.Column="0" ItemsSource="{Binding Teachers}" SelectedItem="{Binding SelectedTeacher}">
|
||||
<ComboBox.ItemTemplate>
|
||||
<DataTemplate x:DataType="svc:UntisTeacherDto"><TextBlock Text="{Binding DisplayName}"/></DataTemplate>
|
||||
@@ -22,23 +22,35 @@
|
||||
<CalendarDatePicker Grid.Column="1" SelectedDate="{Binding WeekDate, Converter={x:Static conv:DateTimeOffsetToDateTimeConverter.Instance}}"/>
|
||||
<Button Grid.Column="2" Content="Woche laden" Command="{Binding LoadCommand}" IsEnabled="{Binding !Busy}"/>
|
||||
</Grid>
|
||||
<ScrollViewer Grid.Row="2">
|
||||
<StackPanel Grid.Row="2" Spacing="4" IsEnabled="{Binding !Busy}">
|
||||
<CheckBox Content="Unterrichtsnummern der Lerngruppen aktualisieren" IsChecked="{Binding UpdateLessonIds}"/>
|
||||
<CheckBox Content="Dauerhaften Stundenplan aktualisieren (zugeordnete Stunden ersetzen oder ergänzen)" IsChecked="{Binding UpdateTimetable}"/>
|
||||
<CheckBox Content="Auch bisherige Stunden entfernen, die in der Auswahl fehlen (gesamten Stundenplan ersetzen)"
|
||||
IsChecked="{Binding ReplaceTimetable}" IsEnabled="{Binding UpdateTimetable}"/>
|
||||
</StackPanel>
|
||||
<ScrollViewer Grid.Row="3" IsEnabled="{Binding !Busy}">
|
||||
<ItemsControl ItemsSource="{Binding Rows}">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate x:DataType="vm:WebUntisTimetableRow">
|
||||
<Grid ColumnDefinitions="48,85,2*,2*,Auto" ColumnSpacing="8" Margin="0,3">
|
||||
<TextBlock Grid.Column="0" Text="{Binding WeekdayLabel}" VerticalAlignment="Center" FontWeight="SemiBold"/>
|
||||
<Grid ColumnDefinitions="65,85,2*,2*,Auto" ColumnSpacing="8" Margin="0,3">
|
||||
<CheckBox Grid.Column="0" Content="{Binding WeekdayLabel}" IsChecked="{Binding Include}" VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1">
|
||||
<TextBlock Text="{Binding PeriodNumber, StringFormat={}{0}. Std.}" FontSize="12"/>
|
||||
<TextBlock Text="{Binding TimeLabel}" FontSize="10" Opacity="0.6"/>
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Column="2" Text="{Binding UntisLabel}" TextWrapping="Wrap" VerticalAlignment="Center"/>
|
||||
<ComboBox Grid.Column="3" ItemsSource="{Binding GroupOptions}" SelectedItem="{Binding SelectedGroup}"
|
||||
<StackPanel Grid.Column="2" Spacing="3">
|
||||
<TextBlock Text="{Binding UntisLabel}" TextWrapping="Wrap"/>
|
||||
<CheckBox Content="{Binding LessonIdLabel}" IsChecked="{Binding ApplyLessonId}" FontSize="11"/>
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Column="3" Spacing="3">
|
||||
<ComboBox ItemsSource="{Binding GroupOptions}" SelectedItem="{Binding SelectedGroup}"
|
||||
PlaceholderText="nicht übernehmen">
|
||||
<ComboBox.ItemTemplate>
|
||||
<DataTemplate x:DataType="vm:WebUntisGroupOption"><TextBlock Text="{Binding DisplayName}"/></DataTemplate>
|
||||
</ComboBox.ItemTemplate>
|
||||
</ComboBox>
|
||||
<TextBlock Text="{Binding ExistingLessonIdLabel}" FontSize="11" Opacity="0.65"/>
|
||||
</StackPanel>
|
||||
<Button Grid.Column="4" Content="Neue Gruppe…" FontSize="11"
|
||||
Command="{Binding $parent[ItemsControl].((vm:WebUntisTimetableImportViewModel)DataContext).CreateGroupCommand}"
|
||||
CommandParameter="{Binding}"/>
|
||||
@@ -47,7 +59,7 @@
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</ScrollViewer>
|
||||
<Grid Grid.Row="3" ColumnDefinitions="*,Auto,Auto" ColumnSpacing="8">
|
||||
<Grid Grid.Row="4" ColumnDefinitions="*,Auto,Auto" ColumnSpacing="8">
|
||||
<TextBlock Grid.Column="0" Text="{Binding Status}" FontSize="12" TextWrapping="Wrap" VerticalAlignment="Center"/>
|
||||
<Button Grid.Column="1" Content="Abbrechen" Click="OnCancel"/>
|
||||
<Button Grid.Column="2" Content="Zuordnung übernehmen" Command="{Binding SaveCommand}" Click="OnSave"
|
||||
|
||||
Reference in new issue
Block a user