merging again

ViewModels/MainWindowViewModel.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Immutable;
 using System.Collections.ObjectModel;
+using System;
 
 namespace Acosta.ViewModels
 {
@@ -19,6 +20,7 @@ namespace Acosta.ViewModels
         static SuharevaContext myConnection4 = new SuharevaContext();
 
         AuthorizationViewModel authorizationVM = new AuthorizationViewModel();
+               
         public AuthorizationViewModel AuthorizationVM { get => authorizationVM; set => authorizationVM = value; }
 
         AddTradeNetworksViewViewModel addTradeNetworksVM = new AddTradeNetworksViewViewModel(myConnection2);
@@ -31,11 +33,9 @@ namespace Acosta.ViewModels
         AddOutletsViewModel outletVM = new AddOutletsViewModel(myConnection3);
         public AddOutletsViewModel OutletVM { get => outletVM; set => outletVM = value; }
 
-
         //OutletsListViewModel outletListVM = new OutletsListViewModel(myConnection);
         //public OutletsListViewModel OutletListVM { get => outletListVM; set => outletListVM = value; }
 
-
         PersonalAccountViewModel personalAccountVM = new PersonalAccountViewModel(myConnection);
         public PersonalAccountViewModel PersonalAccountVM { get => personalAccountVM; set => personalAccountVM = value; }
 
@@ -168,8 +168,6 @@ namespace Acosta.ViewModels
         /*public List<Role> rolesList => (from p in myConnection.Roles.ToList() where p.Title != "Оператор" select p).ToImmutableList().ToList();
         public List<Employee> userList => (from p in myConnection.Employees.ToList() where p.Role != 1 select p).ToImmutableList().ToList();*/
 
-
-
         public void AddVisitView()
         {
             UC = new AddVisitView();
@@ -183,7 +181,6 @@ namespace Acosta.ViewModels
             UC = new EditVisitView();
         }
 
-
         public void AddProjectsView()
         {
             UC = new AddProjectsView();
@@ -197,7 +194,6 @@ namespace Acosta.ViewModels
             UC = new EditProjectsView();
         }
 
-
         public void BackPersonalAccountView()
         {
             UC = new PersonalAccountView();
@@ -211,7 +207,6 @@ namespace Acosta.ViewModels
             UC = new AuthorizationView();
         }
 
-
         public void AddTradeNetworksView()
         {
             UC = new AddTradeNetworksView();
@@ -221,7 +216,6 @@ namespace Acosta.ViewModels
             UC = new TradeNetworksView();
         }
 
-
         public void AddOutletsView()
         {
             UC = new AddOutletsView();
@@ -235,7 +229,6 @@ namespace Acosta.ViewModels
             UC = new EditOutletsView();
         }
 
-
         public void AddEmployeesView()
         {
 

ViewModels/OutletsListViewModel.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Acosta.Models;
+using Avalonia.Controls;
 using Microsoft.EntityFrameworkCore;
 using ReactiveUI;
 
@@ -20,7 +21,6 @@ namespace Acosta.ViewModels
 
         public List<TradeNetwork> ListTrades => myConnection.TradeNetworks.ToList();
 
-        public Outlet? CurrentOutlet { get => currentOutlet; set => currentOutlet = value; }
-        
+        public Outlet? CurrentOutlet { get => currentOutlet; set => currentOutlet = value; }        
     }
 }