diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/04891692-ed0a-47bf-84bf-6c58cbdcdec6.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/04891692-ed0a-47bf-84bf-6c58cbdcdec6.vsidx
new file mode 100644
index 0000000..df790e5
Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/04891692-ed0a-47bf-84bf-6c58cbdcdec6.vsidx differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/189fb1df-5c43-4b05-9ead-099e62a5ca02.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/189fb1df-5c43-4b05-9ead-099e62a5ca02.vsidx
deleted file mode 100644
index 5848865..0000000
Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/189fb1df-5c43-4b05-9ead-099e62a5ca02.vsidx and /dev/null differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/1ffcf824-4c2c-4b24-959a-d1a5b4020c56.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/1ffcf824-4c2c-4b24-959a-d1a5b4020c56.vsidx
new file mode 100644
index 0000000..6ed1052
Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/1ffcf824-4c2c-4b24-959a-d1a5b4020c56.vsidx differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/2c2befbc-0d40-497d-954c-e3d9179cbc36.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/37103c9a-52c1-4e57-925d-9846040fc9bc.vsidx
similarity index 73%
rename from demo_blagodat/.vs/demo_blagodat/FileContentIndex/2c2befbc-0d40-497d-954c-e3d9179cbc36.vsidx
rename to demo_blagodat/.vs/demo_blagodat/FileContentIndex/37103c9a-52c1-4e57-925d-9846040fc9bc.vsidx
index a6a2e74..1c27f45 100644
Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/2c2befbc-0d40-497d-954c-e3d9179cbc36.vsidx and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/37103c9a-52c1-4e57-925d-9846040fc9bc.vsidx differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/67708396-eea9-48a8-94ab-665531c373a2.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/67708396-eea9-48a8-94ab-665531c373a2.vsidx
new file mode 100644
index 0000000..09eb740
Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/67708396-eea9-48a8-94ab-665531c373a2.vsidx differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/7883fc26-7e6f-4732-80d9-b9acc1e3371f.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/7883fc26-7e6f-4732-80d9-b9acc1e3371f.vsidx
deleted file mode 100644
index 8c99302..0000000
Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/7883fc26-7e6f-4732-80d9-b9acc1e3371f.vsidx and /dev/null differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/8bb8871c-5530-41bb-a095-6df45f3a88a1.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/8bb8871c-5530-41bb-a095-6df45f3a88a1.vsidx
new file mode 100644
index 0000000..8ded520
Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/8bb8871c-5530-41bb-a095-6df45f3a88a1.vsidx differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/926c26eb-e82d-437b-85c0-cf5ca0a706d4.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/926c26eb-e82d-437b-85c0-cf5ca0a706d4.vsidx
deleted file mode 100644
index f150b53..0000000
Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/926c26eb-e82d-437b-85c0-cf5ca0a706d4.vsidx and /dev/null differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/a232597f-5d2b-4c36-bd2d-f564a0b6b1ee.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/a232597f-5d2b-4c36-bd2d-f564a0b6b1ee.vsidx
deleted file mode 100644
index 82ab0e0..0000000
Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/a232597f-5d2b-4c36-bd2d-f564a0b6b1ee.vsidx and /dev/null differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/aaf018a0-d59a-4b01-b1f4-cc3159e5f84e.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/aaf018a0-d59a-4b01-b1f4-cc3159e5f84e.vsidx
deleted file mode 100644
index 05d1df0..0000000
Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/aaf018a0-d59a-4b01-b1f4-cc3159e5f84e.vsidx and /dev/null differ
diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/ea856d02-36e7-4a04-9927-3be48debcadd.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/ea856d02-36e7-4a04-9927-3be48debcadd.vsidx
new file mode 100644
index 0000000..edadb3c
Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/ea856d02-36e7-4a04-9927-3be48debcadd.vsidx differ
diff --git a/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2 b/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2
index 010d901..3f4141c 100644
Binary files a/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2 and b/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2 differ
diff --git a/demo_blagodat/.vs/demo_blagodat/v17/.suo b/demo_blagodat/.vs/demo_blagodat/v17/.suo
index 1ad9db1..6893341 100644
Binary files a/demo_blagodat/.vs/demo_blagodat/v17/.suo and b/demo_blagodat/.vs/demo_blagodat/v17/.suo differ
diff --git a/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json b/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json
index 84cc898..38b022e 100644
--- a/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json
+++ b/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json
@@ -1,32 +1,7 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\",
- "Documents": [
- {
- "AbsoluteMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|c:\\users\\vivobook 15x\\desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\demo_blagodat\\demo_blagodat\\demo_blagodat\\functions\\changeclient.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:functions\\changeclient.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|c:\\users\\vivobook 15x\\desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\demo_blagodat\\demo_blagodat\\demo_blagodat\\functions\\heir.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:functions\\heir.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|c:\\users\\vivobook 15x\\desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\demo_blagodat\\demo_blagodat\\demo_blagodat\\functions\\heir.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
- "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:functions\\heir.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|c:\\users\\vivobook 15x\\desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\demo_blagodat\\demo_blagodat\\demo_blagodat\\functions\\deleteclient.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:functions\\deleteclient.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|c:\\users\\vivobook 15x\\desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\demo_blagodat\\demo_blagodat\\demo_blagodat\\functions\\changeclient.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
- "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:functions\\changeclient.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|c:\\users\\vivobook 15x\\desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\demo_blagodat\\demo_blagodat\\demo_blagodat\\models\\client.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:models\\client.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- }
- ],
+ "Documents": [],
"DocumentGroupContainers": [
{
"Orientation": 0,
@@ -34,7 +9,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 5,
+ "SelectedChildIndex": -1,
"Children": [
{
"$type": "Bookmark",
@@ -43,82 +18,6 @@
{
"$type": "Bookmark",
"Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
- },
- {
- "$type": "Document",
- "DocumentIndex": 1,
- "Title": "Heir.axaml.cs",
- "DocumentMoniker": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Functions\\Heir.axaml.cs",
- "RelativeDocumentMoniker": "Functions\\Heir.axaml.cs",
- "ToolTip": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Functions\\Heir.axaml.cs",
- "RelativeToolTip": "Functions\\Heir.axaml.cs",
- "ViewState": "AgIAACoAAAAAAAAAAAAAABsAAAAFAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-09T19:44:15.189Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 2,
- "Title": "Heir.axaml",
- "DocumentMoniker": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Functions\\Heir.axaml",
- "RelativeDocumentMoniker": "Functions\\Heir.axaml",
- "ToolTip": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Functions\\Heir.axaml",
- "RelativeToolTip": "Functions\\Heir.axaml",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
- "WhenOpened": "2025-03-09T19:43:26.417Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
- "Title": "DeleteClient.axaml.cs",
- "DocumentMoniker": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Functions\\DeleteClient.axaml.cs",
- "RelativeDocumentMoniker": "Functions\\DeleteClient.axaml.cs",
- "ToolTip": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Functions\\DeleteClient.axaml.cs",
- "RelativeToolTip": "Functions\\DeleteClient.axaml.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-09T19:41:40.367Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
- "Title": "ChangeClient.axaml.cs",
- "DocumentMoniker": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Functions\\ChangeClient.axaml.cs",
- "RelativeDocumentMoniker": "Functions\\ChangeClient.axaml.cs",
- "ToolTip": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Functions\\ChangeClient.axaml.cs*",
- "RelativeToolTip": "Functions\\ChangeClient.axaml.cs*",
- "ViewState": "AgIAACIAAAAAAAAAAAAwwDEAAABSAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-09T19:39:06.531Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "Title": "ChangeClient.axaml",
- "DocumentMoniker": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Functions\\ChangeClient.axaml",
- "RelativeDocumentMoniker": "Functions\\ChangeClient.axaml",
- "ToolTip": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Functions\\ChangeClient.axaml",
- "RelativeToolTip": "Functions\\ChangeClient.axaml",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
- "WhenOpened": "2025-03-09T19:39:02.539Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "Client.cs",
- "DocumentMoniker": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Models\\Client.cs",
- "RelativeDocumentMoniker": "Models\\Client.cs",
- "ToolTip": "C:\\Users\\VivoBook 15X\\Desktop\\\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0435 \u043C\u043E\u0434\u0443\u043B\u0438\\Demo_Blagodat\\demo_blagodat\\demo_blagodat\\Models\\Client.cs",
- "RelativeToolTip": "Models\\Client.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAcAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-03-09T19:24:32.315Z",
- "EditorCaption": ""
}
]
}
diff --git a/demo_blagodat/Entry/Registration.axaml b/demo_blagodat/Entry/Registration.axaml
index a3213da..2f87e2b 100644
--- a/demo_blagodat/Entry/Registration.axaml
+++ b/demo_blagodat/Entry/Registration.axaml
@@ -5,21 +5,23 @@
mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="550"
x:Class="demo_blagodat.Registration"
Title="Регистрация">
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
diff --git a/demo_blagodat/Functions/AddClient.axaml b/demo_blagodat/Functions/AddClient.axaml
index 4d2d44c..62a82be 100644
--- a/demo_blagodat/Functions/AddClient.axaml
+++ b/demo_blagodat/Functions/AddClient.axaml
@@ -6,7 +6,9 @@
x:Class="demo_blagodat.AddClient"
xmlns:vm="using:demo_blagodat.Models"
Title="Добавление клиентов">
+
+
@@ -21,7 +23,7 @@
-
+
@@ -86,5 +88,7 @@
+
+
diff --git a/demo_blagodat/Functions/AddClient.axaml.cs b/demo_blagodat/Functions/AddClient.axaml.cs
index 1fea182..64bb7cc 100644
--- a/demo_blagodat/Functions/AddClient.axaml.cs
+++ b/demo_blagodat/Functions/AddClient.axaml.cs
@@ -7,6 +7,7 @@ using System.Runtime.ExceptionServices;
using System;
using System.Linq;
using System.Collections.ObjectModel;
+using System.Globalization;
namespace demo_blagodat;
@@ -39,7 +40,7 @@ public partial class AddClient : Window
int id = db.Clients.Max(it => it.ClientCode) + 1; // ID "1"
string name = TextName.Text;
string pas = TextPassport.Text;
- DateOnly date = DateOnly.TryParse(TextBirthday.Text, out var BirthDate) ? BirthDate : new DateOnly();
+ DateOnly date = DateOnly.FromDateTime(calendar.SelectedDate.Value.Date);
string address = TextAddress.Text;
string email = TextEmail.Text;
string password = TextPassword.Text;
@@ -66,7 +67,7 @@ public partial class AddClient : Window
//
TextName.Text = "";
TextPassport.Text = "";
- TextBirthday.Text = "";
+ calendar.SelectedDate = null;
TextAddress.Text = "";
TextEmail.Text = "";
TextPassword.Text = "";
diff --git a/demo_blagodat/Functions/AddOrder.axaml b/demo_blagodat/Functions/AddOrder.axaml
index 9ff5ee4..e5261b9 100644
--- a/demo_blagodat/Functions/AddOrder.axaml
+++ b/demo_blagodat/Functions/AddOrder.axaml
@@ -6,6 +6,7 @@
x:Class="demo_blagodat.CreateOrder"
xmlns:vm="using:demo_blagodat.Models"
Title="Создание заказа">
+
@@ -35,8 +36,8 @@
-
-
+
+
@@ -61,4 +62,5 @@
+
diff --git a/demo_blagodat/Functions/AddOrder.axaml.cs b/demo_blagodat/Functions/AddOrder.axaml.cs
index 78e6f97..899fb48 100644
--- a/demo_blagodat/Functions/AddOrder.axaml.cs
+++ b/demo_blagodat/Functions/AddOrder.axaml.cs
@@ -39,7 +39,7 @@ public partial class CreateOrder : Window
Client client = db.Clients.Where(it => it == sender).FirstOrDefault();
int order_rental_time = int.Parse(TextOrderRentalTime.Text);
- DateOnly? order_closing_date = DateOnly.TryParse(TextOrderClosingDate.Text, out var Date) ? Date : null;
+ DateOnly? order_closing_date = DateOnly.FromDateTime(calendar.SelectedDate.Value.Date);
if (TextOrderRentalTime.Text != "")
{
diff --git a/demo_blagodat/Functions/AddServices.axaml b/demo_blagodat/Functions/AddServices.axaml
index bda45f8..036dc20 100644
--- a/demo_blagodat/Functions/AddServices.axaml
+++ b/demo_blagodat/Functions/AddServices.axaml
@@ -5,6 +5,7 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="demo_blagodat.AddServices"
Title="Добавить новую услугу">
+
@@ -26,4 +27,5 @@
+
diff --git a/demo_blagodat/Functions/ChangeClient.axaml b/demo_blagodat/Functions/ChangeClient.axaml
index 2014e5e..8a3b028 100644
--- a/demo_blagodat/Functions/ChangeClient.axaml
+++ b/demo_blagodat/Functions/ChangeClient.axaml
@@ -6,6 +6,7 @@
x:Class="demo_blagodat.ChangeClient"
xmlns:vm="using:demo_blagodat.Models"
Title="Изменить клиента">
+
@@ -32,8 +33,8 @@
-
-
+
+
@@ -105,4 +106,5 @@
+
diff --git a/demo_blagodat/Functions/ChangeClient.axaml.cs b/demo_blagodat/Functions/ChangeClient.axaml.cs
index 3f218cf..49cb068 100644
--- a/demo_blagodat/Functions/ChangeClient.axaml.cs
+++ b/demo_blagodat/Functions/ChangeClient.axaml.cs
@@ -42,7 +42,7 @@ public partial class ChangeClient : Window
string? newname = TextNewName.Text;
string? newpas = TextNewPassport.Text;
string? newaddress = TextNewAddress.Text;
- DateOnly? newdate = DateOnly.TryParse(TextNewBirthday.Text, out var BirthDate) ? BirthDate : null;
+ DateOnly? newdate = DateOnly.FromDateTime(calendar.SelectedDate.Value.Date);
string? newemail = TextNewEmail.Text;
string? newpassword = TextNewPassword.Text;
@@ -111,7 +111,7 @@ public partial class ChangeClient : Window
MesAddError.Text = "";
}
- if (TextNewName.Text == "" && TextNewPassport.Text == "" && TextNewBirthday.Text == "" && TextNewEmail.Text == "" && TextNewPassword.Text == "" && TextNewAddress.Text == "")
+ if (TextNewName.Text == "" && TextNewPassport.Text == "" && calendar.SelectedDate == null && TextNewEmail.Text == "" && TextNewPassword.Text == "" && TextNewAddress.Text == "")
{
//
MesAdd.Text = "";
@@ -140,7 +140,7 @@ public partial class ChangeClient : Window
{
TextNewName.Text = "";
TextNewPassport.Text = "";
- TextNewBirthday.Text = "";
+ calendar.SelectedDate = null;
TextNewAddress.Text = "";
TextNewEmail.Text = "";
TextNewPassword.Text = "";
diff --git a/demo_blagodat/Functions/ChangeOrder.axaml b/demo_blagodat/Functions/ChangeOrder.axaml
index a38d12b..f7cf5b4 100644
--- a/demo_blagodat/Functions/ChangeOrder.axaml
+++ b/demo_blagodat/Functions/ChangeOrder.axaml
@@ -5,7 +5,9 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="demo_blagodat.ChangeOrder"
Title="Изменить заказ">
-
-
-
+
+
+
+
+
diff --git a/demo_blagodat/Functions/ChangeServices.axaml b/demo_blagodat/Functions/ChangeServices.axaml
index 516f0cf..bac0dcb 100644
--- a/demo_blagodat/Functions/ChangeServices.axaml
+++ b/demo_blagodat/Functions/ChangeServices.axaml
@@ -5,6 +5,7 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="demo_blagodat.ChangeServices"
Title="Изменить услугу">
+
@@ -59,4 +60,5 @@
+
diff --git a/demo_blagodat/Functions/ChangeYourSelf.axaml b/demo_blagodat/Functions/ChangeYourSelf.axaml
index 111390b..0a69c4a 100644
--- a/demo_blagodat/Functions/ChangeYourSelf.axaml
+++ b/demo_blagodat/Functions/ChangeYourSelf.axaml
@@ -5,6 +5,7 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="demo_blagodat.ChangeYourSelf"
Title="Изменить свои данные">
+
@@ -59,4 +60,5 @@
+
diff --git a/demo_blagodat/Functions/DeleteClient.axaml b/demo_blagodat/Functions/DeleteClient.axaml
index 51ce0a1..4db5940 100644
--- a/demo_blagodat/Functions/DeleteClient.axaml
+++ b/demo_blagodat/Functions/DeleteClient.axaml
@@ -6,10 +6,11 @@
x:Class="demo_blagodat.DeleteClient"
xmlns:vm="using:demo_blagodat.Models"
Title="Удалить клиента">
+
-
+
@@ -50,4 +51,5 @@
+
diff --git a/demo_blagodat/Functions/DeleteEmployee.axaml b/demo_blagodat/Functions/DeleteEmployee.axaml
index ce90232..69e0098 100644
--- a/demo_blagodat/Functions/DeleteEmployee.axaml
+++ b/demo_blagodat/Functions/DeleteEmployee.axaml
@@ -6,10 +6,11 @@
x:Class="demo_blagodat.DeleteEmployee"
x:CompileBindings="False"
Title="Удалить сотрудника">
+
-
+
@@ -34,4 +35,5 @@
+
diff --git a/demo_blagodat/Functions/DeleteOrder.axaml b/demo_blagodat/Functions/DeleteOrder.axaml
index b179cdd..052450a 100644
--- a/demo_blagodat/Functions/DeleteOrder.axaml
+++ b/demo_blagodat/Functions/DeleteOrder.axaml
@@ -6,6 +6,7 @@
x:Class="demo_blagodat.DeleteOrder"
xmlns:vm="using:demo_blagodat.Models"
Title="Удалить заказ">
+
@@ -73,4 +74,5 @@
+
diff --git a/demo_blagodat/Functions/DeleteServices.axaml b/demo_blagodat/Functions/DeleteServices.axaml
index 8686201..1c4a7df 100644
--- a/demo_blagodat/Functions/DeleteServices.axaml
+++ b/demo_blagodat/Functions/DeleteServices.axaml
@@ -5,6 +5,7 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="demo_blagodat.DeleteServices"
Title="Удалить Сервис">
+
@@ -30,4 +31,5 @@
+
diff --git a/demo_blagodat/Functions/Heir.axaml b/demo_blagodat/Functions/Heir.axaml
index ba87ae9..0a218a7 100644
--- a/demo_blagodat/Functions/Heir.axaml
+++ b/demo_blagodat/Functions/Heir.axaml
@@ -6,6 +6,7 @@
x:Class="demo_blagodat.Heir"
xmlns:vm="using:demo_blagodat.Models"
Title="Наследник">
+
@@ -32,4 +33,5 @@
+
diff --git a/demo_blagodat/Users/Admin.axaml b/demo_blagodat/Users/Admin.axaml
index 5e31c81..77f95f9 100644
--- a/demo_blagodat/Users/Admin.axaml
+++ b/demo_blagodat/Users/Admin.axaml
@@ -5,6 +5,7 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="demo_blagodat.Admin"
Title="Администратор">
+
@@ -45,4 +46,5 @@
+
diff --git a/demo_blagodat/Users/Seller.axaml b/demo_blagodat/Users/Seller.axaml
index 738e116..9654801 100644
--- a/demo_blagodat/Users/Seller.axaml
+++ b/demo_blagodat/Users/Seller.axaml
@@ -5,40 +5,42 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="demo_blagodat.Seller"
Title="Продавец">
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
+
diff --git a/demo_blagodat/Users/ShiftSupervisor.axaml b/demo_blagodat/Users/ShiftSupervisor.axaml
index 8f36438..831b1ed 100644
--- a/demo_blagodat/Users/ShiftSupervisor.axaml
+++ b/demo_blagodat/Users/ShiftSupervisor.axaml
@@ -5,33 +5,35 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="demo_blagodat.ShiftSupervisor"
Title="Начальник смены">
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
+
diff --git a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll
index 6acfa87..9cb9c12 100644
Binary files a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll and b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll differ
diff --git a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.exe b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.exe
index 0637739..0194144 100644
Binary files a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.exe and b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.exe differ
diff --git a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.pdb b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.pdb
index 439caff..8dd1d8b 100644
Binary files a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.pdb and b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.pdb differ
diff --git a/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.dll
index 6acfa87..9cb9c12 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.dll differ
diff --git a/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.pdb b/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.pdb
index 439caff..8dd1d8b 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.pdb and b/demo_blagodat/obj/Debug/net8.0/Avalonia/demo_blagodat.pdb differ
diff --git a/demo_blagodat/obj/Debug/net8.0/Avalonia/resources b/demo_blagodat/obj/Debug/net8.0/Avalonia/resources
index b11839a..d7d7469 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/Avalonia/resources and b/demo_blagodat/obj/Debug/net8.0/Avalonia/resources differ
diff --git a/demo_blagodat/obj/Debug/net8.0/apphost.exe b/demo_blagodat/obj/Debug/net8.0/apphost.exe
index 0637739..0194144 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/apphost.exe and b/demo_blagodat/obj/Debug/net8.0/apphost.exe differ
diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfo.cs b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfo.cs
index 220bcbc..9c3fb51 100644
--- a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfo.cs
+++ b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("demo_blagodat")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b008bbb7c3b4872362ba133dab1e4e56d88879b1")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f63e4d41bce29f31e8cca027a20f1c4f0ddbad69")]
[assembly: System.Reflection.AssemblyProductAttribute("demo_blagodat")]
[assembly: System.Reflection.AssemblyTitleAttribute("demo_blagodat")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfoInputs.cache b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfoInputs.cache
index 871c982..6a688d4 100644
--- a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfoInputs.cache
+++ b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.AssemblyInfoInputs.cache
@@ -1 +1 @@
-1996c7c7b98fd58da02e7dbb702e3e22f04fe74dad563ed472a35d21f12b144d
+d63b72aa80eb2f6a00640f99908a69b82a4fdfcb728d063234bb70a027739d4a
diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll
index ddd7ecd..d5214dd 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll differ
diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.pdb b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.pdb
index 3708b87..4f86e2c 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.pdb and b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.pdb differ
diff --git a/demo_blagodat/obj/Debug/net8.0/ref/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/ref/demo_blagodat.dll
index f93971c..70baa11 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/ref/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/ref/demo_blagodat.dll differ
diff --git a/demo_blagodat/obj/Debug/net8.0/refint/Avalonia/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/refint/Avalonia/demo_blagodat.dll
index f93971c..70baa11 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/refint/Avalonia/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/refint/Avalonia/demo_blagodat.dll differ
diff --git a/demo_blagodat/obj/Debug/net8.0/refint/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/refint/demo_blagodat.dll
index d21ee11..9b5ffa5 100644
Binary files a/demo_blagodat/obj/Debug/net8.0/refint/demo_blagodat.dll and b/demo_blagodat/obj/Debug/net8.0/refint/demo_blagodat.dll differ