aktueller Stand

2026-01-28 12:08:39 +01:00
parent 1283750829
commit ee1f54675e
104 changed files with 6797 additions and 1867 deletions
--- a/FasdDesktopUi/Basics/Models/ConnectionStatusHelper.cs
+++ b/FasdDesktopUi/Basics/Models/ConnectionStatusHelper.cs
@@ -280,7 +280,10 @@ namespace FasdDesktopUi.Basics.Models
                    }

                    if (App.M42OptionMenuItem != null)
-                        App.M42OptionMenuItem.Enabled = userInfo != null;
+                        App.Current.MainWindow.Dispatcher.Invoke(() =>
+                        {
+                                App.M42OptionMenuItem.Enabled = userInfo != null;
+                        });

                    // check, if the are logons needed
                    bool m42Valid = await CheckAndRefreshM42LogonAsync();
--- a/FasdDesktopUi/Basics/Models/HeadingDataModel.cs
+++ b/FasdDesktopUi/Basics/Models/HeadingDataModel.cs
@@ -9,6 +9,7 @@ namespace FasdDesktopUi.Basics.Models
        public enumFasdInformationClass InformationClass { get; set; }
        public bool IsOnline { get; set; }
        public cF4sdIdentityList Identities { get; set; }
+        public cF4sdApiSearchResultRelation Realtion { get; set; }
    }

    public class cSwapCaseInfo
--- a/FasdDesktopUi/Basics/Models/NamedParameterEntry.cs
+++ b/FasdDesktopUi/Basics/Models/NamedParameterEntry.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Windows;

 using C4IT.F4SD.DisplayFormatting;
+using C4IT.F4SD.SupportCaseProtocoll.Models;
 using C4IT.FASD.Base;

 using FasdCockpitBase;
@@ -49,6 +50,7 @@ namespace FasdDesktopUi.Basics.Models
            try
            {
                cUtility.RawValueFormatter.SetDefaultCulture(new System.Globalization.CultureInfo(cFasdCockpitConfig.Instance.SelectedLanguage));
+                cUtility.RawValueFormatter.SetDefaultTimeZone(TimeZoneInfo.Local);

                var outputTable = dataProvider.HealthCardDataHelper.HealthCardRawData.GetTableByName(valueAdress.ValueTable, true);
                if (outputTable != null)
--- a/FasdDesktopUi/Basics/Models/TicketOverviewModel.cs
+++ b/FasdDesktopUi/Basics/Models/TicketOverviewModel.cs
@@ -69,79 +69,79 @@ namespace FasdDesktopUi.Basics.Models
            set { if (_unassignedTicketsSelected != value) { _unassignedTicketsSelected = value; OnPropertyChanged(nameof(UnassignedTicketsSelected)); } }
        }

