diff --git a/.vs/Demka_Snova_1/FileContentIndex/1d1b9f72-3dfe-4215-8752-bb136c9144d0.vsidx b/.vs/Demka_Snova_1/FileContentIndex/1d1b9f72-3dfe-4215-8752-bb136c9144d0.vsidx deleted file mode 100644 index e1475e4..0000000 Binary files a/.vs/Demka_Snova_1/FileContentIndex/1d1b9f72-3dfe-4215-8752-bb136c9144d0.vsidx and /dev/null differ diff --git a/.vs/Demka_Snova_1/FileContentIndex/2c8cd3c8-1be5-414a-b600-313578072061.vsidx b/.vs/Demka_Snova_1/FileContentIndex/2c8cd3c8-1be5-414a-b600-313578072061.vsidx new file mode 100644 index 0000000..52237b6 Binary files /dev/null and b/.vs/Demka_Snova_1/FileContentIndex/2c8cd3c8-1be5-414a-b600-313578072061.vsidx differ diff --git a/.vs/Demka_Snova_1/v17/.futdcache.v2 b/.vs/Demka_Snova_1/v17/.futdcache.v2 index b5cf9a6..7a86563 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 baade37..ad0c67c 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 6aab5c1..6d78a54 100644 --- a/.vs/Demka_Snova_1/v17/DocumentLayout.backup.json +++ b/.vs/Demka_Snova_1/v17/DocumentLayout.backup.json @@ -3,8 +3,24 @@ "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\\connectorv2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\connectorv2.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.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}" + }, + { + "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\\addclientwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addclientwindow.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\\addsotrudnikwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addsotrudnikwindow.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}" }, { "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}", @@ -30,18 +46,10 @@ "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\\hardik\\conect\\dao\\klientdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\klientdao.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\\historydao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\historydao.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\\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}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -70,10 +78,6 @@ "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addclientwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addclientwindow.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\\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}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addsotrudnikwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addsotrudnikwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -94,22 +98,8 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 0, + "SelectedChildIndex": 19, "Children": [ - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "ConnectorV2.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs", - "RelativeDocumentMoniker": "Hardik\\Conect\\ConnectorV2.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs", - "RelativeToolTip": "Hardik\\Conect\\ConnectorV2.cs", - "ViewState": "AgIAABwAAAAAAAAAAAAAACwAAABUAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-21T07:34:41.229Z", - "IsPinned": true, - "EditorCaption": "" - }, { "$type": "Bookmark", "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" @@ -126,9 +116,45 @@ "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "AddClientWindow.axaml", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddClientWindow.axaml", + "RelativeDocumentMoniker": "OknaFunciy\\AddClientWindow.axaml", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddClientWindow.axaml", + "RelativeToolTip": "OknaFunciy\\AddClientWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2025-05-07T11:34:19.101Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "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", + "RelativeToolTip": "OknaFunciy\\AddOtchotWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2025-05-07T11:34:12.54Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 3, + "Title": "AddSotrudnikWindow.axaml", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddSotrudnikWindow.axaml", + "RelativeDocumentMoniker": "OknaFunciy\\AddSotrudnikWindow.axaml", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddSotrudnikWindow.axaml", + "RelativeToolTip": "OknaFunciy\\AddSotrudnikWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2025-05-07T11:34:06.814Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, "Title": "SotrudnikDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\SotrudnikDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\SotrudnikDao.cs", @@ -140,7 +166,7 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 8, "Title": "SelectDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\SelectDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\SelectDao.cs", @@ -152,7 +178,7 @@ }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 9, "Title": "OtchotDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\OtchotDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\OtchotDao.cs", @@ -164,7 +190,7 @@ }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 10, "Title": "ordersDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\ordersDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\ordersDao.cs", @@ -176,7 +202,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 11, "Title": "historyDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\historyDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\historyDao.cs", @@ -188,19 +214,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, - "Title": "KlientDao.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\KlientDao.cs", - "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\KlientDao.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\KlientDao.cs", - "RelativeToolTip": "Hardik\\Conect\\Dao\\KlientDao.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-06T09:54:22.165Z" - }, - { - "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 17, "Title": "Dostup.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Date\\Dostup.cs", "RelativeDocumentMoniker": "Hardik\\Date\\Dostup.cs", @@ -212,7 +226,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 12, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs", @@ -224,7 +238,7 @@ }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 14, "Title": "StarshiyWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\StarshiyWindow.axaml.cs", "RelativeDocumentMoniker": "OknaRoley\\StarshiyWindow.axaml.cs", @@ -232,11 +246,12 @@ "RelativeToolTip": "OknaRoley\\StarshiyWindow.axaml.cs", "ViewState": "AgIAADIAAAAAAAAAAAAuwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:22:30.297Z" + "WhenOpened": "2025-04-29T07:22:30.297Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 13, "Title": "SellerWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\SellerWindow.axaml.cs", "RelativeDocumentMoniker": "OknaRoley\\SellerWindow.axaml.cs", @@ -244,11 +259,12 @@ "RelativeToolTip": "OknaRoley\\SellerWindow.axaml.cs", "ViewState": "AgIAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:22:24.814Z" + "WhenOpened": "2025-04-29T07:22:24.814Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 14, + "DocumentIndex": 16, "Title": "AdminWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml.cs", "RelativeDocumentMoniker": "OknaRoley\\AdminWindow.axaml.cs", @@ -256,11 +272,12 @@ "RelativeToolTip": "OknaRoley\\AdminWindow.axaml.cs", "ViewState": "AgIAABMAAAAAAAAAAAA+wBwAAAAFAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:21:20.054Z" + "WhenOpened": "2025-04-29T07:21:20.054Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 13, + "DocumentIndex": 15, "Title": "ActivityWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\ActivityWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\ActivityWindow.axaml.cs", @@ -272,7 +289,7 @@ }, { "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 18, "Title": "AddClientWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddClientWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\AddClientWindow.axaml.cs", @@ -284,19 +301,20 @@ }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 0, "Title": "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", "RelativeToolTip": "OknaFunciy\\AddOtchotWindow.axaml.cs", - "ViewState": "AgIAAHEAAAAAAAAAAEBlwAAAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAH4AAAAAAAAAAAAAAIgAAAAwAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:20:59.048Z" + "WhenOpened": "2025-04-29T07:20:59.048Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 18, + "DocumentIndex": 19, "Title": "AddSotrudnikWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddSotrudnikWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\AddSotrudnikWindow.axaml.cs", @@ -308,7 +326,7 @@ }, { "$type": "Document", - "DocumentIndex": 19, + "DocumentIndex": 20, "Title": "ChangeRoleWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\ChangeRoleWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\ChangeRoleWindow.axaml.cs", @@ -320,7 +338,7 @@ }, { "$type": "Document", - "DocumentIndex": 20, + "DocumentIndex": 21, "Title": "SotrudnikiWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml.cs", @@ -328,11 +346,12 @@ "RelativeToolTip": "OknaFunciy\\SotrudnikiWindow.axaml.cs", "ViewState": "AgIAADEAAAAAAAAAAIBZwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:19:52.266Z" + "WhenOpened": "2025-04-29T07:19:52.266Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 6, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", @@ -343,26 +362,28 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 5, "Title": "AddZakazWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\AddZakazWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml.cs", "RelativeToolTip": "OknaFunciy\\AddZakazWindow.axaml.cs", - "ViewState": "AgIAADwAAAAAAAAAAAAAADkAAAAQAAAAAAAAAA==", + "ViewState": "AgIAAEQAAAAAAAAAAAAAACgAAAAmAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-25T08:03:48.653Z" + "WhenOpened": "2025-04-25T08:03:48.653Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 4, "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-04-25T08:03:34.528Z" + "WhenOpened": "2025-04-25T08:03:34.528Z", + "EditorCaption": "" } ] } diff --git a/.vs/Demka_Snova_1/v17/DocumentLayout.json b/.vs/Demka_Snova_1/v17/DocumentLayout.json index 5d1f70c..6d78a54 100644 --- a/.vs/Demka_Snova_1/v17/DocumentLayout.json +++ b/.vs/Demka_Snova_1/v17/DocumentLayout.json @@ -3,16 +3,28 @@ "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\\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\\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}" + }, + { + "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\\addclientwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addclientwindow.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\\addsotrudnikwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addsotrudnikwindow.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}" }, { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\connectorv2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\connectorv2.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\\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\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", @@ -34,10 +46,6 @@ "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\\hardik\\conect\\dao\\klientdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\klientdao.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\\historydao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\historydao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -70,10 +78,6 @@ "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addclientwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addclientwindow.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\\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}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\addsotrudnikwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\addsotrudnikwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -94,22 +98,8 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 23, + "SelectedChildIndex": 19, "Children": [ - { - "$type": "Document", - "DocumentIndex": 2, - "Title": "ConnectorV2.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs", - "RelativeDocumentMoniker": "Hardik\\Conect\\ConnectorV2.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs", - "RelativeToolTip": "Hardik\\Conect\\ConnectorV2.cs", - "ViewState": "AgIAABwAAAAAAAAAAAAAACwAAABUAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-21T07:34:41.229Z", - "IsPinned": true, - "EditorCaption": "" - }, { "$type": "Bookmark", "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" @@ -128,7 +118,43 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 2, + "Title": "AddClientWindow.axaml", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddClientWindow.axaml", + "RelativeDocumentMoniker": "OknaFunciy\\AddClientWindow.axaml", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddClientWindow.axaml", + "RelativeToolTip": "OknaFunciy\\AddClientWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2025-05-07T11:34:19.101Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "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", + "RelativeToolTip": "OknaFunciy\\AddOtchotWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2025-05-07T11:34:12.54Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "AddSotrudnikWindow.axaml", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddSotrudnikWindow.axaml", + "RelativeDocumentMoniker": "OknaFunciy\\AddSotrudnikWindow.axaml", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddSotrudnikWindow.axaml", + "RelativeToolTip": "OknaFunciy\\AddSotrudnikWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2025-05-07T11:34:06.814Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, "Title": "SotrudnikDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\SotrudnikDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\SotrudnikDao.cs", @@ -140,7 +166,7 @@ }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 8, "Title": "SelectDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\SelectDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\SelectDao.cs", @@ -152,7 +178,7 @@ }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 9, "Title": "OtchotDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\OtchotDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\OtchotDao.cs", @@ -164,7 +190,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 10, "Title": "ordersDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\ordersDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\ordersDao.cs", @@ -176,7 +202,7 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 11, "Title": "historyDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\historyDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\historyDao.cs", @@ -188,19 +214,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, - "Title": "KlientDao.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\KlientDao.cs", - "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\KlientDao.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\KlientDao.cs", - "RelativeToolTip": "Hardik\\Conect\\Dao\\KlientDao.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-06T09:54:22.165Z" - }, - { - "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 17, "Title": "Dostup.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Date\\Dostup.cs", "RelativeDocumentMoniker": "Hardik\\Date\\Dostup.cs", @@ -212,7 +226,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 12, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs", @@ -224,7 +238,7 @@ }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 14, "Title": "StarshiyWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\StarshiyWindow.axaml.cs", "RelativeDocumentMoniker": "OknaRoley\\StarshiyWindow.axaml.cs", @@ -232,11 +246,12 @@ "RelativeToolTip": "OknaRoley\\StarshiyWindow.axaml.cs", "ViewState": "AgIAADIAAAAAAAAAAAAuwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:22:30.297Z" + "WhenOpened": "2025-04-29T07:22:30.297Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 13, "Title": "SellerWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\SellerWindow.axaml.cs", "RelativeDocumentMoniker": "OknaRoley\\SellerWindow.axaml.cs", @@ -244,11 +259,12 @@ "RelativeToolTip": "OknaRoley\\SellerWindow.axaml.cs", "ViewState": "AgIAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:22:24.814Z" + "WhenOpened": "2025-04-29T07:22:24.814Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 14, + "DocumentIndex": 16, "Title": "AdminWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml.cs", "RelativeDocumentMoniker": "OknaRoley\\AdminWindow.axaml.cs", @@ -256,11 +272,12 @@ "RelativeToolTip": "OknaRoley\\AdminWindow.axaml.cs", "ViewState": "AgIAABMAAAAAAAAAAAA+wBwAAAAFAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:21:20.054Z" + "WhenOpened": "2025-04-29T07:21:20.054Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 13, + "DocumentIndex": 15, "Title": "ActivityWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\ActivityWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\ActivityWindow.axaml.cs", @@ -272,7 +289,7 @@ }, { "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 18, "Title": "AddClientWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddClientWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\AddClientWindow.axaml.cs", @@ -284,19 +301,20 @@ }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 0, "Title": "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", "RelativeToolTip": "OknaFunciy\\AddOtchotWindow.axaml.cs", - "ViewState": "AgIAAHEAAAAAAAAAAEBlwAAAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAH4AAAAAAAAAAAAAAIgAAAAwAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:20:59.048Z" + "WhenOpened": "2025-04-29T07:20:59.048Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 18, + "DocumentIndex": 19, "Title": "AddSotrudnikWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddSotrudnikWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\AddSotrudnikWindow.axaml.cs", @@ -308,7 +326,7 @@ }, { "$type": "Document", - "DocumentIndex": 19, + "DocumentIndex": 20, "Title": "ChangeRoleWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\ChangeRoleWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\ChangeRoleWindow.axaml.cs", @@ -320,7 +338,7 @@ }, { "$type": "Document", - "DocumentIndex": 20, + "DocumentIndex": 21, "Title": "SotrudnikiWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml.cs", @@ -328,11 +346,12 @@ "RelativeToolTip": "OknaFunciy\\SotrudnikiWindow.axaml.cs", "ViewState": "AgIAADEAAAAAAAAAAIBZwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:19:52.266Z" + "WhenOpened": "2025-04-29T07:19:52.266Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 6, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", @@ -343,20 +362,20 @@ }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 5, "Title": "AddZakazWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\AddZakazWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml.cs", "RelativeToolTip": "OknaFunciy\\AddZakazWindow.axaml.cs", - "ViewState": "AgIAAC0AAAAAAAAAAAAAADkAAAAQAAAAAAAAAA==", + "ViewState": "AgIAAEQAAAAAAAAAAAAAACgAAAAmAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-04-25T08:03:48.653Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 4, "Title": "AddZakazWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml", "RelativeDocumentMoniker": "OknaFunciy\\AddZakazWindow.axaml", diff --git a/OknaFunciy/AddOtchotWindow.axaml.cs b/OknaFunciy/AddOtchotWindow.axaml.cs index 2a10d10..a4de77d 100644 --- a/OknaFunciy/AddOtchotWindow.axaml.cs +++ b/OknaFunciy/AddOtchotWindow.axaml.cs @@ -65,70 +65,70 @@ public partial class AddOtchotWindow : Window Prokat = prokat }; - SaveOrderToPdf(order); + //SaveOrderToPdf(order); ordersList.Add(order); - ClearFields(); - ShowError("Заказ успешно создан и сохранен в PDF!"); + ObnuleniePoley(); + ShowError("Заказ успешно создан!"); } - private void SaveOrderToPdf(ordersDao order) - { - string directoryPath = "C:/Users/PC/source/Dopolnenia/Fails/Doky"; - string pdfPath = Path.Combine(directoryPath, $"Order_{order.CodeZakaz}.pdf"); + //private void SaveOrderToPdf(ordersDao order) // Sohronenie v pdf + //{ + // string directoryPath = "C:/Users/Public/Documents/Dopolnenia/Fails/Doky"; + // string pdfPath = Path.Combine(directoryPath, $"Order_{order.CodeZakaz}.pdf"); - - if (!Directory.Exists(directoryPath)) - { - Directory.CreateDirectory(directoryPath); - } - using (PdfWriter writer = new PdfWriter(pdfPath)) - using (PdfDocument pdf = new PdfDocument(writer)) - { - Document document = new Document(pdf); - PdfFont font; - try - { - font = PdfFontFactory.CreateFont("C:/Windows/Fonts/arial.ttf", PdfEncodings.IDENTITY_H); - } - catch - { - font = PdfFontFactory.CreateFont(StandardFonts.HELVETICA); - } - document.Add(new Paragraph($"Отчет о заказе от {order.Date}") - .SetTextAlignment(iText.Layout.Properties.TextAlignment.CENTER) - .SetFontSize(20) - .SetFont(font)); + // if (!Directory.Exists(directoryPath)) + // { + // Directory.CreateDirectory(directoryPath); + // } + // using (PdfWriter writer = new PdfWriter(pdfPath)) + // using (PdfDocument pdf = new PdfDocument(writer)) + // { + // Document document = new Document(pdf); + // PdfFont font; + // try + // { + // font = PdfFontFactory.CreateFont("C:/Windows/Fonts/arial.ttf", PdfEncodings.IDENTITY_H); + // } + // catch + // { + // font = PdfFontFactory.CreateFont(StandardFonts.HELVETICA); + // } - var fields = new Dictionary - { - {"Код заказа", order.CodeZakaz}, - {"Код клиента", order.CodeClient}, - {"Услуга", order.Usluga}, - {"Прокат", order.Prokat.ToString()}, - {"Дата", order.Date.ToString()}, - {"Время", order.Time.ToString()}, - {"Статус", order.Status} - }; + // document.Add(new Paragraph($"Отчет о заказе от {order.Date}") + // .SetTextAlignment(iText.Layout.Properties.TextAlignment.CENTER) + // .SetFontSize(20) + // .SetFont(font)); - foreach (var field in fields) - { - document.Add(new Paragraph($"{field.Key}: {field.Value}").SetFont(font)); - } + // var fields = new Dictionary + // { + // {"Код заказа", order.CodeZakaz}, + // {"Код клиента", order.CodeClient}, + // {"Услуга", order.Usluga}, + // {"Прокат", order.Prokat.ToString()}, + // {"Дата", order.Date.ToString()}, + // {"Время", order.Time.ToString()}, + // {"Статус", order.Status} + // }; - document.Close(); - } - } + // foreach (var field in fields) + // { + // document.Add(new Paragraph($"{field.Key}: {field.Value}").SetFont(font)); + // } - private void ClearFields() + // document.Close(); + // } + // } + + private void ObnuleniePoley() { this.FindControl("ClientTextBox").Text = string.Empty; this.FindControl("UslugaTextBox").Text = string.Empty; this.FindControl("ProkatTextBox").Text = string.Empty; } - private void Exitka(object sender, RoutedEventArgs e) + private void Exitka(object sender, RoutedEventArgs e) // выход { new AdminWindow().Show(); this.Close(); diff --git a/OknaFunciy/AddZakazWindow.axaml.cs b/OknaFunciy/AddZakazWindow.axaml.cs index ff4b486..0c2a76f 100644 --- a/OknaFunciy/AddZakazWindow.axaml.cs +++ b/OknaFunciy/AddZakazWindow.axaml.cs @@ -37,6 +37,7 @@ public partial class AddZakazWindow : Window public AddZakazWindow() { InitializeComponent(); + this.DataContext = this; this.Loaded += OnWindowLoaded; } @@ -54,9 +55,9 @@ public partial class AddZakazWindow : Window _allClients = db.GetAllKlienti(); _allServices = db.GetAllUslugi(); - foreach(var service in _allServices) + foreach (var service in _allServices) { - service.Code = Convert.ToString(service.Code); + service.Code = service.id.ToString(); } var orders = db.GetAllOrders(); @@ -92,11 +93,14 @@ public partial class AddZakazWindow : Window private void ClientSearchTextBox_TextChanged(object sender, TextChangedEventArgs e) { - var searchText = this.FindControl("ClientSearchTextBox").Text.ToLower(); - ClientsDataGrid.ItemsSource = _allClients - .Where(c => c.Fio.ToLower().Contains(searchText) || - c.Code.ToString().Contains(searchText)) - .ToList(); + var searchText = ClientSearchTextBox.Text?.ToLower() ?? string.Empty; + if (_allClients != null) + { + ClientsDataGrid.ItemsSource = _allClients + .Where(c => c.Fio?.ToLower().Contains(searchText) == true || + c.Code.ToString().Contains(searchText)) + .ToList(); + } } private void ServiceSearchTextBox_TextChanged(object sender, TextChangedEventArgs e) diff --git a/OknaFunciy/SotrudnikiWindow.axaml.cs b/OknaFunciy/SotrudnikiWindow.axaml.cs index 6eee2ad..b99cd09 100644 --- a/OknaFunciy/SotrudnikiWindow.axaml.cs +++ b/OknaFunciy/SotrudnikiWindow.axaml.cs @@ -121,7 +121,7 @@ public partial class SotrudnikiWindow : Window } } - private void Exitka(object sender, RoutedEventArgs e) + private void Exitka(object sender, RoutedEventArgs e) // выход { new AdminWindow().Show(); this.Close(); diff --git a/OknaRoley/AdminWindow.axaml.cs b/OknaRoley/AdminWindow.axaml.cs index aae20b5..d642de9 100644 --- a/OknaRoley/AdminWindow.axaml.cs +++ b/OknaRoley/AdminWindow.axaml.cs @@ -28,7 +28,7 @@ public partial class AdminWindow : Window //вњЌпёЏ(в—”в—Ўв—”)) } - private void Exitka(object sender, RoutedEventArgs e) + private void Exitka(object sender, RoutedEventArgs e) // выход { var login = new MainWindow(); login.Show(); diff --git a/OknaRoley/SellerWindow.axaml.cs b/OknaRoley/SellerWindow.axaml.cs index e742eaa..15474ef 100644 --- a/OknaRoley/SellerWindow.axaml.cs +++ b/OknaRoley/SellerWindow.axaml.cs @@ -19,7 +19,7 @@ public partial class SellerWindow : Window this.Close(); } - private void Exitka(object sender, RoutedEventArgs e) + private void Exitka(object sender, RoutedEventArgs e) // выход { var login = new MainWindow(); login.Show(); diff --git a/OknaRoley/StarshiyWindow.axaml.cs b/OknaRoley/StarshiyWindow.axaml.cs index c6881f2..621deaa 100644 --- a/OknaRoley/StarshiyWindow.axaml.cs +++ b/OknaRoley/StarshiyWindow.axaml.cs @@ -45,7 +45,7 @@ public partial class StarshiyWindow : Window } } - private void Exitka(object sender, RoutedEventArgs e) + private void Exitka(object sender, RoutedEventArgs e) // выход { var login = new MainWindow(); login.Show(); diff --git a/bin/Debug/net8.0/Demka_Snova_1.dll b/bin/Debug/net8.0/Demka_Snova_1.dll index 7e2e24f..d3f904c 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 945a3e1..cab56b6 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 01bac73..65c0f2f 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 7e2e24f..d3f904c 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 01bac73..65c0f2f 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 01ee27d..110aec0 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+6dbd15cc40d86780ff180cf5754bf88d93466aaa")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1b17fa5be88b2b302d40c1b1f913c32562f67f6e")] [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 c4fae56..a14cbd6 100644 --- a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache +++ b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache @@ -1 +1 @@ -b4e03c17c6652365cb025ebc302b4959fbe573f211bfb1368d1b4fd4cc6d9fb2 +45e07e161ded7500e8dba89a1cfeee767273fdba99a6cbe76ddad64748894ed9 diff --git a/obj/Debug/net8.0/Demka_Snova_1.dll b/obj/Debug/net8.0/Demka_Snova_1.dll index 4520418..9eb88c2 100644 Binary files a/obj/Debug/net8.0/Demka_Snova_1.dll 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 index 36f0057..ccec11e 100644 Binary files a/obj/Debug/net8.0/Demka_Snova_1.pdb 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 945a3e1..cab56b6 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 e6c9790..9fa0352 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 e6c9790..9fa0352 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 index 9fec15c..aff70b9 100644 Binary files a/obj/Debug/net8.0/refint/Demka_Snova_1.dll and b/obj/Debug/net8.0/refint/Demka_Snova_1.dll differ