diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index b06ff2d..e14510f 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -12,6 +12,6 @@ "\\Zurnal\\RemaDateBase\\Interfase", "\\Zurnal\\UI" ], - "SelectedNode": "\\Zurnal\\UI\\Info.cs", + "SelectedNode": "\\Zurnal\\Program.cs", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/Zurnal/FileContentIndex/1e114c58-71a3-4bcd-ae8d-d923d7f0975b.vsidx b/.vs/Zurnal/FileContentIndex/1e114c58-71a3-4bcd-ae8d-d923d7f0975b.vsidx new file mode 100644 index 0000000..449943b Binary files /dev/null and b/.vs/Zurnal/FileContentIndex/1e114c58-71a3-4bcd-ae8d-d923d7f0975b.vsidx differ diff --git a/.vs/Zurnal/FileContentIndex/81121301-750b-48db-82fe-82814c12c488.vsidx b/.vs/Zurnal/FileContentIndex/81121301-750b-48db-82fe-82814c12c488.vsidx deleted file mode 100644 index fd8b58b..0000000 Binary files a/.vs/Zurnal/FileContentIndex/81121301-750b-48db-82fe-82814c12c488.vsidx and /dev/null differ diff --git a/.vs/Zurnal/FileContentIndex/8985e59e-297a-4120-bec2-dd5dd4f3e18e.vsidx b/.vs/Zurnal/FileContentIndex/8985e59e-297a-4120-bec2-dd5dd4f3e18e.vsidx deleted file mode 100644 index 60b2500..0000000 Binary files a/.vs/Zurnal/FileContentIndex/8985e59e-297a-4120-bec2-dd5dd4f3e18e.vsidx and /dev/null differ diff --git a/.vs/Zurnal/FileContentIndex/bc3abf9e-6cc5-49e6-b517-24f06a8bac76.vsidx b/.vs/Zurnal/FileContentIndex/bc3abf9e-6cc5-49e6-b517-24f06a8bac76.vsidx new file mode 100644 index 0000000..cab74d2 Binary files /dev/null and b/.vs/Zurnal/FileContentIndex/bc3abf9e-6cc5-49e6-b517-24f06a8bac76.vsidx differ diff --git a/.vs/Zurnal/FileContentIndex/def250fa-9ba9-4962-a710-bc5f584ee0b3.vsidx b/.vs/Zurnal/FileContentIndex/def250fa-9ba9-4962-a710-bc5f584ee0b3.vsidx new file mode 100644 index 0000000..bd4a279 Binary files /dev/null and b/.vs/Zurnal/FileContentIndex/def250fa-9ba9-4962-a710-bc5f584ee0b3.vsidx differ diff --git a/.vs/Zurnal/FileContentIndex/f84cbb7b-0906-48de-8992-319758bba80a.vsidx b/.vs/Zurnal/FileContentIndex/f84cbb7b-0906-48de-8992-319758bba80a.vsidx deleted file mode 100644 index 39677d7..0000000 Binary files a/.vs/Zurnal/FileContentIndex/f84cbb7b-0906-48de-8992-319758bba80a.vsidx and /dev/null differ diff --git a/.vs/Zurnal/v17/.wsuo b/.vs/Zurnal/v17/.wsuo index 8dab93f..5da5b96 100644 Binary files a/.vs/Zurnal/v17/.wsuo and b/.vs/Zurnal/v17/.wsuo differ diff --git a/.vs/Zurnal/v17/DocumentLayout.backup.json b/.vs/Zurnal/v17/DocumentLayout.backup.json index 28d93f8..f84ffce 100644 --- a/.vs/Zurnal/v17/DocumentLayout.backup.json +++ b/.vs/Zurnal/v17/DocumentLayout.backup.json @@ -2,18 +2,34 @@ "Version": 1, "WorkspaceRootPath": "C:\\Users\\profi\\source\\repos\\Zurnal\\", "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\Program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\conver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\UI\\conver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Date\\Repository\\IGroupRepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\Date\\Repository\\IGroupRepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\RemoutDateBase.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\RemoutDateBase.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\Info.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\UI\\Info.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\UserDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\DateDao\\UserDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\UserDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\DateDao\\UserDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -26,7 +42,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 1, + "SelectedChildIndex": 2, "Children": [ { "$type": "Bookmark", @@ -34,33 +50,81 @@ }, { "$type": "Document", - "DocumentIndex": 0, - "Title": "Info.cs", - "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\Info.cs", - "RelativeDocumentMoniker": "Zurnal\\UI\\Info.cs", - "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\Info.cs", - "RelativeToolTip": "Zurnal\\UI\\Info.cs", - "ViewState": "AgIAAEsAAAAAAAAAAAAAAFwAAAAFAAAAAAAAAA==", + "DocumentIndex": 2, + "Title": "IGroupRepository.cs", + "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Date\\Repository\\IGroupRepository.cs", + "RelativeDocumentMoniker": "Zurnal\\Date\\Repository\\IGroupRepository.cs", + "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Date\\Repository\\IGroupRepository.cs", + "RelativeToolTip": "Zurnal\\Date\\Repository\\IGroupRepository.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAA0AAAAFAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-28T08:04:53.338Z", - "EditorCaption": "" + "WhenOpened": "2024-10-31T10:12:18.045Z" }, { "$type": "Document", - "DocumentIndex": 2, - "Title": "PresnceDao.cs", - "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", - "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", - "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", - "RelativeToolTip": "Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAA==", + "DocumentIndex": 0, + "Title": "Program.cs", + "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Program.cs", + "RelativeDocumentMoniker": "Zurnal\\Program.cs", + "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Program.cs", + "RelativeToolTip": "Zurnal\\Program.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-24T11:06:26.008Z", + "WhenOpened": "2024-10-31T09:55:53.345Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 3, + "Title": "RemoutDateBase.cs", + "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\RemoutDateBase.cs", + "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\RemoutDateBase.cs", + "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\RemoutDateBase.cs", + "RelativeToolTip": "Zurnal\\RemaDateBase\\RemoutDateBase.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAA4AAABYAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-10-31T09:55:25.475Z" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "conver.cs", + "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\conver.cs", + "RelativeDocumentMoniker": "Zurnal\\UI\\conver.cs", + "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\conver.cs", + "RelativeToolTip": "Zurnal\\UI\\conver.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAATAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-10-30T08:26:48.661Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Info.cs", + "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\Info.cs", + "RelativeDocumentMoniker": "Zurnal\\UI\\Info.cs", + "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\Info.cs", + "RelativeToolTip": "Zurnal\\UI\\Info.cs", + "ViewState": "AgIAAAwAAAAAAAAAAAAAAAsAAAAFAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-10-28T08:04:53.338Z" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "PresnceDao.cs", + "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", + "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", + "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", + "RelativeToolTip": "Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAABAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-10-24T11:06:26.008Z" + }, + { + "$type": "Document", + "DocumentIndex": 7, "Title": "GroupDao.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs", "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs", @@ -68,12 +132,11 @@ "RelativeToolTip": "Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAwAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-24T11:06:19.494Z", - "EditorCaption": "" + "WhenOpened": "2024-10-24T11:06:19.494Z" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 6, "Title": "UserDao.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\UserDao.cs", "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\DateDao\\UserDao.cs", @@ -81,8 +144,7 @@ "RelativeToolTip": "Zurnal\\RemaDateBase\\DateDao\\UserDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-28T12:18:34.74Z", - "EditorCaption": "" + "WhenOpened": "2024-10-28T12:18:34.74Z" } ] } diff --git a/.vs/Zurnal/v17/DocumentLayout.json b/.vs/Zurnal/v17/DocumentLayout.json index c0eacbb..f84ffce 100644 --- a/.vs/Zurnal/v17/DocumentLayout.json +++ b/.vs/Zurnal/v17/DocumentLayout.json @@ -2,18 +2,34 @@ "Version": 1, "WorkspaceRootPath": "C:\\Users\\profi\\source\\repos\\Zurnal\\", "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\Program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\conver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\UI\\conver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Date\\Repository\\IGroupRepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\Date\\Repository\\IGroupRepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\RemoutDateBase.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\RemoutDateBase.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\Info.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\UI\\Info.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\UserDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\DateDao\\UserDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\UserDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\DateDao\\UserDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -26,7 +42,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 1, + "SelectedChildIndex": 2, "Children": [ { "$type": "Bookmark", @@ -34,33 +50,81 @@ }, { "$type": "Document", - "DocumentIndex": 0, - "Title": "Info.cs", - "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\Info.cs", - "RelativeDocumentMoniker": "Zurnal\\UI\\Info.cs", - "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\Info.cs", - "RelativeToolTip": "Zurnal\\UI\\Info.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAsAAAAFAAAAAAAAAA==", + "DocumentIndex": 2, + "Title": "IGroupRepository.cs", + "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Date\\Repository\\IGroupRepository.cs", + "RelativeDocumentMoniker": "Zurnal\\Date\\Repository\\IGroupRepository.cs", + "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Date\\Repository\\IGroupRepository.cs", + "RelativeToolTip": "Zurnal\\Date\\Repository\\IGroupRepository.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAA0AAAAFAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-28T08:04:53.338Z", - "EditorCaption": "" + "WhenOpened": "2024-10-31T10:12:18.045Z" }, { "$type": "Document", - "DocumentIndex": 2, - "Title": "PresnceDao.cs", - "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", - "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", - "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", - "RelativeToolTip": "Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAA==", + "DocumentIndex": 0, + "Title": "Program.cs", + "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Program.cs", + "RelativeDocumentMoniker": "Zurnal\\Program.cs", + "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Program.cs", + "RelativeToolTip": "Zurnal\\Program.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-24T11:06:26.008Z", + "WhenOpened": "2024-10-31T09:55:53.345Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 3, + "Title": "RemoutDateBase.cs", + "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\RemoutDateBase.cs", + "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\RemoutDateBase.cs", + "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\RemoutDateBase.cs", + "RelativeToolTip": "Zurnal\\RemaDateBase\\RemoutDateBase.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAA4AAABYAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-10-31T09:55:25.475Z" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "conver.cs", + "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\conver.cs", + "RelativeDocumentMoniker": "Zurnal\\UI\\conver.cs", + "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\conver.cs", + "RelativeToolTip": "Zurnal\\UI\\conver.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAATAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-10-30T08:26:48.661Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Info.cs", + "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\Info.cs", + "RelativeDocumentMoniker": "Zurnal\\UI\\Info.cs", + "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\UI\\Info.cs", + "RelativeToolTip": "Zurnal\\UI\\Info.cs", + "ViewState": "AgIAAAwAAAAAAAAAAAAAAAsAAAAFAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-10-28T08:04:53.338Z" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "PresnceDao.cs", + "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", + "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", + "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", + "RelativeToolTip": "Zurnal\\RemaDateBase\\DateDao\\PresnceDao.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAABAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-10-24T11:06:26.008Z" + }, + { + "$type": "Document", + "DocumentIndex": 7, "Title": "GroupDao.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs", "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs", @@ -68,12 +132,11 @@ "RelativeToolTip": "Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAwAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-24T11:06:19.494Z", - "EditorCaption": "" + "WhenOpened": "2024-10-24T11:06:19.494Z" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 6, "Title": "UserDao.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\UserDao.cs", "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\DateDao\\UserDao.cs", @@ -81,8 +144,7 @@ "RelativeToolTip": "Zurnal\\RemaDateBase\\DateDao\\UserDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-28T12:18:34.74Z", - "EditorCaption": "" + "WhenOpened": "2024-10-28T12:18:34.74Z" } ] } diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 72d7665..ec975b2 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Zurnal/Date/Repository/IGroupRepository.cs b/Zurnal/Date/Repository/IGroupRepository.cs index 7c9f21f..e2f7fd1 100644 --- a/Zurnal/Date/Repository/IGroupRepository.cs +++ b/Zurnal/Date/Repository/IGroupRepository.cs @@ -1,4 +1,6 @@ using Zurnal.domain.Models; +using Microsoft.Extensions.DependencyInjection; +using Zurnal.Data.Repository; namespace Zurnal.Date.Repository { @@ -10,7 +12,13 @@ namespace Zurnal.Date.Repository GroupLocalEntity GetGroupById(int groupID); bool AddGroup(GroupLocalEntity newGroup); } - internal interface IServiceCollection services = new ServiceCollection(); - serivces.AddDbContext() - .AddDbContext(); -} + + internal class ServiceConfiguration + { + public static void ConfigureServices(IServiceCollection services) + { + services.AddDbContext() + .AddScoped(); + } + } +} \ No newline at end of file diff --git a/Zurnal/Date/Repository/UserRepositoryImpl.cs b/Zurnal/Date/Repository/UserRepositoryImpl.cs index 400966e..d883154 100644 --- a/Zurnal/Date/Repository/UserRepositoryImpl.cs +++ b/Zurnal/Date/Repository/UserRepositoryImpl.cs @@ -8,8 +8,7 @@ namespace Zurnal.Data.Repository { public UserRepositoryImpl() => GetAllUsers = LocalStaticData.users; - public List GetAllUsers - { get; set; } + public List GetAllUsers { get; set; } public bool RemoveUserByGuid(Guid userGuid) { @@ -37,70 +36,40 @@ namespace Zurnal.Data.Repository userLocal.GroupID = userUpdateLocalEnity.GroupID; return userLocal; } + public List GetAllUsersList() { - return GetAllUsersList; + return GetAllUsers; } - List IGroupRepository.GetAllGroups() + public List GetAllGroups() { throw new NotImplementedException(); } - bool IGroupRepository.RemoveGroupById(int groupID) + public bool RemoveGroupById(int groupID) { throw new NotImplementedException(); } - bool IGroupRepository.UpdateGroupById(int groupID, GroupLocalEntity updatedGroup) + public bool UpdateGroupById(int groupID, GroupLocalEntity updatedGroup) { throw new NotImplementedException(); } - GroupLocalEntity IGroupRepository.GetGroupById(int groupID) + public GroupLocalEntity GetGroupById(int groupID) { throw new NotImplementedException(); } - bool IGroupRepository.AddGroup(GroupLocalEntity newGroup) + public bool AddGroup(GroupLocalEntity newGroup) { throw new NotImplementedException(); } - internal object GetAllUsers() - { - throw new NotImplementedException(); - } - - public void AddGroup(System.Text.RegularExpressions.Group group) - { - throw new NotImplementedException(); - } - - public System.Text.RegularExpressions.Group GetGroupById(int id) - { - throw new NotImplementedException(); - } - - public IEnumerable GetAllGroups() - { - throw new NotImplementedException(); - } - - public void UpdateGroup(System.Text.RegularExpressions.Group group) - { - throw new NotImplementedException(); - } - - public void DeleteGroup(int id) - { - throw new NotImplementedException(); - } - - public object GetAllGroup() + public List GetAllGroup() { throw new NotImplementedException(); } } - } \ No newline at end of file diff --git a/Zurnal/Domain/UseCase/UserUseCase.cs b/Zurnal/Domain/UseCase/UserUseCase.cs index 65b5b5d..0eb958d 100644 --- a/Zurnal/Domain/UseCase/UserUseCase.cs +++ b/Zurnal/Domain/UseCase/UserUseCase.cs @@ -4,21 +4,22 @@ using Zurnal.RemaDateBase; namespace Zurnal.Domain.UseCase { - public class UserUseCase + public class UserUseCase : IGroupRepository { private readonly UserRepositoryImpl _repositoryUserImpl; internal IGroupRepository RepositoryGroupImpl { get; } public UserUseCase(UserRepositoryImpl repositoryImpl, GroupRepositoryImpl repositoryGroupImpl) - { - _repositoryUserImpl = repositoryImpl; - RepositoryGroupImpl = (IGroupRepository?)repositoryGroupImpl; - } +{ + _repositoryUserImpl = repositoryImpl; + RepositoryGroupImpl = (IGroupRepository?)(repositoryGroupImpl ?? throw new ArgumentNullException(nameof(repositoryGroupImpl))); +} public List GetAllGroups() - { - return RepositoryGroupImpl.GetAllGroup() + { + return RepositoryGroupImpl.GetAllGroup() .Select(it => new Group { Id = it.Id, Name = it.Name }).ToList(); + } public List GetAllUsers() => _repositoryUserImpl.GetAllUsers() .Join(RepositoryGroupImpl.GetAllGroup(), @@ -35,14 +36,19 @@ namespace Zurnal.Domain.UseCase return _repositoryUserImpl.RemoveUserByGuid(userGuid); } - public User UpdateUser(User user) + public User UpdateUser(User user) + { + UserLocalEntity userLocalEntity = new UserLocalEntity { FIO = user.FIO, GroupID = user.Group.Id, Guid = user.Guid }; + UserLocalEntity? result = _repositoryUserImpl.UpdateUser(userLocalEntity); + if (result == null) throw new Exception("User update failed."); + Group? group = GetAllGroups().FirstOrDefault(it => it.Id == result.GroupID.ToString()); + if (group == null) throw new Exception("Group not found."); + return new User { FIO = user.FIO, Guid = user.Guid, Group = group }; + } + + private static UserLocalEnity GetUserLocalEntity(UserLocalEnity userLocalEntity) { - UserLocalEnity userLocalEntity = new UserLocalEntity { FIO = user.FIO, GroupID = user.Group.Id, Guid = user.Guid }; - UserLocalEntity? result = _repositoryUserImpl.UpdateUser(userLocalEntity); - if (result == null) throw new Exception("User update failed."); - Group? group = GetAllGroups().FirstOrDefault(it => it.Id = result.GroupID); - if (group == null) throw new Exception("Group not found."); - return new User { FIO = user.FIO, Guid = user.Guid, Group = group }; + return userLocalEntity; } public User FindUserByGuid(Guid userGuid) @@ -52,12 +58,52 @@ namespace Zurnal.Domain.UseCase var group = RepositoryGroupImpl.GetAllGroup().FirstOrDefault(g => g.Id == user.GroupID); return new User { FIO = user.FIO, Guid = user.Guid, Group = group }; } + + public void AddGroup(System.Text.RegularExpressions.Group group) + { + throw new NotImplementedException(); + } + + public System.Text.RegularExpressions.Group GetGroupById(int id) + { + throw new NotImplementedException(); + } + + IEnumerable IGroupRepository.GetAllGroups() + { + throw new NotImplementedException(); + } + + public void UpdateGroup(System.Text.RegularExpressions.Group group) + { + throw new NotImplementedException(); + } + + public void DeleteGroup(int id) + { + throw new NotImplementedException(); + } + + public object GetAllGroup() + { + throw new NotImplementedException(); + } + + public bool RemoveGroupById(int groupID) + { + throw new NotImplementedException(); + } + + public bool UpdateGroupById(int groupID, GroupLocalEntity updatedGroup) + { + throw new NotImplementedException(); + } } - internal class UserLocalEntity -{ - public string FIO { get; set; } - public Guid GroupID { get; set; } - public Guid Guid { get; set; } -} + internal class UserLocalEntity + { + public string FIO { get; set; } + public Guid GroupID { get; set; } + public Guid Guid { get; set; } + } } \ No newline at end of file diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfo.cs b/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfo.cs index 176964f..35417dd 100644 --- a/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfo.cs +++ b/Zurnal/obj/Debug/net8.0/Zurnal.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("Zurnal")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d8c07ebb08166eee30eac561a7fa77aefe53881a")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bbb179fc02f09c0232d9bd68bc47d05d01057838")] [assembly: System.Reflection.AssemblyProductAttribute("Zurnal")] [assembly: System.Reflection.AssemblyTitleAttribute("Zurnal")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -// Generated by the MSBuild WriteCodeFragment class. +// Создано классом WriteCodeFragment MSBuild. diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache b/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache index bfc11be..6d3dc0f 100644 --- a/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache +++ b/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache @@ -1 +1 @@ -2754838fa838fa1622a1d28241e8741e2e14cd8f1431a3835aa8fe78997d910b +9851d28081f418a784ac6bd862df7b5379b79dbd8150859bed7e0ebb1d5cd3f1 diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.csproj.CoreCompileInputs.cache b/Zurnal/obj/Debug/net8.0/Zurnal.csproj.CoreCompileInputs.cache index 1c95884..b4fc97a 100644 --- a/Zurnal/obj/Debug/net8.0/Zurnal.csproj.CoreCompileInputs.cache +++ b/Zurnal/obj/Debug/net8.0/Zurnal.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -13489223e0d626da5907d123774240f235140bab4c40dd0ca76da61d7235e904 +6c6720db556a4418cad2bec16d4d434fb3bb5d14252123bfac524503f5ff6976