Compare commits

..

2 Commits
master ... Devi

Author SHA1 Message Date
9ebcb8212f Merge pull request 'master' (#2) from master into Devi
Reviewed-on: #2
2025-05-07 11:43:48 +00:00
714b7ff7c2 Merge pull request 'master' (#1) from master into Devi
Reviewed-on: #1
2025-05-06 10:41:35 +00:00
18 changed files with 136 additions and 216 deletions

Binary file not shown.

View File

@ -2,14 +2,6 @@
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\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}"
@ -106,7 +98,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 5,
"SelectedChildIndex": 19,
"Children": [
{
"$type": "Bookmark",
@ -126,66 +118,43 @@
},
{
"$type": "Document",
"DocumentIndex": 1,
"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": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T12:30:35.014Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "Conector.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Conector.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\Conector.cs",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Conector.cs",
"RelativeToolTip": "Hardik\\Conect\\Conector.cs",
"ViewState": "AgIAABwAAAAAAAAAAAAAADkAAAAdAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T12:12:42.424Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 4,
"DocumentIndex": 2,
"Title": "AddClientWindow.axaml",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddClientWindow.axaml",
"RelativeDocumentMoniker": "OknaFunciy\\AddClientWindow.axaml",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddClientWindow.axaml",
"RelativeToolTip": "OknaFunciy\\AddClientWindow.axaml",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
"WhenOpened": "2025-05-07T11:34:19.101Z"
"WhenOpened": "2025-05-07T11:34:19.101Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 3,
"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"
"WhenOpened": "2025-05-07T11:34:12.54Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 5,
"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"
"WhenOpened": "2025-05-07T11:34:06.814Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 9,
"DocumentIndex": 7,
"Title": "SotrudnikDao.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\SotrudnikDao.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\SotrudnikDao.cs",
@ -197,7 +166,7 @@
},
{
"$type": "Document",
"DocumentIndex": 10,
"DocumentIndex": 8,
"Title": "SelectDao.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\SelectDao.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\SelectDao.cs",
@ -209,7 +178,7 @@
},
{
"$type": "Document",
"DocumentIndex": 11,
"DocumentIndex": 9,
"Title": "OtchotDao.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\OtchotDao.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\OtchotDao.cs",
@ -221,7 +190,7 @@
},
{
"$type": "Document",
"DocumentIndex": 12,
"DocumentIndex": 10,
"Title": "ordersDao.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\ordersDao.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\ordersDao.cs",
@ -233,7 +202,7 @@
},
{
"$type": "Document",
"DocumentIndex": 13,
"DocumentIndex": 11,
"Title": "historyDao.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\historyDao.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\historyDao.cs",
@ -245,7 +214,7 @@
},
{
"$type": "Document",
"DocumentIndex": 19,
"DocumentIndex": 17,
"Title": "Dostup.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Date\\Dostup.cs",
"RelativeDocumentMoniker": "Hardik\\Date\\Dostup.cs",
@ -257,7 +226,7 @@
},
{
"$type": "Document",
"DocumentIndex": 14,
"DocumentIndex": 12,
"Title": "MainWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml.cs",
"RelativeDocumentMoniker": "MainWindow.axaml.cs",
@ -269,7 +238,7 @@
},
{
"$type": "Document",
"DocumentIndex": 16,
"DocumentIndex": 14,
"Title": "StarshiyWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\StarshiyWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaRoley\\StarshiyWindow.axaml.cs",
@ -277,11 +246,12 @@
"RelativeToolTip": "OknaRoley\\StarshiyWindow.axaml.cs",
"ViewState": "AgIAADIAAAAAAAAAAAAuwAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-29T07:22:30.297Z"
"WhenOpened": "2025-04-29T07:22:30.297Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 15,
"DocumentIndex": 13,
"Title": "SellerWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\SellerWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaRoley\\SellerWindow.axaml.cs",
@ -289,11 +259,12 @@
"RelativeToolTip": "OknaRoley\\SellerWindow.axaml.cs",
"ViewState": "AgIAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-29T07:22:24.814Z"
"WhenOpened": "2025-04-29T07:22:24.814Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 18,
"DocumentIndex": 16,
"Title": "AdminWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaRoley\\AdminWindow.axaml.cs",
@ -301,11 +272,12 @@
"RelativeToolTip": "OknaRoley\\AdminWindow.axaml.cs",
"ViewState": "AgIAABMAAAAAAAAAAAA+wBwAAAAFAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-29T07:21:20.054Z"
"WhenOpened": "2025-04-29T07:21:20.054Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 17,
"DocumentIndex": 15,
"Title": "ActivityWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\ActivityWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\ActivityWindow.axaml.cs",
@ -317,7 +289,7 @@
},
{
"$type": "Document",
"DocumentIndex": 20,
"DocumentIndex": 18,
"Title": "AddClientWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddClientWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\AddClientWindow.axaml.cs",
@ -329,20 +301,20 @@
},
{
"$type": "Document",
"DocumentIndex": 2,
"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": "AgIAAAAAAAAAAAAAAAAAAIgAAAAwAAAAAAAAAA==",
"ViewState": "AgIAAH4AAAAAAAAAAAAAAIgAAAAwAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-29T07:20:59.048Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 21,
"DocumentIndex": 19,
"Title": "AddSotrudnikWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddSotrudnikWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\AddSotrudnikWindow.axaml.cs",
@ -354,7 +326,7 @@
},
{
"$type": "Document",
"DocumentIndex": 22,
"DocumentIndex": 20,
"Title": "ChangeRoleWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\ChangeRoleWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\ChangeRoleWindow.axaml.cs",
@ -366,7 +338,7 @@
},
{
"$type": "Document",
"DocumentIndex": 23,
"DocumentIndex": 21,
"Title": "SotrudnikiWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml.cs",
@ -374,11 +346,12 @@
"RelativeToolTip": "OknaFunciy\\SotrudnikiWindow.axaml.cs",
"ViewState": "AgIAADEAAAAAAAAAAIBZwAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-29T07:19:52.266Z"
"WhenOpened": "2025-04-29T07:19:52.266Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 8,
"DocumentIndex": 6,
"Title": "MainWindow.axaml",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml",
"RelativeDocumentMoniker": "MainWindow.axaml",
@ -389,7 +362,7 @@
},
{
"$type": "Document",
"DocumentIndex": 7,
"DocumentIndex": 5,
"Title": "AddZakazWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\AddZakazWindow.axaml.cs",
@ -397,18 +370,20 @@
"RelativeToolTip": "OknaFunciy\\AddZakazWindow.axaml.cs",
"ViewState": "AgIAAEQAAAAAAAAAAAAAACgAAAAmAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-25T08:03:48.653Z"
"WhenOpened": "2025-04-25T08:03:48.653Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 6,
"DocumentIndex": 4,
"Title": "AddZakazWindow.axaml",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml",
"RelativeDocumentMoniker": "OknaFunciy\\AddZakazWindow.axaml",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml",
"RelativeToolTip": "OknaFunciy\\AddZakazWindow.axaml",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
"WhenOpened": "2025-04-25T08:03:34.528Z"
"WhenOpened": "2025-04-25T08:03:34.528Z",
"EditorCaption": ""
}
]
}

