feat: editing

This commit is contained in:
Иван Овсянников 2024-09-13 10:39:04 +03:00
parent 15bda430b8
commit 5cb42013cf
25 changed files with 89 additions and 77 deletions

Binary file not shown.

Binary file not shown.

View File

@ -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}", "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}" "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}", "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}" "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}", "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}" "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}", "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}" "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}", "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}" "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}", "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}" "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", "$type": "Document",
"DocumentIndex": 4, "DocumentIndex": 7,
"Title": "MainWindow.axaml", "Title": "MainWindow.axaml",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml",
"RelativeDocumentMoniker": "MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml",
"ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml",
"RelativeToolTip": "MainWindow.axaml", "RelativeToolTip": "MainWindow.axaml",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
"WhenOpened": "2024-09-05T10:07:01.685Z", "WhenOpened": "2024-09-05T10:07:01.685Z"
"EditorCaption": ""
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 8, "DocumentIndex": 6,
"Title": "MainWindow.axaml.cs", "Title": "MainWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml.cs",
"RelativeDocumentMoniker": "MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs",
"ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml.cs",
"RelativeToolTip": "MainWindow.axaml.cs", "RelativeToolTip": "MainWindow.axaml.cs",
"ViewState": "AQIAABAAAAAAAAAAAADgvx8AAAAYAAAA", "ViewState": "AgIAABAAAAAAAAAAAADgvx8AAAAYAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-09-05T10:07:04.004Z" "WhenOpened": "2024-09-05T10:07:04.004Z",
"EditorCaption": ""
}, },
{ {
"$type": "Document", "$type": "Document",
@ -101,20 +101,20 @@
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 2, "DocumentIndex": 1,
"Title": "ServiceWindow.axaml.cs", "Title": "ServiceWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\ServiceWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\ServiceWindow.axaml.cs",
"RelativeDocumentMoniker": "ServiceWindow.axaml.cs", "RelativeDocumentMoniker": "ServiceWindow.axaml.cs",
"ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\ServiceWindow.axaml.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\ServiceWindow.axaml.cs",
"RelativeToolTip": "ServiceWindow.axaml.cs", "RelativeToolTip": "ServiceWindow.axaml.cs",
"ViewState": "AgIAAHwAAAAAAAAAAADwv5AAAAAJAAAAAAAAAA==", "ViewState": "AgIAAH0AAAAAAAAAAAAAwIUAAAAJAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-09-05T10:22:27.057Z", "WhenOpened": "2024-09-05T10:22:27.057Z",
"EditorCaption": "" "EditorCaption": ""
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 1, "DocumentIndex": 5,
"Title": "AddEditWindow.axaml", "Title": "AddEditWindow.axaml",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\AddEditWindow.axaml", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\AddEditWindow.axaml",
"RelativeDocumentMoniker": "AddEditWindow.axaml", "RelativeDocumentMoniker": "AddEditWindow.axaml",
@ -132,38 +132,40 @@
"RelativeDocumentMoniker": "AddEditWindow.axaml.cs", "RelativeDocumentMoniker": "AddEditWindow.axaml.cs",
"ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\AddEditWindow.axaml.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\AddEditWindow.axaml.cs",
"RelativeToolTip": "AddEditWindow.axaml.cs", "RelativeToolTip": "AddEditWindow.axaml.cs",
"ViewState": "AgIAAFAAAAAAAAAAAAAcwGUAAAABAAAAAAAAAA==", "ViewState": "AgIAAFoAAAAAAAAAAAAQwE0AAAAFAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-09-05T10:07:17.713Z", "WhenOpened": "2024-09-05T10:07:17.713Z",
"EditorCaption": "" "EditorCaption": ""
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 7, "DocumentIndex": 2,
"Title": "Context.cs", "Title": "Context.cs",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Utils\\Context.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Utils\\Context.cs",
"RelativeDocumentMoniker": "Utils\\Context.cs", "RelativeDocumentMoniker": "Utils\\Context.cs",
"ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\Utils\\Context.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\Utils\\Context.cs",
"RelativeToolTip": "Utils\\Context.cs", "RelativeToolTip": "Utils\\Context.cs",
"ViewState": "AQIAAAAAAAAAAAAAAAAAAAkAAAAbAAAA", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAbAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-09-05T10:39:51.541Z" "WhenOpened": "2024-09-05T10:39:51.541Z",
"EditorCaption": ""
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 6, "DocumentIndex": 4,
"Title": "Service.cs", "Title": "Service.cs",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Models\\Service.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Models\\Service.cs",
"RelativeDocumentMoniker": "Models\\Service.cs", "RelativeDocumentMoniker": "Models\\Service.cs",
"ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\Models\\Service.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\Models\\Service.cs",
"RelativeToolTip": "Models\\Service.cs", "RelativeToolTip": "Models\\Service.cs",
"ViewState": "AQIAAAoAAAAAAAAAAAAgwBsAAAANAAAA", "ViewState": "AgIAAAYAAAAAAAAAAAAAABsAAAANAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-09-05T11:00:44.489Z" "WhenOpened": "2024-09-05T11:00:44.489Z",
"EditorCaption": ""
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 5, "DocumentIndex": 8,
"Title": "Colors.cs", "Title": "Colors.cs",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Colors.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Colors.cs",
"RelativeDocumentMoniker": "Colors.cs", "RelativeDocumentMoniker": "Colors.cs",
@ -171,8 +173,7 @@
"RelativeToolTip": "Colors.cs", "RelativeToolTip": "Colors.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==", "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-09-05T10:07:30.214Z", "WhenOpened": "2024-09-05T10:07:30.214Z"
"EditorCaption": ""
} }
] ]
} }

