diff --git a/.idea/.idea.AvaloniaApplication14_Inventory_300326/.idea/avalonia.xml b/.idea/.idea.AvaloniaApplication14_Inventory_300326/.idea/avalonia.xml
index 9a4eeeb..65caf28 100644
--- a/.idea/.idea.AvaloniaApplication14_Inventory_300326/.idea/avalonia.xml
+++ b/.idea/.idea.AvaloniaApplication14_Inventory_300326/.idea/avalonia.xml
@@ -4,6 +4,8 @@
diff --git a/AvaloniaApplication14_Inventory_300326/App.axaml.cs b/AvaloniaApplication14_Inventory_300326/App.axaml.cs
index 3bd9693..aab1295 100644
--- a/AvaloniaApplication14_Inventory_300326/App.axaml.cs
+++ b/AvaloniaApplication14_Inventory_300326/App.axaml.cs
@@ -32,7 +32,7 @@ public partial class App : Application
// More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
DisableAvaloniaDataAnnotationValidation();
- var win = _serviceProvider.GetService();
+ var win = _serviceProvider.GetRequiredService();
desktop.MainWindow = win;
}
diff --git a/AvaloniaApplication14_Inventory_300326/Models/DataBase/EmployeeRepository.cs b/AvaloniaApplication14_Inventory_300326/Models/DataBase/EmployeeRepository.cs
index 023b4cb..2c452f0 100644
--- a/AvaloniaApplication14_Inventory_300326/Models/DataBase/EmployeeRepository.cs
+++ b/AvaloniaApplication14_Inventory_300326/Models/DataBase/EmployeeRepository.cs
@@ -82,4 +82,9 @@ public class EmployeeRepository : BaseRepository, IDisposable
{
throw new NotImplementedException();
}
+
+ public void Dispose()
+ {
+ base.Dispose();
+ }
}
\ No newline at end of file
diff --git a/AvaloniaApplication14_Inventory_300326/Models/DataBase/EquipmeentRepository.cs b/AvaloniaApplication14_Inventory_300326/Models/DataBase/EquipmentRepository.cs
similarity index 91%
rename from AvaloniaApplication14_Inventory_300326/Models/DataBase/EquipmeentRepository.cs
rename to AvaloniaApplication14_Inventory_300326/Models/DataBase/EquipmentRepository.cs
index b9695e8..712f043 100644
--- a/AvaloniaApplication14_Inventory_300326/Models/DataBase/EquipmeentRepository.cs
+++ b/AvaloniaApplication14_Inventory_300326/Models/DataBase/EquipmentRepository.cs
@@ -8,9 +8,9 @@ using MySqlConnector;
namespace AvaloniaApplication14_Inventory_300326.Models.DataBase;
-public class EquipmeentRepository : BaseRepository, IDisposable
+public class EquipmentRepository : BaseRepository, IDisposable
{
- public EquipmeentRepository(IOptions ConnectionString) : base(ConnectionString)
+ public EquipmentRepository(IOptions ConnectionString) : base(ConnectionString)
{
OpenConnection();
}
diff --git a/AvaloniaApplication14_Inventory_300326/Models/DataBase/PositionRepository.cs b/AvaloniaApplication14_Inventory_300326/Models/DataBase/PositionRepository.cs
new file mode 100644
index 0000000..96cd796
--- /dev/null
+++ b/AvaloniaApplication14_Inventory_300326/Models/DataBase/PositionRepository.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using AvaloniaApplication14_autoTest_190326.Models;
+using AvaloniaApplication14_Di_test_1125.Models;
+using AvaloniaApplication14_Inventory_300326.Models.Models;
+using Microsoft.Extensions.Options;
+using MySqlConnector;
+
+namespace AvaloniaApplication14_Inventory_300326.Models.DataBase;
+
+public class PositionRepository : BaseRepository, IDisposable
+{
+ public PositionRepository(IOptions ConnectionString) : base(ConnectionString)
+ {
+ OpenConnection();
+ }
+
+ public override List? GetAll()
+ {
+ List result = new List();
+ string sql = "SELECT * FROM Positions";
+ using (var mc = new MySqlCommand(sql, connection))
+ {
+ using (var reader = mc.ExecuteReader())
+ {
+ while (reader.Read())
+ {
+ Position position = new Position()
+ {
+ Id = reader.GetInt32("Id"),
+ Name = reader.GetString("Name"),
+ };
+ result.Add(position);
+ }
+ }
+ }
+
+ return result;
+ }
+
+ public override Position? GetById(int id)
+ {
+ string sql = "SELECT * FROM Positions WHERE Id = @Id";
+ Position result = null;
+ using (var mc = new MySqlCommand(sql, connection))
+ {
+ mc.Parameters.AddWithValue("@Id", id);
+ using (var reader = mc.ExecuteReader())
+ {
+ while (reader.Read())
+ {
+ result = new Position()
+ {
+ Id = reader.GetInt32("Id"),
+ Name = reader.GetString("Name")
+ };
+ }
+ }
+ }
+
+ return result;
+ }
+
+ public override bool Delete(int id)
+ {
+ throw new NotImplementedException();
+ }
+
+ public override bool Update(Position item)
+ {
+ throw new NotImplementedException();
+ }
+
+ public override bool Add(Position item)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void Dispose()
+ {
+ base.Dispose();
+ }
+}
\ No newline at end of file
diff --git a/AvaloniaApplication14_Inventory_300326/Models/Models/EmployeeVisual.cs b/AvaloniaApplication14_Inventory_300326/Models/Models/EmployeeVisual.cs
new file mode 100644
index 0000000..f77306f
--- /dev/null
+++ b/AvaloniaApplication14_Inventory_300326/Models/Models/EmployeeVisual.cs
@@ -0,0 +1,14 @@
+namespace AvaloniaApplication14_Inventory_300326.Models.Models;
+
+public class EmployeeVisual
+{
+ public int Id { get; set; }
+ public string FullName { get; set; }
+ public Position Position { get; set; }
+
+ public void CreateFromEmployee(Employee employee)
+ {
+ Id = employee.Id;
+ FullName = employee.FullName;
+ }
+}
\ No newline at end of file
diff --git a/AvaloniaApplication14_Inventory_300326/Program.cs b/AvaloniaApplication14_Inventory_300326/Program.cs
index 59458e4..436c8da 100644
--- a/AvaloniaApplication14_Inventory_300326/Program.cs
+++ b/AvaloniaApplication14_Inventory_300326/Program.cs
@@ -26,7 +26,10 @@ sealed class Program
service.Configure(context.Configuration.GetSection("DatabaseSettings"));
service.AddTransient();
service.AddTransient();
- service.AddTransient();
+ service.AddTransient();
+ service.AddTransient();
+ service.AddTransient();
+
}).Build();
BuildAvaloniaApp(host.Services)
diff --git a/AvaloniaApplication14_Inventory_300326/ViewModels/EmployeeEditingWindowViewModel.cs b/AvaloniaApplication14_Inventory_300326/ViewModels/EmployeeEditingWindowViewModel.cs
new file mode 100644
index 0000000..2562680
--- /dev/null
+++ b/AvaloniaApplication14_Inventory_300326/ViewModels/EmployeeEditingWindowViewModel.cs
@@ -0,0 +1,6 @@
+namespace AvaloniaApplication14_Inventory_300326.ViewModels;
+
+public class EmployeeEditingWindowViewModel : ViewModelBase
+{
+
+}
\ No newline at end of file
diff --git a/AvaloniaApplication14_Inventory_300326/ViewModels/EquipmentEditingWindowViewModel.cs b/AvaloniaApplication14_Inventory_300326/ViewModels/EquipmentEditingWindowViewModel.cs
new file mode 100644
index 0000000..a19bc73
--- /dev/null
+++ b/AvaloniaApplication14_Inventory_300326/ViewModels/EquipmentEditingWindowViewModel.cs
@@ -0,0 +1,6 @@
+namespace AvaloniaApplication14_Inventory_300326.ViewModels;
+
+public class EquipmentEditingWindowViewModel : ViewModelBase
+{
+
+}
\ No newline at end of file
diff --git a/AvaloniaApplication14_Inventory_300326/ViewModels/MainWindowViewModel.cs b/AvaloniaApplication14_Inventory_300326/ViewModels/MainWindowViewModel.cs
index e26639e..5b4782f 100644
--- a/AvaloniaApplication14_Inventory_300326/ViewModels/MainWindowViewModel.cs
+++ b/AvaloniaApplication14_Inventory_300326/ViewModels/MainWindowViewModel.cs
@@ -1,12 +1,17 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
using Avalonia.Controls;
using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.LogicalTree;
using AvaloniaApplication14_Inventory_300326.Models.DataBase;
using AvaloniaApplication14_Inventory_300326.Models.Models;
using AvaloniaApplication14_Inventory_300326.Views;
using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.DependencyInjection;
namespace AvaloniaApplication14_Inventory_300326.ViewModels;
@@ -19,14 +24,12 @@ public partial class MainWindowViewModel : ViewModelBase
[ObservableProperty] private ObservableCollection _entities;
[ObservableProperty] private Entity _selectedEntity;
[ObservableProperty] private ObservableCollection _techs;
- [ObservableProperty] private ObservableCollection _employees;
+ [ObservableProperty] private ObservableCollection _employees;
[ObservableProperty] private ObservableCollection _positions;
-
- partial void OnEntitiesChanged(ObservableCollection value)
- {
- Console.WriteLine("OnEntitiesChanged");
- }
-
+ [ObservableProperty] private EquipmentVisual _selectedEquipmentVisual;
+ [ObservableProperty] private EmployeeVisual _selectedEmployeeVisual;
+ [ObservableProperty] private Position _selectedPosition;
+
partial void OnSelectedEntityChanged(Entity value)
{
if (_currentWindow != null)
@@ -35,18 +38,33 @@ public partial class MainWindowViewModel : ViewModelBase
{
case 0:
+ GetTeches();
+
+ ShowTeches();
+
break;
case 1:
-
+
+ GetEmployees();
+
+ ShowEmployees();
+
break;
case 2:
-
+
+ GetPositions();
+
+ ShowPositions();
+
break;
}
}
}
- public MainWindowViewModel(IServiceProvider serviceProvider, EquipmeentRepository equipmeentRepository)
+
+ //###################################################################################################################
+
+ public MainWindowViewModel(IServiceProvider serviceProvider)
{
_serviceProvider = serviceProvider;
@@ -57,11 +75,80 @@ public partial class MainWindowViewModel : ViewModelBase
Entities.Add(new Entity(){Id = 2, Name = "Должности"});
SelectedEntity = Entities[0];
- List test = equipmeentRepository.GetAll();
-
- Techs = new ObservableCollection();
+
+
+ using (var equipmentRepository = _serviceProvider.GetService())
+ {
+ List equipments = equipmentRepository.GetAll();
+ Techs = new ObservableCollection(ConvertListEqToEqVis(equipments));
+ }
+ }
+
+ //###################################################################################################################
+
+
+
+ private void GetTeches()
+ {
+ using (var equipmentRepository = _serviceProvider.GetService())
+ {
+ List teches = equipmentRepository.GetAll();
+ Techs = new ObservableCollection(ConvertListEqToEqVis(teches));
+ }
}
+ public void GetEmployees()
+ {
+ using (var employeeRepository = _serviceProvider.GetService())
+ {
+ var employees = employeeRepository.GetAll();
+ Employees = new ObservableCollection(ConvertListEmplToEmplVis(employees));
+ }
+ }
+
+ public void GetPositions()
+ {
+ using (var positionRepository = _serviceProvider.GetService())
+ {
+ var positions = positionRepository.GetAll();
+ Positions = new ObservableCollection(positions);
+ }
+ }
+
+ public void ShowTeches()
+ {
+ _currentWindow.ScrollViewerDataGridTech.IsVisible = true;
+ _currentWindow.ScrollViewerDataGridEmpl.IsVisible = false;
+ _currentWindow.ScrollViewerDataGridPos.IsVisible = false;
+ }
+ public void ShowEmployees()
+ {
+ _currentWindow.ScrollViewerDataGridTech.IsVisible = false;
+ _currentWindow.ScrollViewerDataGridEmpl.IsVisible = true;
+ _currentWindow.ScrollViewerDataGridPos.IsVisible = false;
+ }
+ public void ShowPositions()
+ {
+ _currentWindow.ScrollViewerDataGridTech.IsVisible = false;
+ _currentWindow.ScrollViewerDataGridEmpl.IsVisible = false;
+ _currentWindow.ScrollViewerDataGridPos.IsVisible = true;
+ }
+
+ private void DoubleTappedTechDataGrid()
+ {
+ Console.WriteLine("DoubleTappedTechDataGrid");
+ }
+
+ private void DoubleTappedEmployeeDataGrid()
+ {
+
+ }
+
+ private void DoubleTappedPositionDataGrid()
+ {
+
+ }
+
public List ConvertListEqToEqVis(List equipments)
{
List result = new List();
@@ -77,9 +164,35 @@ public partial class MainWindowViewModel : ViewModelBase
}
return result;
}
+
+ public List ConvertListEmplToEmplVis(List employees)
+ {
+ List result = new List();
+ foreach (var item in employees)
+ {
+ EmployeeVisual eve = new EmployeeVisual();
+ using (var posRepo = _serviceProvider.GetRequiredService())
+ {
+ eve.CreateFromEmployee(item);
+ eve.Position = posRepo.GetById(item.PositionId);
+ }
+ result.Add(eve);
+ }
+ return result;
+ }
+
public void SetScreen(MainWindow window)
{
_currentWindow = window;
Console.WriteLine(window);
+ ShowTeches();
+ INIT();
+ }
+
+ private void INIT()
+ {
+ _currentWindow.DataGridTech.DoubleTapped += (sender, args) => DoubleTappedTechDataGrid();
+ _currentWindow.DataGridEmployees.DoubleTapped += (sender, args) => DoubleTappedEmployeeDataGrid();
+ _currentWindow.DataGridPositions.DoubleTapped += (sender, args) => DoubleTappedPositionDataGrid();
}
}
\ No newline at end of file
diff --git a/AvaloniaApplication14_Inventory_300326/ViewModels/PositionEditingWindowViewModel.cs b/AvaloniaApplication14_Inventory_300326/ViewModels/PositionEditingWindowViewModel.cs
new file mode 100644
index 0000000..8d64d7c
--- /dev/null
+++ b/AvaloniaApplication14_Inventory_300326/ViewModels/PositionEditingWindowViewModel.cs
@@ -0,0 +1,5 @@
+namespace AvaloniaApplication14_Inventory_300326.ViewModels;
+
+public class PositionEditingWindowViewModel : ViewModelBase
+{
+}
\ No newline at end of file
diff --git a/AvaloniaApplication14_Inventory_300326/Views/EmployeeEditingWindow.axaml b/AvaloniaApplication14_Inventory_300326/Views/EmployeeEditingWindow.axaml
new file mode 100644
index 0000000..6e9d844
--- /dev/null
+++ b/AvaloniaApplication14_Inventory_300326/Views/EmployeeEditingWindow.axaml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/AvaloniaApplication14_Inventory_300326/Views/EmployeeEditingWindow.axaml.cs b/AvaloniaApplication14_Inventory_300326/Views/EmployeeEditingWindow.axaml.cs
new file mode 100644
index 0000000..e4af99d
--- /dev/null
+++ b/AvaloniaApplication14_Inventory_300326/Views/EmployeeEditingWindow.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace AvaloniaApplication14_Inventory_300326.Views;
+
+public partial class EmployeeEditingWindow : Window
+{
+ public EmployeeEditingWindow()
+ {
+ InitializeComponent();
+ }
+}
\ No newline at end of file
diff --git a/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml b/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml
new file mode 100644
index 0000000..2f6796f
--- /dev/null
+++ b/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml.cs b/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml.cs
new file mode 100644
index 0000000..5b4cede
--- /dev/null
+++ b/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace AvaloniaApplication14_Inventory_300326.Views;
+
+public partial class EquipmentEditingWindow : Window
+{
+ public EquipmentEditingWindow()
+ {
+ InitializeComponent();
+ }
+}
\ No newline at end of file
diff --git a/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml b/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml
index f74fb14..0623b23 100644
--- a/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml
+++ b/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml
@@ -11,39 +11,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml.cs b/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml.cs
index bb14f30..15283aa 100644
--- a/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml.cs
+++ b/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml.cs
@@ -1,4 +1,9 @@
+using System;
+using System.Linq;
using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.LogicalTree;
+using Avalonia.VisualTree;
using AvaloniaApplication14_Inventory_300326.ViewModels;
namespace AvaloniaApplication14_Inventory_300326.Views;
@@ -8,7 +13,7 @@ public partial class MainWindow : Window
public MainWindow(MainWindowViewModel viewModel)
{
DataContext = viewModel;
- viewModel.SetScreen(this);
InitializeComponent();
+ viewModel.SetScreen(this);
}
}
\ No newline at end of file
diff --git a/AvaloniaApplication14_Inventory_300326/Views/PositionEditingWindow.axaml b/AvaloniaApplication14_Inventory_300326/Views/PositionEditingWindow.axaml
new file mode 100644
index 0000000..24440c6
--- /dev/null
+++ b/AvaloniaApplication14_Inventory_300326/Views/PositionEditingWindow.axaml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/AvaloniaApplication14_Inventory_300326/Views/PositionEditingWindow.axaml.cs b/AvaloniaApplication14_Inventory_300326/Views/PositionEditingWindow.axaml.cs
new file mode 100644
index 0000000..f7ba274
--- /dev/null
+++ b/AvaloniaApplication14_Inventory_300326/Views/PositionEditingWindow.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace AvaloniaApplication14_Inventory_300326.Views;
+
+public partial class PositionEditingWindow : Window
+{
+ public PositionEditingWindow()
+ {
+ InitializeComponent();
+ }
+}
\ No newline at end of file
diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache
index ffd8e92..4931bd1 100644
--- a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache
+++ b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/Resources.Inputs.cache
@@ -1 +1 @@
-e1249ffb9cd09bddc505ada9ef39da7ea4d26088608c96c2743b4efc3b96e16d
+2a84cdfd20fd3ba333d939c83e85ef60a8d19237a93d0faa0b7453529059536d
diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/resources b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/resources
index 94f727b..b8cce1e 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 ac162ec..a0911fb 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+b169a275b4b92a8d251235436b93bd0960f3e459")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cbf2b3c1d343b3e775109533b3de5382ddf0d55c")]
[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 6d4f169..e03c4db 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 @@
-8207d089541f27ef630877f99fb8ddb693d2b2d0d47fd66842c9106296f96e66
+579358abf2419881fdf5be6d074ce09167d36f918fb2742d80f5fe41cf044223
diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.GeneratedMSBuildEditorConfig.editorconfig b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.GeneratedMSBuildEditorConfig.editorconfig
index ebd7c77..289f59e 100644
--- a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.GeneratedMSBuildEditorConfig.editorconfig
+++ b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.GeneratedMSBuildEditorConfig.editorconfig
@@ -24,5 +24,14 @@ build_property.EnableCodeStyleSeverity =
[/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/App.axaml]
build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
+[/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/Views/EmployeeEditingWindow.axaml]
+build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
+
+[/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/Views/EquipmentEditingWindow.axaml]
+build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
+
[/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml]
build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
+
+[/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/Views/PositionEditingWindow.axaml]
+build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.CoreCompileInputs.cache b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.CoreCompileInputs.cache
index 3e573ef..ac2a8d2 100644
--- a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.CoreCompileInputs.cache
+++ b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-05243996e8958daf2ebabc094115b0206a262c6457c45b77b7c6600d3aa1f314
+bf4cf4167d1af19dcdd79f28d74d6e280f089043cf069c74a3cde874464ff374
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 6afb468..fca95c2 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 5adf943..c2bf690 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 d5588c7..452e5c9 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 d5588c7..452e5c9 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