UX-Update 2.0, Neues Dashboard

2026-08-29 00:45:19 +02:00
parent 229ef79e75
commit 9b04d7eb98
14 changed files with 774 additions and 355 deletions
@@ -28,11 +28,37 @@
        <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8">
          <Button Content="Klassenbuch abgleichen…" Click="OnCompareWebUntisDocumentationClick"
                  VerticalAlignment="Center"/>
-          <Button Content="Dashboard anpassen" Command="{Binding ToggleDashboardSettingsCommand}"
+          <Button Content="Bereiche anpassen" Command="{Binding ToggleDashboardSettingsCommand}"
                  VerticalAlignment="Center"/>
        </StackPanel>
      </Grid>

+      <!-- Der Tagesfokus beantwortet zuerst die vier Fragen, die beim Öffnen der App zählen:
+           Was unterrichte ich, was ist zu tun, wo muss ich reagieren und was steht an? -->
+      <Border Background="{DynamicResource AppCardBackgroundBrush}"
+              BorderBrush="{DynamicResource AppCardBorderBrush}" BorderThickness="1"
+              CornerRadius="10" Padding="16,14">
+        <Grid ColumnDefinitions="*,*,*,*">
+          <StackPanel Grid.Column="0" Spacing="3">
+            <TextBlock Text="UNTERRICHT HEUTE" FontSize="10" FontWeight="Bold" Opacity="0.5"/>
+            <TextBlock Text="{Binding TodayLessonSummary}" FontSize="18" FontWeight="SemiBold"/>
+          </StackPanel>
+          <StackPanel Grid.Column="1" Spacing="3" Margin="18,0,0,0">
+            <TextBlock Text="AUFGABEN" FontSize="10" FontWeight="Bold" Opacity="0.5"/>
+            <TextBlock Text="{Binding OpenTaskSummary}" FontSize="18" FontWeight="SemiBold"/>
+          </StackPanel>
+          <StackPanel Grid.Column="2" Spacing="3" Margin="18,0,0,0">
+            <TextBlock Text="HANDLUNGSBEDARF" FontSize="10" FontWeight="Bold" Opacity="0.5"/>
+            <TextBlock Text="{Binding AttentionSummary}" FontSize="18" FontWeight="SemiBold"
+                       Foreground="{DynamicResource AppStatusWarningBrush}"/>
+          </StackPanel>
+          <StackPanel Grid.Column="3" Spacing="3" Margin="18,0,0,0">
+            <TextBlock Text="NÄCHSTE 30 TAGE" FontSize="10" FontWeight="Bold" Opacity="0.5"/>
+            <TextBlock Text="{Binding UpcomingSummary}" FontSize="18" FontWeight="SemiBold"/>
+          </StackPanel>
+        </Grid>
+      </Border>
+
      <Border Background="{DynamicResource SystemControlBackgroundAltHighBrush}" CornerRadius="8"
              Padding="12" IsVisible="{Binding IsDashboardSettingsOpen}">
        <ItemsControl ItemsSource="{Binding DashboardCards}">
@@ -59,14 +85,15 @@
      </Border>

      <!-- Serverseitig gecachte DWD-Daten für den in den Einstellungen hinterlegten Schulstandort. -->
-      <Border Background="{DynamicResource SystemControlBackgroundAltHighBrush}" CornerRadius="8"
-              Padding="16" IsVisible="{Binding IsWeatherPanelVisible}">
-        <StackPanel Spacing="10">
+      <Expander Header="{Binding WeatherSummary}" IsExpanded="{Binding HasWeatherWarnings}"
+                IsVisible="{Binding IsWeatherPanelVisible}"
+                Background="{DynamicResource AppCardBackgroundBrush}"
+                BorderBrush="{DynamicResource AppCardBorderBrush}" BorderThickness="1"
+                CornerRadius="8" Padding="12,6">
+        <StackPanel Spacing="10" Margin="6,8,6,6">
          <Grid ColumnDefinitions="*,Auto">
            <StackPanel>
              <TextBlock Text="WETTER AM SCHULSTANDORT" FontSize="11" FontWeight="Bold" Opacity="0.5"/>