-        private bool _unassignedTicketsCriticalSelected;
-        public bool UnassignedTicketsCriticalSelected
-        {
-            get => _unassignedTicketsCriticalSelected;
-            set { if (_unassignedTicketsCriticalSelected != value) { _unassignedTicketsCriticalSelected = value; OnPropertyChanged(nameof(UnassignedTicketsCriticalSelected)); } }
-        }
-        #endregion
-
-        #region Highlight-Properties
-        private bool _ticketsNewHighlighted;
-        public bool TicketsNewHighlighted { get => _ticketsNewHighlighted; set { if (_ticketsNewHighlighted != value) { _ticketsNewHighlighted = value; OnPropertyChanged(nameof(TicketsNewHighlighted)); } } }
-
-        private bool _ticketsActiveHighlighted;
-        public bool TicketsActiveHighlighted { get => _ticketsActiveHighlighted; set { if (_ticketsActiveHighlighted != value) { _ticketsActiveHighlighted = value; OnPropertyChanged(nameof(TicketsActiveHighlighted)); } } }
-
-        private bool _ticketsCriticalHighlighted;
-        public bool TicketsCriticalHighlighted { get => _ticketsCriticalHighlighted; set { if (_ticketsCriticalHighlighted != value) { _ticketsCriticalHighlighted = value; OnPropertyChanged(nameof(TicketsCriticalHighlighted)); } } }
-
-        private bool _ticketsNewInfoHighlighted;
-        public bool TicketsNewInfoHighlighted { get => _ticketsNewInfoHighlighted; set { if (_ticketsNewInfoHighlighted != value) { _ticketsNewInfoHighlighted = value; OnPropertyChanged(nameof(TicketsNewInfoHighlighted)); } } }
-
-        private bool _incidentNewHighlighted;
-        public bool IncidentNewHighlighted { get => _incidentNewHighlighted; set { if (_incidentNewHighlighted != value) { _incidentNewHighlighted = value; OnPropertyChanged(nameof(IncidentNewHighlighted)); } } }
-
-        private bool _incidentActiveHighlighted;
-        public bool IncidentActiveHighlighted { get => _incidentActiveHighlighted; set { if (_incidentActiveHighlighted != value) { _incidentActiveHighlighted = value; OnPropertyChanged(nameof(IncidentActiveHighlighted)); } } }
-
-        private bool _incidentCriticalHighlighted;
-        public bool IncidentCriticalHighlighted { get => _incidentCriticalHighlighted; set { if (_incidentCriticalHighlighted != value) { _incidentCriticalHighlighted = value; OnPropertyChanged(nameof(IncidentCriticalHighlighted)); } } }
-
-        private bool _incidentNewInfoHighlighted;
-        public bool IncidentNewInfoHighlighted { get => _incidentNewInfoHighlighted; set { if (_incidentNewInfoHighlighted != value) { _incidentNewInfoHighlighted = value; OnPropertyChanged(nameof(IncidentNewInfoHighlighted)); } } }
-
-        private bool _unassignedTicketsHighlighted;
-        public bool UnassignedTicketsHighlighted { get => _unassignedTicketsHighlighted; set { if (_unassignedTicketsHighlighted != value) { _unassignedTicketsHighlighted = value; OnPropertyChanged(nameof(UnassignedTicketsHighlighted)); } } }
-
-        private bool _unassignedTicketsCriticalHighlighted;
-        public bool UnassignedTicketsCriticalHighlighted { get => _unassignedTicketsCriticalHighlighted; set { if (_unassignedTicketsCriticalHighlighted != value) { _unassignedTicketsCriticalHighlighted = value; OnPropertyChanged(nameof(UnassignedTicketsCriticalHighlighted)); } } }
-        #endregion
-
-        #region Change Hint Properties
-        private string _ticketsNewChangeHint;
-        public string TicketsNewChangeHint { get => _ticketsNewChangeHint; set { if (_ticketsNewChangeHint != value) { _ticketsNewChangeHint = value; OnPropertyChanged(nameof(TicketsNewChangeHint)); } } }
-
-        private string _ticketsActiveChangeHint;
-        public string TicketsActiveChangeHint { get => _ticketsActiveChangeHint; set { if (_ticketsActiveChangeHint != value) { _ticketsActiveChangeHint = value; OnPropertyChanged(nameof(TicketsActiveChangeHint)); } } }
-
-        private string _ticketsCriticalChangeHint;
-        public string TicketsCriticalChangeHint { get => _ticketsCriticalChangeHint; set { if (_ticketsCriticalChangeHint != value) { _ticketsCriticalChangeHint = value; OnPropertyChanged(nameof(TicketsCriticalChangeHint)); } } }
-
-        private string _ticketsNewInfoChangeHint;
-        public string TicketsNewInfoChangeHint { get => _ticketsNewInfoChangeHint; set { if (_ticketsNewInfoChangeHint != value) { _ticketsNewInfoChangeHint = value; OnPropertyChanged(nameof(TicketsNewInfoChangeHint)); } } }
-
-        private string _incidentNewChangeHint;
-        public string IncidentNewChangeHint { get => _incidentNewChangeHint; set { if (_incidentNewChangeHint != value) { _incidentNewChangeHint = value; OnPropertyChanged(nameof(IncidentNewChangeHint)); } } }
-
-        private string _incidentActiveChangeHint;
-        public string IncidentActiveChangeHint { get => _incidentActiveChangeHint; set { if (_incidentActiveChangeHint != value) { _incidentActiveChangeHint = value; OnPropertyChanged(nameof(IncidentActiveChangeHint)); } } }
-
-        private string _incidentCriticalChangeHint;
-        public string IncidentCriticalChangeHint { get => _incidentCriticalChangeHint; set { if (_incidentCriticalChangeHint != value) { _incidentCriticalChangeHint = value; OnPropertyChanged(nameof(IncidentCriticalChangeHint)); } } }
-
-        private string _incidentNewInfoChangeHint;
-        public string IncidentNewInfoChangeHint { get => _incidentNewInfoChangeHint; set { if (_incidentNewInfoChangeHint != value) { _incidentNewInfoChangeHint = value; OnPropertyChanged(nameof(IncidentNewInfoChangeHint)); } } }
-
-        private string _unassignedTicketsChangeHint;
-        public string UnassignedTicketsChangeHint { get => _unassignedTicketsChangeHint; set { if (_unassignedTicketsChangeHint != value) { _unassignedTicketsChangeHint = value; OnPropertyChanged(nameof(UnassignedTicketsChangeHint)); } } }
-
-        private string _unassignedTicketsCriticalChangeHint;
-        public string UnassignedTicketsCriticalChangeHint { get => _unassignedTicketsCriticalChangeHint; set { if (_unassignedTicketsCriticalChangeHint != value) { _unassignedTicketsCriticalChangeHint = value; OnPropertyChanged(nameof(UnassignedTicketsCriticalChangeHint)); } } }
-        #endregion
-
-        #region Ticket & Incident-Properties
+        private bool _unassignedTicketsCriticalSelected;
+        public bool UnassignedTicketsCriticalSelected
+        {
+            get => _unassignedTicketsCriticalSelected;
+            set { if (_unassignedTicketsCriticalSelected != value) { _unassignedTicketsCriticalSelected = value; OnPropertyChanged(nameof(UnassignedTicketsCriticalSelected)); } }
+        }
+        #endregion
+
+        #region Highlight-Properties
+        private bool _ticketsNewHighlighted;
+        public bool TicketsNewHighlighted { get => _ticketsNewHighlighted; set { if (_ticketsNewHighlighted != value) { _ticketsNewHighlighted = value; OnPropertyChanged(nameof(TicketsNewHighlighted)); } } }
+
+        private bool _ticketsActiveHighlighted;
+        public bool TicketsActiveHighlighted { get => _ticketsActiveHighlighted; set { if (_ticketsActiveHighlighted != value) { _ticketsActiveHighlighted = value; OnPropertyChanged(nameof(TicketsActiveHighlighted)); } } }
+
+        private bool _ticketsCriticalHighlighted;
+        public bool TicketsCriticalHighlighted { get => _ticketsCriticalHighlighted; set { if (_ticketsCriticalHighlighted != value) { _ticketsCriticalHighlighted = value; OnPropertyChanged(nameof(TicketsCriticalHighlighted)); } } }
+
+        private bool _ticketsNewInfoHighlighted;
+        public bool TicketsNewInfoHighlighted { get => _ticketsNewInfoHighlighted; set { if (_ticketsNewInfoHighlighted != value) { _ticketsNewInfoHighlighted = value; OnPropertyChanged(nameof(TicketsNewInfoHighlighted)); } } }
+
+        private bool _incidentNewHighlighted;
+        public bool IncidentNewHighlighted { get => _incidentNewHighlighted; set { if (_incidentNewHighlighted != value) { _incidentNewHighlighted = value; OnPropertyChanged(nameof(IncidentNewHighlighted)); } } }
+
+        private bool _incidentActiveHighlighted;
+        public bool IncidentActiveHighlighted { get => _incidentActiveHighlighted; set { if (_incidentActiveHighlighted != value) { _incidentActiveHighlighted = value; OnPropertyChanged(nameof(IncidentActiveHighlighted)); } } }
+
+        private bool _incidentCriticalHighlighted;
+        public bool IncidentCriticalHighlighted { get => _incidentCriticalHighlighted; set { if (_incidentCriticalHighlighted != value) { _incidentCriticalHighlighted = value; OnPropertyChanged(nameof(IncidentCriticalHighlighted)); } } }
+
+        private bool _incidentNewInfoHighlighted;
+        public bool IncidentNewInfoHighlighted { get => _incidentNewInfoHighlighted; set { if (_incidentNewInfoHighlighted != value) { _incidentNewInfoHighlighted = value; OnPropertyChanged(nameof(IncidentNewInfoHighlighted)); } } }
+
+        private bool _unassignedTicketsHighlighted;
+        public bool UnassignedTicketsHighlighted { get => _unassignedTicketsHighlighted; set { if (_unassignedTicketsHighlighted != value) { _unassignedTicketsHighlighted = value; OnPropertyChanged(nameof(UnassignedTicketsHighlighted)); } } }
+
+        private bool _unassignedTicketsCriticalHighlighted;
+        public bool UnassignedTicketsCriticalHighlighted { get => _unassignedTicketsCriticalHighlighted; set { if (_unassignedTicketsCriticalHighlighted != value) { _unassignedTicketsCriticalHighlighted = value; OnPropertyChanged(nameof(UnassignedTicketsCriticalHighlighted)); } } }
+        #endregion
+
+        #region Change Hint Properties
+        private string _ticketsNewChangeHint;
+        public string TicketsNewChangeHint { get => _ticketsNewChangeHint; set { if (_ticketsNewChangeHint != value) { _ticketsNewChangeHint = value; OnPropertyChanged(nameof(TicketsNewChangeHint)); } } }
+
+        private string _ticketsActiveChangeHint;
+        public string TicketsActiveChangeHint { get => _ticketsActiveChangeHint; set { if (_ticketsActiveChangeHint != value) { _ticketsActiveChangeHint = value; OnPropertyChanged(nameof(TicketsActiveChangeHint)); } } }
+
+        private string _ticketsCriticalChangeHint;
+        public string TicketsCriticalChangeHint { get => _ticketsCriticalChangeHint; set { if (_ticketsCriticalChangeHint != value) { _ticketsCriticalChangeHint = value; OnPropertyChanged(nameof(TicketsCriticalChangeHint)); } } }
+
+        private string _ticketsNewInfoChangeHint;
+        public string TicketsNewInfoChangeHint { get => _ticketsNewInfoChangeHint; set { if (_ticketsNewInfoChangeHint != value) { _ticketsNewInfoChangeHint = value; OnPropertyChanged(nameof(TicketsNewInfoChangeHint)); } } }
+
+        private string _incidentNewChangeHint;
+        public string IncidentNewChangeHint { get => _incidentNewChangeHint; set { if (_incidentNewChangeHint != value) { _incidentNewChangeHint = value; OnPropertyChanged(nameof(IncidentNewChangeHint)); } } }
+
+        private string _incidentActiveChangeHint;
+        public string IncidentActiveChangeHint { get => _incidentActiveChangeHint; set { if (_incidentActiveChangeHint != value) { _incidentActiveChangeHint = value; OnPropertyChanged(nameof(IncidentActiveChangeHint)); } } }
+
+        private string _incidentCriticalChangeHint;
+        public string IncidentCriticalChangeHint { get => _incidentCriticalChangeHint; set { if (_incidentCriticalChangeHint != value) { _incidentCriticalChangeHint = value; OnPropertyChanged(nameof(IncidentCriticalChangeHint)); } } }
+
+        private string _incidentNewInfoChangeHint;
+        public string IncidentNewInfoChangeHint { get => _incidentNewInfoChangeHint; set { if (_incidentNewInfoChangeHint != value) { _incidentNewInfoChangeHint = value; OnPropertyChanged(nameof(IncidentNewInfoChangeHint)); } } }
+
+        private string _unassignedTicketsChangeHint;
+        public string UnassignedTicketsChangeHint { get => _unassignedTicketsChangeHint; set { if (_unassignedTicketsChangeHint != value) { _unassignedTicketsChangeHint = value; OnPropertyChanged(nameof(UnassignedTicketsChangeHint)); } } }
+
+        private string _unassignedTicketsCriticalChangeHint;
+        public string UnassignedTicketsCriticalChangeHint { get => _unassignedTicketsCriticalChangeHint; set { if (_unassignedTicketsCriticalChangeHint != value) { _unassignedTicketsCriticalChangeHint = value; OnPropertyChanged(nameof(UnassignedTicketsCriticalChangeHint)); } } }
+        #endregion
+
+        #region Ticket & Incident-Properties

        // Ticket Properties
        private int _ticketsNew;
