From 9ad2073e099ced73eb412444e3d42919dcf0b032 Mon Sep 17 00:00:00 2001
From: Userok <dullahannomer3@gmail.com>
Date: Fri, 27 Dec 2024 16:07:13 +0300
Subject: [PATCH]

---
 Demka-2/Views/MainWindow.axaml           |  9 +++---
 Demka-2/Views/MainWindow.axaml.cs        | 19 ++++++++++++
 Demka-2/Views/ServiceFormWindow.axaml.cs | 39 +++++++++++-------------
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/Demka-2/Views/MainWindow.axaml b/Demka-2/Views/MainWindow.axaml
index 0b1cdac..6a2f501 100644
--- a/Demka-2/Views/MainWindow.axaml
+++ b/Demka-2/Views/MainWindow.axaml
@@ -1,7 +1,7 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="Demka_2.Views.MainWindow"
-        Width="800" Height="600"
+        Width="1200" Height="800"
         Title="Список услуг">
 	<DockPanel>
 		<StackPanel Orientation="Horizontal" DockPanel.Dock="Top" Margin="5">
@@ -28,10 +28,10 @@
 			<Button Content="Добавить услугу" Name="AddServiceButton" Margin="5" />
 			<Button Content="Редактировать услугу" Name="EditServiceButton" Margin="5" />
 			<Button Content="Удалить услугу" Name="DeleteServiceButton" Margin="5" />
-	<!-- 	<Button Content="Открыть форму для добавления товаров" Name="OpenServiceFormWindow" Click="OpenServiceFormWindow_Click" Margin="5" />-->
+	<!--	<Button Content="Открыть форму для добавления товаров" Name="OpenServiceFormWindow" Click="OpenServiceFormWindow_Click" Margin="5" /> -->
 		</StackPanel>
 		
-		<ListBox Name="ServiceList" Margin="5">
+		<ListBox Name="ServiceList" Margin="5" Width="600">
 			<ListBox.ItemTemplate>
 				<DataTemplate>
 					<StackPanel Orientation="Vertical" Background="{Binding BackgroundColor}" Margin="5">
@@ -46,7 +46,6 @@
 				</DataTemplate>
 			</ListBox.ItemTemplate>
 		</ListBox>
-
-		<TextBlock Name="ServiceCountText" DockPanel.Dock="Left" Margin="5" HorizontalAlignment="Center" />
+		<TextBlock Name="ServiceCountText" DockPanel.Dock="Bottom" Margin="50" HorizontalAlignment="Center" />
 	</DockPanel>
 </Window>
\ No newline at end of file
diff --git a/Demka-2/Views/MainWindow.axaml.cs b/Demka-2/Views/MainWindow.axaml.cs
index f240670..d12627a 100644
--- a/Demka-2/Views/MainWindow.axaml.cs
+++ b/Demka-2/Views/MainWindow.axaml.cs
@@ -145,7 +145,26 @@ public partial class MainWindow : Window
         UpdateFilteredServices();
     }
 
+    public async void ShowMessage(string message)
+    {
+        var messageBox = new Window
+        {
+            Title = "Сообщение",
+            Content = message,
+            Width = 300,
+            Height = 150,
+            WindowStartupLocation = WindowStartupLocation.CenterScreen
+        };
 
+        var okButton = new Button { Content = "ОК" };
+        okButton.Click += (s, e) => messageBox.Close();
+        messageBox.Content = new StackPanel
+        {
+            Children = { new TextBlock { Text = message }, okButton }
+        };
+
+        await messageBox.ShowDialog(this);
+    }
 
     private (decimal min, decimal max)? ParseDiscountRange(string rangeText)
     {
diff --git a/Demka-2/Views/ServiceFormWindow.axaml.cs b/Demka-2/Views/ServiceFormWindow.axaml.cs
index 876408c..beb8054 100644
--- a/Demka-2/Views/ServiceFormWindow.axaml.cs
+++ b/Demka-2/Views/ServiceFormWindow.axaml.cs
@@ -24,27 +24,24 @@ namespace Demka_2.Views
             SaveButton.Click += SaveButton_Click;
             SelectImageButton.Click += SelectImageButton_Click;
 
+            //AddServiceButton.Click += (s, e) =>
+            //{
+            //    var serviceForm = new ServiceFormWindow(new Service(), Services);
+            //    serviceForm.ShowDialog(this).ContinueWith(_ => UpdateFilteredServices());
+            //};
 
-            /*
-             * AddServiceButton.Click += (s, e) =>
-            {
-                var serviceForm = new ServiceFormWindow(new Service(), Services);
-                serviceForm.ShowDialog(this).ContinueWith(_ => UpdateFilteredServices());
-            };
-
-            EditServiceButton.Click += (s, e) =>
-            {
-                if (_serviceList.SelectedItem is Service selectedService)
-                {
-                    var serviceForm = new ServiceFormWindow(selectedService, Services);
-                    serviceForm.ShowDialog(this).ContinueWith(_ => UpdateFilteredServices());
-                }
-                else
-                {
-                    MessageBox.Show("Выберите услугу для редактирования.");
-                }
-            };
-            */
+            //EditServiceButton.Click += (s, e) =>
+            //{
+            //    if (_serviceList.SelectedItem is Service selectedService)
+            //    {
+            //        var serviceForm = new ServiceFormWindow(selectedService, Services);
+            //        serviceForm.ShowDialog(this).ContinueWith(_ => UpdateFilteredServices());
+            //    }
+            //    else
+            //    {
+            //        ShowMessage("Выберите услугу для редактирования.");
+            //    }
+            //};
         }
 
         private void LoadServiceData()
@@ -59,7 +56,7 @@ namespace Demka_2.Views
                 ThumbnailImage.Source = new Bitmap(_service.ImagePath);
             }
         }
-        private async void ShowMessage(string message)
+        public async void ShowMessage(string message)
         {
             var messageBox = new Window
             {