diff --git a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.metadata.v9.bin b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.metadata.v9.bin index 64b763a..fbcdf80 100644 Binary files a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.metadata.v9.bin and b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.metadata.v9.bin differ diff --git a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.projects.v9.bin b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.projects.v9.bin index dc7756a..e96f54f 100644 Binary files a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.projects.v9.bin and b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.projects.v9.bin differ diff --git a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.strings.v9.bin b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.strings.v9.bin index d80efdc..e1ec0c8 100644 Binary files a/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.strings.v9.bin and b/demo_blagodat/.vs/ProjectEvaluation/demo_blagodat.strings.v9.bin differ diff --git a/demo_blagodat/.vs/demo_blagodat/DesignTimeBuild/.dtbcache.v2 b/demo_blagodat/.vs/demo_blagodat/DesignTimeBuild/.dtbcache.v2 index 102fa24..7f2267d 100644 Binary files a/demo_blagodat/.vs/demo_blagodat/DesignTimeBuild/.dtbcache.v2 and b/demo_blagodat/.vs/demo_blagodat/DesignTimeBuild/.dtbcache.v2 differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/209f809b-738f-4429-979d-680294b0f4e1.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/209f809b-738f-4429-979d-680294b0f4e1.vsidx new file mode 100644 index 0000000..345b1bc Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/209f809b-738f-4429-979d-680294b0f4e1.vsidx differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/2f7180ed-6101-4375-87aa-b12b4311e278.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/2f7180ed-6101-4375-87aa-b12b4311e278.vsidx new file mode 100644 index 0000000..633f7ed Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/2f7180ed-6101-4375-87aa-b12b4311e278.vsidx differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/6392012d-8ccb-4c4b-800b-66aaefaa85b4.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/6392012d-8ccb-4c4b-800b-66aaefaa85b4.vsidx deleted file mode 100644 index 68439dc..0000000 Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/6392012d-8ccb-4c4b-800b-66aaefaa85b4.vsidx and /dev/null differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/69d9c51c-01e5-47c1-b95b-7338aa161825.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/69d9c51c-01e5-47c1-b95b-7338aa161825.vsidx deleted file mode 100644 index 4b12800..0000000 Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/69d9c51c-01e5-47c1-b95b-7338aa161825.vsidx and /dev/null differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/892c40ee-1745-4361-b9a3-a30a6c372404.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/892c40ee-1745-4361-b9a3-a30a6c372404.vsidx new file mode 100644 index 0000000..2c78a39 Binary files /dev/null and b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/892c40ee-1745-4361-b9a3-a30a6c372404.vsidx differ diff --git a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/e8a518db-57ef-49db-ade3-3a005116752b.vsidx b/demo_blagodat/.vs/demo_blagodat/FileContentIndex/e8a518db-57ef-49db-ade3-3a005116752b.vsidx deleted file mode 100644 index 96cd2fa..0000000 Binary files a/demo_blagodat/.vs/demo_blagodat/FileContentIndex/e8a518db-57ef-49db-ade3-3a005116752b.vsidx and /dev/null differ diff --git a/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2 b/demo_blagodat/.vs/demo_blagodat/v17/.futdcache.v2 index 3704f23..6e7a10e 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 1912c65..e4b972b 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 38b022e..400e3ce 100644 --- a/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json +++ b/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.backup.json @@ -1,7 +1,24 @@ { "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": [], + "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\\addservices.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:functions\\addservices.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\\addservices.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:functions\\addservices.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\\addclient.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:functions\\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\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:models\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + } + ], "DocumentGroupContainers": [ { "Orientation": 0, @@ -9,7 +26,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": -1, + "SelectedChildIndex": 4, "Children": [ { "$type": "Bookmark", @@ -18,6 +35,57 @@ { "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "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\\Functions\\AddClient.axaml.cs", + "RelativeDocumentMoniker": "Functions\\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\\Functions\\AddClient.axaml.cs", + "RelativeToolTip": "Functions\\AddClient.axaml.cs", + "ViewState": "AgIAAA8AAAAAAAAAAAAAAB4AAABpAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-02-26T12:26:35.443Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "Service.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\\Service.cs", + "RelativeDocumentMoniker": "Models\\Service.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\\Service.cs", + "RelativeToolTip": "Models\\Service.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAA0AAAASAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-02-26T12:14:09.14Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "AddServices.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\\AddServices.axaml.cs", + "RelativeDocumentMoniker": "Functions\\AddServices.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\\AddServices.axaml.cs", + "RelativeToolTip": "Functions\\AddServices.axaml.cs", + "ViewState": "AgIAACoAAAAAAAAAAAAAADgAAABfAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-02-26T12:11:59.898Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "AddServices.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\\AddServices.axaml", + "RelativeDocumentMoniker": "Functions\\AddServices.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\\AddServices.axaml", + "RelativeToolTip": "Functions\\AddServices.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2025-02-26T12:11:58.617Z", + "EditorCaption": "" } ] } diff --git a/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.json b/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.json index 38b022e..400e3ce 100644 --- a/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.json +++ b/demo_blagodat/.vs/demo_blagodat/v17/DocumentLayout.json @@ -1,7 +1,24 @@ { "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": [], + "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\\addservices.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:functions\\addservices.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\\addservices.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:functions\\addservices.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\\addclient.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:functions\\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\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B40AB1D5-A904-4458-95A8-8CAE49BE0884}|demo_blagodat.csproj|solutionrelative:models\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + } + ], "DocumentGroupContainers": [ { "Orientation": 0, @@ -9,7 +26,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": -1, + "SelectedChildIndex": 4, "Children": [ { "$type": "Bookmark", @@ -18,6 +35,57 @@ { "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "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\\Functions\\AddClient.axaml.cs", + "RelativeDocumentMoniker": "Functions\\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\\Functions\\AddClient.axaml.cs", + "RelativeToolTip": "Functions\\AddClient.axaml.cs", + "ViewState": "AgIAAA8AAAAAAAAAAAAAAB4AAABpAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-02-26T12:26:35.443Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "Service.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\\Service.cs", + "RelativeDocumentMoniker": "Models\\Service.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\\Service.cs", + "RelativeToolTip": "Models\\Service.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAA0AAAASAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-02-26T12:14:09.14Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "AddServices.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\\AddServices.axaml.cs", + "RelativeDocumentMoniker": "Functions\\AddServices.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\\AddServices.axaml.cs", + "RelativeToolTip": "Functions\\AddServices.axaml.cs", + "ViewState": "AgIAACoAAAAAAAAAAAAAADgAAABfAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-02-26T12:11:59.898Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "AddServices.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\\AddServices.axaml", + "RelativeDocumentMoniker": "Functions\\AddServices.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\\AddServices.axaml", + "RelativeToolTip": "Functions\\AddServices.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2025-02-26T12:11:58.617Z", + "EditorCaption": "" } ] } diff --git a/demo_blagodat/Functions/AddServices.axaml b/demo_blagodat/Functions/AddServices.axaml new file mode 100644 index 0000000..bda45f8 --- /dev/null +++ b/demo_blagodat/Functions/AddServices.axaml @@ -0,0 +1,29 @@ +<Window xmlns="https://github.com/avaloniaui" + 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" + x:Class="demo_blagodat.AddServices" + Title="Добавить новую услугу"> + <StackPanel Spacing="15" HorizontalAlignment="Center" VerticalAlignment="Center"> + + <TextBlock Text="Введите Название новой услуги"/> + <TextBox Width="300" x:Name="TextName"/> + + <TextBlock Text="Введите Код услуги"/> + <TextBox Width="300" x:Name="TextCode"/> + + <TextBlock Text="Введите стоимость услуги в рублях."/> + <TextBox Width="300" x:Name="TextPrice"/> + + + <StackPanel HorizontalAlignment="Center" Orientation="Horizontal"> + <Button Content="Добавить Услугу" Click="addService"/> + <Button Content="Вернуться назад" Click="ExitCliсk"/> + </StackPanel> + <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> + <TextBlock x:Name="MesAddError" Text="" Foreground="Red"/> + <TextBlock x:Name="MesAdd" Text="" Foreground="Green"/> + </StackPanel> + </StackPanel> +</Window> diff --git a/demo_blagodat/Functions/AddServices.axaml.cs b/demo_blagodat/Functions/AddServices.axaml.cs new file mode 100644 index 0000000..9f3fed9 --- /dev/null +++ b/demo_blagodat/Functions/AddServices.axaml.cs @@ -0,0 +1,103 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Markup.Xaml; +using demo_blagodat.Models; +using System.Linq; +using System; + +namespace demo_blagodat; + +public partial class AddServices : Window +{ + public Employee User; + public AddServices(Employee user) + { + InitializeComponent(); + User = user; + } + private void ExitCli�k(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(); + } + + + private void addService(object sender, RoutedEventArgs e) + { + try // ����������� ��� ��������� ���������� + { + using (User11Context db = new User11Context()) // ����������� � �� + { + // �������� ��� ������ � ������ + int id = db.Services.Max(it => it.ServiceId) + 1; // ���� ������������ ID ������������ � ���������� "1" + string name = TextName.Text; + string code = TextCode.Text; + decimal price = Math.Round(decimal.Parse(TextPrice.Text.Replace(".", ",")), 2); + + + if (name != null && code != null) // ��������� ������� ������ ������ + { + Service newService = new Service() // ������ ��������� ������ Service + { + // ��������� ���������� + ServiceId = id, + ServiceName = name, + ServiceCode = code, + ServiceCostPerHour = price + }; + + // ��������� ������������ � �� + db.Services.Add(newService); + db.SaveChanges(); + + // ������� ��� ������ + TextName.Text = ""; + TextCode.Text = ""; + TextPrice.Text = ""; + + // ������ ��������� + MesAddError.Text = ""; + MesAdd.Text = "������ ��������"; + } + else + { + // ������ ��������� + MesAdd.Text = ""; + MesAddError.Text = "����� ����������� �������� �������� � ���!"; + } + } + } + catch (Exception ex) + { + // ������� ��������� �� ������ � ������� + Console.WriteLine(ex.Message); + + // ������ ��������� + MesAdd.Text = ""; + MesAddError.Text = "��������� ������"; + } + + } +} \ No newline at end of file diff --git a/demo_blagodat/Functions/CreateOrder.axaml b/demo_blagodat/Functions/CreateOrder.axaml index fb8041a..a148484 100644 --- a/demo_blagodat/Functions/CreateOrder.axaml +++ b/demo_blagodat/Functions/CreateOrder.axaml @@ -5,7 +5,7 @@ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="demo_blagodat.CreateOrder" Title="Создание заказа"> - <StackPanel> + <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> <Button Content="Назад" Click="ExitClik"/> </StackPanel> </Window> diff --git a/demo_blagodat/Users/Admin.axaml b/demo_blagodat/Users/Admin.axaml index b4c12e1..add9a3f 100644 --- a/demo_blagodat/Users/Admin.axaml +++ b/demo_blagodat/Users/Admin.axaml @@ -5,11 +5,13 @@ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="demo_blagodat.Admin" Title="Администратор"> - <StackPanel> + <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> <TextBlock x:Name="HelloUser" Text="Добрый день, "/> - <Button Content="Сформировать заказ" Click="createOrder"/> <Button Content="Выход" Click="ExitAuthorization"/> <Button Content="Выход из приложения" Click="Exit"/> <Button Content="Добавить клиента" Click="addClient"/> + <Button Content="Сформировать заказ" Click="createOrder"/> + <Button Content="Добавить услугу" Click="addServices"/> + <Button Content="Удалить заказ" /> </StackPanel> </Window> diff --git a/demo_blagodat/Users/Admin.axaml.cs b/demo_blagodat/Users/Admin.axaml.cs index 53744cb..c488f69 100644 --- a/demo_blagodat/Users/Admin.axaml.cs +++ b/demo_blagodat/Users/Admin.axaml.cs @@ -49,6 +49,12 @@ public partial class Admin : Window Close(); } + private void addServices(object sender, RoutedEventArgs e) + { + new AddServices(User).Show(); + Close(); + } + // ����� ��� ���������� ���������� �� false private void activityUpdate() { diff --git a/demo_blagodat/Users/Seller.axaml b/demo_blagodat/Users/Seller.axaml index 476092a..fdc1e0d 100644 --- a/demo_blagodat/Users/Seller.axaml +++ b/demo_blagodat/Users/Seller.axaml @@ -5,11 +5,12 @@ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="demo_blagodat.Seller" Title="Продавец"> - <StackPanel> + <StackPanel Orientation="Horizontal"> <TextBlock x:Name="HelloUser" Text="Добрый день "/> <Button Content="Сформировать заказ" Click="createOrder"/> <Button Content="Выход" Click="ExitAuthorization"/> <Button Content="Выход из приложения" Click="Exit"/> <Button Content="Добавить клиента" Click="addClient"/> + <Button Content="Добавить услугу" Click="addServices"/> </StackPanel> </Window> diff --git a/demo_blagodat/Users/Seller.axaml.cs b/demo_blagodat/Users/Seller.axaml.cs index 3398872..d46b726 100644 --- a/demo_blagodat/Users/Seller.axaml.cs +++ b/demo_blagodat/Users/Seller.axaml.cs @@ -37,6 +37,11 @@ public partial class Seller : Window new CreateOrder(User).Show(); Close(); // ��������� ������� ���� } + private void addServices(object sender, RoutedEventArgs e) + { + new AddServices(User).Show(); + Close(); + } private void addClient(object sender, RoutedEventArgs e) { new AddClient(User).Show(); diff --git a/demo_blagodat/Users/ShiftSupervisor.axaml b/demo_blagodat/Users/ShiftSupervisor.axaml index cebbc4f..64618c7 100644 --- a/demo_blagodat/Users/ShiftSupervisor.axaml +++ b/demo_blagodat/Users/ShiftSupervisor.axaml @@ -6,8 +6,11 @@ x:Class="demo_blagodat.ShiftSupervisor" Title="Начальник смены"> <StackPanel Orientation="Horizontal"> - <Button Content="сформировать заказ"/> + <TextBlock x:Name="HelloUser" Text="Добрый день "/> + <Button Content="сформировать заказ" Click="createOrder"/> + <Button Content="Добавить пользователя" Click="addClient"/> <Button Content="принять товар"/> - <Button Content="Выход" Click="Exit"/> + <Button Content="Выход из приложения" Click="Exit"/> + <Button Content="Выход" Click="ExitAuthorization"/> </StackPanel> </Window> diff --git a/demo_blagodat/Users/ShiftSupervisor.axaml.cs b/demo_blagodat/Users/ShiftSupervisor.axaml.cs index 0ec7179..000151f 100644 --- a/demo_blagodat/Users/ShiftSupervisor.axaml.cs +++ b/demo_blagodat/Users/ShiftSupervisor.axaml.cs @@ -3,6 +3,7 @@ using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using demo_blagodat.Models; +using System.Linq; namespace demo_blagodat; @@ -13,10 +14,38 @@ public partial class ShiftSupervisor : Window { 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(); - Close(); + activityUpdate();// ����� ��� ���������� ���������� �� false + Close(); // ��������� ������� ���� + } + + private void Exit(object sender, RoutedEventArgs e) + { + activityUpdate(); // ����� ��� ���������� ���������� �� false + Close(); // ��������� ������� ���� + } + private void activityUpdate() + { + using (User11Context db = new User11Context()) // ����������� � �� + { + var corrUser = db.Employees.Where(x => x.EmployeesLogin == User.EmployeesLogin).FirstOrDefault(); + corrUser.EmployeesEntrance = false; // ������ � ��������� "����������" True �� False + db.SaveChanges(); // ��������� ��������� � �� + } + } + + private void createOrder(object sender, RoutedEventArgs e) + { + new CreateOrder(User).Show(); + Close(); // ��������� ������� ���� + } + private void addClient(object sender, RoutedEventArgs e) + { + new AddClient(User).Show(); + Close(); // ��������� ������� ���� } } \ No newline at end of file diff --git a/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll b/demo_blagodat/bin/Debug/net8.0/demo_blagodat.dll index 5941c46..ff049f9 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 6f80274..81af6b9 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 1c329c4..2f47a09 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/Resources.Inputs.cache b/demo_blagodat/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index 019c09c..f8f3a75 100644 --- a/demo_blagodat/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/demo_blagodat/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -587c6bac365720a8d2bbdeb7a2ee455b6747d01e0902eac9a6bf9026eb160acf +2be621f199d7e2a203d693ae6f5fff0625d5a2932fb1fc10452e2ec3e6444158 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 5941c46..ff049f9 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 1c329c4..2f47a09 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 2892609..9afbd48 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 6f80274..81af6b9 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 018013b..9a40306 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+110362f3fc4c907df6f7adeafb5f733533326568")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d1d788fca6acff374ece2a3f894c126aabaf8e6c")] [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 89258e9..af85cf1 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 @@ -cbcb50529ef34f85de31420edc7cd8f286a0c01d84c740e2f2a4f10765d919d2 +9617ed43f2c6ccc36d2b3aaebf7dea43f410ae6f72ffcca46d342c98745650e9 diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.GeneratedMSBuildEditorConfig.editorconfig b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.GeneratedMSBuildEditorConfig.editorconfig index de23257..05c7cb5 100644 --- a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.GeneratedMSBuildEditorConfig.editorconfig +++ b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.GeneratedMSBuildEditorConfig.editorconfig @@ -30,6 +30,9 @@ build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml [C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/Functions/AddClient.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml +[C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/Functions/AddServices.axaml] +build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml + [C:/Users/VivoBook 15X/Desktop/программные модули/Demo_Blagodat/demo_blagodat/demo_blagodat/Functions/CreateOrder.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.csproj.CoreCompileInputs.cache b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.csproj.CoreCompileInputs.cache index c591c30..9878d44 100644 --- a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.csproj.CoreCompileInputs.cache +++ b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -40e3485ea6ee456ff08f179efa3e7e7f539492c04c12875cdde14ecd742da0e2 +9e71e112725c9a716a2103cd3fd384cd298c46c7c9feef916663171f7912498b diff --git a/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll b/demo_blagodat/obj/Debug/net8.0/demo_blagodat.dll index e8a5087..ef26328 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 3a819d7..6816b10 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 94fe945..b1621d0 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 94fe945..b1621d0 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 e3c3959..f8d00c3 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