-              <TextBlock Text="{Binding WeatherSummary}" FontSize="20" FontWeight="SemiBold" Margin="0,5,0,0"
-                         IsVisible="{Binding WeatherSummary, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
              <TextBlock Text="{Binding WeatherDetails}" FontSize="11" Opacity="0.65" TextWrapping="Wrap"
                         IsVisible="{Binding WeatherDetails, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
            </StackPanel>
@@ -96,17 +123,20 @@
          </ItemsControl>
          <TextBlock Text="Wetterdaten © Deutscher Wetterdienst" FontSize="10" Opacity="0.5"/>
        </StackPanel>
-      </Border>
+      </Expander>

-      <Grid ColumnDefinitions="*,*" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
+      <TextBlock Text="HEUTE UND HANDLUNGSBEDARF" FontSize="11" FontWeight="Bold" Opacity="0.5"
+                 Margin="2,2,0,-8"/>
+
+      <Grid ColumnDefinitions="3*,2*" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">

        <!-- Heutige Stunden -->
        <Border Grid.Column="{Binding TodayCard.Column}" Grid.Row="{Binding TodayCard.Row}"
-                IsVisible="{Binding TodayCard.IsVisible}" Margin="0,0,8,8"
+                IsVisible="{Binding TodayCard.EffectiveIsVisible}" Margin="0,0,8,8"
                Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
                CornerRadius="8" Padding="16">
          <StackPanel>
-            <TextBlock Text="HEUTE" FontSize="11" FontWeight="Bold"
+            <TextBlock Text="Heute" FontSize="14" FontWeight="SemiBold"
                       Opacity="0.5" Margin="0,0,0,10"/>
            <ItemsControl ItemsSource="{Binding TodaysLessons}">
              <ItemsControl.ItemTemplate>
@@ -143,12 +173,12 @@

        <!-- Offene Aufgaben -->
        <Border Grid.Column="{Binding TasksCard.Column}" Grid.Row="{Binding TasksCard.Row}"
-                IsVisible="{Binding TasksCard.IsVisible}" Margin="8,0,0,8"
+                IsVisible="{Binding TasksCard.EffectiveIsVisible}" Margin="8,0,0,8"
                Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
                CornerRadius="8" Padding="16">
          <StackPanel>
            <Grid ColumnDefinitions="*,Auto,Auto" Margin="0,0,0,10">
-              <TextBlock Grid.Column="0" Text="OFFENE AUFGABEN" FontSize="11" FontWeight="Bold"
+              <TextBlock Grid.Column="0" Text="Offene Aufgaben" FontSize="14" FontWeight="SemiBold"
                         Opacity="0.5" VerticalAlignment="Center"/>
              <Button Grid.Column="1" Content="🔔＋" FontSize="12" Padding="7,2" Margin="0,0,4,0"
                      ToolTip.Tip="Erinnerung anlegen" Command="{Binding AddReminderCommand}"/>
@@ -180,7 +210,7 @@
        <!-- Kalender: feste Position direkt unter Heute/Aufgaben, damit die wachsende
             Lerngruppen-Liste darunter ihn nicht nach unten verdrängt. -->
        <Border Grid.Column="{Binding CalendarCard.Column}" Grid.Row="{Binding CalendarCard.Row}"
-                IsVisible="{Binding CalendarCard.IsVisible}" Margin="0,0,8,8"
+                IsVisible="{Binding CalendarCard.EffectiveIsVisible}" Margin="0,0,8,8"
                Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
                CornerRadius="8" Padding="16">
          <StackPanel Spacing="8">
@@ -321,7 +351,7 @@

        <!-- Offene Entschuldigungen: neben dem Kalender, ebenfalls feste Position -->
        <Border Grid.Column="{Binding ExcusesCard.Column}" Grid.Row="{Binding ExcusesCard.Row}"
