Compare commits

..

No commits in common. "110362f3fc4c907df6f7adeafb5f733533326568" and "0992c9fef8521c73a8735a7b8a16ba3d717b541f" have entirely different histories.

36 changed files with 243 additions and 225 deletions

View File

@ -3,8 +3,24 @@
"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\\", "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": [ "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\\admin.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\\addclient.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
"RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:admin.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:addclient.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\\authorization.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
"RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:authorization.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\\registration.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:registration.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\\addclient.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:addclient.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\\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}"
} }
], ],
"DocumentGroupContainers": [ "DocumentGroupContainers": [
@ -14,7 +30,7 @@
"DocumentGroups": [ "DocumentGroups": [
{ {
"DockedWidth": 200, "DockedWidth": 200,
"SelectedChildIndex": 2, "SelectedChildIndex": 5,
"Children": [ "Children": [
{ {
"$type": "Bookmark", "$type": "Bookmark",
@ -26,15 +42,65 @@
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 0, "DocumentIndex": 1,
"Title": "Admin.axaml.cs", "Title": "Authorization.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\\Admin.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\\Authorization.axaml",
"RelativeDocumentMoniker": "Admin.axaml.cs", "RelativeDocumentMoniker": "Authorization.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\\Admin.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\\Authorization.axaml",
"RelativeToolTip": "Admin.axaml.cs", "RelativeToolTip": "Authorization.axaml",
"ViewState": "AgIAAA8AAAAAAAAAAAAAACcAAAAvAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
"WhenOpened": "2025-02-19T17:29:07.592Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
"Title": "Registration.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\\Registration.axaml.cs",
"RelativeDocumentMoniker": "Registration.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\\Registration.axaml.cs",
"RelativeToolTip": "Registration.axaml.cs",
"ViewState": "AgIAAC0AAAAAAAAAAAAAACoAAABEAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-25T14:35:58.682Z", "WhenOpened": "2025-02-19T17:18:38.423Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 4,
"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": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-19T17:13:36.115Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "AddClient.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\\AddClient.axaml",
"RelativeDocumentMoniker": "AddClient.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\\AddClient.axaml",
"RelativeToolTip": "AddClient.axaml",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
"WhenOpened": "2025-02-19T15:27:24.839Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 3,
"Title": "AddClient.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\\AddClient.axaml.cs",
"RelativeDocumentMoniker": "AddClient.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\\AddClient.axaml.cs",
"RelativeToolTip": "AddClient.axaml.cs",
"ViewState": "AgIAAB4AAAAAAAAAAAAAADgAAAAtAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-19T17:00:34.941Z",
"EditorCaption": "" "EditorCaption": ""
} }
] ]

View File

@ -1,7 +1,28 @@
{ {
"Version": 1, "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\\", "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": [], "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\\addclient.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
"RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:addclient.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\\authorization.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
"RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:authorization.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\\registration.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:registration.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\\addclient.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:addclient.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\\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}"
}
],
"DocumentGroupContainers": [ "DocumentGroupContainers": [
{ {
"Orientation": 0, "Orientation": 0,
@ -9,7 +30,7 @@
"DocumentGroups": [ "DocumentGroups": [
{ {
"DockedWidth": 200, "DockedWidth": 200,
"SelectedChildIndex": -1, "SelectedChildIndex": 5,
"Children": [ "Children": [
{ {
"$type": "Bookmark", "$type": "Bookmark",
@ -18,6 +39,69 @@
{ {
"$type": "Bookmark", "$type": "Bookmark",
"Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
},
{
"$type": "Document",
"DocumentIndex": 1,
"Title": "Authorization.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\\Authorization.axaml",
"RelativeDocumentMoniker": "Authorization.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\\Authorization.axaml",
"RelativeToolTip": "Authorization.axaml",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
"WhenOpened": "2025-02-19T17:29:07.592Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
"Title": "Registration.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\\Registration.axaml.cs",
"RelativeDocumentMoniker": "Registration.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\\Registration.axaml.cs",
"RelativeToolTip": "Registration.axaml.cs",
"ViewState": "AgIAAC0AAAAAAAAAAAAAACoAAABEAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-19T17:18:38.423Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 4,
"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": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-19T17:13:36.115Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "AddClient.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\\AddClient.axaml",
"RelativeDocumentMoniker": "AddClient.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\\AddClient.axaml",
"RelativeToolTip": "AddClient.axaml",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
"WhenOpened": "2025-02-19T15:27:24.839Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 3,
"Title": "AddClient.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\\AddClient.axaml.cs",
"RelativeDocumentMoniker": "AddClient.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\\AddClient.axaml.cs",
"RelativeToolTip": "AddClient.axaml.cs",
"ViewState": "AgIAAB4AAAAAAAAAAAAAADgAAAAtAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-19T17:00:34.941Z",
"EditorCaption": ""
} }
] ]
} }

View File

@ -25,12 +25,9 @@
<TextBlock Text="Введите пароль"/> <TextBlock Text="Введите пароль"/>
<TextBox Width="300" x:Name="TextPassword" ></TextBox> <TextBox Width="300" x:Name="TextPassword" ></TextBox>
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<Button Content="Добавить Клиента" Click="addclient"/> <Button Content="Добавить пользователя" Click="addclient"/>
<Button Content="Вернуться назад" Click="ExitClik"/> <Button Content="Вернуться назад" Click="ExitAddToSeller"/>
</StackPanel>
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock x:Name="MesAddError" Text="" Foreground="Red"/>
<TextBlock x:Name="MesAdd" Text="" Foreground="Green"/>
</StackPanel> </StackPanel>
<TextBlock x:Name="MesAdd" Text="" Foreground="Red"/>
</StackPanel> </StackPanel>
</Window> </Window>

View File

@ -11,14 +11,18 @@ namespace demo_blagodat;
public partial class AddClient : Window public partial class AddClient : Window
{ {
public Employee User; public AddClient()
public AddClient(Employee user)
{ {
InitializeComponent(); InitializeComponent();
User = user;
} }
private void addclient(object sender, RoutedEventArgs e) public void ExitAddToSeller(object sender, RoutedEventArgs e)
{
new Seller().Show();
Close();
}
public void addclient(object sender, RoutedEventArgs e)
{ {
try try
{ {
@ -32,8 +36,6 @@ public partial class AddClient : Window
string email = TextEmail.Text; string email = TextEmail.Text;
string password = TextPassword.Text; string password = TextPassword.Text;
if (name != null && pas != null && address != null && password != null)
{
Client client = new Client() Client client = new Client()
{ {
ClientCode = id, ClientCode = id,
@ -46,49 +48,13 @@ public partial class AddClient : Window
}; };
db.Clients.Add(client); db.Clients.Add(client);
db.SaveChanges(); db.SaveChanges();
MesAddError.Text = "";
MesAdd.Text = "Êëèåíò äîáàëåí"; MesAdd.Text = "Êëèåíò äîáàëåí";
} }
else
{
MesAdd.Text = "";
MesAddError.Text = "Íóæíî äîáàâèòü âñå äàííûå êëèåíòà!\nÌîæíî èãíîðèðîâàòü òîëüêî ïî÷òó.";
}
}
} }
catch (Exception ex) catch (Exception ex)
{ {
ExceptionDispatchInfo.Capture(ex).Throw(); ExceptionDispatchInfo.Capture(ex).Throw();
MesAdd.Text = ""; MesAdd.Text = "Ïðîâåðüòå äàííûå";
MesAddError.Text = "Ïðîâåðüòå äàííûå"; }
}
}
private void ExitClik(object sender, RoutedEventArgs e)
{
switch (User.EmployeesPosition)
{
case "Àäìèíèñòðàòîð": AdminOneClikc(User); break;
case "Ïðîäàâåö": SellerOneClikc(User); break;
case "Ñòàðøèé ñìåíû": ShiftSupervisorOneClikc(User); break;
}
Close();
}
private void SellerOneClikc(Employee User)
{
new Seller(User).Show();
Close();
}
private void AdminOneClikc(Employee User)
{
new Admin(User).Show();
Close();
}
private void ShiftSupervisorOneClikc(Employee User)
{
new ShiftSupervisor(User).Show();
Close();
} }
} }

View File

@ -6,10 +6,7 @@
x:Class="demo_blagodat.Admin" x:Class="demo_blagodat.Admin"
Title="Администратор"> Title="Администратор">
<StackPanel> <StackPanel>
<TextBlock x:Name="HelloUser" Text="Добрый день, "/> <Button Content="Сформировать заказ" />
<Button Content="Сформировать заказ" Click="createOrder"/> <Button Content="Выход" Click="Exit"/>
<Button Content="Выход" Click="ExitAuthorization"/>
<Button Content="Выход из приложения" Click="Exit"/>
<Button Content="Добавить клиента" Click="addClient"/>
</StackPanel> </StackPanel>
</Window> </Window>

View File

@ -6,51 +6,19 @@ using System.Runtime.ExceptionServices;
using System; using System;
using demo_blagodat.Models; using demo_blagodat.Models;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System.Linq;
namespace demo_blagodat; namespace demo_blagodat;
public partial class Admin : Window public partial class Admin : Window
{ {
public Employee User; public Admin()
public Admin(Employee user)
{ {
InitializeComponent(); InitializeComponent();
User = user;
HelloUser.Text = HelloUser.Text + User.EmployeesName;
} }
public void Exit(object sender, RoutedEventArgs e)
private void ExitAuthorization(object sender, RoutedEventArgs e)
{ {
new Authorization().Show(); new Authorization().Show();
using (User11Context db = new User11Context())
{
var corrUser = db.Employees.Where(x => x.EmployeesLogin == User.EmployeesLogin).FirstOrDefault();
corrUser.EmployeesEntrance = false;
db.SaveChanges();
}
Close();
}
private void Exit(object sender, RoutedEventArgs e)
{
using (User11Context db = new User11Context())
{
var corrUser = db.Employees.Where(x => x.EmployeesLogin == User.EmployeesLogin).FirstOrDefault();
corrUser.EmployeesEntrance = false;
db.SaveChanges();
}
Close();
}
private void createOrder(object sender, RoutedEventArgs e)
{
new CreateOrder(User).Show();
Close();
}
private void addClient(object sender, RoutedEventArgs e)
{
new AddClient(User).Show();
Close(); Close();
} }
} }

View File

@ -4,7 +4,6 @@ using Avalonia.Interactivity;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using demo_blagodat.Models; using demo_blagodat.Models;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System;
using System.Linq; using System.Linq;
namespace demo_blagodat; namespace demo_blagodat;
@ -13,6 +12,8 @@ public partial class Authorization : Window
{ {
string? Login; string? Login;
string? password; string? password;
static User11Context db = new User11Context();
public Authorization() public Authorization()
{ {
@ -29,49 +30,35 @@ public partial class Authorization : Window
Login = LoginTextBox.Text; Login = LoginTextBox.Text;
password = PasswordTextBox.Text; password = PasswordTextBox.Text;
User11Context db = new User11Context(); var corrUser = db.Employees.FirstOrDefault(x => x.EmployeesLogin == Login && x.EmployeesPassword == password);
var corrUser = db.Employees.Where(x => x.EmployeesLogin == Login && x.EmployeesPassword == password).FirstOrDefault();
if (corrUser == null) if (corrUser == null)
{ {
Mess.Text = "Ïîëüçîâàòåëü íå íàéäåí â ñèñòåìå"; Mess.Text = "Ïîëüçîâàòåëü íå íàéäåí â ñèñòåìå";
} }
else else
{ {
try
{
corrUser.EmployeesEntrance = true;
corrUser.EmployeesDateHour = TimeOnly.FromDateTime(DateTime.Now);
corrUser.EmployeesDateDay = DateOnly.FromDateTime(DateTime.Now);
db.SaveChanges();
switch (corrUser.EmployeesPosition) switch (corrUser.EmployeesPosition)
{ {
case "Àäìèíèñòðàòîð": AdminOneClikc(corrUser); break; case "Àäìèíèñòðàòîð": AdminOneClikc(); break;
case "Ïðîäàâåö": SellerOneClikc(corrUser); break; case "Ïðîäàâåö": SellerOneClikc(); break;
case "Ñòàðøèé ñìåíû": ShiftSupervisorOneClikc(corrUser); break; case "Ñòàðøèé ñìåíû": ShiftSupervisorOneClikc(); break;
}
Close();
}
catch (Exception ex)
{
Console.WriteLine("{0} Exception caught", ex.Message);
} }
} }
} }
private void SellerOneClikc(Employee corrUser) private void SellerOneClikc()
{ {
new Seller(corrUser).Show(); new Seller().Show();
Close(); Close();
} }
private void AdminOneClikc(Employee corrUser) private void AdminOneClikc()
{ {
new Admin(corrUser).Show(); new Admin().Show();
Close(); Close();
} }
private void ShiftSupervisorOneClikc(Employee corrUser) private void ShiftSupervisorOneClikc()
{ {
new ShiftSupervisor(corrUser).Show(); new ShiftSupervisor().Show();
Close(); Close();
} }
} }

View File

@ -5,7 +5,5 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="demo_blagodat.CreateOrder" x:Class="demo_blagodat.CreateOrder"
Title="CreateOrder"> Title="CreateOrder">
<StackPanel> Welcome to Avalonia!
<Button Content="Назад" Click="ExitClik"/>
</StackPanel>
</Window> </Window>

View File

@ -1,43 +1,13 @@
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using demo_blagodat.Models;
namespace demo_blagodat; namespace demo_blagodat;
public partial class CreateOrder : Window public partial class CreateOrder : Window
{ {
public Employee User; public CreateOrder()
public CreateOrder(Employee user)
{ {
InitializeComponent(); InitializeComponent();
User = user;
}
private void ExitClik(object sender, RoutedEventArgs e)
{
switch (User.EmployeesPosition)
{
case "Àäìèíèñòðàòîð": AdminOneClikc(User); break;
case "Ïðîäàâåö": SellerOneClikc(User); break;
case "Ñòàðøèé ñìåíû": ShiftSupervisorOneClikc(User); break;
}
Close();
}
private void SellerOneClikc(Employee User)
{
new Seller(User).Show();
Close();
}
private void AdminOneClikc(Employee User)
{
new Admin(User).Show();
Close();
}
private void ShiftSupervisorOneClikc(Employee User)
{
new ShiftSupervisor(User).Show();
Close();
} }
} }

View File

@ -15,7 +15,7 @@
<TextBlock Text="Введите пароль"/> <TextBlock Text="Введите пароль"/>
<TextBox Width="300" x:Name="PasswordTextBox" ></TextBox> <TextBox Width="300" x:Name="PasswordTextBox" ></TextBox>
<TextBlock x:Name="position" Text="Добрый день "/> <TextBox Text="Выберите должность:" x:Name="position"/>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Button Content="Продавец" Click="sellerUser"/> <Button Content="Продавец" Click="sellerUser"/>
<Button Content="Старший смены" Click="shiftSupervisorUser"/> <Button Content="Старший смены" Click="shiftSupervisorUser"/>

View File

@ -57,14 +57,17 @@ public partial class Registration : Window
}; };
db.Employees.Add(newUser); db.Employees.Add(newUser);
db.SaveChanges(); db.SaveChanges();
}
switch (PositionUser) switch (PositionUser)
{ {
case "Ïðîäàâåö": SellerOneClikc(newUser); break; case "Ïðîäàâåö": SellerOneClikc(); break;
case "Ñòàðøèé ñìåíû": ShiftSupervisorOneClikc(newUser); break; case "Ñòàðøèé ñìåíû": ShiftSupervisorOneClikc(); break;
} }
UserLogin = LoginTextBox.Text; UserLogin = LoginTextBox.Text;
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -72,15 +75,15 @@ public partial class Registration : Window
} }
} }
private void SellerOneClikc(Employee newUser) private void SellerOneClikc()
{ {
new Seller(newUser).Show(); new Seller().Show();
Close(); Close();
} }
private void ShiftSupervisorOneClikc(Employee newUser) private void ShiftSupervisorOneClikc()
{ {
new ShiftSupervisor(newUser).Show(); new ShiftSupervisor().Show();
Close(); Close();
} }
} }

View File

@ -6,8 +6,7 @@
x:Class="demo_blagodat.Seller" x:Class="demo_blagodat.Seller"
Title="Продавец"> Title="Продавец">
<StackPanel> <StackPanel>
<TextBlock x:Name="HelloUser" Text="Добрый день "/> <Button Content="Сформировать заказ" />
<Button Content="Сформировать заказ" Click="createOrder"/>
<Button Content="Выход" Click="ExitAuthorization"/> <Button Content="Выход" Click="ExitAuthorization"/>
<Button Content="Выход из приложения" Click="Exit"/> <Button Content="Выход из приложения" Click="Exit"/>
<Button Content="Добавить клиента" Click="addClient"/> <Button Content="Добавить клиента" Click="addClient"/>

View File

@ -4,52 +4,38 @@ using Avalonia.Interactivity;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using demo_blagodat.Models; using demo_blagodat.Models;
using System.Linq; using System.Linq;
using System;
using System.Runtime.ExceptionServices;
using Microsoft.EntityFrameworkCore.Diagnostics;
namespace demo_blagodat; namespace demo_blagodat;
public partial class Seller : Window public partial class Seller : Window
{ {
public Employee User; public Seller()
public Seller(Employee user)
{ {
InitializeComponent(); InitializeComponent();
User = user;
HelloUser.Text = HelloUser.Text + User.EmployeesName;
} }
private void ExitAuthorization(object sender, RoutedEventArgs e) public void ExitAuthorization(object sender, RoutedEventArgs e)
{ {
new Authorization().Show(); new Authorization().Show();
using(User11Context db = new User11Context()) Close();
{
var corrUser = db.Employees.Where(x => x.EmployeesLogin == User.EmployeesLogin).FirstOrDefault();
corrUser.EmployeesEntrance = false;
db.SaveChanges();
} }
public void Exit(object sender, RoutedEventArgs e)
{
//using(User11Context db = new User11Context())
//{
// var name = db.Employees.Where(it => it.EmployeesLogin == ).FirstOrDefault();
// name.EmployeesEntrance = false;
//}
Close(); Close();
} }
private void Exit(object sender, RoutedEventArgs e) public void createOrder(object sender, RoutedEventArgs e)
{ {
using (User11Context db = new User11Context()) new CreateOrder().Show();
{
var corrUser = db.Employees.Where(x => x.EmployeesLogin == User.EmployeesLogin).FirstOrDefault();
corrUser.EmployeesEntrance = false;
db.SaveChanges();
}
Close(); Close();
} }
public void addClient(object sender, RoutedEventArgs e)
private void createOrder(object sender, RoutedEventArgs e)
{ {
new CreateOrder(User).Show(); new AddClient().Show();
Close();
}
private void addClient(object sender, RoutedEventArgs e)
{
new AddClient(User).Show();
Close(); Close();
} }
} }

View File

@ -2,17 +2,14 @@ using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using demo_blagodat.Models;
namespace demo_blagodat; namespace demo_blagodat;
public partial class ShiftSupervisor : Window public partial class ShiftSupervisor : Window
{ {
public Employee User; public ShiftSupervisor()
public ShiftSupervisor(Employee user)
{ {
InitializeComponent(); InitializeComponent();
User = user;
} }
public void Exit(object sender, RoutedEventArgs e) public void Exit(object sender, RoutedEventArgs e)
{ {

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("demo_blagodat")] [assembly: System.Reflection.AssemblyCompanyAttribute("demo_blagodat")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2e74cf1d5d3ba7d67ec5e1e7f82eb3dbc9049a33")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a74f671c1736abf62fd1c02babbd24d2b1a8c3e5")]
[assembly: System.Reflection.AssemblyProductAttribute("demo_blagodat")] [assembly: System.Reflection.AssemblyProductAttribute("demo_blagodat")]
[assembly: System.Reflection.AssemblyTitleAttribute("demo_blagodat")] [assembly: System.Reflection.AssemblyTitleAttribute("demo_blagodat")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
71985eb52f2155cee0fce6b8282760c334b0f233c9de818568a3939bfb7ab19c dbbe2cc112a9145b1547020b2168630c89be8f28250ce59976a57c7b151ab048