From 46e85e6311f99520fa52a5a9bf3adc84231b5402 Mon Sep 17 00:00:00 2001
From: NikitaOnianov <nikita.onianov@yandex.ru>
Date: Tue, 4 Mar 2025 14:08:51 +0300
Subject: [PATCH] add data output to the screen

---
 demo_blagodat/Functions/DeleteClient.axaml    | 28 ++++----
 demo_blagodat/Functions/DeleteClient.axaml.cs | 65 ++++++++-----------
 demo_blagodat/Functions/DeleteEmployee.axaml  | 22 ++++---
 .../Functions/DeleteEmployee.axaml.cs         | 59 +++++++----------
 4 files changed, 76 insertions(+), 98 deletions(-)

diff --git a/demo_blagodat/Functions/DeleteClient.axaml b/demo_blagodat/Functions/DeleteClient.axaml
index 6c636aa..dd5bdcb 100644
--- a/demo_blagodat/Functions/DeleteClient.axaml
+++ b/demo_blagodat/Functions/DeleteClient.axaml
@@ -2,23 +2,11 @@
         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"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600"
         x:Class="demo_blagodat.DeleteClient"
+		x:CompileBindings="False"
         Title="Удалить клиента">
-	<StackPanel Orientation="Vertical">
-		<StackPanel Spacing="15" HorizontalAlignment="Center" Orientation="Vertical">
-
-			<StackPanel Orientation="Vertical">
-				<TextBlock Text="Введите ФИО"/>
-				<TextBox Width="300" x:Name="TextName"/>
-			</StackPanel>
-
-			<StackPanel Orientation="Vertical">
-				<TextBlock Text="Введите Паспорт"/>
-				<TextBox Width="300" x:Name="TextPassport"/>
-			</StackPanel>
-
-		</StackPanel>
+	<StackPanel>
 
 		<StackPanel HorizontalAlignment="Center" Orientation="Vertical" VerticalAlignment="Center">
 			<Button Content="Удвлить Клиента" Click="deleteclient"/>
@@ -28,5 +16,15 @@
 			<TextBlock x:Name="MesDelError" Text="" Foreground="Red"/>
 			<TextBlock x:Name="MesDel" Text="" Foreground="Green"/>
 		</StackPanel>
+		
+		<ListBox Name="Items" SelectionChanged="ListBox_SelectionChanged">
+			<ListBox.ItemTemplate>
+				<DataTemplate>
+					<TextBlock Text="{Binding ClientName}"/>
+				</DataTemplate>
+			</ListBox.ItemTemplate>
+		</ListBox>
+
+		
 	</StackPanel>
 </Window>
diff --git a/demo_blagodat/Functions/DeleteClient.axaml.cs b/demo_blagodat/Functions/DeleteClient.axaml.cs
index 78fe8b6..313b8fc 100644
--- a/demo_blagodat/Functions/DeleteClient.axaml.cs
+++ b/demo_blagodat/Functions/DeleteClient.axaml.cs
@@ -3,61 +3,48 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using demo_blagodat.Models;
+using Microsoft.EntityFrameworkCore;
 using System;
+using System.Collections.ObjectModel;
 using System.Linq;
-
 namespace demo_blagodat;
 
 public partial class DeleteClient : Window
 {
+    static User11Context db = new User11Context();
+    ObservableCollection<Client> itemSource = new ObservableCollection<Client>(db.Clients);
     public Employee User;
+
+    public DeleteClient()
+    {
+
+    }
+
     public DeleteClient(Employee user)
     {
         InitializeComponent();
         User = user;
+        Items.ItemsSource = itemSource;
+    }
+    private void ListBox_SelectionChanged(object? sender, Avalonia.Controls.SelectionChangedEventArgs e)
+    {
+        if(sender != null)
+        {
+
+        }
     }
     private void deleteclient(object sender, RoutedEventArgs e)
     {
         try // ����������� ��� ��������� ����������
         {
-            using (User11Context db = new User11Context()) // ����������� � ��
+            if (sender != null)
             {
-                // �������� ��� ������ � ������
-                string? name = TextName.Text;
-                //string pas = TextPassport.Text;
-                
-
-                if (name != null) // ��������� ������� ������ ������
-                {
-                    Client? client = db.Clients.Where(it => it.ClientName == name).FirstOrDefault(); // ������ ��������� ������ Client
-
-                    if (client != null)
-                    {
-                        // ������� ������������ �� ��
-                        db.Clients.Remove(client);
-
-                        // ��������� ��������� ��
-                        db.SaveChanges();
-
-                        // ������ ���������
-                        MesDelError.Text = "";
-                        MesDel.Text = "������ �����";
-                    }
-                    else
-                    {
-                        MesDel.Text = "������ ������� ���";
-                    }
-
-                    // ������� ��� ������
-                    TextName.Text = "";
-                    TextPassport.Text = "";
-                }
-                else
-                {
-                    // ������ ���������
-                    MesDel.Text = "";
-                    MesDelError.Text = "����� �������� ��� ������ �������!\n����� ������������ ������ �����.";
-                }
+                db.Clients.Remove(Items.SelectedItem as Client);
+                itemSource.Remove(Items.SelectedItem as Client);
+                db.SaveChanges();
+                // ������ ���������
+                MesDel.Text = "������ �����";
+                MesDelError.Text = "";
             }
         }
         catch (Exception ex)
@@ -67,7 +54,7 @@ public partial class DeleteClient : Window
 
             // ������ ���������
             MesDel.Text = "";
-            MesDelError.Text = "��������� ������";
+            MesDelError.Text = "��������� ������";
         }
 
     }
