diff --git a/.vs/Demka_Snova_1/DesignTimeBuild/.dtbcache.v2 b/.vs/Demka_Snova_1/DesignTimeBuild/.dtbcache.v2 index 38858d6..10f047a 100644 Binary files a/.vs/Demka_Snova_1/DesignTimeBuild/.dtbcache.v2 and b/.vs/Demka_Snova_1/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Demka_Snova_1/FileContentIndex/10d9b619-926e-4bae-9991-4b7eb46308a0.vsidx b/.vs/Demka_Snova_1/FileContentIndex/10d9b619-926e-4bae-9991-4b7eb46308a0.vsidx deleted file mode 100644 index 58ea3ff..0000000 Binary files a/.vs/Demka_Snova_1/FileContentIndex/10d9b619-926e-4bae-9991-4b7eb46308a0.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/FileContentIndex/626fc7e8-a2fd-49c5-966f-573633d0a83f.vsidx b/.vs/Demka_Snova_1/FileContentIndex/626fc7e8-a2fd-49c5-966f-573633d0a83f.vsidx deleted file mode 100644 index 06b0739..0000000 Binary files a/.vs/Demka_Snova_1/FileContentIndex/626fc7e8-a2fd-49c5-966f-573633d0a83f.vsidx and /dev/null differ diff --git a/.vs/Demka_Snova_1/FileContentIndex/9eec28f9-1b34-442a-9dda-2b891a969aea.vsidx b/.vs/Demka_Snova_1/FileContentIndex/9eec28f9-1b34-442a-9dda-2b891a969aea.vsidx deleted file mode 100644 index a0c5c9e..0000000 Binary files a/.vs/Demka_Snova_1/FileContentIndex/9eec28f9-1b34-442a-9dda-2b891a969aea.vsidx and /dev/null differ diff --git a/.vs/Demka_Snova_1/FileContentIndex/addfac63-baec-4b1f-8f14-ff4769cb4056.vsidx b/.vs/Demka_Snova_1/FileContentIndex/addfac63-baec-4b1f-8f14-ff4769cb4056.vsidx deleted file mode 100644 index 8e0290f..0000000 Binary files a/.vs/Demka_Snova_1/FileContentIndex/addfac63-baec-4b1f-8f14-ff4769cb4056.vsidx and /dev/null differ diff --git a/.vs/Demka_Snova_1/FileContentIndex/d136efbd-07e5-4ed5-b125-8c71df22cb55.vsidx b/.vs/Demka_Snova_1/FileContentIndex/d136efbd-07e5-4ed5-b125-8c71df22cb55.vsidx deleted file mode 100644 index c5b425f..0000000 Binary files a/.vs/Demka_Snova_1/FileContentIndex/d136efbd-07e5-4ed5-b125-8c71df22cb55.vsidx and /dev/null differ diff --git a/.vs/Demka_Snova_1/FileContentIndex/d542b87f-9af7-4742-b850-b5d3abe0860f.vsidx b/.vs/Demka_Snova_1/FileContentIndex/d542b87f-9af7-4742-b850-b5d3abe0860f.vsidx deleted file mode 100644 index fa05346..0000000 Binary files a/.vs/Demka_Snova_1/FileContentIndex/d542b87f-9af7-4742-b850-b5d3abe0860f.vsidx and /dev/null differ diff --git a/.vs/Demka_Snova_1/v17/.futdcache.v2 b/.vs/Demka_Snova_1/v17/.futdcache.v2 index 7c0c574..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 bb79594..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 de0e68e..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", @@ -136,12 +162,11 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\SotrudnikDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-06T10:16:23.432Z", - "EditorCaption": "" + "WhenOpened": "2025-05-06T10:16:23.432Z" }, { "$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", @@ -149,12 +174,11 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\SelectDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-06T10:16:20.337Z", - "EditorCaption": "" + "WhenOpened": "2025-05-06T10:16:20.337Z" }, { "$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", @@ -162,12 +186,11 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\OtchotDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-06T10:16:18.573Z", - "EditorCaption": "" + "WhenOpened": "2025-05-06T10:16:18.573Z" }, { "$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", @@ -175,12 +198,11 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\ordersDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-06T10:16:17.181Z", - "EditorCaption": "" + "WhenOpened": "2025-05-06T10:16:17.181Z" }, { "$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,25 +210,11 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\historyDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-06T10:16:14.254Z", - "EditorCaption": "" + "WhenOpened": "2025-05-06T10:16:14.254Z" }, { "$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", - "EditorCaption": "" - }, - { - "$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", @@ -214,12 +222,11 @@ "RelativeToolTip": "Hardik\\Date\\Dostup.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAaAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:23:29.828Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:23:29.828Z" }, { "$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", @@ -227,12 +234,11 @@ "RelativeToolTip": "MainWindow.axaml.cs", "ViewState": "AgIAABAAAAAAAAAAAAAAABoAAAAeAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:22:39.927Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:22:39.927Z" }, { "$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", @@ -245,7 +251,7 @@ }, { "$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", @@ -258,7 +264,7 @@ }, { "$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", @@ -271,7 +277,7 @@ }, { "$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", @@ -279,12 +285,11 @@ "RelativeToolTip": "OknaFunciy\\ActivityWindow.axaml.cs", "ViewState": "AgIAAAAAAAAAAAAAAADwvwwAAAAaAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:21:14.133Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:21:14.133Z" }, { "$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", @@ -292,25 +297,24 @@ "RelativeToolTip": "OknaFunciy\\AddClientWindow.axaml.cs", "ViewState": "AgIAAAsAAAAAAAAAAAAuwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:21:08.181Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:21:08.181Z" }, { "$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", "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", @@ -318,12 +322,11 @@ "RelativeToolTip": "OknaFunciy\\AddSotrudnikWindow.axaml.cs", "ViewState": "AgIAABMAAAAAAAAAAAAuwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:20:44.663Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:20:44.663Z" }, { "$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", @@ -331,12 +334,11 @@ "RelativeToolTip": "OknaFunciy\\ChangeRoleWindow.axaml.cs", "ViewState": "AgIAAAAAAAAAAAAAAEBVwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:20:10.148Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:20:10.148Z" }, { "$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", @@ -349,32 +351,31 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 6, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml", "RelativeToolTip": "MainWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2025-04-29T07:02:12.543Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:02:12.543Z" }, { "$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", "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", diff --git a/.vs/Demka_Snova_1/v17/DocumentLayout.json b/.vs/Demka_Snova_1/v17/DocumentLayout.json index de0e68e..6d78a54 100644 --- a/.vs/Demka_Snova_1/v17/DocumentLayout.json +++ b/.vs/Demka_Snova_1/v17/DocumentLayout.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", @@ -136,12 +162,11 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\SotrudnikDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-06T10:16:23.432Z", - "EditorCaption": "" + "WhenOpened": "2025-05-06T10:16:23.432Z" }, { "$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", @@ -149,12 +174,11 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\SelectDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-06T10:16:20.337Z", - "EditorCaption": "" + "WhenOpened": "2025-05-06T10:16:20.337Z" }, { "$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", @@ -162,12 +186,11 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\OtchotDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-06T10:16:18.573Z", - "EditorCaption": "" + "WhenOpened": "2025-05-06T10:16:18.573Z" }, { "$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", @@ -175,12 +198,11 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\ordersDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-06T10:16:17.181Z", - "EditorCaption": "" + "WhenOpened": "2025-05-06T10:16:17.181Z" }, { "$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,25 +210,11 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\historyDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-06T10:16:14.254Z", - "EditorCaption": "" + "WhenOpened": "2025-05-06T10:16:14.254Z" }, { "$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", - "EditorCaption": "" - }, - { - "$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", @@ -214,12 +222,11 @@ "RelativeToolTip": "Hardik\\Date\\Dostup.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAaAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:23:29.828Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:23:29.828Z" }, { "$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", @@ -227,12 +234,11 @@ "RelativeToolTip": "MainWindow.axaml.cs", "ViewState": "AgIAABAAAAAAAAAAAAAAABoAAAAeAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:22:39.927Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:22:39.927Z" }, { "$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", @@ -245,7 +251,7 @@ }, { "$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", @@ -258,7 +264,7 @@ }, { "$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", @@ -271,7 +277,7 @@ }, { "$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", @@ -279,12 +285,11 @@ "RelativeToolTip": "OknaFunciy\\ActivityWindow.axaml.cs", "ViewState": "AgIAAAAAAAAAAAAAAADwvwwAAAAaAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:21:14.133Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:21:14.133Z" }, { "$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", @@ -292,25 +297,24 @@ "RelativeToolTip": "OknaFunciy\\AddClientWindow.axaml.cs", "ViewState": "AgIAAAsAAAAAAAAAAAAuwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:21:08.181Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:21:08.181Z" }, { "$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", "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", @@ -318,12 +322,11 @@ "RelativeToolTip": "OknaFunciy\\AddSotrudnikWindow.axaml.cs", "ViewState": "AgIAABMAAAAAAAAAAAAuwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:20:44.663Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:20:44.663Z" }, { "$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", @@ -331,12 +334,11 @@ "RelativeToolTip": "OknaFunciy\\ChangeRoleWindow.axaml.cs", "ViewState": "AgIAAAAAAAAAAAAAAEBVwAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-29T07:20:10.148Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:20:10.148Z" }, { "$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", @@ -349,32 +351,31 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 6, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml", "RelativeToolTip": "MainWindow.axaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2025-04-29T07:02:12.543Z", - "EditorCaption": "" + "WhenOpened": "2025-04-29T07:02:12.543Z" }, { "$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", "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", diff --git a/.vs/ProjectEvaluation/demka_snova_1.metadata.v9.bin b/.vs/ProjectEvaluation/demka_snova_1.metadata.v9.bin index 24f8909..c744c22 100644 Binary files a/.vs/ProjectEvaluation/demka_snova_1.metadata.v9.bin and b/.vs/ProjectEvaluation/demka_snova_1.metadata.v9.bin differ diff --git a/.vs/ProjectEvaluation/demka_snova_1.projects.v9.bin b/.vs/ProjectEvaluation/demka_snova_1.projects.v9.bin index 6ca2321..e6017f6 100644 Binary files a/.vs/ProjectEvaluation/demka_snova_1.projects.v9.bin and b/.vs/ProjectEvaluation/demka_snova_1.projects.v9.bin differ 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 f2837a5..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 f7a3e8e..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 f2837a5..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/Avalonia/Resources.Inputs.cache b/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index 567338f..7b690bd 100644 --- a/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -09fa9e99fd9da34d80592406fa96cc387080707d7b37b9870dae9bac24e6d2fa +e586319a586d192e9dafd8a6d1398220b40b26cfdf44ccb79fb2c3fb8b15cb93 diff --git a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfo.cs b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfo.cs index 0fabe5e..110aec0 100644 --- a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfo.cs +++ b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfo.cs @@ -1,9 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. // //------------------------------------------------------------------------------ @@ -13,10 +14,10 @@ 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+e8fbd0a635bf619bbff5ca86a0573c0291e71976")] +[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")] -// Generated by the MSBuild WriteCodeFragment class. +// Создано классом WriteCodeFragment MSBuild. diff --git a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache index 3c2e4e3..a14cbd6 100644 --- a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache +++ b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache @@ -1 +1 @@ -597877a1ea6f66b7c6876c6b6b9c624a707b353d69c3f0fd8def14630230df87 +45e07e161ded7500e8dba89a1cfeee767273fdba99a6cbe76ddad64748894ed9 diff --git a/obj/Debug/net8.0/Demka_Snova_1.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net8.0/Demka_Snova_1.GeneratedMSBuildEditorConfig.editorconfig index 7045124..6975564 100644 --- a/obj/Debug/net8.0/Demka_Snova_1.GeneratedMSBuildEditorConfig.editorconfig +++ b/obj/Debug/net8.0/Demka_Snova_1.GeneratedMSBuildEditorConfig.editorconfig @@ -15,44 +15,44 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Demka_Snova_1 -build_property.ProjectDir = C:\Users\PC\source\repos\Demka_Snova\ +build_property.ProjectDir = C:\Users\PC\Source\Repos\Demka_Snova\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 8.0 build_property.EnableCodeStyleSeverity = -[C:/Users/PC/source/repos/Demka_Snova/App.axaml] +[C:/Users/PC/Source/Repos/Demka_Snova/App.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml -[C:/Users/PC/source/repos/Demka_Snova/MainWindow.axaml] +[C:/Users/PC/Source/Repos/Demka_Snova/MainWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml -[C:/Users/PC/source/repos/Demka_Snova/OknaFunciy/ActivityWindow.axaml] +[C:/Users/PC/Source/Repos/Demka_Snova/OknaFunciy/ActivityWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml -[C:/Users/PC/source/repos/Demka_Snova/OknaFunciy/AddClientWindow.axaml] +[C:/Users/PC/Source/Repos/Demka_Snova/OknaFunciy/AddClientWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml -[C:/Users/PC/source/repos/Demka_Snova/OknaFunciy/AddOtchotWindow.axaml] +[C:/Users/PC/Source/Repos/Demka_Snova/OknaFunciy/AddOtchotWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml -[C:/Users/PC/source/repos/Demka_Snova/OknaFunciy/AddSotrudnikWindow.axaml] +[C:/Users/PC/Source/Repos/Demka_Snova/OknaFunciy/AddSotrudnikWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml -[C:/Users/PC/source/repos/Demka_Snova/OknaFunciy/AddZakazWindow.axaml] +[C:/Users/PC/Source/Repos/Demka_Snova/OknaFunciy/AddZakazWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml -[C:/Users/PC/source/repos/Demka_Snova/OknaFunciy/ChangeRoleWindow.axaml] +[C:/Users/PC/Source/Repos/Demka_Snova/OknaFunciy/ChangeRoleWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml -[C:/Users/PC/source/repos/Demka_Snova/OknaFunciy/SotrudnikiWindow.axaml] +[C:/Users/PC/Source/Repos/Demka_Snova/OknaFunciy/SotrudnikiWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml -[C:/Users/PC/source/repos/Demka_Snova/OknaRoley/AdminWindow.axaml] +[C:/Users/PC/Source/Repos/Demka_Snova/OknaRoley/AdminWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml -[C:/Users/PC/source/repos/Demka_Snova/OknaRoley/SellerWindow.axaml] +[C:/Users/PC/Source/Repos/Demka_Snova/OknaRoley/SellerWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml -[C:/Users/PC/source/repos/Demka_Snova/OknaRoley/StarshiyWindow.axaml] +[C:/Users/PC/Source/Repos/Demka_Snova/OknaRoley/StarshiyWindow.axaml] build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml diff --git a/obj/Debug/net8.0/Demka_Snova_1.assets.cache b/obj/Debug/net8.0/Demka_Snova_1.assets.cache index 71adeb1..04cc70a 100644 Binary files a/obj/Debug/net8.0/Demka_Snova_1.assets.cache and b/obj/Debug/net8.0/Demka_Snova_1.assets.cache differ diff --git a/obj/Debug/net8.0/Demka_Snova_1.dll b/obj/Debug/net8.0/Demka_Snova_1.dll index e76fc01..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 176dccd..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 f7a3e8e..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 860f4bf..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 860f4bf..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 a7ed8e7..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 diff --git a/obj/Demka_Snova_1.csproj.nuget.dgspec.json b/obj/Demka_Snova_1.csproj.nuget.dgspec.json index 80ba435..a86ba45 100644 --- a/obj/Demka_Snova_1.csproj.nuget.dgspec.json +++ b/obj/Demka_Snova_1.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Demka_Snova_1.csproj": {} + "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\Demka_Snova_1.csproj": {} }, "projects": { - "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Demka_Snova_1.csproj": { + "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\Demka_Snova_1.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Demka_Snova_1.csproj", + "projectUniqueName": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\Demka_Snova_1.csproj", "projectName": "Demka_Snova_1", - "projectPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Demka_Snova_1.csproj", + "projectPath": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\Demka_Snova_1.csproj", "packagesPath": "C:\\Users\\PC\\.nuget\\packages\\", - "outputPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\obj\\", + "outputPath": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/obj/Demka_Snova_1.csproj.nuget.g.props b/obj/Demka_Snova_1.csproj.nuget.g.props index 3fc1841..92233f4 100644 --- a/obj/Demka_Snova_1.csproj.nuget.g.props +++ b/obj/Demka_Snova_1.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\PC\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.13.1 + 6.13.2 diff --git a/obj/project.assets.json b/obj/project.assets.json index c661c75..27ad9bf 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -8732,11 +8732,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Demka_Snova_1.csproj", + "projectUniqueName": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\Demka_Snova_1.csproj", "projectName": "Demka_Snova_1", - "projectPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Demka_Snova_1.csproj", + "projectPath": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\Demka_Snova_1.csproj", "packagesPath": "C:\\Users\\PC\\.nuget\\packages\\", - "outputPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\obj\\", + "outputPath": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -8861,7 +8861,7 @@ "code": "NU1701", "level": "Warning", "warningLevel": 1, - "message": "Package 'iTextSharp 5.5.13.4' was restored using '.NETFramework,Version=v4.6.1, .NETFramework,Version=v4.6.2, .NETFramework,Version=v4.7, .NETFramework,Version=v4.7.1, .NETFramework,Version=v4.7.2, .NETFramework,Version=v4.8, .NETFramework,Version=v4.8.1' instead of the project target framework 'net8.0'. This package may not be fully compatible with your project.", + "message": "Пакет \"iTextSharp 5.5.13.4\" был восстановлен с помощью \".NETFramework,Version=v4.6.1, .NETFramework,Version=v4.6.2, .NETFramework,Version=v4.7, .NETFramework,Version=v4.7.1, .NETFramework,Version=v4.7.2, .NETFramework,Version=v4.8, .NETFramework,Version=v4.8.1\", а не целевой платформы проекта \"net8.0\". Этот пакет может быть не полностью совместим с вашим проектом.", "libraryId": "iTextSharp", "targetGraphs": [ "net8.0" diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index 9a600d1..dd280c8 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "sH06kV0C8M8=", + "dgSpecHash": "MCXvF1cbXAc=", "success": true, - "projectFilePath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Demka_Snova_1.csproj", + "projectFilePath": "C:\\Users\\PC\\Source\\Repos\\Demka_Snova\\Demka_Snova_1.csproj", "expectedPackageFiles": [ "C:\\Users\\PC\\.nuget\\packages\\avalonia\\11.2.8\\avalonia.11.2.8.nupkg.sha512", "C:\\Users\\PC\\.nuget\\packages\\avalonia.angle.windows.natives\\2.1.22045.20230930\\avalonia.angle.windows.natives.2.1.22045.20230930.nupkg.sha512", @@ -173,7 +173,7 @@ "code": "NU1701", "level": "Warning", "warningLevel": 1, - "message": "Package 'iTextSharp 5.5.13.4' was restored using '.NETFramework,Version=v4.6.1, .NETFramework,Version=v4.6.2, .NETFramework,Version=v4.7, .NETFramework,Version=v4.7.1, .NETFramework,Version=v4.7.2, .NETFramework,Version=v4.8, .NETFramework,Version=v4.8.1' instead of the project target framework 'net8.0'. This package may not be fully compatible with your project.", + "message": "Пакет \"iTextSharp 5.5.13.4\" был восстановлен с помощью \".NETFramework,Version=v4.6.1, .NETFramework,Version=v4.6.2, .NETFramework,Version=v4.7, .NETFramework,Version=v4.7.1, .NETFramework,Version=v4.7.2, .NETFramework,Version=v4.8, .NETFramework,Version=v4.8.1\", а не целевой платформы проекта \"net8.0\". Этот пакет может быть не полностью совместим с вашим проектом.", "libraryId": "iTextSharp", "targetGraphs": [ "net8.0"