diff --git a/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj b/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj index 2855af1..efa0295 100644 --- a/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj +++ b/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj @@ -25,6 +25,7 @@ + diff --git a/AvaloniaApplication14_Inventory_300326/Models/DataBase/EmployeeRepository.cs b/AvaloniaApplication14_Inventory_300326/Models/DataBase/EmployeeRepository.cs index 7bb79e0..a7e3b4c 100644 --- a/AvaloniaApplication14_Inventory_300326/Models/DataBase/EmployeeRepository.cs +++ b/AvaloniaApplication14_Inventory_300326/Models/DataBase/EmployeeRepository.cs @@ -70,7 +70,21 @@ public class EmployeeRepository : BaseRepository, IDisposable public override bool Delete(int id) { - throw new NotImplementedException(); + string sql = "DELETE FROM `Employees` WHERE Id = @Id"; + try + { + using (var mc = new MySqlCommand(sql, connection)) + { + mc.Parameters.AddWithValue("@Id", id); + mc.ExecuteNonQuery(); + } + return true; + } + catch (Exception e) + { + Console.WriteLine(e); + return false; + } } public override bool Update(Employee item) @@ -109,6 +123,7 @@ public class EmployeeRepository : BaseRepository, IDisposable return false; } } + public void Dispose() { diff --git a/AvaloniaApplication14_Inventory_300326/Models/DataBase/EquipmentRepository.cs b/AvaloniaApplication14_Inventory_300326/Models/DataBase/EquipmentRepository.cs index a7fc265..7181a1e 100644 --- a/AvaloniaApplication14_Inventory_300326/Models/DataBase/EquipmentRepository.cs +++ b/AvaloniaApplication14_Inventory_300326/Models/DataBase/EquipmentRepository.cs @@ -80,6 +80,41 @@ public class EquipmentRepository : BaseRepository, IDisposable } } + public List DoesEmployeeHaveEquipments(int EmployeeId) + { + List result = new List(); + string sql = "select * from `Equipment` where CurrentEmployeeId=@CurrentEmployeeId"; + try + { + using (var mc = new MySqlCommand(sql, connection)) + { + mc.Parameters.AddWithValue("@CurrentEmployeeId", EmployeeId); + using (var reader = mc.ExecuteReader()) + { + while (reader.Read()) + { + Equipment item = new Equipment() + { + Id = reader.GetInt32("Id"), + Name = reader.GetString("Name"), + InvNumber = reader.GetString("InvNumber"), + Date = reader.GetDateOnly("PurchaseDate"), + Cost = reader.GetDecimal("Cost"), + IsWrittenOff = reader.GetBoolean("IsWrittenOff"), + CurrentEmployeeId = reader.GetInt32("CurrentEmployeeId") + }; + result.Add(item); + } + } + } + return result; + } + catch (Exception e) + { + Console.WriteLine(e); + return null; + } + } public override bool Add(Equipment item) { string sql = "INSERT INTO TechInventory.Equipment (InvNumber, Name, PurchaseDate, Cost, IsWrittenOff, CurrentEmployeeId) VALUES(@InvNum, @Name, @Date, @Cost, @IsWrittenOff, @CurrentEmployeeId)"; diff --git a/AvaloniaApplication14_Inventory_300326/Models/DataBase/PositionRepository.cs b/AvaloniaApplication14_Inventory_300326/Models/DataBase/PositionRepository.cs index 96cd796..dfc579c 100644 --- a/AvaloniaApplication14_Inventory_300326/Models/DataBase/PositionRepository.cs +++ b/AvaloniaApplication14_Inventory_300326/Models/DataBase/PositionRepository.cs @@ -63,17 +63,60 @@ public class PositionRepository : BaseRepository, IDisposable public override bool Delete(int id) { - throw new NotImplementedException(); + string sql = "DELETE FROM Positions WHERE Id = @Id"; + try + { + using (var mc = new MySqlCommand(sql, connection)) + { + mc.Parameters.AddWithValue("@Id", id); + mc.ExecuteNonQuery(); + } + return true; + } + catch (Exception e) + { + Console.WriteLine(e); + return false; + } } public override bool Update(Position item) { - throw new NotImplementedException(); + string sql = "UPDATE Positions SET Name = @Name WHERE Id = @Id"; + try + { + using (var mc = new MySqlCommand(sql, connection)) + { + mc.Parameters.AddWithValue("@Name", item.Name); + mc.Parameters.AddWithValue("@Id", item.Id); + mc.ExecuteNonQuery(); + } + return true; + } + catch (Exception e) + { + Console.WriteLine(e); + return false; + } } public override bool Add(Position item) { - throw new NotImplementedException(); + string sql = "INSERT INTO Positions (Name) VALUES (@Name)"; + try + { + using (var mc = new MySqlCommand(sql, connection)) + { + mc.Parameters.AddWithValue("@Name", item.Name); + mc.ExecuteNonQuery(); + } + return true; + } + catch (Exception e) + { + Console.WriteLine(e); + return false; + } } public void Dispose() diff --git a/AvaloniaApplication14_Inventory_300326/Models/Models/Position.cs b/AvaloniaApplication14_Inventory_300326/Models/Models/Position.cs index 7f7d0a3..fcdb799 100644 --- a/AvaloniaApplication14_Inventory_300326/Models/Models/Position.cs +++ b/AvaloniaApplication14_Inventory_300326/Models/Models/Position.cs @@ -2,5 +2,10 @@ namespace AvaloniaApplication14_Inventory_300326.Models.Models; public class Position : DBObj { - public string Name { get; set; } + public string Name { get; set; } = ""; + + public bool IsNew() + { + return Name == ""; + } } \ No newline at end of file diff --git a/AvaloniaApplication14_Inventory_300326/ViewModels/EmployeeEditingWindowViewModel.cs b/AvaloniaApplication14_Inventory_300326/ViewModels/EmployeeEditingWindowViewModel.cs index b3cef43..fb1fe48 100644 --- a/AvaloniaApplication14_Inventory_300326/ViewModels/EmployeeEditingWindowViewModel.cs +++ b/AvaloniaApplication14_Inventory_300326/ViewModels/EmployeeEditingWindowViewModel.cs @@ -1,11 +1,18 @@ using System; +using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Linq; +using System.Threading.Tasks; +using Avalonia.Controls; 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; +using MsBox.Avalonia; +using MsBox.Avalonia.Enums; +using Tmds.DBus.Protocol; namespace AvaloniaApplication14_Inventory_300326.ViewModels; @@ -16,7 +23,7 @@ public partial class EmployeeEditingWindowViewModel : ViewModelBase private bool _isEditing; private Employee _employee; - [ObservableProperty] private string _name; + [ObservableProperty] private string _fullName; [ObservableProperty] private ObservableCollection _positions; [ObservableProperty] private Position _selectedPosition; @@ -25,25 +32,62 @@ public partial class EmployeeEditingWindowViewModel : ViewModelBase { _currentWindow.Close(); } - + [RelayCommand] - private void Confirm() + private async Task Fire() { - _employee.FullName = Name; - _employee.PositionId = SelectedPosition.Id; - using (var repo = _serviceProvider.GetService()) + List temp = null; + using (var repo = _serviceProvider.GetService()) { - if (_isEditing) + temp = repo.DoesEmployeeHaveEquipments(_employee.Id); + } + + if (temp != null) + { + if (temp.Count > 0) { - repo.Update(_employee); - } - else - { - repo.Add(_employee); + string errorMessage = "За выбранным сотрудником числится следующие вещи: \n"; + foreach (var item in temp) + { + errorMessage += $"{item.Name} \n"; + } + var win = MessageBoxManager.GetMessageBoxStandard("Ошибка", errorMessage, ButtonEnum.Ok, Icon.Error); + await win.ShowWindowDialogAsync(_currentWindow); } } - _currentWindow.Close(); } + + [RelayCommand] + private async Task Confirm() + { + bool allow = true; + if (string.IsNullOrEmpty(FullName)) + { + var win = MessageBoxManager.GetMessageBoxStandard("Ошибка", "Имя работника пустое", ButtonEnum.Ok, + Icon.Error, null, WindowStartupLocation.CenterOwner); + await win.ShowWindowDialogAsync(_currentWindow); + allow = false; + } + + if (allow) + { + _employee.FullName = FullName; + _employee.PositionId = SelectedPosition.Id; + using (var repo = _serviceProvider.GetService()) + { + if (_isEditing) + { + repo.Update(_employee); + } + else + { + repo.Add(_employee); + } + } + _currentWindow.Close(); + } + } + public EmployeeEditingWindowViewModel(IServiceProvider serviceProvider, Employee employee) { _isEditing=!employee.IsNew(); @@ -53,11 +97,14 @@ public partial class EmployeeEditingWindowViewModel : ViewModelBase { Positions = new ObservableCollection(repo.GetAll()); } - - Name = employee.FullName; - + if (_isEditing) + { + FullName = employee.FullName; + SelectedPosition = Positions.FirstOrDefault(p => p.Id == employee.PositionId); + } } + public void SetScreen(EmployeeEditingWindow window) { _currentWindow = window; diff --git a/AvaloniaApplication14_Inventory_300326/ViewModels/MainWindowViewModel.cs b/AvaloniaApplication14_Inventory_300326/ViewModels/MainWindowViewModel.cs index 33adc83..0674325 100644 --- a/AvaloniaApplication14_Inventory_300326/ViewModels/MainWindowViewModel.cs +++ b/AvaloniaApplication14_Inventory_300326/ViewModels/MainWindowViewModel.cs @@ -1,13 +1,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Threading; using System.Threading.Tasks; -using Avalonia.Controls; -using Avalonia.Data; -using Avalonia.Input; -using Avalonia.LogicalTree; using AvaloniaApplication14_Inventory_300326.Models.DataBase; using AvaloniaApplication14_Inventory_300326.Models.Factories; using AvaloniaApplication14_Inventory_300326.Models.Factoryes; @@ -16,6 +10,9 @@ using AvaloniaApplication14_Inventory_300326.Views; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Microsoft.Extensions.DependencyInjection; +using MsBox.Avalonia; +using MsBox.Avalonia.Dto; +using MsBox.Avalonia.Enums; namespace AvaloniaApplication14_Inventory_300326.ViewModels; @@ -32,6 +29,30 @@ public partial class MainWindowViewModel : ViewModelBase [ObservableProperty] private EquipmentVisual _selectedEquipmentVisual; [ObservableProperty] private EmployeeVisual _selectedEmployeeVisual; [ObservableProperty] private Position _selectedPosition; + + [RelayCommand] + private async Task Fire() + { + List temp = null; + using (var repo = _serviceProvider.GetService()) + { + temp = repo.DoesEmployeeHaveEquipments(SelectedEmployeeVisual.Id); + } + + if (temp != null) + { + if (temp.Count > 0) + { + string errorMessage = "За выбранным сотрудником числится следующие вещи: \n"; + foreach (var item in temp) + { + errorMessage += $"{item.Name} \n"; + } + var win = MessageBoxManager.GetMessageBoxStandard("Ошибка", errorMessage, ButtonEnum.Ok, Icon.Error); + await win.ShowWindowDialogAsync(_currentWindow); + } + } + } [RelayCommand] @@ -186,9 +207,13 @@ public partial class MainWindowViewModel : ViewModelBase GetEmployees(); } - private void DoubleTappedPositionDataGrid() + private async Task DoubleTappedPositionDataGrid() { - + var PositionVm = ActivatorUtilities.CreateInstance(_serviceProvider, SelectedPosition); + var win = ActivatorUtilities.CreateInstance(_serviceProvider, PositionVm); + await win.ShowDialog(_currentWindow); + ShowPositions(); + GetPositions(); } public List ConvertListEqToEqVis(List equipments) diff --git a/AvaloniaApplication14_Inventory_300326/ViewModels/PositionEditingWindowViewModel.cs b/AvaloniaApplication14_Inventory_300326/ViewModels/PositionEditingWindowViewModel.cs index 8d64d7c..5dee212 100644 --- a/AvaloniaApplication14_Inventory_300326/ViewModels/PositionEditingWindowViewModel.cs +++ b/AvaloniaApplication14_Inventory_300326/ViewModels/PositionEditingWindowViewModel.cs @@ -1,5 +1,43 @@ +using System; +using AvaloniaApplication14_Inventory_300326.Models.Models; +using AvaloniaApplication14_Inventory_300326.Views; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; + namespace AvaloniaApplication14_Inventory_300326.ViewModels; -public class PositionEditingWindowViewModel : ViewModelBase +public partial class PositionEditingWindowViewModel : ViewModelBase { + private IServiceProvider _serviceProvider; + private bool _isEditing; + private PositionEditingWindow _currentWindow; + + [ObservableProperty] private string _positionName; + + [RelayCommand] + private void Cancel() + { + + } + + [RelayCommand] + private void Confirm() + { + + } + public PositionEditingWindowViewModel(IServiceProvider serviceProvider, Position position) + { + _serviceProvider = serviceProvider; + _isEditing = !position.IsNew(); + if (_isEditing) + { + PositionName = position.Name; + } + } + + public void SetWindow(PositionEditingWindow window) + { + _currentWindow = window; + _currentWindow.ConfirmButton.Content = _isEditing ? "Изменить" : "Добавить"; + } } \ No newline at end of file diff --git a/AvaloniaApplication14_Inventory_300326/Views/EmployeeEditingWindow.axaml b/AvaloniaApplication14_Inventory_300326/Views/EmployeeEditingWindow.axaml index f2597bf..5692360 100644 --- a/AvaloniaApplication14_Inventory_300326/Views/EmployeeEditingWindow.axaml +++ b/AvaloniaApplication14_Inventory_300326/Views/EmployeeEditingWindow.axaml @@ -11,24 +11,24 @@ WindowStartupLocation="CenterOwner"> - - - - - - - + + + + + + + - - - - - + + + + + diff --git a/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml b/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml index 9052b5f..8587e91 100644 --- a/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml +++ b/AvaloniaApplication14_Inventory_300326/Views/MainWindow.axaml @@ -36,11 +36,16 @@ - + + + + + + diff --git a/AvaloniaApplication14_Inventory_300326/Views/PositionEditingWindow.axaml b/AvaloniaApplication14_Inventory_300326/Views/PositionEditingWindow.axaml index 24440c6..f204c1e 100644 --- a/AvaloniaApplication14_Inventory_300326/Views/PositionEditingWindow.axaml +++ b/AvaloniaApplication14_Inventory_300326/Views/PositionEditingWindow.axaml @@ -2,8 +2,17 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:vm="using:AvaloniaApplication14_Inventory_300326.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="AvaloniaApplication14_Inventory_300326.Views.PositionEditingWindow" + x:DataType="vm:PositionEditingWindowViewModel" Title="PositionEditingWindow"> + + + + + + + diff --git a/AvaloniaApplication14_Inventory_300326/obj/AvaloniaApplication14_Inventory_300326.csproj.nuget.dgspec.json b/AvaloniaApplication14_Inventory_300326/obj/AvaloniaApplication14_Inventory_300326.csproj.nuget.dgspec.json index 20ec88a..d8930eb 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/AvaloniaApplication14_Inventory_300326.csproj.nuget.dgspec.json +++ b/AvaloniaApplication14_Inventory_300326/obj/AvaloniaApplication14_Inventory_300326.csproj.nuget.dgspec.json @@ -76,6 +76,10 @@ "target": "Package", "version": "[14.2.0, )" }, + "MessageBox.Avalonia": { + "target": "Package", + "version": "[3.3.1.1, )" + }, "Microsoft.Extensions.Hosting": { "target": "Package", "version": "[10.0.5, )" diff --git a/AvaloniaApplication14_Inventory_300326/obj/AvaloniaApplication14_Inventory_300326.csproj.nuget.g.props b/AvaloniaApplication14_Inventory_300326/obj/AvaloniaApplication14_Inventory_300326.csproj.nuget.g.props index 9bcb2ba..bc256ca 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/AvaloniaApplication14_Inventory_300326.csproj.nuget.g.props +++ b/AvaloniaApplication14_Inventory_300326/obj/AvaloniaApplication14_Inventory_300326.csproj.nuget.g.props @@ -15,8 +15,8 @@ - + /home/student/.nuget/packages/avalonia.buildservices/0.0.31 diff --git a/AvaloniaApplication14_Inventory_300326/obj/AvaloniaApplication14_Inventory_300326.csproj.nuget.g.targets b/AvaloniaApplication14_Inventory_300326/obj/AvaloniaApplication14_Inventory_300326.csproj.nuget.g.targets index 37a3b19..78a5cb1 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/AvaloniaApplication14_Inventory_300326.csproj.nuget.g.targets +++ b/AvaloniaApplication14_Inventory_300326/obj/AvaloniaApplication14_Inventory_300326.csproj.nuget.g.targets @@ -7,9 +7,9 @@ - - + + \ No newline at end of file diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/references b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/references index 5190759..21dfc2d 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/references +++ b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/references @@ -24,6 +24,7 @@ /home/student/.nuget/packages/avalonia.win32/11.3.4/lib/net8.0/Avalonia.Win32.dll /home/student/.nuget/packages/avalonia.x11/11.3.4/lib/net8.0/Avalonia.X11.dll /home/student/.nuget/packages/communitytoolkit.mvvm/8.2.1/lib/net6.0/CommunityToolkit.Mvvm.dll +/home/student/.nuget/packages/dialoghost.avalonia/0.8.1/lib/netstandard2.0/DialogHost.Avalonia.dll /home/student/.nuget/packages/harfbuzzsharp/8.3.1.1/lib/net8.0/HarfBuzzSharp.dll /home/student/.nuget/packages/microcom.runtime/0.11.0/lib/net5.0/MicroCom.Runtime.dll /home/student/.dotnet/packs/Microsoft.NETCore.App.Ref/9.0.13/ref/net9.0/Microsoft.CSharp.dll @@ -58,6 +59,7 @@ /home/student/.dotnet/packs/Microsoft.NETCore.App.Ref/9.0.13/ref/net9.0/Microsoft.VisualBasic.dll /home/student/.dotnet/packs/Microsoft.NETCore.App.Ref/9.0.13/ref/net9.0/Microsoft.Win32.Primitives.dll /home/student/.dotnet/packs/Microsoft.NETCore.App.Ref/9.0.13/ref/net9.0/Microsoft.Win32.Registry.dll +/home/student/.nuget/packages/messagebox.avalonia/3.3.1.1/lib/netstandard2.0/MsBox.Avalonia.dll /home/student/.dotnet/packs/Microsoft.NETCore.App.Ref/9.0.13/ref/net9.0/mscorlib.dll /home/student/.nuget/packages/mysqlconnector/2.5.0/lib/net9.0/MySqlConnector.dll /home/student/.dotnet/packs/Microsoft.NETCore.App.Ref/9.0.13/ref/net9.0/netstandard.dll diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/resources b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/Avalonia/resources index 8112bc3..cdb1324 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 0cf9bbd..e8b6257 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+147ed9b1e85ec232bec24cd3ec30a7c4c274fb3a")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+aeb0013a062acd378099c740807360d515c81abe")] [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 077cca1..4b48c1e 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 @@ -8a899368f07641840a01d1306cc38ae23bb799c2cc2003defe76e2e5a69b0e4b +202b4e7895223083a77909f91fbe1a27b39e500114519106f4377d3e9113ba9a diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.assets.cache b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.assets.cache index 2c90ef4..4f76e08 100644 Binary files a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.assets.cache and b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.assets.cache differ diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.AssemblyReference.cache b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.AssemblyReference.cache index 23c54af..5327bde 100644 Binary files a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.AssemblyReference.cache and b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.AssemblyReference.cache differ 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 ed4ff55..0ab1dfe 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 @@ -5bc4c528ec3f534aa8ca0cf3a075bf3146165660900677036c54b6cf77df99d8 +40dcb0cffdab5c0643c31952ff7fdad779ded408c005a8c22e32baa5f4058328 diff --git a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.FileListAbsolute.txt b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.FileListAbsolute.txt index 5baab1a..51d02b6 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.FileListAbsolute.txt +++ b/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.csproj.FileListAbsolute.txt @@ -116,3 +116,5 @@ /home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/AvaloniaApplication14_Inventory_300326.genruntimeconfig.cache /home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/obj/Debug/net9.0/ref/AvaloniaApplication14_Inventory_300326.dll /home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/bin/Debug/net9.0/Avalonia.Controls.DataGrid.dll +/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/bin/Debug/net9.0/DialogHost.Avalonia.dll +/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/bin/Debug/net9.0/MsBox.Avalonia.dll 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 aba773b..905b4f6 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 384de6e..8cf4582 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 d15ed03..535bd62 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 d15ed03..535bd62 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/project.assets.json b/AvaloniaApplication14_Inventory_300326/obj/project.assets.json index 750cd5e..9c44a63 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/project.assets.json +++ b/AvaloniaApplication14_Inventory_300326/obj/project.assets.json @@ -357,6 +357,22 @@ "buildTransitive/netstandard2.1/CommunityToolkit.Mvvm.targets": {} } }, + "DialogHost.Avalonia/0.8.1": { + "type": "package", + "dependencies": { + "Avalonia": "11.1.0" + }, + "compile": { + "lib/netstandard2.0/DialogHost.Avalonia.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DialogHost.Avalonia.dll": { + "related": ".xml" + } + } + }, "FreeSpire.XLS/14.2.0": { "type": "package", "dependencies": { @@ -502,6 +518,19 @@ } } }, + "MessageBox.Avalonia/3.3.1.1": { + "type": "package", + "dependencies": { + "Avalonia": "11.1.5", + "DialogHost.Avalonia": "0.8.1" + }, + "compile": { + "lib/netstandard2.0/MsBox.Avalonia.dll": {} + }, + "runtime": { + "lib/netstandard2.0/MsBox.Avalonia.dll": {} + } + }, "MicroCom.Runtime/0.11.0": { "type": "package", "compile": { @@ -1975,6 +2004,21 @@ "lib/netstandard2.1/CommunityToolkit.Mvvm.xml" ] }, + "DialogHost.Avalonia/0.8.1": { + "sha512": "RLBOMqjJPgSmwe0i1pzX3Q7Pn0i4xE/E1b774krd4VyEkaorz1AYMdYQHyIfuhtQv5NntZyS0MuQbxJl/PhzBg==", + "type": "package", + "path": "dialoghost.avalonia/0.8.1", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "README.md", + "dialoghost.avalonia.0.8.1.nupkg.sha512", + "dialoghost.avalonia.nuspec", + "icon.png", + "lib/netstandard2.0/DialogHost.Avalonia.dll", + "lib/netstandard2.0/DialogHost.Avalonia.xml" + ] + }, "FreeSpire.XLS/14.2.0": { "sha512": "hh27gKg+nRO2QM8ZB+P0T7UL54SWbk45Z/1i5vHetYqxQMUI4JxpCxTVtADxwMgIVU0oLExUTBn1+GO8bWaSaA==", "type": "package", @@ -2149,6 +2193,19 @@ "runtimes/win-x86/native/libHarfBuzzSharp.dll" ] }, + "MessageBox.Avalonia/3.3.1.1": { + "sha512": "a0NocLvE0ipg0REevrMtilNI+ud+tFTJW7YrPtploeM93ew8S3Y6hEybqZ7W9q5Yqa9u+xOrOjAlG1lTihWhnQ==", + "type": "package", + "path": "messagebox.avalonia/3.3.1.1", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "icon.jpg", + "lib/netstandard2.0/MsBox.Avalonia.dll", + "messagebox.avalonia.3.3.1.1.nupkg.sha512", + "messagebox.avalonia.nuspec" + ] + }, "MicroCom.Runtime/0.11.0": { "sha512": "MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", "type": "package", @@ -3835,6 +3892,7 @@ "Avalonia.Themes.Fluent >= 11.3.4", "CommunityToolkit.Mvvm >= 8.2.1", "FreeSpire.XLS >= 14.2.0", + "MessageBox.Avalonia >= 3.3.1.1", "Microsoft.Extensions.Hosting >= 10.0.5", "MySqlConnector >= 2.5.0" ] @@ -3914,6 +3972,10 @@ "target": "Package", "version": "[14.2.0, )" }, + "MessageBox.Avalonia": { + "target": "Package", + "version": "[3.3.1.1, )" + }, "Microsoft.Extensions.Hosting": { "target": "Package", "version": "[10.0.5, )" diff --git a/AvaloniaApplication14_Inventory_300326/obj/project.nuget.cache b/AvaloniaApplication14_Inventory_300326/obj/project.nuget.cache index bca042b..ad9926e 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/project.nuget.cache +++ b/AvaloniaApplication14_Inventory_300326/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "5/jarL7CRng=", + "dgSpecHash": "tf6TrHiISRE=", "success": true, "projectFilePath": "/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj", "expectedPackageFiles": [ @@ -21,12 +21,14 @@ "/home/student/.nuget/packages/avalonia.win32/11.3.4/avalonia.win32.11.3.4.nupkg.sha512", "/home/student/.nuget/packages/avalonia.x11/11.3.4/avalonia.x11.11.3.4.nupkg.sha512", "/home/student/.nuget/packages/communitytoolkit.mvvm/8.2.1/communitytoolkit.mvvm.8.2.1.nupkg.sha512", + "/home/student/.nuget/packages/dialoghost.avalonia/0.8.1/dialoghost.avalonia.0.8.1.nupkg.sha512", "/home/student/.nuget/packages/freespire.xls/14.2.0/freespire.xls.14.2.0.nupkg.sha512", "/home/student/.nuget/packages/harfbuzzsharp/8.3.1.1/harfbuzzsharp.8.3.1.1.nupkg.sha512", "/home/student/.nuget/packages/harfbuzzsharp.nativeassets.linux/8.3.1.1/harfbuzzsharp.nativeassets.linux.8.3.1.1.nupkg.sha512", "/home/student/.nuget/packages/harfbuzzsharp.nativeassets.macos/8.3.1.1/harfbuzzsharp.nativeassets.macos.8.3.1.1.nupkg.sha512", "/home/student/.nuget/packages/harfbuzzsharp.nativeassets.webassembly/8.3.1.1/harfbuzzsharp.nativeassets.webassembly.8.3.1.1.nupkg.sha512", "/home/student/.nuget/packages/harfbuzzsharp.nativeassets.win32/8.3.1.1/harfbuzzsharp.nativeassets.win32.8.3.1.1.nupkg.sha512", + "/home/student/.nuget/packages/messagebox.avalonia/3.3.1.1/messagebox.avalonia.3.3.1.1.nupkg.sha512", "/home/student/.nuget/packages/microcom.runtime/0.11.0/microcom.runtime.0.11.0.nupkg.sha512", "/home/student/.nuget/packages/microsoft.extensions.configuration/10.0.5/microsoft.extensions.configuration.10.0.5.nupkg.sha512", "/home/student/.nuget/packages/microsoft.extensions.configuration.abstractions/10.0.5/microsoft.extensions.configuration.abstractions.10.0.5.nupkg.sha512", diff --git a/AvaloniaApplication14_Inventory_300326/obj/project.packagespec.json b/AvaloniaApplication14_Inventory_300326/obj/project.packagespec.json index 2874b3b..3b4568b 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/project.packagespec.json +++ b/AvaloniaApplication14_Inventory_300326/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj","projectName":"AvaloniaApplication14_Inventory_300326","projectPath":"/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj","outputPath":"/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net9.0"],"sources":{"http://192.168.200.81:8081/repository/nuget.org-proxy/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.300"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Avalonia":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Controls.DataGrid":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Desktop":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Diagnostics":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Fonts.Inter":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Themes.Fluent":{"target":"Package","version":"[11.3.4, )"},"CommunityToolkit.Mvvm":{"target":"Package","version":"[8.2.1, )"},"FreeSpire.XLS":{"target":"Package","version":"[14.2.0, )"},"Microsoft.Extensions.Hosting":{"target":"Package","version":"[10.0.5, )"},"MySqlConnector":{"target":"Package","version":"[2.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/home/student/.dotnet/sdk/9.0.311/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj","projectName":"AvaloniaApplication14_Inventory_300326","projectPath":"/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326.csproj","outputPath":"/home/student/RiderProjects/AvaloniaApplication14_Inventory_300326/AvaloniaApplication14_Inventory_300326/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net9.0"],"sources":{"http://192.168.200.81:8081/repository/nuget.org-proxy/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.300"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"Avalonia":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Controls.DataGrid":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Desktop":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Diagnostics":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Fonts.Inter":{"target":"Package","version":"[11.3.4, )"},"Avalonia.Themes.Fluent":{"target":"Package","version":"[11.3.4, )"},"CommunityToolkit.Mvvm":{"target":"Package","version":"[8.2.1, )"},"FreeSpire.XLS":{"target":"Package","version":"[14.2.0, )"},"MessageBox.Avalonia":{"target":"Package","version":"[3.3.1.1, )"},"Microsoft.Extensions.Hosting":{"target":"Package","version":"[10.0.5, )"},"MySqlConnector":{"target":"Package","version":"[2.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/home/student/.dotnet/sdk/9.0.311/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/AvaloniaApplication14_Inventory_300326/obj/rider.project.model.nuget.info b/AvaloniaApplication14_Inventory_300326/obj/rider.project.model.nuget.info index 73ae30a..c399e25 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/rider.project.model.nuget.info +++ b/AvaloniaApplication14_Inventory_300326/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17751742412854983 \ No newline at end of file +17763047588415830 \ No newline at end of file diff --git a/AvaloniaApplication14_Inventory_300326/obj/rider.project.restore.info b/AvaloniaApplication14_Inventory_300326/obj/rider.project.restore.info index 73ae30a..f4c3d0c 100644 --- a/AvaloniaApplication14_Inventory_300326/obj/rider.project.restore.info +++ b/AvaloniaApplication14_Inventory_300326/obj/rider.project.restore.info @@ -1 +1 @@ -17751742412854983 \ No newline at end of file +17763047593305837 \ No newline at end of file