diff --git a/AvaloniaApplication14_Inventory_300326/ViewModels/EmployeeEditingWindowViewModel.cs b/AvaloniaApplication14_Inventory_300326/ViewModels/EmployeeEditingWindowViewModel.cs index 7dd27ec..1aa3c93 100644 --- a/AvaloniaApplication14_Inventory_300326/ViewModels/EmployeeEditingWindowViewModel.cs +++ b/AvaloniaApplication14_Inventory_300326/ViewModels/EmployeeEditingWindowViewModel.cs @@ -113,5 +113,9 @@ public partial class EmployeeEditingWindowViewModel : ViewModelBase { _currentWindow = window; _currentWindow.ConfirmButton.Content = _isEditing ? "Изменить" : "Добавить"; + if (_isEditing) + { + + } } } \ No newline at end of file diff --git a/AvaloniaApplication14_Inventory_300326/ViewModels/EquipmentEditingWindowViewModel.cs b/AvaloniaApplication14_Inventory_300326/ViewModels/EquipmentEditingWindowViewModel.cs index d01289e..18bd3d7 100644 --- a/AvaloniaApplication14_Inventory_300326/ViewModels/EquipmentEditingWindowViewModel.cs +++ b/AvaloniaApplication14_Inventory_300326/ViewModels/EquipmentEditingWindowViewModel.cs @@ -72,10 +72,6 @@ public partial class EquipmentEditingWindowViewModel : ViewModelBase _equipment = _equipmentVisualFactory.CreateFromEquipment(equipment); _equipment.CurrentEmployee = repo.GetById(equipment.CurrentEmployeeId); } - using (var repo = _serviceProvider.GetService()) - { - Employees = new ObservableCollection(repo.GetAll()); - } if (_isEditing) { @@ -84,10 +80,17 @@ public partial class EquipmentEditingWindowViewModel : ViewModelBase Date = _equipment.Date; Cost = _equipment.Cost; IsWrittenOff = _equipment.IsWrittenOff; - CurrentEmployee = Employees.FirstOrDefault(o => o.Id == equipment.CurrentEmployeeId); + CurrentEmployee = _equipment.CurrentEmployee; + Employees = new ObservableCollection(); + Employees.Add(CurrentEmployee); } else { + using (var repo = _serviceProvider.GetService()) + { + Employees = new ObservableCollection(repo.GetAll()); + } + CurrentEmployee = Employees[0]; Date = DateTimeOffset.Now; } @@ -96,5 +99,13 @@ public partial class EquipmentEditingWindowViewModel : ViewModelBase { _currentWindow = window; _currentWindow.OkButton.Content = _isEditing ? "Изменить" : "Добавить"; + if (_isEditing) + { + _currentWindow.CurrentEmployeeBox.IsVisible = false; + } + else + { + _currentWindow.CurrentEmployeeLabel.IsVisible = false; + } } } \ No newline at end of file diff --git a/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml b/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml index b4d9010..a5b45c2 100644 --- a/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml +++ b/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml @@ -38,13 +38,14 @@ - + + diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/resources b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/resources index 400c1da..c42e3f4 100644 Binary files a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/resources and b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/resources differ diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfo.cs b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfo.cs index 0610a87..e9c4373 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfo.cs +++ b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("AvaloniaApplication14_Inventory_300326")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70111810c1836182b0f37d93a7e8b2e96bbb6f90")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cca23316ccaf6ff854c560608fe74ea070bdd85a")] [assembly: System.Reflection.AssemblyProductAttribute("AvaloniaApplication14_Inventory_300326")] [assembly: System.Reflection.AssemblyTitleAttribute("AvaloniaApplication14_Inventory_300326")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfoInputs.cache b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfoInputs.cache index 069a514..649d2e3 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfoInputs.cache +++ b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.AssemblyInfoInputs.cache @@ -1 +1 @@ -9dbe6ffb36df0983dc0fb68e296275034be5aec8e886a3b04e3c9808d6290db8 +63e3e38dd183c9ac63856099ca701d49eeb37cffc3fb48b85df28a550d81ee4f diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.dll b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.dll index 2ed0171..a8dc561 100644 Binary files a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.dll and b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.dll differ diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.pdb b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.pdb index f441fae..d5d029e 100644 Binary files a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.pdb and b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.pdb differ diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/ref/AvaloniaApplication14_Inventory_300326.dll b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/ref/AvaloniaApplication14_Inventory_300326.dll index 2ad9779..4ab2258 100644 Binary files a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/ref/AvaloniaApplication14_Inventory_300326.dll and b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/ref/AvaloniaApplication14_Inventory_300326.dll differ diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/refint/AvaloniaApplication14_Inventory_300326.dll b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/refint/AvaloniaApplication14_Inventory_300326.dll index 2ad9779..4ab2258 100644 Binary files a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/refint/AvaloniaApplication14_Inventory_300326.dll and b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/refint/AvaloniaApplication14_Inventory_300326.dll differ diff --git a/AvaloniaApplication14_Inventory_300326/obj/rider.project.model.nuget.info b/AvaloniaApplication14_Inventory_300326/obj/rider.project.model.nuget.info index 10fdab7..acdc386 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/rider.project.model.nuget.info +++ b/AvaloniaApplication14_Inventory_300326/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17763141913838317 \ No newline at end of file +17763836796197075 \ No newline at end of file