View File

@ -2,14 +2,6 @@
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\conector.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\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}"
@ -106,7 +98,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 5,
"SelectedChildIndex": 19,
"Children": [
{
"$type": "Bookmark",
@ -126,66 +118,43 @@
},
{
"$type": "Document",
"DocumentIndex": 1,
"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": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T12:30:35.014Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "Conector.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Conector.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\Conector.cs",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Conector.cs",
"RelativeToolTip": "Hardik\\Conect\\Conector.cs",
"ViewState": "AgIAABwAAAAAAAAAAAAAADkAAAAdAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-13T12:12:42.424Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 4,
"DocumentIndex": 2,
"Title": "AddClientWindow.axaml",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddClientWindow.axaml",
"RelativeDocumentMoniker": "OknaFunciy\\AddClientWindow.axaml",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddClientWindow.axaml",
"RelativeToolTip": "OknaFunciy\\AddClientWindow.axaml",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
"WhenOpened": "2025-05-07T11:34:19.101Z"
"WhenOpened": "2025-05-07T11:34:19.101Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 3,
"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"
"WhenOpened": "2025-05-07T11:34:12.54Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 5,
"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"
"WhenOpened": "2025-05-07T11:34:06.814Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 9,
"DocumentIndex": 7,
"Title": "SotrudnikDao.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\SotrudnikDao.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\SotrudnikDao.cs",
@ -197,7 +166,7 @@
},
{
"$type": "Document",
"DocumentIndex": 10,
"DocumentIndex": 8,
"Title": "SelectDao.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\SelectDao.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\SelectDao.cs",
@ -209,7 +178,7 @@
},
{
"$type": "Document",
"DocumentIndex": 11,
"DocumentIndex": 9,
"Title": "OtchotDao.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\OtchotDao.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\OtchotDao.cs",
@ -221,7 +190,7 @@
},
{
"$type": "Document",
"DocumentIndex": 12,
"DocumentIndex": 10,
"Title": "ordersDao.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\ordersDao.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\ordersDao.cs",
@ -233,7 +202,7 @@
},
{
"$type": "Document",
"DocumentIndex": 13,
"DocumentIndex": 11,
"Title": "historyDao.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\historyDao.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\historyDao.cs",
@ -245,7 +214,7 @@
},
{
"$type": "Document",
"DocumentIndex": 19,
"DocumentIndex": 17,
"Title": "Dostup.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Date\\Dostup.cs",
"RelativeDocumentMoniker": "Hardik\\Date\\Dostup.cs",
@ -257,7 +226,7 @@
},
{
"$type": "Document",
"DocumentIndex": 14,
"DocumentIndex": 12,
"Title": "MainWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml.cs",
"RelativeDocumentMoniker": "MainWindow.axaml.cs",
@ -269,7 +238,7 @@
},
{
"$type": "Document",
"DocumentIndex": 16,
"DocumentIndex": 14,
"Title": "StarshiyWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\StarshiyWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaRoley\\StarshiyWindow.axaml.cs",
@ -277,11 +246,12 @@
"RelativeToolTip": "OknaRoley\\StarshiyWindow.axaml.cs",
"ViewState": "AgIAADIAAAAAAAAAAAAuwAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-29T07:22:30.297Z"
"WhenOpened": "2025-04-29T07:22:30.297Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 15,
"DocumentIndex": 13,
"Title": "SellerWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\SellerWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaRoley\\SellerWindow.axaml.cs",
@ -289,11 +259,12 @@
"RelativeToolTip": "OknaRoley\\SellerWindow.axaml.cs",
"ViewState": "AgIAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-29T07:22:24.814Z"
"WhenOpened": "2025-04-29T07:22:24.814Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 18,
"DocumentIndex": 16,
"Title": "AdminWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaRoley\\AdminWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaRoley\\AdminWindow.axaml.cs",
@ -301,11 +272,12 @@
"RelativeToolTip": "OknaRoley\\AdminWindow.axaml.cs",
"ViewState": "AgIAABMAAAAAAAAAAAA+wBwAAAAFAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-29T07:21:20.054Z"
"WhenOpened": "2025-04-29T07:21:20.054Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 17,
"DocumentIndex": 15,
"Title": "ActivityWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\ActivityWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\ActivityWindow.axaml.cs",
@ -317,7 +289,7 @@
},
{
"$type": "Document",
"DocumentIndex": 20,
"DocumentIndex": 18,
"Title": "AddClientWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddClientWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\AddClientWindow.axaml.cs",
@ -329,20 +301,20 @@
},
{
"$type": "Document",
"DocumentIndex": 2,
"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": "AgIAAAAAAAAAAAAAAAAAAIgAAAAwAAAAAAAAAA==",
"ViewState": "AgIAAH4AAAAAAAAAAAAAAIgAAAAwAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-29T07:20:59.048Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 21,
"DocumentIndex": 19,
"Title": "AddSotrudnikWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddSotrudnikWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\AddSotrudnikWindow.axaml.cs",
@ -354,7 +326,7 @@
},
{
"$type": "Document",
"DocumentIndex": 22,
"DocumentIndex": 20,
"Title": "ChangeRoleWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\ChangeRoleWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\ChangeRoleWindow.axaml.cs",
@ -366,7 +338,7 @@
},
{
"$type": "Document",
"DocumentIndex": 23,
"DocumentIndex": 21,
"Title": "SotrudnikiWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml.cs",
@ -374,11 +346,12 @@
"RelativeToolTip": "OknaFunciy\\SotrudnikiWindow.axaml.cs",
"ViewState": "AgIAADEAAAAAAAAAAIBZwAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-29T07:19:52.266Z"
"WhenOpened": "2025-04-29T07:19:52.266Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 8,
"DocumentIndex": 6,
"Title": "MainWindow.axaml",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\MainWindow.axaml",
"RelativeDocumentMoniker": "MainWindow.axaml",
@ -389,7 +362,7 @@
},
{
"$type": "Document",
"DocumentIndex": 7,
"DocumentIndex": 5,
"Title": "AddZakazWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\AddZakazWindow.axaml.cs",
@ -397,18 +370,20 @@
"RelativeToolTip": "OknaFunciy\\AddZakazWindow.axaml.cs",
"ViewState": "AgIAAEQAAAAAAAAAAAAAACgAAAAmAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-25T08:03:48.653Z"
"WhenOpened": "2025-04-25T08:03:48.653Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 6,
"DocumentIndex": 4,
"Title": "AddZakazWindow.axaml",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml",
"RelativeDocumentMoniker": "OknaFunciy\\AddZakazWindow.axaml",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\AddZakazWindow.axaml",
"RelativeToolTip": "OknaFunciy\\AddZakazWindow.axaml",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
"WhenOpened": "2025-04-25T08:03:34.528Z"
"WhenOpened": "2025-04-25T08:03:34.528Z",
"EditorCaption": ""
}
]
}

