diff --git a/.vs/DemoService/FileContentIndex/120dacdd-e92c-42fd-96c8-7cfe3383391f.vsidx b/.vs/DemoService/FileContentIndex/120dacdd-e92c-42fd-96c8-7cfe3383391f.vsidx new file mode 100644 index 0000000..92edec4 Binary files /dev/null and b/.vs/DemoService/FileContentIndex/120dacdd-e92c-42fd-96c8-7cfe3383391f.vsidx differ diff --git a/.vs/DemoService/FileContentIndex/39839bc3-483a-4d65-bc8a-df59630684e5.vsidx b/.vs/DemoService/FileContentIndex/2256605d-b422-4f32-934f-6a5d5457fab2.vsidx similarity index 97% rename from .vs/DemoService/FileContentIndex/39839bc3-483a-4d65-bc8a-df59630684e5.vsidx rename to .vs/DemoService/FileContentIndex/2256605d-b422-4f32-934f-6a5d5457fab2.vsidx index fb10f50..73f3fa4 100644 Binary files a/.vs/DemoService/FileContentIndex/39839bc3-483a-4d65-bc8a-df59630684e5.vsidx and b/.vs/DemoService/FileContentIndex/2256605d-b422-4f32-934f-6a5d5457fab2.vsidx differ diff --git a/.vs/DemoService/FileContentIndex/94df70c0-e7e0-42bb-8752-b0d765f95f85.vsidx b/.vs/DemoService/FileContentIndex/94df70c0-e7e0-42bb-8752-b0d765f95f85.vsidx new file mode 100644 index 0000000..aee7cd5 Binary files /dev/null and b/.vs/DemoService/FileContentIndex/94df70c0-e7e0-42bb-8752-b0d765f95f85.vsidx differ diff --git a/.vs/DemoService/FileContentIndex/af21cad8-2a1d-4f7a-ace3-5cacdc40d514.vsidx b/.vs/DemoService/FileContentIndex/af21cad8-2a1d-4f7a-ace3-5cacdc40d514.vsidx deleted file mode 100644 index fd7e454..0000000 Binary files a/.vs/DemoService/FileContentIndex/af21cad8-2a1d-4f7a-ace3-5cacdc40d514.vsidx and /dev/null differ diff --git a/.vs/DemoService/FileContentIndex/c6b847a0-a06f-4ded-a79e-a9d28538ac40.vsidx b/.vs/DemoService/FileContentIndex/c6b847a0-a06f-4ded-a79e-a9d28538ac40.vsidx deleted file mode 100644 index 1c57b2d..0000000 Binary files a/.vs/DemoService/FileContentIndex/c6b847a0-a06f-4ded-a79e-a9d28538ac40.vsidx and /dev/null differ diff --git a/.vs/DemoService/v17/.futdcache.v2 b/.vs/DemoService/v17/.futdcache.v2 index 2cbb8a4..d43d6d5 100644 Binary files a/.vs/DemoService/v17/.futdcache.v2 and b/.vs/DemoService/v17/.futdcache.v2 differ diff --git a/.vs/DemoService/v17/.suo b/.vs/DemoService/v17/.suo index 58b2aa4..9e12704 100644 Binary files a/.vs/DemoService/v17/.suo and b/.vs/DemoService/v17/.suo differ diff --git a/.vs/DemoService/v17/DocumentLayout.backup.json b/.vs/DemoService/v17/DocumentLayout.backup.json index 9483629..b932660 100644 --- a/.vs/DemoService/v17/DocumentLayout.backup.json +++ b/.vs/DemoService/v17/DocumentLayout.backup.json @@ -6,29 +6,13 @@ "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\servicewindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" - }, { "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\models\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:models\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\addeditwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:addeditwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" - }, - { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\addeditwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:addeditwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" }, { "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", @@ -39,8 +23,20 @@ "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:utils\\context.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\app.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:app.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\addeditwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:addeditwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\addeditwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:addeditwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\models\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:models\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", @@ -54,64 +50,56 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 5, + "SelectedChildIndex": 4, "Children": [ { "$type": "Document", "DocumentIndex": 9, - "Title": "App.axaml.cs", - "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\App.axaml.cs", - "RelativeDocumentMoniker": "App.axaml.cs", - "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\App.axaml.cs", - "RelativeToolTip": "App.axaml.cs", - "ViewState": "AgIAAAQAAAAAAAAAAAAUwBEAAAApAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:22:19.688Z" - }, - { - "$type": "Document", - "DocumentIndex": 10, "Title": "App.axaml", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\App.axaml", "RelativeDocumentMoniker": "App.axaml", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\App.axaml", "RelativeToolTip": "App.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-09-05T09:32:46.205Z" + "WhenOpened": "2024-09-05T09:32:46.205Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 3, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\MainWindow.axaml", "RelativeToolTip": "MainWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-09-05T10:07:01.685Z" + "WhenOpened": "2024-09-05T10:07:01.685Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 1, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\MainWindow.axaml.cs", "RelativeToolTip": "MainWindow.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAC8AAAABAAAAAAAAAA==", + "ViewState": "AgIAAAgAAAAAAAAAAAAywC8AAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:07:04.004Z" + "WhenOpened": "2024-09-05T10:07:04.004Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "ServiceWindow.axaml", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml", "RelativeDocumentMoniker": "ServiceWindow.axaml", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml", "RelativeToolTip": "ServiceWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-09-05T10:22:49.921Z" + "WhenOpened": "2024-09-05T10:22:49.921Z", + "EditorCaption": "" }, { "$type": "Document", @@ -121,69 +109,74 @@ "RelativeDocumentMoniker": "ServiceWindow.axaml.cs", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml.cs", "RelativeToolTip": "ServiceWindow.axaml.cs", - "ViewState": "AgIAACAAAAAAAAAAAAAqwC0AAAABAAAAAAAAAA==", + "ViewState": "AgIAAEAAAAAAAAAAAAAawE8AAAAIAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-09-05T10:22:27.057Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 5, "Title": "AddEditWindow.axaml", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\AddEditWindow.axaml", "RelativeDocumentMoniker": "AddEditWindow.axaml", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\AddEditWindow.axaml", "RelativeToolTip": "AddEditWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-09-05T10:07:17.245Z" + "WhenOpened": "2024-09-05T10:07:17.245Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 6, "Title": "AddEditWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\AddEditWindow.axaml.cs", "RelativeDocumentMoniker": "AddEditWindow.axaml.cs", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\AddEditWindow.axaml.cs", "RelativeToolTip": "AddEditWindow.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAgAAAAKAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABgAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:07:17.713Z" + "WhenOpened": "2024-09-05T10:07:17.713Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 8, "Title": "Colors.cs", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\Colors.cs", "RelativeDocumentMoniker": "Colors.cs", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\Colors.cs", "RelativeToolTip": "Colors.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:07:30.214Z" + "WhenOpened": "2024-09-05T10:07:30.214Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 4, "Title": "Context.cs", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\Utils\\Context.cs", "RelativeDocumentMoniker": "Utils\\Context.cs", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\Utils\\Context.cs", "RelativeToolTip": "Utils\\Context.cs", - "ViewState": "AgIAAAEAAAAAAAAAAAAUwAkAAAAbAAAAAAAAAA==", + "ViewState": "AgIAAAEAAAAAAAAAAAAUwA4AAABiAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:39:51.541Z" + "WhenOpened": "2024-09-05T10:39:51.541Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 7, "Title": "Service.cs", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\Models\\Service.cs", "RelativeDocumentMoniker": "Models\\Service.cs", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\Models\\Service.cs", "RelativeToolTip": "Models\\Service.cs", - "ViewState": "AgIAAAMAAAAAAAAAAAAAABEAAAATAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAsAAAAXAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T11:00:44.489Z" + "WhenOpened": "2024-09-05T11:00:44.489Z", + "EditorCaption": "" } ] } diff --git a/.vs/DemoService/v17/DocumentLayout.json b/.vs/DemoService/v17/DocumentLayout.json index 9483629..b932660 100644 --- a/.vs/DemoService/v17/DocumentLayout.json +++ b/.vs/DemoService/v17/DocumentLayout.json @@ -6,29 +6,13 @@ "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\servicewindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" - }, { "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\models\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:models\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\addeditwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:addeditwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" - }, - { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\addeditwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:addeditwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:servicewindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" }, { "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", @@ -39,8 +23,20 @@ "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:utils\\context.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\app.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:app.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\addeditwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:addeditwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\addeditwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:addeditwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\models\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:models\\service.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:colors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\prdb\\desktop\\xofei\\demoservice\\app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", @@ -54,64 +50,56 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 5, + "SelectedChildIndex": 4, "Children": [ { "$type": "Document", "DocumentIndex": 9, - "Title": "App.axaml.cs", - "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\App.axaml.cs", - "RelativeDocumentMoniker": "App.axaml.cs", - "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\App.axaml.cs", - "RelativeToolTip": "App.axaml.cs", - "ViewState": "AgIAAAQAAAAAAAAAAAAUwBEAAAApAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:22:19.688Z" - }, - { - "$type": "Document", - "DocumentIndex": 10, "Title": "App.axaml", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\App.axaml", "RelativeDocumentMoniker": "App.axaml", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\App.axaml", "RelativeToolTip": "App.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-09-05T09:32:46.205Z" + "WhenOpened": "2024-09-05T09:32:46.205Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 3, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\MainWindow.axaml", "RelativeToolTip": "MainWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-09-05T10:07:01.685Z" + "WhenOpened": "2024-09-05T10:07:01.685Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 1, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\MainWindow.axaml.cs", "RelativeToolTip": "MainWindow.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAC8AAAABAAAAAAAAAA==", + "ViewState": "AgIAAAgAAAAAAAAAAAAywC8AAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:07:04.004Z" + "WhenOpened": "2024-09-05T10:07:04.004Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "ServiceWindow.axaml", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml", "RelativeDocumentMoniker": "ServiceWindow.axaml", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml", "RelativeToolTip": "ServiceWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-09-05T10:22:49.921Z" + "WhenOpened": "2024-09-05T10:22:49.921Z", + "EditorCaption": "" }, { "$type": "Document", @@ -121,69 +109,74 @@ "RelativeDocumentMoniker": "ServiceWindow.axaml.cs", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\ServiceWindow.axaml.cs", "RelativeToolTip": "ServiceWindow.axaml.cs", - "ViewState": "AgIAACAAAAAAAAAAAAAqwC0AAAABAAAAAAAAAA==", + "ViewState": "AgIAAEAAAAAAAAAAAAAawE8AAAAIAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-09-05T10:22:27.057Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 5, "Title": "AddEditWindow.axaml", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\AddEditWindow.axaml", "RelativeDocumentMoniker": "AddEditWindow.axaml", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\AddEditWindow.axaml", "RelativeToolTip": "AddEditWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-09-05T10:07:17.245Z" + "WhenOpened": "2024-09-05T10:07:17.245Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 6, "Title": "AddEditWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\AddEditWindow.axaml.cs", "RelativeDocumentMoniker": "AddEditWindow.axaml.cs", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\AddEditWindow.axaml.cs", "RelativeToolTip": "AddEditWindow.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAgAAAAKAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABgAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:07:17.713Z" + "WhenOpened": "2024-09-05T10:07:17.713Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 8, "Title": "Colors.cs", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\Colors.cs", "RelativeDocumentMoniker": "Colors.cs", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\Colors.cs", "RelativeToolTip": "Colors.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:07:30.214Z" + "WhenOpened": "2024-09-05T10:07:30.214Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 4, "Title": "Context.cs", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\Utils\\Context.cs", "RelativeDocumentMoniker": "Utils\\Context.cs", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\Utils\\Context.cs", "RelativeToolTip": "Utils\\Context.cs", - "ViewState": "AgIAAAEAAAAAAAAAAAAUwAkAAAAbAAAAAAAAAA==", + "ViewState": "AgIAAAEAAAAAAAAAAAAUwA4AAABiAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:39:51.541Z" + "WhenOpened": "2024-09-05T10:39:51.541Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 7, "Title": "Service.cs", "DocumentMoniker": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\Models\\Service.cs", "RelativeDocumentMoniker": "Models\\Service.cs", "ToolTip": "C:\\Users\\prdb\\Desktop\\Xofei\\DemoService\\Models\\Service.cs", "RelativeToolTip": "Models\\Service.cs", - "ViewState": "AgIAAAMAAAAAAAAAAAAAABEAAAATAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAsAAAAXAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T11:00:44.489Z" + "WhenOpened": "2024-09-05T11:00:44.489Z", + "EditorCaption": "" } ] } diff --git a/AddEditWindow.axaml b/AddEditWindow.axaml index 7ff48d5..a19642b 100644 --- a/AddEditWindow.axaml +++ b/AddEditWindow.axaml @@ -5,5 +5,29 @@ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600" x:Class="DemoService.AddEditWindow" Title="AddEditWindow"> - + + + + + + + + + + + diff --git a/AddEditWindow.axaml.cs b/AddEditWindow.axaml.cs index 594f54d..f8bb3f2 100644 --- a/AddEditWindow.axaml.cs +++ b/AddEditWindow.axaml.cs @@ -10,4 +10,16 @@ public partial class AddEditWindow : Window { InitializeComponent(); } + + private void AddPictureButton_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e) + { + } + + private void AddServiceButton_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e) + { + } + + private void EditServiceButton_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e) + { + } } \ No newline at end of file diff --git a/ServiceWindow.axaml b/ServiceWindow.axaml index 88efcd2..ce18765 100644 --- a/ServiceWindow.axaml +++ b/ServiceWindow.axaml @@ -11,16 +11,20 @@ ColumnDefinitions="* Auto Auto"> - - Сортировка + Не сортировать + По возрастанию + По убыванию Фильтрация - diff --git a/ServiceWindow.axaml.cs b/ServiceWindow.axaml.cs index 104a2f1..bd1fb7b 100644 --- a/ServiceWindow.axaml.cs +++ b/ServiceWindow.axaml.cs @@ -3,16 +3,20 @@ using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; using DemoService.Models; +using System.Collections.Generic; +using System.Linq; namespace DemoService; public partial class ServiceWindow : Window { private readonly bool AdminMode; + private bool? SortedMode; + private List displayList = Utils.Context.Services; public ServiceWindow() { InitializeComponent(); - ServicesListBox.ItemsSource = Utils.Context.Services; + ServicesListBox.ItemsSource = displayList; } public ServiceWindow(bool admin) { @@ -22,7 +26,7 @@ public partial class ServiceWindow : Window { AddButton.IsVisible = false; } - ServicesListBox.ItemsSource = Utils.Context.Services; + ServicesListBox.ItemsSource = displayList; foreach (var service in ServicesListBox.ItemsSource) { @@ -43,4 +47,36 @@ public partial class ServiceWindow : Window } return null; } + + private void AddButton_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e) + { + AddEditWindow addEditWindow = new(); + addEditWindow.Show(); + Close(); + } + + private void SortComboBox_SelectionChanged(object? sender, Avalonia.Controls.SelectionChangedEventArgs e) + { + int selectedIndex = (sender as ComboBox).SelectedIndex; + switch (selectedIndex) + { + case 0: SortedMode = false; break; + case 1: SortedMode = true; break; + default: SortedMode = null; break; + } + DisplayService(); + } + private void DisplayService() + { + switch (SortedMode) + { + case true: + displayList = displayList.OrderBy(service => service.Cost).ToList(); + break; + case false: + displayList = displayList.OrderByDescending(service => service.Cost).ToList(); + break; + } + ServicesListBox.ItemsSource = displayList.ToList(); + } } \ No newline at end of file diff --git a/bin/Debug/net8.0/DemoService.dll b/bin/Debug/net8.0/DemoService.dll index 41d2851..2053d10 100644 Binary files a/bin/Debug/net8.0/DemoService.dll and b/bin/Debug/net8.0/DemoService.dll differ diff --git a/bin/Debug/net8.0/DemoService.exe b/bin/Debug/net8.0/DemoService.exe index 1e49f42..4b2430d 100644 Binary files a/bin/Debug/net8.0/DemoService.exe and b/bin/Debug/net8.0/DemoService.exe differ diff --git a/bin/Debug/net8.0/DemoService.pdb b/bin/Debug/net8.0/DemoService.pdb index 5f34c28..9631a49 100644 Binary files a/bin/Debug/net8.0/DemoService.pdb and b/bin/Debug/net8.0/DemoService.pdb differ diff --git a/obj/Debug/net8.0/Avalonia/original.dll b/obj/Debug/net8.0/Avalonia/original.dll index 7b21d09..1c24cec 100644 Binary files a/obj/Debug/net8.0/Avalonia/original.dll and b/obj/Debug/net8.0/Avalonia/original.dll differ diff --git a/obj/Debug/net8.0/Avalonia/original.pdb b/obj/Debug/net8.0/Avalonia/original.pdb index 4c61762..fce741a 100644 Binary files a/obj/Debug/net8.0/Avalonia/original.pdb and b/obj/Debug/net8.0/Avalonia/original.pdb differ diff --git a/obj/Debug/net8.0/Avalonia/original.ref.dll b/obj/Debug/net8.0/Avalonia/original.ref.dll index 143429f..12dc1a3 100644 Binary files a/obj/Debug/net8.0/Avalonia/original.ref.dll and b/obj/Debug/net8.0/Avalonia/original.ref.dll differ diff --git a/obj/Debug/net8.0/Avalonia/resources b/obj/Debug/net8.0/Avalonia/resources index 0000cb5..d24008a 100644 Binary files a/obj/Debug/net8.0/Avalonia/resources and b/obj/Debug/net8.0/Avalonia/resources differ diff --git a/obj/Debug/net8.0/DemoService.AssemblyInfo.cs b/obj/Debug/net8.0/DemoService.AssemblyInfo.cs index 6e11b62..bac6b04 100644 --- a/obj/Debug/net8.0/DemoService.AssemblyInfo.cs +++ b/obj/Debug/net8.0/DemoService.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("DemoService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a0aeb3383e50a3d3edc2340714462d42292b3c23")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d9ac0d4f20bfa9d8075239816deac4ac497b037d")] [assembly: System.Reflection.AssemblyProductAttribute("DemoService")] [assembly: System.Reflection.AssemblyTitleAttribute("DemoService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache b/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache index d3c1f07..320c359 100644 --- a/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache +++ b/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache @@ -1 +1 @@ -bd35063401f5d5357db0758901b18b2ecc46217fad5f20625d62d440323a798f +8842c9b832b538afd18ba0faa663a8dc5d70b1bf33f5448d6e2234b21102127f diff --git a/obj/Debug/net8.0/DemoService.dll b/obj/Debug/net8.0/DemoService.dll index 41d2851..2053d10 100644 Binary files a/obj/Debug/net8.0/DemoService.dll and b/obj/Debug/net8.0/DemoService.dll differ diff --git a/obj/Debug/net8.0/DemoService.pdb b/obj/Debug/net8.0/DemoService.pdb index 5f34c28..9631a49 100644 Binary files a/obj/Debug/net8.0/DemoService.pdb and b/obj/Debug/net8.0/DemoService.pdb differ diff --git a/obj/Debug/net8.0/apphost.exe b/obj/Debug/net8.0/apphost.exe index 1e49f42..4b2430d 100644 Binary files a/obj/Debug/net8.0/apphost.exe and b/obj/Debug/net8.0/apphost.exe differ diff --git a/obj/Debug/net8.0/ref/DemoService.dll b/obj/Debug/net8.0/ref/DemoService.dll index 3c504e2..2e1dd16 100644 Binary files a/obj/Debug/net8.0/ref/DemoService.dll and b/obj/Debug/net8.0/ref/DemoService.dll differ diff --git a/obj/Debug/net8.0/refint/DemoService.dll b/obj/Debug/net8.0/refint/DemoService.dll index 3c504e2..2e1dd16 100644 Binary files a/obj/Debug/net8.0/refint/DemoService.dll and b/obj/Debug/net8.0/refint/DemoService.dll differ