INT-28894 refactor Название полей

Исправлено наименование полей сотрудника.
NotTastyCupcake · Feb 8, 2024 · 93b557f · 93b557f
1 parent cc43046
commit 93b557f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/src/UI/WpfApplication/ViewModels/Employes/EditEmployeeViewModel.cs b/src/UI/WpfApplication/ViewModels/Employes/EditEmployeeViewModel.cs
@@ -68,6 +68,8 @@ public void GetEmployeeToEdit(Employee employee)
             FirstName = employee.FirstName;
             MiddleName = employee.MiddleName;
             BirthdayDate = employee.BirthdayDate;
+            BirthdayDateSelected = employee.BirthdayDate;
+            ResidentSelected = employee.Resident;
             Resident = employee.Resident;
             Nationality = employee.Nationality;
             PhoneNumber = employee.PhoneNumber;

diff --git a/src/UI/WpfApplication/ViewModels/Employes/EmployeeViewModel.cs b/src/UI/WpfApplication/ViewModels/Employes/EmployeeViewModel.cs
@@ -54,8 +54,8 @@ public class EmployeeViewModel : ReactiveValidationObject, IEmployee
 
             Task.Run(() => Initialize());
 
-            this.WhenAnyValue(vm => vm.BirthdayDateSelector).Subscribe(vm => BirthdayDate = vm.HasValue ? vm.Value : DateTime.MinValue);
-            this.WhenAnyValue(vm => vm.ResidentView).Subscribe(vm => Resident = vm.HasValue ? vm.Value : false);
+            this.WhenAnyValue(vm => vm.BirthdayDateSelected).Subscribe(vm => BirthdayDate = vm.HasValue ? vm.Value : DateTime.MinValue);
+            this.WhenAnyValue(vm => vm.ResidentSelected).Subscribe(vm => Resident = vm.HasValue ? vm.Value : false);
         }
 
         private async Task Initialize()
@@ -77,7 +77,7 @@ private void Validation()
                 "Фамилия должно быть заполнено обязательно");
 
             this.ValidationRule(
-                viewModel => viewModel.BirthdayDateSelector,
+                viewModel => viewModel.BirthdayDateSelected,
                 item => item.HasValue && item.Value != DateTime.MinValue && item.Value != DateTime.Today,
                 "Дата рождения должна быть заполнена обязательно");
 
@@ -92,7 +92,7 @@ private void Validation()
                 "Документ должен быть заполнен обязательно");
 
             this.ValidationRule(
-                viewModel => viewModel.ResidentView,
+                viewModel => viewModel.ResidentSelected,
                 item => item != null,
                 "Резидентность должна быть заполнена обязательно");
         }
@@ -103,7 +103,7 @@ private void Validation()
         [Reactive]
         public DateTime BirthdayDate { get; set; }
         [Reactive]
-        public DateTime? BirthdayDateSelector { get; set; }
+        public DateTime? BirthdayDateSelected { get; set; }
         [Reactive]
         public string BonusNumber { get; set; }
         [Reactive]
@@ -144,7 +144,7 @@ private void Validation()
         [Reactive]
         public bool Resident { get; set; }
         [Reactive]
-        public bool? ResidentView { get; set; }
+        public bool? ResidentSelected { get; set; }
 
         [Reactive]
         public EmployeeType Type { get; set; }

diff --git a/src/UI/WpfApplication/Views/Employes/CreateEmployeeView.xaml.cs b/src/UI/WpfApplication/Views/Employes/CreateEmployeeView.xaml.cs
@@ -61,7 +61,7 @@ public CreateEmployeeView(CreateEmployeeViewModel viewModel = null)
 
 
                 this.Bind(this.ViewModel,
-                    vm => vm.BirthdayDateSelector,
+                    vm => vm.BirthdayDateSelected,
                     view => view.BirthdayDatePicker.SelectedDate)
                     .DisposeWith(disposable);
 
@@ -90,7 +90,7 @@ public CreateEmployeeView(CreateEmployeeViewModel viewModel = null)
                     .DisposeWith(disposable);
 
                 this.Bind(this.ViewModel,
-                    vm => vm.ResidentView,
+                    vm => vm.ResidentSelected,
                     view => view.Resident.IsChecked)
                     .DisposeWith(disposable);
 
@@ -132,7 +132,7 @@ public CreateEmployeeView(CreateEmployeeViewModel viewModel = null)
                     .DisposeWith(disposable);
 
                 this.BindValidation(this.ViewModel,
-                    vm => vm.BirthdayDateSelector,
+                    vm => vm.BirthdayDateSelected,
                     view => view.BirthdayError.Content)
                     .DisposeWith(disposable);
 
@@ -142,7 +142,7 @@ public CreateEmployeeView(CreateEmployeeViewModel viewModel = null)
                     .DisposeWith(disposable);
 
                 this.BindValidation(this.ViewModel,
-                    vm => vm.ResidentView,
+                    vm => vm.ResidentSelected,
                     view => view.ResidentError.Content)
                     .DisposeWith(disposable);
 

diff --git a/src/UI/WpfApplication/Views/Employes/EditEmployeeView.xaml.cs b/src/UI/WpfApplication/Views/Employes/EditEmployeeView.xaml.cs
@@ -61,7 +61,7 @@ public EditEmployeeView(EditEmployeeViewModel viewModel = null)
 
 
                 this.Bind(this.ViewModel,
-                    vm => vm.BirthdayDateSelector,
+                    vm => vm.BirthdayDateSelected,
                     view => view.BirthdayDatePicker.SelectedDate)
                     .DisposeWith(disposable);
 
@@ -91,7 +91,7 @@ public EditEmployeeView(EditEmployeeViewModel viewModel = null)
 
 
                 this.Bind(this.ViewModel,
-                    vm => vm.ResidentView,
+                    vm => vm.ResidentSelected,
                     view => view.Resident.IsChecked)
                     .DisposeWith(disposable);
 
@@ -133,7 +133,7 @@ public EditEmployeeView(EditEmployeeViewModel viewModel = null)
                     .DisposeWith(disposable);
 
                 this.BindValidation(this.ViewModel,
-                    vm => vm.BirthdayDateSelector,
+                    vm => vm.BirthdayDateSelected,
                     view => view.BirthdayError.Content)
                     .DisposeWith(disposable);
 
@@ -143,7 +143,7 @@ public EditEmployeeView(EditEmployeeViewModel viewModel = null)
                     .DisposeWith(disposable);
 
                 this.BindValidation(this.ViewModel,
-                    vm => vm.ResidentView,
+                    vm => vm.ResidentSelected,
                     view => view.ResidentError.Content)
                     .DisposeWith(disposable);