diff --git a/Models/Database/ClientRepository.cs b/Models/Database/ClientRepository.cs index 6232c28..f8096ce 100644 --- a/Models/Database/ClientRepository.cs +++ b/Models/Database/ClientRepository.cs @@ -50,7 +50,7 @@ public class ClientRepository : BaseRepository, IDisposable public override bool Add(Client client) { - string sql = "insert into `client` (`id`, `name`, `surname`) values (0, @name, @surname)"; + string sql = "insert into `client` (`id`, `name`, `surname`, `email`) values (0, @name, @surname, @email)"; try { using (var command = new MySqlCommand(sql, connection)) @@ -71,7 +71,7 @@ public class ClientRepository : BaseRepository, IDisposable public override bool Update(Client client) { - string sql = "update `client` set name = @name, surname = @surname"; + string sql = "update `client` set name = @name, surname = @surname, email = @email"; try { using (var command = new MySqlCommand(sql, connection)) diff --git a/ViewModels/UserControlViewModels/ClientViewModel.cs b/ViewModels/UserControlViewModels/ClientViewModel.cs index 958ddfe..2e19439 100644 --- a/ViewModels/UserControlViewModels/ClientViewModel.cs +++ b/ViewModels/UserControlViewModels/ClientViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using BathHouseManagmet.Database; using BathHouseManagmet.Models; @@ -13,7 +14,7 @@ public partial class ClientViewModel : ViewModelBase { private readonly IServiceProvider _serviceProvider; - [ObservableProperty] List _clients; + [ObservableProperty] ObservableCollection _clients; [ObservableProperty] int _currentPageSize; [ObservableProperty] List _pageSizes; [ObservableProperty] string _pageInfo; @@ -25,8 +26,8 @@ public partial class ClientViewModel : ViewModelBase { _serviceProvider = serviceProvider; - using (var rep = serviceProvider.GetRequiredService()) - Clients = new List(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Clients = new ObservableCollection(rep.GetPage()); PageSizes = new List([5,10,15]); CurrentPageSize = PageSizes.First(); diff --git a/ViewModels/UserControlViewModels/DiscountViewModel.cs b/ViewModels/UserControlViewModels/DiscountViewModel.cs index a7d6f55..b776d74 100644 --- a/ViewModels/UserControlViewModels/DiscountViewModel.cs +++ b/ViewModels/UserControlViewModels/DiscountViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Data; using System.Linq; using BathHouseManagmet.Database; @@ -14,7 +15,7 @@ public partial class DiscountViewModel : ViewModelBase { private readonly IServiceProvider _serviceProvider; - [ObservableProperty] List _discounts; + [ObservableProperty] ObservableCollection _discounts; [ObservableProperty] int _currentPageSize; [ObservableProperty] List _pageSizes; [ObservableProperty] string _pageInfo; @@ -26,8 +27,8 @@ public partial class DiscountViewModel : ViewModelBase { _serviceProvider = serviceProvider; - using (var rep = serviceProvider.GetRequiredService()) - Discounts = new List(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Discounts = new ObservableCollection(rep.GetPage()); PageSizes = new List([5, 10, 15]); CurrentPageSize = PageSizes.First(); diff --git a/ViewModels/UserControlViewModels/EmployeeViewModel.cs b/ViewModels/UserControlViewModels/EmployeeViewModel.cs index 2c2a723..b5b917b 100644 --- a/ViewModels/UserControlViewModels/EmployeeViewModel.cs +++ b/ViewModels/UserControlViewModels/EmployeeViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using BathHouseManagmet.Database; using BathHouseManagmet.Models; @@ -13,8 +14,8 @@ public partial class EmployeeViewModel : ViewModelBase { private readonly IServiceProvider _serviceProvider; - [ObservableProperty] List _employees; - [ObservableProperty] List _positions; + [ObservableProperty] ObservableCollection _employees; + [ObservableProperty] ObservableCollection _positions; [ObservableProperty] int _currentPageSize; [ObservableProperty] List _pageSizes; [ObservableProperty] string _pageInfo; @@ -26,10 +27,10 @@ public partial class EmployeeViewModel : ViewModelBase { _serviceProvider = serviceProvider; - using (var rep = serviceProvider.GetRequiredService()) - Employees = new List(rep.GetPage()); - using (var rep = serviceProvider.GetRequiredService()) - Positions = new List(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Employees = new ObservableCollection(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Positions = new ObservableCollection(rep.GetPage()); PageSizes = new List([5, 10, 15]); CurrentPageSize = PageSizes.First(); diff --git a/ViewModels/UserControlViewModels/OrderViewModel.cs b/ViewModels/UserControlViewModels/OrderViewModel.cs index c12a49d..3e39ff9 100644 --- a/ViewModels/UserControlViewModels/OrderViewModel.cs +++ b/ViewModels/UserControlViewModels/OrderViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using BathHouseManagmet.Database; using BathHouseManagmet.Models; @@ -19,32 +20,32 @@ public partial class OrderViewModel : ViewModelBase private int currentPage = 0; private int totalPages; - [ObservableProperty] List orders; - [ObservableProperty] List employees; - [ObservableProperty] List positions; - [ObservableProperty] List clients; - [ObservableProperty] List zones; - [ObservableProperty] List services; - [ObservableProperty] List discounts; + [ObservableProperty] ObservableCollection orders; + [ObservableProperty] ObservableCollection employees; + [ObservableProperty] ObservableCollection positions; + [ObservableProperty] ObservableCollection clients; + [ObservableProperty] ObservableCollection zones; + [ObservableProperty] ObservableCollection services; + [ObservableProperty] ObservableCollection discounts; public OrderViewModel(IServiceProvider serviceProvider) { _serviceProvider = serviceProvider; - using (var rep = serviceProvider.GetRequiredService()) - Orders = new List(rep.GetPage()); - using (var rep = serviceProvider.GetRequiredService()) - Employees = new List(rep.GetPage()); - using (var rep = serviceProvider.GetRequiredService()) - Zones = new List(rep.GetPage()); - using (var rep = serviceProvider.GetRequiredService()) - Services = new List(rep.GetPage()); - using (var rep = serviceProvider.GetRequiredService()) - Clients = new List(rep.GetPage()); - using (var rep = serviceProvider.GetRequiredService()) - Positions = new List(rep.GetPage()); - using (var rep = serviceProvider.GetRequiredService()) - Discounts = new List(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Orders = new ObservableCollection(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Employees = new ObservableCollection(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Zones = new ObservableCollection(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Services = new ObservableCollection(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Clients = new ObservableCollection(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Positions = new ObservableCollection(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Discounts = new ObservableCollection(rep.GetPage()); PageSizes = new List([5,10,20]); CurrentPageSize = PageSizes.First(); diff --git a/ViewModels/UserControlViewModels/PositionViewModel.cs b/ViewModels/UserControlViewModels/PositionViewModel.cs index 8f08a1e..97af7a7 100644 --- a/ViewModels/UserControlViewModels/PositionViewModel.cs +++ b/ViewModels/UserControlViewModels/PositionViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using BathHouseManagmet.Database; using BathHouseManagmet.Models; @@ -13,7 +14,7 @@ public partial class PositionViewModel : ViewModelBase { private readonly IServiceProvider _serviceProvider; - [ObservableProperty] List _positions; + [ObservableProperty] ObservableCollection _positions; [ObservableProperty] int _currentPageSize; [ObservableProperty] List _pageSizes; [ObservableProperty] string pageInfo; @@ -25,8 +26,8 @@ public partial class PositionViewModel : ViewModelBase { _serviceProvider = serviceProvider; - using (var rep = serviceProvider.GetRequiredService()) - Positions = new List(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Positions = new ObservableCollection(rep.GetPage()); PageSizes = new List([5, 10, 15]); CurrentPageSize = PageSizes.First(); diff --git a/ViewModels/UserControlViewModels/ServiceViewModel.cs b/ViewModels/UserControlViewModels/ServiceViewModel.cs index 4cc5c91..cdb5ee4 100644 --- a/ViewModels/UserControlViewModels/ServiceViewModel.cs +++ b/ViewModels/UserControlViewModels/ServiceViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using BathHouseManagmet.Database; using BathHouseManagmet.Models; @@ -13,7 +14,7 @@ public partial class ServiceViewModel : ViewModelBase { private readonly IServiceProvider _serviceProvider; - [ObservableProperty] List services; + [ObservableProperty] ObservableCollection services; [ObservableProperty] int _currentPageSize; [ObservableProperty] List _pageSizes; [ObservableProperty] string _pageInfo; @@ -25,8 +26,8 @@ public partial class ServiceViewModel : ViewModelBase { _serviceProvider = serviceProvider; - using (var rep = serviceProvider.GetRequiredService()) - Services = new List(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Services = new ObservableCollection(rep.GetPage()); PageSizes = new List([5, 10, 15]); CurrentPageSize = PageSizes.First(); diff --git a/ViewModels/UserControlViewModels/ZoneViewModel.cs b/ViewModels/UserControlViewModels/ZoneViewModel.cs index 16b850e..cbaa027 100644 --- a/ViewModels/UserControlViewModels/ZoneViewModel.cs +++ b/ViewModels/UserControlViewModels/ZoneViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using BathHouseManagmet.Database; using BathHouseManagmet.Models; @@ -13,7 +14,7 @@ public partial class ZoneViewModel : ViewModelBase { private readonly IServiceProvider _serviceProvider; - [ObservableProperty] private List zones; + [ObservableProperty] ObservableCollection zones; [ObservableProperty] int _currentPageSize; [ObservableProperty] List _pageSizes; [ObservableProperty] string _pageInfo; @@ -25,8 +26,8 @@ public partial class ZoneViewModel : ViewModelBase { _serviceProvider = serviceProvider; - using (var rep = serviceProvider.GetRequiredService()) - Zones = new List(rep.GetPage()); + using (var rep = _serviceProvider.GetRequiredService()) + Zones = new ObservableCollection(rep.GetPage()); PageSizes = new List([5, 10, 15]); CurrentPageSize = PageSizes.First(); diff --git a/Views/UserControls/ClientView.axaml b/Views/UserControls/ClientView.axaml index 4560057..3a4bf6e 100644 --- a/Views/UserControls/ClientView.axaml +++ b/Views/UserControls/ClientView.axaml @@ -6,11 +6,23 @@ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="BathHouseManagmet.Views.ClientView" x:DataType="viewModels:ClientViewModel"> - - - - - - - + + + + + + + + + +