Forráskód Böngészése

avalonia: forced Repositories.Me to be non-null, since it should always be non-null.

Kenric Nugteren 2 hónapja
szülő
commit
c2fc9d314b

+ 1 - 1
PRS.Avalonia/PRS.Avalonia/MainViewModel.cs

@@ -32,7 +32,7 @@ public partial class MainViewModel : ViewModelBase
             Content = viewModel;
             Title = viewModel is IModuleViewModel module
                 ? module.Title
-                : Repositories.Me?.Name ?? "PRS Avalonia";
+                : Repositories.MaybeMe?.Name ?? "PRS Avalonia";
             PrimaryMenu = viewModel.PrimaryMenu;
             SecondaryMenu = viewModel.SecondaryMenu;
             BackButtonVisible = viewModel.BackButtonVisible;

+ 3 - 1
PRS.Avalonia/PRS.Avalonia/RepositoryLayer.cs

@@ -45,7 +45,7 @@ public partial class RepositoryLayer : ObservableObject
 
     public EmployeeModel MeModel { get; private set; }
 
-    public EmployeeShell? Me
+    public EmployeeShell? MaybeMe
     {
         get
         {
@@ -54,6 +54,8 @@ public partial class RepositoryLayer : ObservableObject
         }
     }
 
+    public EmployeeShell Me => MaybeMe ?? throw new Exception("Invalid employee");
+
     public EmployeeAlertModel MyAlerts { get; private set; }
 
     public NotificationModel MyNotifications { get; private set; }

+ 2 - 1
PRS.Avalonia/PRS.Avalonia/ViewModelBase.cs

@@ -52,6 +52,7 @@ public abstract partial class ViewModelBase : ObservableObject, IViewModelBase
                 _dataAccessLayer = new DataAccessLayer();
                 _dataAccessLayer.Connected += (s, e) => Connected();
                 _dataAccessLayer.Disconnected += (s, e) => Disconnected();
+                _dataAccessLayer.Validated += (s, e) => Validated();
             }
 
             _dataAccessLayer ??= new DataAccessLayer();
@@ -103,7 +104,7 @@ public abstract partial class ViewModelBase : ObservableObject, IViewModelBase
     {
     }
 
-    private void Validated()
+    private static void Validated()
     {
         Repositories.MeModel.Refresh(true);
     }