From 35ef8aff18a133a83c93911a51bbbf3b72ac48f5 Mon Sep 17 00:00:00 2001 From: -SSS- Date: Thu, 3 Apr 2025 23:00:11 +0300 Subject: [PATCH] finish_mb --- demofinish/AddAgent_Window.axaml.cs | 3 +- demofinish/EditWindow.axaml.cs | 2 +- demofinish/MainWindow.axaml | 10 +- demofinish/MainWindow.axaml.cs | 134 ++++++++++++----- demofinish/{Models => Model}/Agent.cs | 9 +- .../{Models => Model}/Agentpriorityhistory.cs | 2 +- demofinish/{Models => Model}/Agenttype.cs | 2 +- demofinish/{Models => Model}/Material.cs | 2 +- .../{Models => Model}/Materialcounthistory.cs | 2 +- demofinish/{Models => Model}/Materialtype.cs | 2 +- demofinish/{Models => Model}/Product.cs | 2 +- demofinish/{Models => Model}/ProductType.cs | 2 +- .../{Models => Model}/Productcosthistory.cs | 2 +- .../{Models => Model}/Productmaterial.cs | 2 +- demofinish/{Models => Model}/Productsale.cs | 4 +- demofinish/{Models => Model}/Shop.cs | 2 +- demofinish/{Models => Model}/Supplier.cs | 2 +- demofinish/{Models => Model}/User1Context.cs | 3 +- demofinish/bin/Debug/net8.0/demofinish.dll | Bin 82944 -> 86016 bytes demofinish/bin/Debug/net8.0/demofinish.exe | Bin 139264 -> 139264 bytes demofinish/bin/Debug/net8.0/demofinish.pdb | Bin 30536 -> 31004 bytes .../net8.0/Avalonia/Resources.Inputs.cache | 2 +- .../obj/Debug/net8.0/Avalonia/demofinish.dll | Bin 82944 -> 86016 bytes .../obj/Debug/net8.0/Avalonia/demofinish.pdb | Bin 30536 -> 31004 bytes .../obj/Debug/net8.0/Avalonia/references | 86 +++++------ .../obj/Debug/net8.0/Avalonia/resources | Bin 11149 -> 11463 bytes demofinish/obj/Debug/net8.0/apphost.exe | Bin 139264 -> 139264 bytes .../Debug/net8.0/demofinish.AssemblyInfo.cs | 2 +- .../demofinish.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 10 +- .../obj/Debug/net8.0/demofinish.assets.cache | Bin 55993 -> 55993 bytes .../demofinish.csproj.AssemblyReference.cache | Bin 20158 -> 20158 bytes .../demofinish.csproj.CoreCompileInputs.cache | 2 +- demofinish/obj/Debug/net8.0/demofinish.dll | Bin 67072 -> 70144 bytes .../net8.0/demofinish.genruntimeconfig.cache | 2 +- demofinish/obj/Debug/net8.0/demofinish.pdb | Bin 27964 -> 28584 bytes .../obj/Debug/net8.0/ref/demofinish.dll | Bin 18432 -> 18944 bytes .../net8.0/refint/Avalonia/demofinish.dll | Bin 18432 -> 18944 bytes .../obj/Debug/net8.0/refint/demofinish.dll | Bin 18944 -> 19456 bytes .../obj/demofinish.csproj.nuget.dgspec.json | 15 +- .../obj/demofinish.csproj.nuget.g.props | 10 +- demofinish/obj/project.assets.json | 13 +- demofinish/obj/project.nuget.cache | 136 +++++++++--------- demofinish/obj/project.packagespec.json | 2 +- demofinish/obj/rider.project.model.nuget.info | 2 +- demofinish/obj/rider.project.restore.info | 2 +- 46 files changed, 267 insertions(+), 206 deletions(-) rename demofinish/{Models => Model}/Agent.cs (82%) rename demofinish/{Models => Model}/Agentpriorityhistory.cs (91%) rename demofinish/{Models => Model}/Agenttype.cs (90%) rename demofinish/{Models => Model}/Material.cs (96%) rename demofinish/{Models => Model}/Materialcounthistory.cs (91%) rename demofinish/{Models => Model}/Materialtype.cs (91%) rename demofinish/{Models => Model}/Product.cs (94%) rename demofinish/{Models => Model}/ProductType.cs (88%) rename demofinish/{Models => Model}/Productcosthistory.cs (89%) rename demofinish/{Models => Model}/Productmaterial.cs (90%) rename demofinish/{Models => Model}/Productsale.cs (78%) rename demofinish/{Models => Model}/Shop.cs (91%) rename demofinish/{Models => Model}/Supplier.cs (93%) rename demofinish/{Models => Model}/User1Context.cs (99%) diff --git a/demofinish/AddAgent_Window.axaml.cs b/demofinish/AddAgent_Window.axaml.cs index 4cd0bc0..694d0a6 100644 --- a/demofinish/AddAgent_Window.axaml.cs +++ b/demofinish/AddAgent_Window.axaml.cs @@ -4,7 +4,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; -using demofinish.Models; +using demofinish.Model; namespace demofinish; @@ -50,6 +50,7 @@ public partial class AddAgent_Window : Window { Title = NameBox.Text, Inn = InnBox.Text, + Logo = "picture.png", Agenttypeid = selectedType.Id, Kpp = KppBox.Text, Email = EmailBox.Text, diff --git a/demofinish/EditWindow.axaml.cs b/demofinish/EditWindow.axaml.cs index 665ec91..4d8e291 100644 --- a/demofinish/EditWindow.axaml.cs +++ b/demofinish/EditWindow.axaml.cs @@ -3,7 +3,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; -using demofinish.Models; +using demofinish.Model; using Avalonia.Controls.ApplicationLifetimes; using System; diff --git a/demofinish/MainWindow.axaml b/demofinish/MainWindow.axaml index c7d6e0f..e9438f9 100644 --- a/demofinish/MainWindow.axaml +++ b/demofinish/MainWindow.axaml @@ -41,7 +41,7 @@ - + по убыванию по возрастанию @@ -56,12 +56,14 @@ - + - + + + @@ -69,8 +71,6 @@