-                IsVisible="{Binding ExcusesCard.IsVisible}" Margin="8,0,0,8" VerticalAlignment="Top"
+                IsVisible="{Binding ExcusesCard.EffectiveIsVisible}" Margin="8,0,0,8" VerticalAlignment="Top"
                Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
                CornerRadius="8" Padding="16">
          <StackPanel>
@@ -355,7 +385,7 @@

        <!-- Fehlzeiten-Warnung (5.2.3) -->
        <Border Grid.Column="{Binding AttendanceCard.Column}" Grid.Row="{Binding AttendanceCard.Row}"
-                IsVisible="{Binding AttendanceCard.IsVisible}" Margin="0,0,8,8" VerticalAlignment="Top"
+                IsVisible="{Binding AttendanceCard.EffectiveIsVisible}" Margin="0,0,8,8" VerticalAlignment="Top"
                Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
                CornerRadius="8" Padding="16">
          <StackPanel>
@@ -385,7 +415,7 @@

        <!-- Förderplan-Wiedervorlage (5.3.2) -->
        <Border Grid.Column="{Binding SupportCard.Column}" Grid.Row="{Binding SupportCard.Row}"
-                IsVisible="{Binding SupportCard.IsVisible}" Margin="8,0,0,8" VerticalAlignment="Top"
+                IsVisible="{Binding SupportCard.EffectiveIsVisible}" Margin="8,0,0,8" VerticalAlignment="Top"
                Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
                CornerRadius="8" Padding="16">
          <StackPanel>
@@ -416,7 +446,7 @@

        <!-- Anstehende Termine (9.3) -->
        <Border Grid.Column="{Binding UpcomingCard.Column}" Grid.Row="{Binding UpcomingCard.Row}"
-                IsVisible="{Binding UpcomingCard.IsVisible}" Margin="0,0,8,8" VerticalAlignment="Top"
+                IsVisible="{Binding UpcomingCard.EffectiveIsVisible}" Margin="0,0,8,8" VerticalAlignment="Top"
                Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
                CornerRadius="8" Padding="16">
          <StackPanel>
@@ -453,7 +483,7 @@

        <!-- Offene Korrekturen (9.4) -->
        <Border Grid.Column="{Binding CorrectionsCard.Column}" Grid.Row="{Binding CorrectionsCard.Row}"
-                IsVisible="{Binding CorrectionsCard.IsVisible}" Margin="8,0,0,8" VerticalAlignment="Top"
+                IsVisible="{Binding CorrectionsCard.EffectiveIsVisible}" Margin="8,0,0,8" VerticalAlignment="Top"
                Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
                CornerRadius="8" Padding="16">
          <StackPanel>
@@ -486,7 +516,7 @@

        <!-- Ungeplante Stunden -->
        <Border Grid.Column="{Binding UnplannedCard.Column}" Grid.Row="{Binding UnplannedCard.Row}"
-                IsVisible="{Binding UnplannedCard.IsVisible}" Margin="0,0,8,8" VerticalAlignment="Top"
+                IsVisible="{Binding UnplannedCard.EffectiveIsVisible}" Margin="0,0,8,8" VerticalAlignment="Top"
                Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
                CornerRadius="8" Padding="16">
          <StackPanel>
@@ -516,7 +546,7 @@

        <!-- Auffälligkeiten (9.5) -->
        <Border Grid.Column="{Binding AlertsCard.Column}" Grid.Row="{Binding AlertsCard.Row}"
-                IsVisible="{Binding AlertsCard.IsVisible}" Margin="0,0,8,8" VerticalAlignment="Top"
+                IsVisible="{Binding AlertsCard.EffectiveIsVisible}" Margin="0,0,8,8" VerticalAlignment="Top"
                Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
                CornerRadius="8" Padding="16">
          <StackPanel>
@@ -550,7 +580,7 @@

        <!-- Meine Lerngruppen -->
        <Border Grid.Column="{Binding GroupsCard.Column}" Grid.Row="{Binding GroupsCard.Row}"
-                IsVisible="{Binding GroupsCard.IsVisible}"
+                IsVisible="{Binding GroupsCard.EffectiveIsVisible}"
                Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
                CornerRadius="8" Padding="16">
          <StackPanel>