View File

@ -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}", "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}" "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}", "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}" "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}", "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}" "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}", "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}" "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}", "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}" "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}", "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}" "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", "$type": "Document",
"DocumentIndex": 4, "DocumentIndex": 7,
"Title": "MainWindow.axaml", "Title": "MainWindow.axaml",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml",
"RelativeDocumentMoniker": "MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml",
"ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml",
"RelativeToolTip": "MainWindow.axaml", "RelativeToolTip": "MainWindow.axaml",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
"WhenOpened": "2024-09-05T10:07:01.685Z", "WhenOpened": "2024-09-05T10:07:01.685Z"
"EditorCaption": ""
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 8, "DocumentIndex": 6,
"Title": "MainWindow.axaml.cs", "Title": "MainWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml.cs",
"RelativeDocumentMoniker": "MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs",
"ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\MainWindow.axaml.cs",
"RelativeToolTip": "MainWindow.axaml.cs", "RelativeToolTip": "MainWindow.axaml.cs",
"ViewState": "AQIAABAAAAAAAAAAAADgvx8AAAAYAAAA", "ViewState": "AgIAABAAAAAAAAAAAADgvx8AAAAYAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-09-05T10:07:04.004Z" "WhenOpened": "2024-09-05T10:07:04.004Z",
"EditorCaption": ""
}, },
{ {
"$type": "Document", "$type": "Document",
@ -101,20 +101,20 @@
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 2, "DocumentIndex": 1,
"Title": "ServiceWindow.axaml.cs", "Title": "ServiceWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\ServiceWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\ServiceWindow.axaml.cs",
"RelativeDocumentMoniker": "ServiceWindow.axaml.cs", "RelativeDocumentMoniker": "ServiceWindow.axaml.cs",
"ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\ServiceWindow.axaml.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\ServiceWindow.axaml.cs",
"RelativeToolTip": "ServiceWindow.axaml.cs", "RelativeToolTip": "ServiceWindow.axaml.cs",
"ViewState": "AgIAAHwAAAAAAAAAAADwv5AAAAAJAAAAAAAAAA==", "ViewState": "AgIAAH0AAAAAAAAAAAAAwIUAAAAJAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-09-05T10:22:27.057Z", "WhenOpened": "2024-09-05T10:22:27.057Z",
"EditorCaption": "" "EditorCaption": ""
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 1, "DocumentIndex": 5,
"Title": "AddEditWindow.axaml", "Title": "AddEditWindow.axaml",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\AddEditWindow.axaml", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\AddEditWindow.axaml",
"RelativeDocumentMoniker": "AddEditWindow.axaml", "RelativeDocumentMoniker": "AddEditWindow.axaml",
@ -132,38 +132,40 @@
"RelativeDocumentMoniker": "AddEditWindow.axaml.cs", "RelativeDocumentMoniker": "AddEditWindow.axaml.cs",
"ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\AddEditWindow.axaml.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\AddEditWindow.axaml.cs",
"RelativeToolTip": "AddEditWindow.axaml.cs", "RelativeToolTip": "AddEditWindow.axaml.cs",
"ViewState": "AgIAAFAAAAAAAAAAAAAcwGUAAAABAAAAAAAAAA==", "ViewState": "AgIAAFoAAAAAAAAAAAAQwE0AAAAFAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-09-05T10:07:17.713Z", "WhenOpened": "2024-09-05T10:07:17.713Z",
"EditorCaption": "" "EditorCaption": ""
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 7, "DocumentIndex": 2,
"Title": "Context.cs", "Title": "Context.cs",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Utils\\Context.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Utils\\Context.cs",
"RelativeDocumentMoniker": "Utils\\Context.cs", "RelativeDocumentMoniker": "Utils\\Context.cs",
"ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\Utils\\Context.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\Utils\\Context.cs",
"RelativeToolTip": "Utils\\Context.cs", "RelativeToolTip": "Utils\\Context.cs",
"ViewState": "AQIAAAAAAAAAAAAAAAAAAAkAAAAbAAAA", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAbAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-09-05T10:39:51.541Z" "WhenOpened": "2024-09-05T10:39:51.541Z",
"EditorCaption": ""
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 6, "DocumentIndex": 4,
"Title": "Service.cs", "Title": "Service.cs",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Models\\Service.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Models\\Service.cs",
"RelativeDocumentMoniker": "Models\\Service.cs", "RelativeDocumentMoniker": "Models\\Service.cs",
"ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\Models\\Service.cs", "ToolTip": "C:\\Users\\Xofei\\Desktop\\DemoService\\Models\\Service.cs",
"RelativeToolTip": "Models\\Service.cs", "RelativeToolTip": "Models\\Service.cs",
"ViewState": "AQIAAAoAAAAAAAAAAAAgwBsAAAANAAAA", "ViewState": "AgIAAAYAAAAAAAAAAAAAABsAAAANAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-09-05T11:00:44.489Z" "WhenOpened": "2024-09-05T11:00:44.489Z",
"EditorCaption": ""
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 5, "DocumentIndex": 8,
"Title": "Colors.cs", "Title": "Colors.cs",
"DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Colors.cs", "DocumentMoniker": "C:\\Users\\Xofei\\Desktop\\DemoService\\Colors.cs",
"RelativeDocumentMoniker": "Colors.cs", "RelativeDocumentMoniker": "Colors.cs",
@ -171,8 +173,7 @@
"RelativeToolTip": "Colors.cs", "RelativeToolTip": "Colors.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==", "ViewState": "AgIAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-09-05T10:07:30.214Z", "WhenOpened": "2024-09-05T10:07:30.214Z"
"EditorCaption": ""
} }
] ]
} }

