diff --git a/.vs/Demka_Snova_1/FileContentIndex/90b79227-8837-46c4-b77b-bfacc095ee7c.vsidx b/.vs/Demka_Snova_1/FileContentIndex/2e5fb1e2-67d4-4a81-a340-9bae07da7cfe.vsidx similarity index 97% rename from .vs/Demka_Snova_1/FileContentIndex/90b79227-8837-46c4-b77b-bfacc095ee7c.vsidx rename to .vs/Demka_Snova_1/FileContentIndex/2e5fb1e2-67d4-4a81-a340-9bae07da7cfe.vsidx index 378ac59..031420a 100644 Binary files a/.vs/Demka_Snova_1/FileContentIndex/90b79227-8837-46c4-b77b-bfacc095ee7c.vsidx and b/.vs/Demka_Snova_1/FileContentIndex/2e5fb1e2-67d4-4a81-a340-9bae07da7cfe.vsidx differ diff --git a/.vs/Demka_Snova_1/FileContentIndex/5774673f-5107-424d-b03c-718778a50dbb.vsidx b/.vs/Demka_Snova_1/FileContentIndex/5774673f-5107-424d-b03c-718778a50dbb.vsidx new file mode 100644 index 0000000..c586101 Binary files /dev/null and b/.vs/Demka_Snova_1/FileContentIndex/5774673f-5107-424d-b03c-718778a50dbb.vsidx differ diff --git a/.vs/Demka_Snova_1/FileContentIndex/ffe62d9f-6fb4-48c6-95bd-5bbee39130ab.vsidx b/.vs/Demka_Snova_1/FileContentIndex/7efd15d2-8d6a-4ae8-8302-420e3040bb89.vsidx similarity index 50% rename from .vs/Demka_Snova_1/FileContentIndex/ffe62d9f-6fb4-48c6-95bd-5bbee39130ab.vsidx rename to .vs/Demka_Snova_1/FileContentIndex/7efd15d2-8d6a-4ae8-8302-420e3040bb89.vsidx index 21c2269..403920c 100644 Binary files a/.vs/Demka_Snova_1/FileContentIndex/ffe62d9f-6fb4-48c6-95bd-5bbee39130ab.vsidx and b/.vs/Demka_Snova_1/FileContentIndex/7efd15d2-8d6a-4ae8-8302-420e3040bb89.vsidx differ diff --git a/.vs/Demka_Snova_1/FileContentIndex/edf41281-bd86-4a17-9b18-24c78f7ee256.vsidx b/.vs/Demka_Snova_1/FileContentIndex/edf41281-bd86-4a17-9b18-24c78f7ee256.vsidx deleted file mode 100644 index 9f9e603..0000000 Binary files a/.vs/Demka_Snova_1/FileContentIndex/edf41281-bd86-4a17-9b18-24c78f7ee256.vsidx and /dev/null differ diff --git a/.vs/Demka_Snova_1/v17/.futdcache.v2 b/.vs/Demka_Snova_1/v17/.futdcache.v2 index 4e4e18d..17222d1 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 16b7445..b4843af 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 440a721..e5e89a8 100644 --- a/.vs/Demka_Snova_1/v17/DocumentLayout.backup.json +++ b/.vs/Demka_Snova_1/v17/DocumentLayout.backup.json @@ -3,32 +3,52 @@ "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\\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}" - }, - { - "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}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:mainwindow.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\\addzakazwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative: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\\addzakazwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative: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\\addzakazwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:addzakazwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\sellerwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\sellerwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\adminwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\adminwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\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}" + }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\sellerwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\sellerwindow.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\\oknaroley\\adminwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\adminwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\dao\\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\\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\\sotrudnikdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\sotrudnikdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\starshiywindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\starshiywindow.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\\app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", @@ -42,10 +62,6 @@ "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\adminwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\adminwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\starshiywindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\starshiywindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -53,18 +69,6 @@ { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\app.manifest||{FA3CD31E-987B-443A-9B81-186104E8DAC1}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:app.manifest||{FA3CD31E-987B-443A-9B81-186104E8DAC1}" - }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\date\\timer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\date\\timer.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\\date\\dostup.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\date\\dostup.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\\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}" } ], "DocumentGroupContainers": [ @@ -74,20 +78,34 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 16, + "SelectedChildIndex": 13, "Children": [ { "$type": "Document", - "DocumentIndex": 14, - "Title": "Dostup.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Date\\Dostup.cs", - "RelativeDocumentMoniker": "Hardik\\Date\\Dostup.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Date\\Dostup.cs", - "RelativeToolTip": "Hardik\\Date\\Dostup.cs", - "ViewState": "AgIAAAEAAAAAAAAAAAAcwBIAAAAdAAAAAAAAAA==", + "DocumentIndex": 7, + "Title": "Conector.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Conector.cs", + "RelativeDocumentMoniker": "Hardik\\Conect\\Conector.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Conector.cs", + "RelativeToolTip": "Hardik\\Conect\\Conector.cs", + "ViewState": "AgIAABAAAAAAAAAAAAAAACIAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-02-05T10:21:40.51Z", - "IsPinned": true + "WhenOpened": "2025-02-12T07:11:06.434Z", + "IsPinned": true, + "EditorCaption": "" + }, + { + "$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-02-12T07:42:11.944Z", + "EditorCaption": "" }, { "$type": "Bookmark", @@ -105,9 +123,34 @@ "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" }, + { + "$type": "Document", + "DocumentIndex": 10, + "Title": "SotrudnikDao.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\SotrudnikDao.cs", + "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\SotrudnikDao.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\SotrudnikDao.cs", + "RelativeToolTip": "Hardik\\Conect\\Dao\\SotrudnikDao.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAKAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-02-12T07:17:47.872Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 11, + "Title": "StarshiyWindow.axaml", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\StarshiyWindow.axaml", + "RelativeDocumentMoniker": "OknaRoley\\StarshiyWindow.axaml", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\StarshiyWindow.axaml", + "RelativeToolTip": "OknaRoley\\StarshiyWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2025-02-12T07:08:05.649Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 15, "Title": "StarshiyWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\StarshiyWindow.axaml.cs", "RelativeDocumentMoniker": "OknaRoley\\StarshiyWindow.axaml.cs", @@ -119,7 +162,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 13, "Title": "App.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\App.axaml.cs", "RelativeDocumentMoniker": "App.axaml.cs", @@ -131,7 +174,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 12, "Title": "App.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\App.axaml", "RelativeDocumentMoniker": "App.axaml", @@ -142,7 +185,7 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 14, "Title": "Program.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Program.cs", "RelativeDocumentMoniker": "Program.cs", @@ -154,7 +197,7 @@ }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 16, "Title": "app.manifest", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\app.manifest", "RelativeDocumentMoniker": "app.manifest", @@ -166,20 +209,20 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 0, "Title": "AddZakazWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\AddZakazWindow.axaml.cs", "RelativeDocumentMoniker": "AddZakazWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\AddZakazWindow.axaml.cs", "RelativeToolTip": "AddZakazWindow.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAiAAAAAAAAAA==", + "ViewState": "AgIAAAMAAAAAAAAAAAAhwAgAAAAjAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-11T08:05:05.174Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 1, "Title": "AddZakazWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\AddZakazWindow.axaml", "RelativeDocumentMoniker": "AddZakazWindow.axaml", @@ -191,7 +234,7 @@ }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 9, "Title": "ordersDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\ordersDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\ordersDao.cs", @@ -199,17 +242,18 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\ordersDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-02-11T07:45:14.088Z" + "WhenOpened": "2025-02-11T07:45:14.088Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 2, "Title": "SellerWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\SellerWindow.axaml.cs", "RelativeDocumentMoniker": "OknaRoley\\SellerWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\SellerWindow.axaml.cs", "RelativeToolTip": "OknaRoley\\SellerWindow.axaml.cs", - "ViewState": "AgIAADAAAAAAAAAAAAAAwDwAAAAYAAAAAAAAAA==", + "ViewState": "AgIAADAAAAAAAAAAAAAAwDwAAAAmAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-11T07:38:47.754Z", "EditorCaption": "" @@ -228,7 +272,7 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 6, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", @@ -240,44 +284,20 @@ }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 4, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml.cs*", - "RelativeToolTip": "MainWindow.axaml.cs*", - "ViewState": "AgIAAA0AAAAAAAAAAAAAABwAAAAAAAAAAAAAAA==", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml.cs", + "RelativeToolTip": "MainWindow.axaml.cs", + "ViewState": "AgIAAB8AAAAAAAAAAAAhwCkAAAAMAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-05T10:53:31.225Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 10, - "Title": "AdminWindow.axaml.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml.cs", - "RelativeDocumentMoniker": "OknaRoley\\AdminWindow.axaml.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml.cs", - "RelativeToolTip": "OknaRoley\\AdminWindow.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAMAAAAbAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-02-05T10:21:58.99Z" - }, - { - "$type": "Document", - "DocumentIndex": 13, - "Title": "Timer.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Date\\Timer.cs", - "RelativeDocumentMoniker": "Hardik\\Date\\Timer.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Date\\Timer.cs", - "RelativeToolTip": "Hardik\\Date\\Timer.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAADMAAAABAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-02-05T10:20:30.391Z" - }, - { - "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 3, "Title": "AdminWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml", "RelativeDocumentMoniker": "OknaRoley\\AdminWindow.axaml", diff --git a/.vs/Demka_Snova_1/v17/DocumentLayout.json b/.vs/Demka_Snova_1/v17/DocumentLayout.json index ebf13da..e5e89a8 100644 --- a/.vs/Demka_Snova_1/v17/DocumentLayout.json +++ b/.vs/Demka_Snova_1/v17/DocumentLayout.json @@ -2,33 +2,53 @@ "Version": 1, "WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\", "Documents": [ - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\addzakazwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative: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\\addzakazwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative: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}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:mainwindow.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}" + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\addzakazwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative: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\\oknaroley\\sellerwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\sellerwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\adminwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\adminwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\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}" + }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\sellerwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\sellerwindow.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\\oknaroley\\adminwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\adminwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\dao\\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\\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\\sotrudnikdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\sotrudnikdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\starshiywindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\starshiywindow.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\\app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", @@ -42,10 +62,6 @@ "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\adminwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\adminwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknaroley\\starshiywindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknaroley\\starshiywindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -53,18 +69,6 @@ { "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\app.manifest||{FA3CD31E-987B-443A-9B81-186104E8DAC1}", "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:app.manifest||{FA3CD31E-987B-443A-9B81-186104E8DAC1}" - }, - { - "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\date\\timer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\date\\timer.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\\date\\dostup.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\date\\dostup.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\\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}" } ], "DocumentGroupContainers": [ @@ -74,20 +78,34 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 11, + "SelectedChildIndex": 13, "Children": [ { "$type": "Document", - "DocumentIndex": 14, - "Title": "Dostup.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Date\\Dostup.cs", - "RelativeDocumentMoniker": "Hardik\\Date\\Dostup.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Date\\Dostup.cs", - "RelativeToolTip": "Hardik\\Date\\Dostup.cs", - "ViewState": "AgIAAAEAAAAAAAAAAAAcwBIAAAAdAAAAAAAAAA==", + "DocumentIndex": 7, + "Title": "Conector.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Conector.cs", + "RelativeDocumentMoniker": "Hardik\\Conect\\Conector.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Conector.cs", + "RelativeToolTip": "Hardik\\Conect\\Conector.cs", + "ViewState": "AgIAABAAAAAAAAAAAAAAACIAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-02-05T10:21:40.51Z", - "IsPinned": true + "WhenOpened": "2025-02-12T07:11:06.434Z", + "IsPinned": true, + "EditorCaption": "" + }, + { + "$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-02-12T07:42:11.944Z", + "EditorCaption": "" }, { "$type": "Bookmark", @@ -105,9 +123,34 @@ "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" }, + { + "$type": "Document", + "DocumentIndex": 10, + "Title": "SotrudnikDao.cs", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\SotrudnikDao.cs", + "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\SotrudnikDao.cs", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\SotrudnikDao.cs", + "RelativeToolTip": "Hardik\\Conect\\Dao\\SotrudnikDao.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAKAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-02-12T07:17:47.872Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 11, + "Title": "StarshiyWindow.axaml", + "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\StarshiyWindow.axaml", + "RelativeDocumentMoniker": "OknaRoley\\StarshiyWindow.axaml", + "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\StarshiyWindow.axaml", + "RelativeToolTip": "OknaRoley\\StarshiyWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2025-02-12T07:08:05.649Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 15, "Title": "StarshiyWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\StarshiyWindow.axaml.cs", "RelativeDocumentMoniker": "OknaRoley\\StarshiyWindow.axaml.cs", @@ -119,7 +162,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 13, "Title": "App.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\App.axaml.cs", "RelativeDocumentMoniker": "App.axaml.cs", @@ -131,7 +174,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 12, "Title": "App.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\App.axaml", "RelativeDocumentMoniker": "App.axaml", @@ -142,7 +185,7 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 14, "Title": "Program.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Program.cs", "RelativeDocumentMoniker": "Program.cs", @@ -154,7 +197,7 @@ }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 16, "Title": "app.manifest", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\app.manifest", "RelativeDocumentMoniker": "app.manifest", @@ -166,20 +209,20 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 0, "Title": "AddZakazWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\AddZakazWindow.axaml.cs", "RelativeDocumentMoniker": "AddZakazWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\AddZakazWindow.axaml.cs", "RelativeToolTip": "AddZakazWindow.axaml.cs", - "ViewState": "AgIAADQAAAAAAAAAAAAAADoAAAAXAAAAAAAAAA==", + "ViewState": "AgIAAAMAAAAAAAAAAAAhwAgAAAAjAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-11T08:05:05.174Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 1, "Title": "AddZakazWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\AddZakazWindow.axaml", "RelativeDocumentMoniker": "AddZakazWindow.axaml", @@ -191,7 +234,7 @@ }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 9, "Title": "ordersDao.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\ordersDao.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\ordersDao.cs", @@ -199,17 +242,18 @@ "RelativeToolTip": "Hardik\\Conect\\Dao\\ordersDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-02-11T07:45:14.088Z" + "WhenOpened": "2025-02-11T07:45:14.088Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 2, "Title": "SellerWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\SellerWindow.axaml.cs", "RelativeDocumentMoniker": "OknaRoley\\SellerWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\SellerWindow.axaml.cs", "RelativeToolTip": "OknaRoley\\SellerWindow.axaml.cs", - "ViewState": "AgIAADAAAAAAAAAAAAAAwDwAAAAYAAAAAAAAAA==", + "ViewState": "AgIAADAAAAAAAAAAAAAAwDwAAAAmAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-11T07:38:47.754Z", "EditorCaption": "" @@ -228,7 +272,7 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 6, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml", "RelativeDocumentMoniker": "MainWindow.axaml", @@ -240,44 +284,20 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 4, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "MainWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml.cs", "RelativeToolTip": "MainWindow.axaml.cs", - "ViewState": "AgIAAA0AAAAAAAAAAAAAABwAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAB8AAAAAAAAAAAAhwCkAAAAMAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-05T10:53:31.225Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 10, - "Title": "AdminWindow.axaml.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml.cs", - "RelativeDocumentMoniker": "OknaRoley\\AdminWindow.axaml.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml.cs", - "RelativeToolTip": "OknaRoley\\AdminWindow.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAMAAAAbAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-02-05T10:21:58.99Z" - }, - { - "$type": "Document", - "DocumentIndex": 13, - "Title": "Timer.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Date\\Timer.cs", - "RelativeDocumentMoniker": "Hardik\\Date\\Timer.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Date\\Timer.cs", - "RelativeToolTip": "Hardik\\Date\\Timer.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAADMAAAABAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-02-05T10:20:30.391Z" - }, - { - "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 3, "Title": "AdminWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml", "RelativeDocumentMoniker": "OknaRoley\\AdminWindow.axaml", diff --git a/Hardik/Conect/Conector.cs b/Hardik/Conect/Conector.cs index 79760a5..7716749 100644 --- a/Hardik/Conect/Conector.cs +++ b/Hardik/Conect/Conector.cs @@ -6,7 +6,8 @@ public class AppDbContext : DbContext { protected override void OnConfiguring(DbContextOptionsBuilder oB) { - oB.UseSqlServer("Host=45.67.56.214;Port=5421;Username=user16;Password=dZ28IVE5;Database=user16"); + oB.UseSqlServer("Server=45.67.56.214,5421;Database=user16;User=user16;Password=dZ28IVE5;"); + // options => options.EnableRetryOnFailure()); } public DbSet sotrudnik { get; set; } public DbSet uslugi { get; set; } @@ -22,11 +23,13 @@ public class AppDbContext : DbContext mb.Entity().HasKey(orders => orders.ID); mb.Entity().Property(orders => orders.ID).ValueGeneratedOnAdd(); + mb.Entity().HasKey(uslugi => uslugi.ID); mb.Entity().HasKey(sotrudnik => sotrudnik.ID); mb.Entity().HasKey(history => history.id); + } } \ No newline at end of file diff --git a/Hardik/Conect/Dao/SotrudnikDao.cs b/Hardik/Conect/Dao/SotrudnikDao.cs index 0c33496..2e37953 100644 --- a/Hardik/Conect/Dao/SotrudnikDao.cs +++ b/Hardik/Conect/Dao/SotrudnikDao.cs @@ -5,10 +5,10 @@ namespace Demka_Snova_1.Hardik.Conect.Dao; public class SotrudnikDao { public int ID {get;set;} - public static string Pozition {get;set;} + public string Pozition {get;set;} public string Fio {get;set;} - public static string Login {get;set;} - public static string Pass {get;set;} + public string Login {get;set;} + public string Pass {get;set;} public string LaspEnt {get;set;} public string TipeEnt {get;set;} } \ No newline at end of file diff --git a/Hardik/Conect/Dao/ordersDao.cs b/Hardik/Conect/Dao/ordersDao.cs index 9ee91a7..20d868c 100644 --- a/Hardik/Conect/Dao/ordersDao.cs +++ b/Hardik/Conect/Dao/ordersDao.cs @@ -13,4 +13,5 @@ public class ordersDao public string Status {get;set;} public string DateClose {get;set;} public decimal Prokat {get;set;} + public KlientDao klient {get;set;} } \ No newline at end of file diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs index b01b47f..ffb5e7e 100644 --- a/MainWindow.axaml.cs +++ b/MainWindow.axaml.cs @@ -1,8 +1,13 @@ using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; +using Demka_Snova_1.Hardik.Conect; using Demka_Snova_1.Hardik.Conect.Dao; using Demka_Snova_1.OknaRoley; +using Microsoft.EntityFrameworkCore; +using System.Linq; +using System.Threading.Tasks; + namespace Demka_Snova_1; public partial class MainWindow : Window @@ -27,54 +32,54 @@ public partial class MainWindow : Window this.Close(); } - private void LoginButton_Click(object sender, RoutedEventArgs e) + private async void LoginButton_Click(object sender, RoutedEventArgs e) { string username = UsernameTextBox.Text; string password = PasswordTextBox.Text; - if (IsValidUser(username, password)) + + using (var context = new AppDbContext()) { - Window nextWindow = null; - switch (SotrudnikDao.Pozition) + var user = await context.sotrudnik + .FirstOrDefaultAsync(u => u.Login == username && u.Pass == password); + + if (user != null) { - case "Продавец": - nextWindow = new SellerWindow(); - break; - case "Старший смены": - nextWindow = new StarshiyWindow(); - break; - case "Администратор": - nextWindow = new AdminWindow(); - break; - default: - ShowError("Неизвестная роль пользователя"); - return; + Window nextWindow = null; + switch (user.Pozition) + { + case "Продавец": + nextWindow = new SellerWindow(); + break; + case "Старший смены": + nextWindow = new StarshiyWindow(); + break; + case "Администратор": + nextWindow = new AdminWindow(); + break; + default: + await ShowError("Неизвестная роль пользователя"); + return; + } + + nextWindow.Show(); + this.Close(); } - - nextWindow.Show(); - this.Close(); - } - else - { - ShowError("Неверный логин или пароль"); - } - - async void ShowError(string mes) - { - var dialog = new Window + else { - Title = "Ошибка", - Content = mes, - Width = 300, - Height = 200 - }; - await dialog.ShowDialog(this); + await ShowError("Неверный логин или пароль"); + } } + } - bool IsValidUser(string username, string password) + private async Task ShowError(string message) + { + var dialog = new Window { - return username == SotrudnikDao.Login && password == SotrudnikDao.Pass; - } - - + Title = "Ошибка", + Content = message, + Width = 300, + Height = 200 + }; + await dialog.ShowDialog(this); } } \ No newline at end of file diff --git a/OknaRoley/AdminWindow.axaml b/OknaRoley/AdminWindow.axaml index e673374..2f6854c 100644 --- a/OknaRoley/AdminWindow.axaml +++ b/OknaRoley/AdminWindow.axaml @@ -4,12 +4,12 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Demka_Snova_1.OknaRoley.AdminWindow" - Title="AdminWindow"> + Title="Админ понель"> -