diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 09e1d95..aaff391 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -5,10 +5,12 @@ "\\Zurnal\\Date", "\\Zurnal\\Date\\LocalDate", "\\Zurnal\\Date\\Repository", + "\\Zurnal\\Domain", + "\\Zurnal\\Domain\\UseCase", "\\Zurnal\\Presence", - "\\Zurnal\\RemaDateBase", - "\\Zurnal\\RemaDateBase\\Interfase" + "\\Zurnal\\RemaDateBase\\Interfase", + "\\Zurnal\\UI" ], - "SelectedNode": "\\Zurnal\\RemaDateBase\\RemoutDateBase.cs", + "SelectedNode": "\\Zurnal\\UI\\MeinMenu.cs", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/Zurnal/FileContentIndex/032a204c-3605-4f6b-b854-46e534391207.vsidx b/.vs/Zurnal/FileContentIndex/032a204c-3605-4f6b-b854-46e534391207.vsidx new file mode 100644 index 0000000..9377be3 Binary files /dev/null and b/.vs/Zurnal/FileContentIndex/032a204c-3605-4f6b-b854-46e534391207.vsidx differ diff --git a/.vs/Zurnal/FileContentIndex/27be1126-db8c-4a29-bc2c-5b081f7bbc50.vsidx b/.vs/Zurnal/FileContentIndex/27be1126-db8c-4a29-bc2c-5b081f7bbc50.vsidx new file mode 100644 index 0000000..d8efc14 Binary files /dev/null and b/.vs/Zurnal/FileContentIndex/27be1126-db8c-4a29-bc2c-5b081f7bbc50.vsidx differ diff --git a/.vs/Zurnal/FileContentIndex/299c5821-6b63-49e5-b4ee-615a52a379bf.vsidx b/.vs/Zurnal/FileContentIndex/299c5821-6b63-49e5-b4ee-615a52a379bf.vsidx new file mode 100644 index 0000000..93b03f3 Binary files /dev/null and b/.vs/Zurnal/FileContentIndex/299c5821-6b63-49e5-b4ee-615a52a379bf.vsidx differ diff --git a/.vs/Zurnal/FileContentIndex/2f39826d-71c7-4f19-af77-690086bb260c.vsidx b/.vs/Zurnal/FileContentIndex/2f39826d-71c7-4f19-af77-690086bb260c.vsidx deleted file mode 100644 index ed2bd16..0000000 Binary files a/.vs/Zurnal/FileContentIndex/2f39826d-71c7-4f19-af77-690086bb260c.vsidx and /dev/null differ diff --git a/.vs/Zurnal/FileContentIndex/5d79ffcc-b2b2-42c0-b30e-1b013c3073ca.vsidx b/.vs/Zurnal/FileContentIndex/5d79ffcc-b2b2-42c0-b30e-1b013c3073ca.vsidx deleted file mode 100644 index f517455..0000000 Binary files a/.vs/Zurnal/FileContentIndex/5d79ffcc-b2b2-42c0-b30e-1b013c3073ca.vsidx and /dev/null differ diff --git a/.vs/Zurnal/FileContentIndex/97e9c5d4-b6fe-4c19-98e1-9f5c5f5846b7.vsidx b/.vs/Zurnal/FileContentIndex/97e9c5d4-b6fe-4c19-98e1-9f5c5f5846b7.vsidx new file mode 100644 index 0000000..1591166 Binary files /dev/null and b/.vs/Zurnal/FileContentIndex/97e9c5d4-b6fe-4c19-98e1-9f5c5f5846b7.vsidx differ diff --git a/.vs/Zurnal/FileContentIndex/a227dc1e-1cd9-47a5-a539-f3cf7b76f36a.vsidx b/.vs/Zurnal/FileContentIndex/a227dc1e-1cd9-47a5-a539-f3cf7b76f36a.vsidx new file mode 100644 index 0000000..743b619 Binary files /dev/null and b/.vs/Zurnal/FileContentIndex/a227dc1e-1cd9-47a5-a539-f3cf7b76f36a.vsidx differ diff --git a/.vs/Zurnal/FileContentIndex/a5f85d5e-1c15-4bd9-baa8-2c9c7bfb4a46.vsidx b/.vs/Zurnal/FileContentIndex/a5f85d5e-1c15-4bd9-baa8-2c9c7bfb4a46.vsidx deleted file mode 100644 index cae0cf0..0000000 Binary files a/.vs/Zurnal/FileContentIndex/a5f85d5e-1c15-4bd9-baa8-2c9c7bfb4a46.vsidx and /dev/null differ diff --git a/.vs/Zurnal/FileContentIndex/c27b3f51-5efa-4655-8c1e-877ab9645431.vsidx b/.vs/Zurnal/FileContentIndex/c27b3f51-5efa-4655-8c1e-877ab9645431.vsidx deleted file mode 100644 index a8feffa..0000000 Binary files a/.vs/Zurnal/FileContentIndex/c27b3f51-5efa-4655-8c1e-877ab9645431.vsidx and /dev/null differ diff --git a/.vs/Zurnal/FileContentIndex/f9a58f8b-ea33-4c2d-aca7-a791bdf12545.vsidx b/.vs/Zurnal/FileContentIndex/f9a58f8b-ea33-4c2d-aca7-a791bdf12545.vsidx deleted file mode 100644 index 3c6fe0d..0000000 Binary files a/.vs/Zurnal/FileContentIndex/f9a58f8b-ea33-4c2d-aca7-a791bdf12545.vsidx and /dev/null differ diff --git a/.vs/Zurnal/v17/.wsuo b/.vs/Zurnal/v17/.wsuo index 4e52d4b..83a7bfe 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 5ff52a6..0756816 100644 --- a/.vs/Zurnal/v17/DocumentLayout.backup.json +++ b/.vs/Zurnal/v17/DocumentLayout.backup.json @@ -3,8 +3,8 @@ "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\\RemaDateBase\\SQLGroupRepositoryImpl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\SQLGroupRepositoryImpl.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\\Interfase\\IGroupRepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -22,10 +22,6 @@ "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}" }, - { - "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}" @@ -66,25 +62,11 @@ "RelativeToolTip": "Zurnal\\RemaDateBase\\Interfase\\IGroupRepository.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAA4AAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-24T11:28:40.405Z", - "EditorCaption": "" + "WhenOpened": "2024-10-24T11:28:40.405Z" }, { "$type": "Document", "DocumentIndex": 0, - "Title": "SQLGroupRepositoryImpl.cs", - "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\SQLGroupRepositoryImpl.cs", - "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\SQLGroupRepositoryImpl.cs", - "ToolTip": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\SQLGroupRepositoryImpl.cs", - "RelativeToolTip": "Zurnal\\RemaDateBase\\SQLGroupRepositoryImpl.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAsAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-24T11:16:10.51Z", - "EditorCaption": "" - }, - { - "$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", @@ -105,12 +87,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": 6, + "DocumentIndex": 5, "Title": "UserDao.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\UserDao.cs", "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\DateDao\\UserDao.cs", @@ -118,12 +99,11 @@ "RelativeToolTip": "Zurnal\\RemaDateBase\\DateDao\\UserDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAUAAAAiAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-24T11:05:48.709Z", - "EditorCaption": "" + "WhenOpened": "2024-10-24T11:05:48.709Z" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 6, "Title": "RemoutDateBase.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\RemoutDateBase.cs", "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\RemoutDateBase.cs", @@ -131,8 +111,7 @@ "RelativeToolTip": "Zurnal\\RemaDateBase\\RemoutDateBase.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABsAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-24T10:21:18.176Z", - "EditorCaption": "" + "WhenOpened": "2024-10-24T10:21:18.176Z" }, { "$type": "Document", @@ -144,12 +123,11 @@ "RelativeToolTip": "Zurnal\\Date\\Repository\\IGroupRepository.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABIAAAAyAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-23T08:03:02.814Z", - "EditorCaption": "" + "WhenOpened": "2024-10-23T08:03:02.814Z" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 8, "Title": "GroupUseCase.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Domain\\UseCase\\GroupUseCase.cs", "RelativeDocumentMoniker": "Zurnal\\Domain\\UseCase\\GroupUseCase.cs", @@ -157,12 +135,11 @@ "RelativeToolTip": "Zurnal\\Domain\\UseCase\\GroupUseCase.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-23T08:01:08.054Z", - "EditorCaption": "" + "WhenOpened": "2024-10-23T08:01:08.054Z" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 7, "Title": "UseCasePresence.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Domain\\UseCase\\UseCasePresence.cs", "RelativeDocumentMoniker": "Zurnal\\Domain\\UseCase\\UseCasePresence.cs", @@ -170,8 +147,7 @@ "RelativeToolTip": "Zurnal\\Domain\\UseCase\\UseCasePresence.cs", "ViewState": "AgIAAAYAAAAAAAAAAAAAAB8AAABfAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-21T11:51:23.091Z", - "EditorCaption": "" + "WhenOpened": "2024-10-21T11:51:23.091Z" }, { "$type": "Document", @@ -183,8 +159,7 @@ "RelativeToolTip": "Zurnal\\Presence\\UseCaseGeneratePresence.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAZAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-21T10:49:23.262Z", - "EditorCaption": "" + "WhenOpened": "2024-10-21T10:49:23.262Z" } ] } diff --git a/.vs/Zurnal/v17/DocumentLayout.json b/.vs/Zurnal/v17/DocumentLayout.json index 0756816..6188a80 100644 --- a/.vs/Zurnal/v17/DocumentLayout.json +++ b/.vs/Zurnal/v17/DocumentLayout.json @@ -3,21 +3,17 @@ "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\\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\\Interfase\\IGroupRepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\Interfase\\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\\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\\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\\Presence\\UseCaseGeneratePresence.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\Presence\\UseCaseGeneratePresence.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\\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}" @@ -31,12 +27,20 @@ "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\\Domain\\UseCase\\UseCasePresence.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\Domain\\UseCase\\UseCasePresence.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\\Domain\\UseCase\\GroupUseCase.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\Domain\\UseCase\\GroupUseCase.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\\Interfase\\IGroupRepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\RemaDateBase\\Interfase\\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\\Domain\\UseCase\\UseCasePresence.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Zurnal\\Domain\\UseCase\\UseCasePresence.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -46,7 +50,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 2, + "SelectedChildIndex": 1, "Children": [ { "$type": "Bookmark", @@ -54,7 +58,20 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "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": "AgIAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-10-28T08:04:53.338Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, "Title": "IGroupRepository.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\Interfase\\IGroupRepository.cs", "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\Interfase\\IGroupRepository.cs", @@ -66,20 +83,20 @@ }, { "$type": "Document", - "DocumentIndex": 0, + "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": "AgIAAAAAAAAAAAAAAAAAAAMAAAABAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-10-24T11:06:26.008Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 3, "Title": "GroupDao.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs", "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs", @@ -87,11 +104,12 @@ "RelativeToolTip": "Zurnal\\RemaDateBase\\DateDao\\GroupDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAwAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-24T11:06:19.494Z" + "WhenOpened": "2024-10-24T11:06:19.494Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 4, "Title": "UserDao.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\DateDao\\UserDao.cs", "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\DateDao\\UserDao.cs", @@ -99,11 +117,12 @@ "RelativeToolTip": "Zurnal\\RemaDateBase\\DateDao\\UserDao.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAUAAAAiAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-24T11:05:48.709Z" + "WhenOpened": "2024-10-24T11:05:48.709Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 5, "Title": "RemoutDateBase.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\RemaDateBase\\RemoutDateBase.cs", "RelativeDocumentMoniker": "Zurnal\\RemaDateBase\\RemoutDateBase.cs", @@ -111,11 +130,12 @@ "RelativeToolTip": "Zurnal\\RemaDateBase\\RemoutDateBase.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABsAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-24T10:21:18.176Z" + "WhenOpened": "2024-10-24T10:21:18.176Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 6, "Title": "IGroupRepository.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Date\\Repository\\IGroupRepository.cs", "RelativeDocumentMoniker": "Zurnal\\Date\\Repository\\IGroupRepository.cs", @@ -123,11 +143,12 @@ "RelativeToolTip": "Zurnal\\Date\\Repository\\IGroupRepository.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABIAAAAyAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-23T08:03:02.814Z" + "WhenOpened": "2024-10-23T08:03:02.814Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 7, "Title": "GroupUseCase.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Domain\\UseCase\\GroupUseCase.cs", "RelativeDocumentMoniker": "Zurnal\\Domain\\UseCase\\GroupUseCase.cs", @@ -135,11 +156,12 @@ "RelativeToolTip": "Zurnal\\Domain\\UseCase\\GroupUseCase.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-23T08:01:08.054Z" + "WhenOpened": "2024-10-23T08:01:08.054Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 9, "Title": "UseCasePresence.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Domain\\UseCase\\UseCasePresence.cs", "RelativeDocumentMoniker": "Zurnal\\Domain\\UseCase\\UseCasePresence.cs", @@ -151,7 +173,7 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 1, "Title": "UseCaseGeneratePresence.cs", "DocumentMoniker": "C:\\Users\\profi\\source\\repos\\Zurnal\\Zurnal\\Presence\\UseCaseGeneratePresence.cs", "RelativeDocumentMoniker": "Zurnal\\Presence\\UseCaseGeneratePresence.cs", @@ -159,7 +181,8 @@ "RelativeToolTip": "Zurnal\\Presence\\UseCaseGeneratePresence.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAZAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-10-21T10:49:23.262Z" + "WhenOpened": "2024-10-21T10:49:23.262Z", + "EditorCaption": "" } ] } diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 4f83574..aec68d9 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Zurnal/Date/LocalDate/Entity/Group.cs b/Zurnal/Date/LocalDate/Entity/Group.cs index 8862e8f..ae5f2e4 100644 --- a/Zurnal/Date/LocalDate/Entity/Group.cs +++ b/Zurnal/Date/LocalDate/Entity/Group.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Zurnal.domain.Models +namespace Zurnal.domain.Models { public class GroupLocalEntity { diff --git a/Zurnal/Date/LocalDate/Entity/Presence.cs b/Zurnal/Date/LocalDate/Entity/Presence.cs index d2459b7..5d951b9 100644 --- a/Zurnal/Date/LocalDate/Entity/Presence.cs +++ b/Zurnal/Date/LocalDate/Entity/Presence.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Zurnal.domain.Models +namespace Zurnal.domain.Models { internal class PresenceLocalEntity { diff --git a/Zurnal/Date/LocalDate/Entity/User.cs b/Zurnal/Date/LocalDate/Entity/User.cs index fcb1c43..7f1276e 100644 --- a/Zurnal/Date/LocalDate/Entity/User.cs +++ b/Zurnal/Date/LocalDate/Entity/User.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Zurnal.domain.Models +namespace Zurnal.domain.Models { public class UserLocalEnity : IEquatable { diff --git a/Zurnal/Date/LocalDate/LocalStaticData.cs b/Zurnal/Date/LocalDate/LocalStaticData.cs index 33b715b..e84b302 100644 --- a/Zurnal/Date/LocalDate/LocalStaticData.cs +++ b/Zurnal/Date/LocalDate/LocalStaticData.cs @@ -1,9 +1,4 @@ using Zurnal.domain.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Zurnal.Date.LocalDate { diff --git a/Zurnal/Date/Repository/IGroupRepository.cs b/Zurnal/Date/Repository/IGroupRepository.cs index 77e0918..7c9f21f 100644 --- a/Zurnal/Date/Repository/IGroupRepository.cs +++ b/Zurnal/Date/Repository/IGroupRepository.cs @@ -1,9 +1,4 @@ using Zurnal.domain.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Zurnal.Date.Repository { diff --git a/Zurnal/Domain/Model/Group.cs b/Zurnal/Domain/Model/Group.cs index d15044a..f4d262e 100644 --- a/Zurnal/Domain/Model/Group.cs +++ b/Zurnal/Domain/Model/Group.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Zurnal.domain.Models +namespace Zurnal.domain.Models { public class Group { diff --git a/Zurnal/Domain/Model/Presence.cs b/Zurnal/Domain/Model/Presence.cs index 37d4a26..674576b 100644 --- a/Zurnal/Domain/Model/Presence.cs +++ b/Zurnal/Domain/Model/Presence.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Zurnal.domain.Models +namespace Zurnal.domain.Models { public class Presence { diff --git a/Zurnal/Domain/Model/User.cs b/Zurnal/Domain/Model/User.cs index 877a049..169270c 100644 --- a/Zurnal/Domain/Model/User.cs +++ b/Zurnal/Domain/Model/User.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Zurnal.domain.Models +namespace Zurnal.domain.Models { public class User { diff --git a/Zurnal/Domain/UseCase/UseCasePresence.cs b/Zurnal/Domain/UseCase/UseCasePresence.cs index d9760d1..8b9fe72 100644 --- a/Zurnal/Domain/UseCase/UseCasePresence.cs +++ b/Zurnal/Domain/UseCase/UseCasePresence.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Zurnal.Presence; -using static Zurnal.Presence.UseCaseGeneratePresence; +using static Zurnal.Presence.UseCaseGeneratePresence; namespace Zurnal.Domain.UseCase { diff --git a/Zurnal/RemaDateBase/DateDao/GroupDao.cs b/Zurnal/RemaDateBase/DateDao/GroupDao.cs index b303774..c55eba6 100644 --- a/Zurnal/RemaDateBase/DateDao/GroupDao.cs +++ b/Zurnal/RemaDateBase/DateDao/GroupDao.cs @@ -1,8 +1,9 @@ -using System; - -public class GroupDao +namespace Zurnal.RemaDateBase.DateDao +{ + public class GroupDao { public int Id { get; set; } public required string Name { get; set; } public IEnumerable Users { get; set; } } +} \ No newline at end of file diff --git a/Zurnal/RemaDateBase/DateDao/PresnceDao.cs b/Zurnal/RemaDateBase/DateDao/PresnceDao.cs index 4c830e2..075c6da 100644 --- a/Zurnal/RemaDateBase/DateDao/PresnceDao.cs +++ b/Zurnal/RemaDateBase/DateDao/PresnceDao.cs @@ -1,6 +1,6 @@ -using System; - -public class PresnceDao +namespace Zurnal.RemaDateBase.DateDao +{ + public class PresnceDao { public Guid UserGuid { get; set; } public bool IsAttendensy { get; set; } = true; @@ -8,3 +8,4 @@ public class PresnceDao public DateOnly Date { get; set; } public UserDao userDao { get; set; } } +} \ No newline at end of file diff --git a/Zurnal/RemaDateBase/DateDao/UserDao.cs b/Zurnal/RemaDateBase/DateDao/UserDao.cs index 59d420d..15b1a42 100644 --- a/Zurnal/RemaDateBase/DateDao/UserDao.cs +++ b/Zurnal/RemaDateBase/DateDao/UserDao.cs @@ -1,9 +1,10 @@ -using System; - -public class UserDao +namespace Zurnal.RemaDateBase.DateDao +{ + public class UserDao { public required string FIO { get; set; } public Guid Guid { get; set; } public GroupDao Group { get; set; } public required int GroupID { get; set; } } +} \ No newline at end of file diff --git a/Zurnal/RemaDateBase/Interfase/IGroupRepository.cs b/Zurnal/RemaDateBase/Interfase/IGroupRepository.cs index 6531bfe..a838bfa 100644 --- a/Zurnal/RemaDateBase/Interfase/IGroupRepository.cs +++ b/Zurnal/RemaDateBase/Interfase/IGroupRepository.cs @@ -1,11 +1,9 @@ -using System; -using System.Text.RegularExpressions; -using Zurnal.domain.Models; +using Zurnal.domain.Models; using Group = System.Text.RegularExpressions.Group; namespace Zurnal.RemaDateBase { -public interface IGroupRepository + public interface IGroupRepository { void AddGroup(Group group); Group GetGroupById(int id); diff --git a/Zurnal/RemaDateBase/RemoutDateBase.cs b/Zurnal/RemaDateBase/RemoutDateBase.cs index 2da464b..6c942d1 100644 --- a/Zurnal/RemaDateBase/RemoutDateBase.cs +++ b/Zurnal/RemaDateBase/RemoutDateBase.cs @@ -1,5 +1,5 @@ -using System; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using Zurnal.RemaDateBase.DateDao; public class RemoteDateBaseContext : DbContext { diff --git a/Zurnal/UI/Info.cs b/Zurnal/UI/Info.cs new file mode 100644 index 0000000..cbac27c --- /dev/null +++ b/Zurnal/UI/Info.cs @@ -0,0 +1,52 @@ +using Zurnal.RemaDateBase.DateDao; + +public class GroupAttendanceService + { + public class AttendanceInfo + { + public int TotalStudents { get; set; } + public int TotalLessons { get; set; } + public double AttendancePercentage { get; set; } + public List StudentAttendances { get; set; } + } + + public class StudentAttendance + { + public string FIO { get; set; } + public int AttendedLessons { get; set; } + public int MissedLessons { get; set; } + public double AttendanceRate { get; set; } + } + public AttendanceInfo GetGroupAttendanceInfo(GroupDao group, List presences) + { + var students = group.Users.ToList(); + var totalLessons = presences.Select(p => p.LessonNumber).Distinct().Count(); + var totalStudents = students.Count; + + var studentAttendances = students.Select(student => + { + var studentPresences = presences.Where(p => p.userDao.Guid == student.Guid).ToList(); + var attendedLessons = studentPresences.Count(p => p.IsAttendensy); + var missedLessons = totalLessons - attendedLessons; + var attendanceRate = totalLessons > 0 ? (double)attendedLessons / totalLessons * 100 : 0; + + return new StudentAttendance + { + FIO = student.FIO, + AttendedLessons = attendedLessons, + MissedLessons = missedLessons, + AttendanceRate = attendanceRate + }; + }).ToList(); + + var attendancePercentage = totalStudents > 0 ? (double)studentAttendances.Sum(s => s.AttendedLessons) / (totalStudents * totalLessons) * 100 : 0; + + return new AttendanceInfo + { + TotalStudents = totalStudents, + TotalLessons = totalLessons, + AttendancePercentage = attendancePercentage, + StudentAttendances = studentAttendances + }; + } + } \ 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 2786515..2131b37 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+ac0c8401da4b7e21c62352026c9fecef06f27728")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7ee7b5a156d7d42fff6882f6267a8ebc833ee76c")] [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 c28ec03..53cdc34 100644 --- a/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache +++ b/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache @@ -1 +1 @@ -121cf440d2f05aa006ed4b5b711149fe4ec7b4624f8cd2c630bef170501bc669 +91402c979d11b7f9095e8e9ebfeb39fabc8bc0b1e52d142bc41a2b7c4c637418 diff --git a/Zurnal/obj/Release/net8.0/Zurnal.AssemblyInfo.cs b/Zurnal/obj/Release/net8.0/Zurnal.AssemblyInfo.cs index 9a726ac..4c02597 100644 --- a/Zurnal/obj/Release/net8.0/Zurnal.AssemblyInfo.cs +++ b/Zurnal/obj/Release/net8.0/Zurnal.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Zurnal")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3c2a052a46be0d31bde662e889b1125d89b34ddf")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7ee7b5a156d7d42fff6882f6267a8ebc833ee76c")] [assembly: System.Reflection.AssemblyProductAttribute("Zurnal")] [assembly: System.Reflection.AssemblyTitleAttribute("Zurnal")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Zurnal/obj/Release/net8.0/Zurnal.AssemblyInfoInputs.cache b/Zurnal/obj/Release/net8.0/Zurnal.AssemblyInfoInputs.cache index 538e8fa..a0d7cd6 100644 --- a/Zurnal/obj/Release/net8.0/Zurnal.AssemblyInfoInputs.cache +++ b/Zurnal/obj/Release/net8.0/Zurnal.AssemblyInfoInputs.cache @@ -1 +1 @@ -55c651428e1762d57a0191284031a7fb9a74201885a6416185bad67726c218fd +074184df6a120de90ee0aea6084cd5e4573e70dd937e30290fe31c6767c4750d