diff --git a/.vs/DemoService/DesignTimeBuild/.dtbcache.v2 b/.vs/DemoService/DesignTimeBuild/.dtbcache.v2 index 5b68963..ddeacd8 100644 Binary files a/.vs/DemoService/DesignTimeBuild/.dtbcache.v2 and b/.vs/DemoService/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/DemoService/FileContentIndex/bbca25f6-08b5-4c79-9322-c3c0bed189c3.vsidx b/.vs/DemoService/FileContentIndex/bbca25f6-08b5-4c79-9322-c3c0bed189c3.vsidx new file mode 100644 index 0000000..e27b2ca Binary files /dev/null and b/.vs/DemoService/FileContentIndex/bbca25f6-08b5-4c79-9322-c3c0bed189c3.vsidx differ diff --git a/.vs/DemoService/FileContentIndex/d3092651-bbf1-4544-a904-c718bbbba817.vsidx b/.vs/DemoService/FileContentIndex/d3092651-bbf1-4544-a904-c718bbbba817.vsidx deleted file mode 100644 index b0e303d..0000000 Binary files a/.vs/DemoService/FileContentIndex/d3092651-bbf1-4544-a904-c718bbbba817.vsidx and /dev/null differ diff --git a/.vs/DemoService/v17/.futdcache.v2 b/.vs/DemoService/v17/.futdcache.v2 index 9a6ea13..8b84883 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 ba58955..a6540f8 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 ea7fde4..15ca288 100644 --- a/.vs/DemoService/v17/DocumentLayout.backup.json +++ b/.vs/DemoService/v17/DocumentLayout.backup.json @@ -6,18 +6,30 @@ "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\xofei\\desktop\\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\\xofei\\desktop\\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\\xofei\\desktop\\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\\xofei\\desktop\\demoservice\\utils\\context.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "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\\xofei\\desktop\\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\\xofei\\desktop\\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\\xofei\\desktop\\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\\xofei\\desktop\\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\\xofei\\desktop\\demoservice\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" @@ -26,18 +38,6 @@ "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\xofei\\desktop\\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\\xofei\\desktop\\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\\xofei\\desktop\\demoservice\\utils\\context.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "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\\xofei\\desktop\\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\\xofei\\desktop\\demoservice\\app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" @@ -65,27 +65,27 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 7, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml", "RelativeToolTip": "MainWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-09-05T10:07:01.685Z", - "EditorCaption": "" + "WhenOpened": "2024-09-05T10:07:01.685Z" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 6, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml.cs", "RelativeToolTip": "MainWindow.axaml.cs", - "ViewState": "AQIAABAAAAAAAAAAAADgvx8AAAAYAAAA", + "ViewState": "AgIAABAAAAAAAAAAAADgvx8AAAAYAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:07:04.004Z" + "WhenOpened": "2024-09-05T10:07:04.004Z", + "EditorCaption": "" }, { "$type": "Document", @@ -101,20 +101,20 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 1, "Title": "ServiceWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\ServiceWindow.axaml.cs", "RelativeDocumentMoniker": "ServiceWindow.axaml.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\ServiceWindow.axaml.cs", "RelativeToolTip": "ServiceWindow.axaml.cs", - "ViewState": "AgIAAHwAAAAAAAAAAADwv5AAAAAJAAAAAAAAAA==", + "ViewState": "AgIAAH0AAAAAAAAAAAAAwIUAAAAJAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-09-05T10:22:27.057Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 5, "Title": "AddEditWindow.axaml", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\AddEditWindow.axaml", "RelativeDocumentMoniker": "AddEditWindow.axaml", @@ -132,38 +132,40 @@ "RelativeDocumentMoniker": "AddEditWindow.axaml.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\AddEditWindow.axaml.cs", "RelativeToolTip": "AddEditWindow.axaml.cs", - "ViewState": "AgIAAFAAAAAAAAAAAAAcwGUAAAABAAAAAAAAAA==", + "ViewState": "AgIAAFoAAAAAAAAAAAAQwE0AAAAFAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-09-05T10:07:17.713Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 2, "Title": "Context.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Utils\\Context.cs", "RelativeDocumentMoniker": "Utils\\Context.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\Utils\\Context.cs", "RelativeToolTip": "Utils\\Context.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAAkAAAAbAAAA", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAbAAAAAAAAAA==", "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": 6, + "DocumentIndex": 4, "Title": "Service.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Models\\Service.cs", "RelativeDocumentMoniker": "Models\\Service.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\Models\\Service.cs", "RelativeToolTip": "Models\\Service.cs", - "ViewState": "AQIAAAoAAAAAAAAAAAAgwBsAAAANAAAA", + "ViewState": "AgIAAAYAAAAAAAAAAAAAABsAAAANAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T11:00:44.489Z" + "WhenOpened": "2024-09-05T11:00:44.489Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 8, "Title": "Colors.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Colors.cs", "RelativeDocumentMoniker": "Colors.cs", @@ -171,8 +173,7 @@ "RelativeToolTip": "Colors.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:07:30.214Z", - "EditorCaption": "" + "WhenOpened": "2024-09-05T10:07:30.214Z" } ] } diff --git a/.vs/DemoService/v17/DocumentLayout.json b/.vs/DemoService/v17/DocumentLayout.json index ea7fde4..15ca288 100644 --- a/.vs/DemoService/v17/DocumentLayout.json +++ b/.vs/DemoService/v17/DocumentLayout.json @@ -6,18 +6,30 @@ "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\xofei\\desktop\\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\\xofei\\desktop\\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\\xofei\\desktop\\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\\xofei\\desktop\\demoservice\\utils\\context.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "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\\xofei\\desktop\\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\\xofei\\desktop\\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\\xofei\\desktop\\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\\xofei\\desktop\\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\\xofei\\desktop\\demoservice\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" @@ -26,18 +38,6 @@ "AbsoluteMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|c:\\users\\xofei\\desktop\\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\\xofei\\desktop\\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\\xofei\\desktop\\demoservice\\utils\\context.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "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\\xofei\\desktop\\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\\xofei\\desktop\\demoservice\\app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", "RelativeMoniker": "D:0:0:{4C331754-91EE-4598-950D-54DF0C075B84}|DemoService.csproj|solutionrelative:app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" @@ -65,27 +65,27 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 7, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml", "RelativeToolTip": "MainWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-09-05T10:07:01.685Z", - "EditorCaption": "" + "WhenOpened": "2024-09-05T10:07:01.685Z" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 6, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml.cs", "RelativeToolTip": "MainWindow.axaml.cs", - "ViewState": "AQIAABAAAAAAAAAAAADgvx8AAAAYAAAA", + "ViewState": "AgIAABAAAAAAAAAAAADgvx8AAAAYAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:07:04.004Z" + "WhenOpened": "2024-09-05T10:07:04.004Z", + "EditorCaption": "" }, { "$type": "Document", @@ -101,20 +101,20 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 1, "Title": "ServiceWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\ServiceWindow.axaml.cs", "RelativeDocumentMoniker": "ServiceWindow.axaml.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\ServiceWindow.axaml.cs", "RelativeToolTip": "ServiceWindow.axaml.cs", - "ViewState": "AgIAAHwAAAAAAAAAAADwv5AAAAAJAAAAAAAAAA==", + "ViewState": "AgIAAH0AAAAAAAAAAAAAwIUAAAAJAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-09-05T10:22:27.057Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 5, "Title": "AddEditWindow.axaml", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\AddEditWindow.axaml", "RelativeDocumentMoniker": "AddEditWindow.axaml", @@ -132,38 +132,40 @@ "RelativeDocumentMoniker": "AddEditWindow.axaml.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\AddEditWindow.axaml.cs", "RelativeToolTip": "AddEditWindow.axaml.cs", - "ViewState": "AgIAAFAAAAAAAAAAAAAcwGUAAAABAAAAAAAAAA==", + "ViewState": "AgIAAFoAAAAAAAAAAAAQwE0AAAAFAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-09-05T10:07:17.713Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 2, "Title": "Context.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Utils\\Context.cs", "RelativeDocumentMoniker": "Utils\\Context.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\Utils\\Context.cs", "RelativeToolTip": "Utils\\Context.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAAkAAAAbAAAA", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAbAAAAAAAAAA==", "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": 6, + "DocumentIndex": 4, "Title": "Service.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Models\\Service.cs", "RelativeDocumentMoniker": "Models\\Service.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\Models\\Service.cs", "RelativeToolTip": "Models\\Service.cs", - "ViewState": "AQIAAAoAAAAAAAAAAAAgwBsAAAANAAAA", + "ViewState": "AgIAAAYAAAAAAAAAAAAAABsAAAANAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T11:00:44.489Z" + "WhenOpened": "2024-09-05T11:00:44.489Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 8, "Title": "Colors.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Colors.cs", "RelativeDocumentMoniker": "Colors.cs", @@ -171,8 +173,7 @@ "RelativeToolTip": "Colors.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-09-05T10:07:30.214Z", - "EditorCaption": "" + "WhenOpened": "2024-09-05T10:07:30.214Z" } ] } diff --git a/.vs/ProjectEvaluation/demoservice.metadata.v9.bin b/.vs/ProjectEvaluation/demoservice.metadata.v9.bin deleted file mode 100644 index 218a950..0000000 Binary files a/.vs/ProjectEvaluation/demoservice.metadata.v9.bin and /dev/null differ diff --git a/.vs/ProjectEvaluation/demoservice.projects.v9.bin b/.vs/ProjectEvaluation/demoservice.projects.v9.bin deleted file mode 100644 index 659ec41..0000000 Binary files a/.vs/ProjectEvaluation/demoservice.projects.v9.bin and /dev/null differ diff --git a/.vs/ProjectEvaluation/demoservice.strings.v9.bin b/.vs/ProjectEvaluation/demoservice.strings.v9.bin deleted file mode 100644 index b8e90b1..0000000 Binary files a/.vs/ProjectEvaluation/demoservice.strings.v9.bin and /dev/null differ diff --git a/AddEditWindow.axaml.cs b/AddEditWindow.axaml.cs index d7aecee..22ed723 100644 --- a/AddEditWindow.axaml.cs +++ b/AddEditWindow.axaml.cs @@ -79,7 +79,7 @@ public partial class AddEditWindow : Window private void EditServiceButton_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e) { - Service service = new Service() + /*Service service = new Service() { Id = serviceID, Title = ServiceName.Text, @@ -87,13 +87,23 @@ public partial class AddEditWindow : Window DurationInSeconds = Convert.ToInt32(DurationInSeconds.Text), Description = Description.Text, Discount = Convert.ToDecimal(Discount.Text) - }; + };*/ using (var context = new OvsyannikovContext()) { - var oldService = context.Services.Find(serviceID); - oldService = service; + var service = context.Services.Find(serviceID); + service.Title = ServiceName.Text; + service.Cost = Convert.ToDecimal(Cost.Text); + service.DurationInSeconds = Convert.ToInt32(DurationInSeconds.Text); + service.Description = Description.Text; + service.Discount = Convert.ToDecimal(Discount.Text); + context.Update(service); context.SaveChanges(); } + /*using (var context = new OvsyannikovContext()) + { + context.Update(service); + context.SaveChanges(); + }*/ Utils.Context.Services = new List(Utils.Context.DbContext.Services); ServiceWindow serviceWindow = new(AdminMode); serviceWindow.Show(); diff --git a/bin/Debug/net8.0/DemoService.dll b/bin/Debug/net8.0/DemoService.dll index 5835872..a20e886 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 ef14352..9554e8d 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 44f67f5..3d11391 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/Resources.Inputs.cache b/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index 4d94eb0..da237fb 100644 --- a/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -06e08a35280aadcddb492b25e869c4bc4d475c54d2617452a73fedccc3d39281 +4c5f89385db47792933c691bc18d57b81622f774da234957ab3beb2f4f287fd9 diff --git a/obj/Debug/net8.0/Avalonia/original.dll b/obj/Debug/net8.0/Avalonia/original.dll index d7558be..46b87c4 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 519d718..4669613 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 4a23cb1..05f5f14 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/DemoService.AssemblyInfo.cs b/obj/Debug/net8.0/DemoService.AssemblyInfo.cs index 9a8c156..23a2822 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+381e459f8311c91465f9e05651f16d5c1faac3e4")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+15bda430b8de3a0f743be82ae38c051908e14e89")] [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 fbe82dc..1f16e01 100644 --- a/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache +++ b/obj/Debug/net8.0/DemoService.AssemblyInfoInputs.cache @@ -1 +1 @@ -8580ac937f5e5fe3093ed13fef4f4861a293107cf1aabef988c829a880863931 +1d934346f696ebba4e5b28ba689bee1be12a36ceb798430d67e6fb5e0cd6385c diff --git a/obj/Debug/net8.0/DemoService.dll b/obj/Debug/net8.0/DemoService.dll index 5835872..a20e886 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 44f67f5..3d11391 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 ef14352..9554e8d 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 5ad41c3..f9956a1 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 5ad41c3..f9956a1 100644 Binary files a/obj/Debug/net8.0/refint/DemoService.dll and b/obj/Debug/net8.0/refint/DemoService.dll differ