Fixed notification event display on client side

This commit is contained in:
Daniel Schick 2025-01-13 11:45:13 +01:00
parent ba8778cc3f
commit 5eb1074a79
7 changed files with 2032 additions and 656 deletions

File diff suppressed because it is too large Load Diff

View File

@ -144,6 +144,10 @@ namespace BreCalClient
ap.NotificationDisplay = Resources.Resources.textTimeConflict; break; ap.NotificationDisplay = Resources.Resources.textTimeConflict; break;
case misc.Model.NotificationType.TimeConflictResolved: case misc.Model.NotificationType.TimeConflictResolved:
ap.NotificationDisplay = Resources.Resources.textTimeConflictResolved; break; ap.NotificationDisplay = Resources.Resources.textTimeConflictResolved; break;
case misc.Model.NotificationType.MissingData:
ap.NotificationDisplay = Resources.Resources.textMissingData; break;
case misc.Model.NotificationType.Cancelled:
ap.NotificationDisplay = Resources.Resources.textCancelled; break;
case misc.Model.NotificationType.Unassigned: case misc.Model.NotificationType.Unassigned:
ap.NotificationDisplay = Resources.Resources.textUnassigned; break; ap.NotificationDisplay = Resources.Resources.textUnassigned; break;
} }

View File

@ -34,6 +34,12 @@ namespace BreCalClient
case "Unassigned": case "Unassigned":
this.ContentWrapper.Background = Brushes.Gray; this.ContentWrapper.Background = Brushes.Gray;
break; break;
case "MissingData":
this.ContentWrapper.Background= Brushes.Yellow;
break;
case "Cancelled":
this.ContentWrapper.Background = Brushes.DarkGray;
break;
default: default:
break; break;

View File

@ -25,7 +25,7 @@
<Setter Property="Foreground" Value="DarkOrange"/> <Setter Property="Foreground" Value="DarkOrange"/>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding NotificationType}" Value="TimeConflict"> <DataTrigger Binding="{Binding NotificationType}" Value="TimeConflict">
<Setter Property="Foreground" Value="Red"/> <Setter Property="Background" Value="Red"/>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding NotificationType}" Value="TimeConflictResolved"> <DataTrigger Binding="{Binding NotificationType}" Value="TimeConflictResolved">
<Setter Property="Foreground" Value="Green"/> <Setter Property="Foreground" Value="Green"/>
@ -33,6 +33,12 @@
<DataTrigger Binding="{Binding NotificationType}" Value="Unassigned"> <DataTrigger Binding="{Binding NotificationType}" Value="Unassigned">
<Setter Property="Foreground" Value="DarkGray"/> <Setter Property="Foreground" Value="DarkGray"/>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding NotificationType}" Value="MissingData">
<Setter Property="Foreground" Value="Yellow" />
</DataTrigger>
<DataTrigger Binding="{Binding NotificationType}" Value="Cancelled">
<Setter Property="Background" Value="LightGray" />
</DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</local:ENIDataGrid.RowStyle> </local:ENIDataGrid.RowStyle>

View File

@ -876,6 +876,15 @@ namespace BreCalClient.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to The participant has not provided any info.
/// </summary>
public static string textMissingData {
get {
return ResourceManager.GetString("textMissingData", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Moored in lock. /// Looks up a localized string similar to Moored in lock.
/// </summary> /// </summary>
@ -1254,6 +1263,15 @@ namespace BreCalClient.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to The shipcall was cancelled.
/// </summary>
public static string textShipcallCancelled {
get {
return ResourceManager.GetString("textShipcallCancelled", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Ship length. /// Looks up a localized string similar to Ship length.
/// </summary> /// </summary>

View File

@ -286,6 +286,9 @@
<data name="textFrom" xml:space="preserve"> <data name="textFrom" xml:space="preserve">
<value>von</value> <value>von</value>
</data> </data>
<data name="textHarbour" xml:space="preserve">
<value>Hafen</value>
</data>
<data name="textIncoming" xml:space="preserve"> <data name="textIncoming" xml:space="preserve">
<value>Einkommend</value> <value>Einkommend</value>
</data> </data>
@ -550,9 +553,6 @@
<data name="textStartTimeMissing" xml:space="preserve"> <data name="textStartTimeMissing" xml:space="preserve">
<value>Wenn eine Ende-Zeit angegeben wird, muss auch eine Start-Zeit angegeben werden</value> <value>Wenn eine Ende-Zeit angegeben wird, muss auch eine Start-Zeit angegeben werden</value>
</data> </data>
<data name="textHarbour" xml:space="preserve">
<value>Hafen</value>
</data>
<data name="textInformationUpdated" xml:space="preserve"> <data name="textInformationUpdated" xml:space="preserve">
<value>Einstellungen erfolgreich aktualisiert</value> <value>Einstellungen erfolgreich aktualisiert</value>
</data> </data>
@ -565,21 +565,21 @@
<data name="textNotifyPush" xml:space="preserve"> <data name="textNotifyPush" xml:space="preserve">
<value>Banner / Push Benachrichtigung in App</value> <value>Banner / Push Benachrichtigung in App</value>
</data> </data>
<data name="textAssignment" xml:space="preserve">
<value>Teilnehmer wurde nominiert</value>
</data>
<data name="textDate" xml:space="preserve"> <data name="textDate" xml:space="preserve">
<value>Datum</value> <value>Datum</value>
</data> </data>
<data name="textNext24h" xml:space="preserve">
<value>Relevant für Morgenrunde (24hrs)</value>
</data>
<data name="textShipcall" xml:space="preserve"> <data name="textShipcall" xml:space="preserve">
<value>Anlauf</value> <value>Anlauf</value>
</data> </data>
<data name="textShowNotifications" xml:space="preserve"> <data name="textShowNotifications" xml:space="preserve">
<value>Benachrichtigungen anzeigen</value> <value>Benachrichtigungen anzeigen</value>
</data> </data>
<data name="textAssignment" xml:space="preserve">
<value>Teilnehmer wurde nominiert</value>
</data>
<data name="textNext24h" xml:space="preserve">
<value>Relevant für Morgenrunde (24hrs)</value>
</data>
<data name="textTimeConflict" xml:space="preserve"> <data name="textTimeConflict" xml:space="preserve">
<value>"Ampel"-Regel(n) wurde verletzt</value> <value>"Ampel"-Regel(n) wurde verletzt</value>
</data> </data>
@ -589,4 +589,10 @@
<data name="textUnassigned" xml:space="preserve"> <data name="textUnassigned" xml:space="preserve">
<value>Nominierung des Teilnehmer entfernt</value> <value>Nominierung des Teilnehmer entfernt</value>
</data> </data>
<data name="textMissingData" xml:space="preserve">
<value>Der Teilnehmer hat keine Daten eingetragen</value>
</data>
<data name="textShipcallCancelled" xml:space="preserve">
<value>Der Anlauf wurde storniert</value>
</data>
</root> </root>

View File

@ -640,4 +640,10 @@
<data name="textUnassigned" xml:space="preserve"> <data name="textUnassigned" xml:space="preserve">
<value>Participant unassigned from shipcall</value> <value>Participant unassigned from shipcall</value>
</data> </data>
<data name="textMissingData" xml:space="preserve">
<value>The participant has not provided any info</value>
</data>
<data name="textShipcallCancelled" xml:space="preserve">
<value>The shipcall was cancelled</value>
</data>
</root> </root>