View File

@ -1,64 +1,34 @@
using Demka_Snova_1.Hardik.Conect.Dao;
using Microsoft.EntityFrameworkCore;
//using Demka_Snova_1.Hardik.Conect.Dao;
//using Microsoft.EntityFrameworkCore;
namespace Demka_Snova_1.Hardik.Conect;
//namespace Demka_Snova_1.Hardik.Conect;
public class AppDbContext : DbContext
{
private readonly string _connectionString;
//public class AppDbContext : DbContext
//{
// protected override void OnConfiguring(DbContextOptionsBuilder oB)
// {
// oB.UseSqlServer("Server=45.67.56.214,5421;Database=user16;User Id=user16;Password=dZ28IVE5;",
// options => options.EnableRetryOnFailure());
// }
public AppDbContext(string connectionString)
{
_connectionString = connectionString;
}
// public DbSet<SotrudnikDao> sotrudnik { get; set; }
// public DbSet<uslugiDao> uslugi { get; set; }
// public DbSet<ordersDao> orders { get; set; }
// public DbSet<KlientDao> klient { get; set; }
// public DbSet<historyDao> history { get; set; }
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
if (!optionsBuilder.IsConfigured)
{
optionsBuilder.UseSqlServer(_connectionString,
sqlOptions => sqlOptions.EnableRetryOnFailure());
}
}
// protected override void OnModelCreating(ModelBuilder mb)
// {
// mb.Entity<KlientDao>().ToTable("Klient", "Demo_Blago").HasKey(klient => klient.Code);
// mb.Entity<KlientDao>().Property(klient => klient.Code).ValueGeneratedOnAdd();
public DbSet<SotrudnikDao> Sotrudnik { get; set; }
public DbSet<uslugiDao> Uslugi { get; set; }
public DbSet<ordersDao> Orders { get; set; }
public DbSet<KlientDao> Klient { get; set; }
public DbSet<historyDao> History { get; set; }
// mb.Entity<ordersDao>().ToTable("orders", "Demo_Blago").HasKey(orders => orders.ID);
// mb.Entity<ordersDao>().Property(orders => orders.ID).ValueGeneratedOnAdd();
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<KlientDao>(entity =>
{
entity.ToTable("Klient", "Demo_Blago");
entity.HasKey(e => e.Code);
entity.Property(e => e.Code).ValueGeneratedOnAdd();
});
// mb.Entity<uslugiDao>().ToTable("uslugi", "Demo_Blago").HasKey(uslugi => uslugi.id);
modelBuilder.Entity<ordersDao>(entity =>
{
entity.ToTable("orders", "Demo_Blago");
entity.HasKey(e => e.ID);
entity.Property(e => e.ID).ValueGeneratedOnAdd();
});
// mb.Entity<SotrudnikDao>().ToTable("Sotrudnik", "Demo_Blago").HasKey(sotrudnik => sotrudnik.ID);
modelBuilder.Entity<uslugiDao>(entity =>
{
entity.ToTable("uslugi", "Demo_Blago");
entity.HasKey(e => e.id);
});
modelBuilder.Entity<SotrudnikDao>(entity =>
{
entity.ToTable("Sotrudnik", "Demo_Blago");
entity.HasKey(e => e.ID);
});
modelBuilder.Entity<historyDao>(entity =>
{
entity.ToTable("history", "Demo_Blago");
entity.HasKey(e => e.id);
});
}
}
// mb.Entity<historyDao>().ToTable("history", "Demo_Blago").HasKey(history => history.id);
// }
//}

View File

@ -1 +1 @@
fd57720145ae725f29f1fb8145be303e9b5c4ff168458db746b664dbc6209d33
e586319a586d192e9dafd8a6d1398220b40b26cfdf44ccb79fb2c3fb8b15cb93

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Demka_Snova_1")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+75ae85af83e9ee992dde0c5d5790ade7e5831cbe")]
[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")]

View File

@ -1 +1 @@
8cd0f8ea0c2434fc805d1347be58e5b25eb6812e93cff997de23b81b3191f36c
45e07e161ded7500e8dba89a1cfeee767273fdba99a6cbe76ddad64748894ed9

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -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",