View File

@ -79,7 +79,7 @@ public partial class AddEditWindow : Window
private void EditServiceButton_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e) private void EditServiceButton_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
{ {
Service service = new Service() /*Service service = new Service()
{ {
Id = serviceID, Id = serviceID,
Title = ServiceName.Text, Title = ServiceName.Text,
@ -87,13 +87,23 @@ public partial class AddEditWindow : Window
DurationInSeconds = Convert.ToInt32(DurationInSeconds.Text), DurationInSeconds = Convert.ToInt32(DurationInSeconds.Text),
Description = Description.Text, Description = Description.Text,
Discount = Convert.ToDecimal(Discount.Text) Discount = Convert.ToDecimal(Discount.Text)
}; };*/
using (var context = new OvsyannikovContext()) using (var context = new OvsyannikovContext())
{ {
var oldService = context.Services.Find(serviceID); var service = context.Services.Find(serviceID);
oldService = service; 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(); context.SaveChanges();
} }
/*using (var context = new OvsyannikovContext())
{
context.Update(service);
context.SaveChanges();
}*/
Utils.Context.Services = new List<Service>(Utils.Context.DbContext.Services); Utils.Context.Services = new List<Service>(Utils.Context.DbContext.Services);
ServiceWindow serviceWindow = new(AdminMode); ServiceWindow serviceWindow = new(AdminMode);
serviceWindow.Show(); serviceWindow.Show();

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
06e08a35280aadcddb492b25e869c4bc4d475c54d2617452a73fedccc3d39281 4c5f89385db47792933c691bc18d57b81622f774da234957ab3beb2f4f287fd9

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("DemoService")] [assembly: System.Reflection.AssemblyCompanyAttribute("DemoService")]
[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+381e459f8311c91465f9e05651f16d5c1faac3e4")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+15bda430b8de3a0f743be82ae38c051908e14e89")]
[assembly: System.Reflection.AssemblyProductAttribute("DemoService")] [assembly: System.Reflection.AssemblyProductAttribute("DemoService")]
[assembly: System.Reflection.AssemblyTitleAttribute("DemoService")] [assembly: System.Reflection.AssemblyTitleAttribute("DemoService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
8580ac937f5e5fe3093ed13fef4f4861a293107cf1aabef988c829a880863931 1d934346f696ebba4e5b28ba689bee1be12a36ceb798430d67e6fb5e0cd6385c

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.