diff --git a/.vs/Demka_Snova_1/FileContentIndex/229e7e8a-c0f5-4774-9a8f-e035af1e060e.vsidx b/.vs/Demka_Snova_1/FileContentIndex/37b96d11-86e7-4292-99b0-35a31ff596d0.vsidx similarity index 99% rename from .vs/Demka_Snova_1/FileContentIndex/229e7e8a-c0f5-4774-9a8f-e035af1e060e.vsidx rename to .vs/Demka_Snova_1/FileContentIndex/37b96d11-86e7-4292-99b0-35a31ff596d0.vsidx index 6d3f2b2..01ba5a3 100644 Binary files a/.vs/Demka_Snova_1/FileContentIndex/229e7e8a-c0f5-4774-9a8f-e035af1e060e.vsidx and b/.vs/Demka_Snova_1/FileContentIndex/37b96d11-86e7-4292-99b0-35a31ff596d0.vsidx differ diff --git a/.vs/Demka_Snova_1/FileContentIndex/96d21996-41c1-4306-a3cc-d56fd8e6a957.vsidx b/.vs/Demka_Snova_1/FileContentIndex/96d21996-41c1-4306-a3cc-d56fd8e6a957.vsidx deleted file mode 100644 index c67919e..0000000 Binary files a/.vs/Demka_Snova_1/FileContentIndex/96d21996-41c1-4306-a3cc-d56fd8e6a957.vsidx and /dev/null differ diff --git a/.vs/Demka_Snova_1/FileContentIndex/e49a3975-1bd5-46a2-9953-467d50e27ba0.vsidx b/.vs/Demka_Snova_1/FileContentIndex/e49a3975-1bd5-46a2-9953-467d50e27ba0.vsidx new file mode 100644 index 0000000..8d05e7c Binary files /dev/null and b/.vs/Demka_Snova_1/FileContentIndex/e49a3975-1bd5-46a2-9953-467d50e27ba0.vsidx differ diff --git a/.vs/Demka_Snova_1/v17/.futdcache.v2 b/.vs/Demka_Snova_1/v17/.futdcache.v2 index 787d663..a8f2fcf 100644 Binary files a/.vs/Demka_Snova_1/v17/.futdcache.v2 and b/.vs/Demka_Snova_1/v17/.futdcache.v2 differ diff --git a/.vs/Demka_Snova_1/v17/.suo b/.vs/Demka_Snova_1/v17/.suo index aff3a8b..cf4e51a 100644 Binary files a/.vs/Demka_Snova_1/v17/.suo and b/.vs/Demka_Snova_1/v17/.suo differ diff --git a/.vs/Demka_Snova_1/v17/DocumentLayout.backup.json b/.vs/Demka_Snova_1/v17/DocumentLayout.backup.json index 42550f1..0792c4a 100644 --- a/.vs/Demka_Snova_1/v17/DocumentLayout.backup.json +++ b/.vs/Demka_Snova_1/v17/DocumentLayout.backup.json @@ -2,6 +2,34 @@ "Version": 1, "WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\", "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\adminwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\adminwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\activitywindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\activitywindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\dao\\uslugidao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\uslugidao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addotchotwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addotchotwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addotchotwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addotchotwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -10,38 +38,18 @@ "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\dao\\ordersdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\ordersdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addotchotwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addotchotwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addzakazwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addzakazwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\adminwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\adminwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\adminwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\adminwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\dao\\otchotdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\otchotdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addzakazwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addzakazwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" @@ -54,17 +62,17 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 9, + "SelectedChildIndex": 0, "Children": [ { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 0, "Title": "Conector.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Conector.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Conector.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Conector.cs", "RelativeToolTip": "Hardik\\Conect\\Conector.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAbAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-12T07:11:06.434Z", "IsPinned": true, @@ -88,7 +96,32 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 5, + "Title": "uslugiDao.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\uslugiDao.cs", + "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\uslugiDao.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\uslugiDao.cs", + "RelativeToolTip": "Hardik\\Conect\\Dao\\uslugiDao.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAmAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-06T10:34:48.881Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "ActivityWindow.axaml", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\ActivityWindow.axaml", + "RelativeDocumentMoniker": "OknaFunciy\\ActivityWindow.axaml", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\ActivityWindow.axaml", + "RelativeToolTip": "OknaFunciy\\ActivityWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2025-03-06T10:22:21.807Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, "Title": "AddZakazWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\AddZakazWindow.axaml.cs", @@ -96,12 +129,11 @@ "RelativeToolTip": "OknaFunciy\\AddZakazWindow.axaml.cs", "ViewState": "AgIAACMAAAAAAAAAAAAmwDIAAAA7AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-05T07:57:26.093Z", - "EditorCaption": "" + "WhenOpened": "2025-03-05T07:57:26.093Z" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 8, "Title": "ordersDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\ordersDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\ordersDao.cs", @@ -109,25 +141,24 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\ordersDao.cs", "ViewState": "AgIAAAYAAAAAAAAAAAAMwA0AAAAUAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-05T07:54:08.583Z", - "EditorCaption": "" + "WhenOpened": "2025-03-05T07:54:08.583Z" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 1, "Title": "SotrudnikiWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs", "RelativeToolTip": "OknaFunciy\\SotrudnikiWindow.axaml.cs", - "ViewState": "AgIAAAgAAAAAAAAAAAAAABsAAAAIAAAAAAAAAA==", + "ViewState": "AgIAABkAAAAAAAAAAAAAABYAAAAgAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-26T10:37:20.724Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 11, "Title": "OtchotDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\OtchotDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\OtchotDao.cs", @@ -135,29 +166,28 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\OtchotDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-02-26T10:44:51.063Z", - "EditorCaption": "" + "WhenOpened": "2025-02-26T10:44:51.063Z" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 7, "Title": "AddOtchotWindow.axaml.cs", - "DocumentMoniker": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\AddOtchotWindow.axaml.cs", - "ToolTip": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml.cs", "RelativeToolTip": "OknaFunciy\\AddOtchotWindow.axaml.cs", - "ViewState": "AgIAAGwAAAAAAAAAAAAAAIMAAAABAAAAAAAAAA==", + "ViewState": "AgIAAHQAAAAAAAAAAAAAAIMAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-26T10:40:02.074Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 6, "Title": "AddOtchotWindow.axaml", - "DocumentMoniker": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml", "RelativeDocumentMoniker": "OknaFunciy\\AddOtchotWindow.axaml", - "ToolTip": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml", "RelativeToolTip": "OknaFunciy\\AddOtchotWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", "WhenOpened": "2025-02-26T10:39:58.541Z", @@ -165,19 +195,18 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 12, "Title": "AddZakazWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml", "RelativeDocumentMoniker": "OknaFunciy\\AddZakazWindow.axaml", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml", "RelativeToolTip": "OknaFunciy\\AddZakazWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2025-02-26T10:37:49.704Z", - "EditorCaption": "" + "WhenOpened": "2025-02-26T10:37:49.704Z" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 3, "Title": "SotrudnikiWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml", "RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml", @@ -189,28 +218,27 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 2, "Title": "AdminWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml.cs", "RelativeDocumentMoniker": "OknaRoley\\AdminWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml.cs", "RelativeToolTip": "OknaRoley\\AdminWindow.axaml.cs", - "ViewState": "AgIAAAoAAAAAAAAAAAAiwBMAAABGAAAAAAAAAA==", + "ViewState": "AgIAAAoAAAAAAAAAAAAiwBUAAAAoAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-26T10:35:46.767Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 10, "Title": "AdminWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml", "RelativeDocumentMoniker": "OknaRoley\\AdminWindow.axaml", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml", "RelativeToolTip": "OknaRoley\\AdminWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2025-02-05T10:17:22.428Z", - "EditorCaption": "" + "WhenOpened": "2025-02-05T10:17:22.428Z" } ] } diff --git a/.vs/Demka_Snova_1/v17/DocumentLayout.json b/.vs/Demka_Snova_1/v17/DocumentLayout.json index 42550f1..8aa6c49 100644 --- a/.vs/Demka_Snova_1/v17/DocumentLayout.json +++ b/.vs/Demka_Snova_1/v17/DocumentLayout.json @@ -2,6 +2,34 @@ "Version": 1, "WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\", "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\adminwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\adminwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\activitywindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\activitywindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\dao\\uslugidao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\uslugidao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addotchotwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addotchotwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addotchotwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addotchotwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -10,38 +38,18 @@ "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\dao\\ordersdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\ordersdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addotchotwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addotchotwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addzakazwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addzakazwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\adminwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\adminwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\adminwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\adminwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\dao\\otchotdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\otchotdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addzakazwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addzakazwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" @@ -54,17 +62,17 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 9, + "SelectedChildIndex": 0, "Children": [ { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 0, "Title": "Conector.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Conector.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Conector.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Conector.cs", "RelativeToolTip": "Hardik\\Conect\\Conector.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAkAAAAbAAAAAAAAAA==", + "ViewState": "AgIAAAUAAAAAAAAAAAAAAAgAAABjAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-12T07:11:06.434Z", "IsPinned": true, @@ -88,7 +96,32 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 5, + "Title": "uslugiDao.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\uslugiDao.cs", + "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\uslugiDao.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\uslugiDao.cs", + "RelativeToolTip": "Hardik\\Conect\\Dao\\uslugiDao.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAmAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-06T10:34:48.881Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "ActivityWindow.axaml", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\ActivityWindow.axaml", + "RelativeDocumentMoniker": "OknaFunciy\\ActivityWindow.axaml", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\ActivityWindow.axaml", + "RelativeToolTip": "OknaFunciy\\ActivityWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2025-03-06T10:22:21.807Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, "Title": "AddZakazWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\AddZakazWindow.axaml.cs", @@ -96,12 +129,11 @@ "RelativeToolTip": "OknaFunciy\\AddZakazWindow.axaml.cs", "ViewState": "AgIAACMAAAAAAAAAAAAmwDIAAAA7AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-05T07:57:26.093Z", - "EditorCaption": "" + "WhenOpened": "2025-03-05T07:57:26.093Z" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 8, "Title": "ordersDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\ordersDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\ordersDao.cs", @@ -109,25 +141,24 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\ordersDao.cs", "ViewState": "AgIAAAYAAAAAAAAAAAAMwA0AAAAUAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-05T07:54:08.583Z", - "EditorCaption": "" + "WhenOpened": "2025-03-05T07:54:08.583Z" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 1, "Title": "SotrudnikiWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs", "RelativeToolTip": "OknaFunciy\\SotrudnikiWindow.axaml.cs", - "ViewState": "AgIAAAgAAAAAAAAAAAAAABsAAAAIAAAAAAAAAA==", + "ViewState": "AgIAABkAAAAAAAAAAAAAABYAAAAgAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-26T10:37:20.724Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 11, "Title": "OtchotDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\OtchotDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\OtchotDao.cs", @@ -135,29 +166,28 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\OtchotDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-02-26T10:44:51.063Z", - "EditorCaption": "" + "WhenOpened": "2025-02-26T10:44:51.063Z" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 7, "Title": "AddOtchotWindow.axaml.cs", - "DocumentMoniker": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\AddOtchotWindow.axaml.cs", - "ToolTip": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml.cs", "RelativeToolTip": "OknaFunciy\\AddOtchotWindow.axaml.cs", - "ViewState": "AgIAAGwAAAAAAAAAAAAAAIMAAAABAAAAAAAAAA==", + "ViewState": "AgIAAHQAAAAAAAAAAAAAAIMAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-26T10:40:02.074Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 6, "Title": "AddOtchotWindow.axaml", - "DocumentMoniker": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml", "RelativeDocumentMoniker": "OknaFunciy\\AddOtchotWindow.axaml", - "ToolTip": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddOtchotWindow.axaml", "RelativeToolTip": "OknaFunciy\\AddOtchotWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", "WhenOpened": "2025-02-26T10:39:58.541Z", @@ -165,19 +195,18 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 12, "Title": "AddZakazWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml", "RelativeDocumentMoniker": "OknaFunciy\\AddZakazWindow.axaml", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml", "RelativeToolTip": "OknaFunciy\\AddZakazWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2025-02-26T10:37:49.704Z", - "EditorCaption": "" + "WhenOpened": "2025-02-26T10:37:49.704Z" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 3, "Title": "SotrudnikiWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml", "RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml", @@ -189,28 +218,27 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 2, "Title": "AdminWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml.cs", "RelativeDocumentMoniker": "OknaRoley\\AdminWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml.cs", "RelativeToolTip": "OknaRoley\\AdminWindow.axaml.cs", - "ViewState": "AgIAAAoAAAAAAAAAAAAiwBMAAABGAAAAAAAAAA==", + "ViewState": "AgIAAAoAAAAAAAAAAAAiwBUAAAAoAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-26T10:35:46.767Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 10, "Title": "AdminWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml", "RelativeDocumentMoniker": "OknaRoley\\AdminWindow.axaml", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml", "RelativeToolTip": "OknaRoley\\AdminWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2025-02-05T10:17:22.428Z", - "EditorCaption": "" + "WhenOpened": "2025-02-05T10:17:22.428Z" } ] } diff --git a/Hardik/Conect/Conector.cs b/Hardik/Conect/Conector.cs index 417f9f4..b4be68b 100644 --- a/Hardik/Conect/Conector.cs +++ b/Hardik/Conect/Conector.cs @@ -7,7 +7,6 @@ public class AppDbContext : DbContext protected override void OnConfiguring(DbContextOptionsBuilder oB) { oB.UseSqlServer("Server=45.67.56.214,5421;Database=user16;User=user16;Password=dZ28IVE5;"); - // options => options.EnableRetryOnFailure()); } public DbSet sotrudnik { get; set; } public DbSet uslugi { get; set; } @@ -17,18 +16,18 @@ public class AppDbContext : DbContext protected override void OnModelCreating(ModelBuilder mb) { - mb.Entity().HasKey(klient => klient.Code); + mb.Entity().ToTable("Klient", "Demo_Blago").HasKey(klient => klient.Code); mb.Entity().Property(klient => klient.Code).ValueGeneratedOnAdd(); - mb.Entity().HasKey(orders => orders.ID); + mb.Entity().ToTable("orders", "Demo_Blago").HasKey(orders => orders.ID); mb.Entity().Property(orders => orders.ID).ValueGeneratedOnAdd(); - mb.Entity().HasKey(uslugi => uslugi.ID); + mb.Entity().ToTable("uslugi", "Demo_Blago").HasKey(uslugi => uslugi.id); - mb.Entity().HasKey(sotrudnik => sotrudnik.ID); + mb.Entity().ToTable("Sotrudnik", "Demo_Blago").HasKey(sotrudnik => sotrudnik.ID); - mb.Entity().HasKey(history => history.id); + mb.Entity().ToTable("history", "Demo_Blago").HasKey(history => history.id); } diff --git a/Hardik/Conect/Dao/uslugiDao.cs b/Hardik/Conect/Dao/uslugiDao.cs index da3c4e5..5cff4a4 100644 --- a/Hardik/Conect/Dao/uslugiDao.cs +++ b/Hardik/Conect/Dao/uslugiDao.cs @@ -2,7 +2,7 @@ namespace Demka_Snova_1.Hardik.Conect.Dao; public class uslugiDao { - public int ID { get; set; } + public int id { get; set; } public string Name { get; set; } public string Code { get; set; } public int PrisePerH { get; set; } diff --git a/bin/Debug/net8.0/Demka_Snova_1.dll b/bin/Debug/net8.0/Demka_Snova_1.dll index 977d6ec..2fe708f 100644 Binary files a/bin/Debug/net8.0/Demka_Snova_1.dll and b/bin/Debug/net8.0/Demka_Snova_1.dll differ diff --git a/bin/Debug/net8.0/Demka_Snova_1.exe b/bin/Debug/net8.0/Demka_Snova_1.exe index 64646b5..b2d76e9 100644 Binary files a/bin/Debug/net8.0/Demka_Snova_1.exe and b/bin/Debug/net8.0/Demka_Snova_1.exe differ diff --git a/bin/Debug/net8.0/Demka_Snova_1.pdb b/bin/Debug/net8.0/Demka_Snova_1.pdb index ebd3922..3c09b66 100644 Binary files a/bin/Debug/net8.0/Demka_Snova_1.pdb and b/bin/Debug/net8.0/Demka_Snova_1.pdb differ diff --git a/obj/Debug/net8.0/Avalonia/Demka_Snova_1.dll b/obj/Debug/net8.0/Avalonia/Demka_Snova_1.dll index 977d6ec..2fe708f 100644 Binary files a/obj/Debug/net8.0/Avalonia/Demka_Snova_1.dll and b/obj/Debug/net8.0/Avalonia/Demka_Snova_1.dll differ diff --git a/obj/Debug/net8.0/Avalonia/Demka_Snova_1.pdb b/obj/Debug/net8.0/Avalonia/Demka_Snova_1.pdb index ebd3922..3c09b66 100644 Binary files a/obj/Debug/net8.0/Avalonia/Demka_Snova_1.pdb and b/obj/Debug/net8.0/Avalonia/Demka_Snova_1.pdb differ diff --git a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfo.cs b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfo.cs index 9d0c89a..5d19cd4 100644 --- a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfo.cs +++ b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Demka_Snova_1")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abc390a3fad1efa71192c56ef8ce004b945bfba7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b14eac1659ebd4ceb5fe265d1ae38b5089a27de2")] [assembly: System.Reflection.AssemblyProductAttribute("Demka_Snova_1")] [assembly: System.Reflection.AssemblyTitleAttribute("Demka_Snova_1")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache index c1d2279..09a9fa5 100644 --- a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache +++ b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache @@ -1 +1 @@ -b5f4859263992c46cba90df06b0da99464d5a7f6798b425b1c1911942537c0c1 +173c33814865361de237ac6aee0e5e5ecb2bf2ae5a1899e3be6690ab0648c417 diff --git a/obj/Debug/net8.0/Demka_Snova_1.dll b/obj/Debug/net8.0/Demka_Snova_1.dll new file mode 100644 index 0000000..7a11df8 Binary files /dev/null and b/obj/Debug/net8.0/Demka_Snova_1.dll differ diff --git a/obj/Debug/net8.0/Demka_Snova_1.pdb b/obj/Debug/net8.0/Demka_Snova_1.pdb new file mode 100644 index 0000000..32bfce3 Binary files /dev/null and b/obj/Debug/net8.0/Demka_Snova_1.pdb differ diff --git a/obj/Debug/net8.0/apphost.exe b/obj/Debug/net8.0/apphost.exe index 64646b5..b2d76e9 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/Demka_Snova_1.dll b/obj/Debug/net8.0/ref/Demka_Snova_1.dll index 3e43dfc..ec8fac8 100644 Binary files a/obj/Debug/net8.0/ref/Demka_Snova_1.dll and b/obj/Debug/net8.0/ref/Demka_Snova_1.dll differ diff --git a/obj/Debug/net8.0/refint/Avalonia/Demka_Snova_1.dll b/obj/Debug/net8.0/refint/Avalonia/Demka_Snova_1.dll index 3e43dfc..ec8fac8 100644 Binary files a/obj/Debug/net8.0/refint/Avalonia/Demka_Snova_1.dll and b/obj/Debug/net8.0/refint/Avalonia/Demka_Snova_1.dll differ diff --git a/obj/Debug/net8.0/refint/Demka_Snova_1.dll b/obj/Debug/net8.0/refint/Demka_Snova_1.dll new file mode 100644 index 0000000..423c09f Binary files /dev/null and b/obj/Debug/net8.0/refint/Demka_Snova_1.dll differ