diff --git a/demo_blagodat/Functions/DeleteEmployee.axaml b/demo_blagodat/Functions/DeleteEmployee.axaml
index ee58c70..b73bd83 100644
--- a/demo_blagodat/Functions/DeleteEmployee.axaml
+++ b/demo_blagodat/Functions/DeleteEmployee.axaml
@@ -4,16 +4,10 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="demo_blagodat.DeleteEmployee"
-        Title="DeleteEmployee">
+		x:CompileBindings="False"
+        Title="Удалить сотрудника">
 	<StackPanel Orientation="Vertical">
-		<StackPanel Spacing="15" HorizontalAlignment="Center" Orientation="Vertical">
-
-			<StackPanel Orientation="Vertical">
-				<TextBlock Text="Введите Логин "/>
-				<TextBox Width="300" x:Name="TextLogin"/>
-			</StackPanel>
-		</StackPanel>
-
+		
 		<StackPanel HorizontalAlignment="Center" Orientation="Vertical" VerticalAlignment="Center">
 			<Button Content="Удвлить Сотрудника" Click="deleteEmployee"/>
 			<Button Content="Вернуться назад" Click="ExitClik"/>
@@ -22,5 +16,15 @@
 			<TextBlock x:Name="MesDelError" Text="" Foreground="Red"/>
 			<TextBlock x:Name="MesDel" Text="" Foreground="Green"/>
 		</StackPanel>
+
+
+		<ListBox Name="Items" SelectionChanged="ListBox_SelectionChanged">
+			<ListBox.ItemTemplate>
+				<DataTemplate>
+					<TextBlock Text="{Binding EmployeesName}"/>
+				</DataTemplate>
+			</ListBox.ItemTemplate>
+		</ListBox>
+
 	</StackPanel>
 </Window>
diff --git a/demo_blagodat/Functions/DeleteEmployee.axaml.cs b/demo_blagodat/Functions/DeleteEmployee.axaml.cs
index d142d4f..adb3971 100644
--- a/demo_blagodat/Functions/DeleteEmployee.axaml.cs
+++ b/demo_blagodat/Functions/DeleteEmployee.axaml.cs
@@ -4,59 +4,48 @@ using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using demo_blagodat.Models;
 using System;
+using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace demo_blagodat;
 
 public partial class DeleteEmployee : Window
 {
+    static User11Context db = new User11Context();
+    ObservableCollection<Employee> itemSource = new ObservableCollection<Employee>(db.Employees);
     public Employee User;
+
+    public DeleteEmployee()
+    {
+
+    }
     public DeleteEmployee(Employee user)
     {
         InitializeComponent();
         User = user;
+        Items.ItemsSource = itemSource;
+    }
+
+    private void ListBox_SelectionChanged(object? sender, Avalonia.Controls.SelectionChangedEventArgs e)
+    {
+        if (sender != null)
+        {
+
+        }
     }
 
     private void deleteEmployee(object sender, RoutedEventArgs e)
     {
         try // ����������� ��� ��������� ����������
         {
-            using (User11Context db = new User11Context()) // ����������� � ��
+            if (sender != null)
             {
-                // �������� ��� ������ � ������
-                string? login = TextLogin.Text;
-
-                if (login != null) // ��������� ������� ������ ������
-                {
-                    Employee? employee = db.Employees.Where(it => it.EmployeesLogin == login).FirstOrDefault();// ������ ��������� ������ Client
-
-                    if (employee != null)
-                    {
-                        // ������� ������������ �� ��
-                        db.Employees.Remove(employee);
-
-                        // ��������� ��������� ��
-                        db.SaveChanges();
-
-                        // ������ ���������
-                        MesDelError.Text = "";
-                        MesDel.Text = "��������� �����";
-                        TextLogin.Text = "";
-                    }
-                    else
-                    {
-                        MesDel.Text = "";
-                        MesDelError.Text = "������ ���������� ���";
-                    }
-
-                    
-                }
-                else
-                {
-                    // ������ ���������
-                    MesDel.Text = "";
-                    MesDelError.Text = "����� ������ ����� ����������";
-                }
+                db.Employees.Remove(Items.SelectedItem as Employee);
+                itemSource.Remove(Items.SelectedItem as Employee);
+                db.SaveChanges();
+                // ������ ���������
+                MesDel.Text = "��������� �����";
+                MesDelError.Text = "";
             }
         }
         catch (Exception ex)