@@ -184,11 +184,11 @@ namespace FasdDesktopUi.Basics.Models

        #region Helper-Methods    

-        public void ResetSelection()
-        {
-            TicketsNewSelected = false;
-            TicketsActiveSelected = false;
-            TicketsCriticalSelected = false;
+        public void ResetSelection()
+        {
+            TicketsNewSelected = false;
+            TicketsActiveSelected = false;
+            TicketsCriticalSelected = false;
            TicketsNewInfoSelected = false;

            IncidentNewSelected = false;
@@ -196,38 +196,44 @@ namespace FasdDesktopUi.Basics.Models
            IncidentCriticalSelected = false;
            IncidentNewInfoSelected = false;

-            UnassignedTicketsSelected = false;
-            UnassignedTicketsCriticalSelected = false;
-        }
-
-        public void ResetHighlights()
-        {
-            TicketsNewHighlighted = false;
-            TicketsActiveHighlighted = false;
-            TicketsCriticalHighlighted = false;
-            TicketsNewInfoHighlighted = false;
-
-            IncidentNewHighlighted = false;
-            IncidentActiveHighlighted = false;
-            IncidentCriticalHighlighted = false;
-            IncidentNewInfoHighlighted = false;
-
-            UnassignedTicketsHighlighted = false;
-            UnassignedTicketsCriticalHighlighted = false;
-
-            TicketsNewChangeHint = null;
-            TicketsActiveChangeHint = null;
-            TicketsCriticalChangeHint = null;
-            TicketsNewInfoChangeHint = null;
-
-            IncidentNewChangeHint = null;
-            IncidentActiveChangeHint = null;
-            IncidentCriticalChangeHint = null;
-            IncidentNewInfoChangeHint = null;
-
-            UnassignedTicketsChangeHint = null;
-            UnassignedTicketsCriticalChangeHint = null;
-        }
-        #endregion
-    }
-}
+            UnassignedTicketsSelected = false;
+            UnassignedTicketsCriticalSelected = false;
+        }
+
+        public void ResetHighlights()
+        {
+            TicketsNewHighlighted = false;
+            TicketsActiveHighlighted = false;
+            TicketsCriticalHighlighted = false;
+            TicketsNewInfoHighlighted = false;
+
+            IncidentNewHighlighted = false;
+            IncidentActiveHighlighted = false;
+            IncidentCriticalHighlighted = false;
+            IncidentNewInfoHighlighted = false;
+
+            UnassignedTicketsHighlighted = false;
+            UnassignedTicketsCriticalHighlighted = false;
+
+            TicketsNewChangeHint = null;
+            TicketsActiveChangeHint = null;
+            TicketsCriticalChangeHint = null;
+            TicketsNewInfoChangeHint = null;
+
+            IncidentNewChangeHint = null;
+            IncidentActiveChangeHint = null;
+            IncidentCriticalChangeHint = null;
+            IncidentNewInfoChangeHint = null;
+
+            UnassignedTicketsChangeHint = null;
+            UnassignedTicketsCriticalChangeHint = null;
+        }
+        #endregion
+
+        public TicketOverviewModel()
+        {
+
+        }
+    }
+
+}