diff --git a/.vs/Zurnal_Vizual/FileContentIndex/585b4c4a-bcd3-4073-b408-528c5bd38c5d.vsidx b/.vs/Zurnal_Vizual/FileContentIndex/585b4c4a-bcd3-4073-b408-528c5bd38c5d.vsidx deleted file mode 100644 index 9443589..0000000 Binary files a/.vs/Zurnal_Vizual/FileContentIndex/585b4c4a-bcd3-4073-b408-528c5bd38c5d.vsidx and /dev/null differ diff --git a/.vs/Zurnal_Vizual/FileContentIndex/588b3d53-ada9-4923-91b6-3371f49b36d1.vsidx b/.vs/Zurnal_Vizual/FileContentIndex/588b3d53-ada9-4923-91b6-3371f49b36d1.vsidx new file mode 100644 index 0000000..37f1f95 Binary files /dev/null and b/.vs/Zurnal_Vizual/FileContentIndex/588b3d53-ada9-4923-91b6-3371f49b36d1.vsidx differ diff --git a/.vs/Zurnal_Vizual/FileContentIndex/7ac56651-5f06-40a5-b582-668a7b817029.vsidx b/.vs/Zurnal_Vizual/FileContentIndex/7ac56651-5f06-40a5-b582-668a7b817029.vsidx deleted file mode 100644 index c01e5cc..0000000 Binary files a/.vs/Zurnal_Vizual/FileContentIndex/7ac56651-5f06-40a5-b582-668a7b817029.vsidx and /dev/null differ diff --git a/.vs/Zurnal_Vizual/FileContentIndex/c72c9345-0979-4fe8-bb3c-db61757c8593.vsidx b/.vs/Zurnal_Vizual/FileContentIndex/c72c9345-0979-4fe8-bb3c-db61757c8593.vsidx new file mode 100644 index 0000000..b748788 Binary files /dev/null and b/.vs/Zurnal_Vizual/FileContentIndex/c72c9345-0979-4fe8-bb3c-db61757c8593.vsidx differ diff --git a/.vs/Zurnal_Vizual/v17/.futdcache.v2 b/.vs/Zurnal_Vizual/v17/.futdcache.v2 index a3f8b1e..05db463 100644 Binary files a/.vs/Zurnal_Vizual/v17/.futdcache.v2 and b/.vs/Zurnal_Vizual/v17/.futdcache.v2 differ diff --git a/.vs/Zurnal_Vizual/v17/.suo b/.vs/Zurnal_Vizual/v17/.suo index de24b5e..3402483 100644 Binary files a/.vs/Zurnal_Vizual/v17/.suo and b/.vs/Zurnal_Vizual/v17/.suo differ diff --git a/.vs/Zurnal_Vizual/v17/DocumentLayout.backup.json b/.vs/Zurnal_Vizual/v17/DocumentLayout.backup.json index 0837db6..767d2c9 100644 --- a/.vs/Zurnal_Vizual/v17/DocumentLayout.backup.json +++ b/.vs/Zurnal_Vizual/v17/DocumentLayout.backup.json @@ -3,24 +3,20 @@ "WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" }, { "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\app.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\app.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", @@ -46,33 +42,33 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "MainWindowViewModel.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", "RelativeDocumentMoniker": "Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", "RelativeToolTip": "Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", - "ViewState": "AgIAACcAAAAAAAAAAAAAADMAAAAIAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-05T10:58:36.906Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 1, "Title": "MainWindow.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\MainWindow.cs", "RelativeDocumentMoniker": "Zurnal_Vizual\\MainWindow.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\MainWindow.cs", "RelativeToolTip": "Zurnal_Vizual\\MainWindow.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAVAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-05T08:51:28.615Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 4, "Title": "App.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml", "RelativeDocumentMoniker": "Zurnal_Vizual\\App.axaml", @@ -85,32 +81,19 @@ { "$type": "Document", "DocumentIndex": 3, - "Title": "App.axaml.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml.cs", - "RelativeDocumentMoniker": "Zurnal_Vizual\\App.axaml.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml.cs", - "RelativeToolTip": "Zurnal_Vizual\\App.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAUAAAAXAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-05T07:25:11.172Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 0, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "Zurnal_Vizual\\Views\\MainWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml.cs", "RelativeToolTip": "Zurnal_Vizual\\Views\\MainWindow.axaml.cs", - "ViewState": "AgIAAEkAAAAAAAAAAAAAAFkAAABUAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-02T10:46:34.635Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 0, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml", "RelativeDocumentMoniker": "Zurnal_Vizual\\Views\\MainWindow.axaml", diff --git a/.vs/Zurnal_Vizual/v17/DocumentLayout.json b/.vs/Zurnal_Vizual/v17/DocumentLayout.json index 0837db6..767d2c9 100644 --- a/.vs/Zurnal_Vizual/v17/DocumentLayout.json +++ b/.vs/Zurnal_Vizual/v17/DocumentLayout.json @@ -3,24 +3,20 @@ "WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" }, { "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\app.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\app.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", - "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|solutionrelative:zurnal_vizual\\views\\mainwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{0A1535B3-B752-4911-B0A7-03B4974AAEF3}|Zurnal_Vizual\\Zurnal_Vizual.csproj|c:\\users\\pc\\source\\repos\\zurnal_vizual\\zurnal_vizual\\app.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", @@ -46,33 +42,33 @@ }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "MainWindowViewModel.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", "RelativeDocumentMoniker": "Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", "RelativeToolTip": "Zurnal_Vizual\\ViewModels\\MainWindowViewModel.cs", - "ViewState": "AgIAACcAAAAAAAAAAAAAADMAAAAIAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-05T10:58:36.906Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 1, "Title": "MainWindow.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\MainWindow.cs", "RelativeDocumentMoniker": "Zurnal_Vizual\\MainWindow.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\MainWindow.cs", "RelativeToolTip": "Zurnal_Vizual\\MainWindow.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAAVAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-05T08:51:28.615Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 4, "Title": "App.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml", "RelativeDocumentMoniker": "Zurnal_Vizual\\App.axaml", @@ -85,32 +81,19 @@ { "$type": "Document", "DocumentIndex": 3, - "Title": "App.axaml.cs", - "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml.cs", - "RelativeDocumentMoniker": "Zurnal_Vizual\\App.axaml.cs", - "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\App.axaml.cs", - "RelativeToolTip": "Zurnal_Vizual\\App.axaml.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAUAAAAXAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-05T07:25:11.172Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 0, "Title": "MainWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml.cs", "RelativeDocumentMoniker": "Zurnal_Vizual\\Views\\MainWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml.cs", "RelativeToolTip": "Zurnal_Vizual\\Views\\MainWindow.axaml.cs", - "ViewState": "AgIAAEkAAAAAAAAAAAAAAFkAAABUAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-12-02T10:46:34.635Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 0, "Title": "MainWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\Zurnal_Vizual\\Views\\MainWindow.axaml", "RelativeDocumentMoniker": "Zurnal_Vizual\\Views\\MainWindow.axaml", diff --git a/Zurnal/bin/Debug/net8.0/Zurnal.dll b/Zurnal/bin/Debug/net8.0/Zurnal.dll index 57a125e..87ed287 100644 Binary files a/Zurnal/bin/Debug/net8.0/Zurnal.dll and b/Zurnal/bin/Debug/net8.0/Zurnal.dll differ diff --git a/Zurnal/bin/Debug/net8.0/Zurnal.pdb b/Zurnal/bin/Debug/net8.0/Zurnal.pdb index 6c71400..8366eec 100644 Binary files a/Zurnal/bin/Debug/net8.0/Zurnal.pdb and b/Zurnal/bin/Debug/net8.0/Zurnal.pdb differ diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache b/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache index 7bef1d7..76ec17c 100644 --- a/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache +++ b/Zurnal/obj/Debug/net8.0/Zurnal.AssemblyInfoInputs.cache @@ -1 +1 @@ -0cc1957e508d216bc16edfba63c7cd6a92394d06eb6458ec124cc01a0abbb768 +c5502f7c89d530558f505dccc9e3a90a66adde1b9ee387e1332c24a922915912 diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.csproj.FileListAbsolute.txt b/Zurnal/obj/Debug/net8.0/Zurnal.csproj.FileListAbsolute.txt index 4b53628..01ef457 100644 --- a/Zurnal/obj/Debug/net8.0/Zurnal.csproj.FileListAbsolute.txt +++ b/Zurnal/obj/Debug/net8.0/Zurnal.csproj.FileListAbsolute.txt @@ -597,3 +597,4 @@ C:\Users\PC\source\repos\Zurnal_Vizual\Zurnal\bin\Debug\net8.0\DynamicData.dll C:\Users\PC\source\repos\Zurnal_Vizual\Zurnal\bin\Debug\net8.0\ReactiveUI.dll C:\Users\PC\source\repos\Zurnal_Vizual\Zurnal\bin\Debug\net8.0\Splat.dll C:\Users\PC\source\repos\Zurnal_Vizual\Zurnal\bin\Debug\net8.0\System.Reactive.dll +C:\Users\PC\source\repos\Zurnal_Vizual\Zurnal\obj\Debug\net8.0\Zurnal.sourcelink.json diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.dll b/Zurnal/obj/Debug/net8.0/Zurnal.dll index 57a125e..87ed287 100644 Binary files a/Zurnal/obj/Debug/net8.0/Zurnal.dll and b/Zurnal/obj/Debug/net8.0/Zurnal.dll differ diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.pdb b/Zurnal/obj/Debug/net8.0/Zurnal.pdb index 6c71400..8366eec 100644 Binary files a/Zurnal/obj/Debug/net8.0/Zurnal.pdb and b/Zurnal/obj/Debug/net8.0/Zurnal.pdb differ diff --git a/Zurnal/obj/Debug/net8.0/Zurnal.sourcelink.json b/Zurnal/obj/Debug/net8.0/Zurnal.sourcelink.json new file mode 100644 index 0000000..45c2372 --- /dev/null +++ b/Zurnal/obj/Debug/net8.0/Zurnal.sourcelink.json @@ -0,0 +1 @@ +{"documents":{"C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\*":"https://raw.githubusercontent.com/NuclierOwl/Jornal/8e78b129eaddfab72461facfad823b5dae9d0c3c/*"}} \ No newline at end of file diff --git a/Zurnal_Vizual/App.axaml.cs b/Zurnal_Vizual/App.axaml.cs index 23e3cc7..03f7090 100644 --- a/Zurnal_Vizual/App.axaml.cs +++ b/Zurnal_Vizual/App.axaml.cs @@ -3,7 +3,7 @@ using Avalonia; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Data.Core.Plugins; using Avalonia.Markup.Xaml; -using Views.MainWindow; +using Zurnal_Vizual.Views.MainWindow; namespace Zurnal_Vizual { diff --git a/Zurnal_Vizual/MainWindow.cs b/Zurnal_Vizual/MainWindow.cs index 4c35dc2..c1ca3f9 100644 --- a/Zurnal_Vizual/MainWindow.cs +++ b/Zurnal_Vizual/MainWindow.cs @@ -1,5 +1,5 @@ using Avalonia.Controls; -using Views.MainWindow; +using Zurnal_Vizual.Views.MainWindow; namespace Zurnal_Vizual { diff --git a/Zurnal_Vizual/ViewModels/MainWindowViewModel.cs b/Zurnal_Vizual/ViewModels/MainWindowViewModel.cs index 4069f9d..5787aa2 100644 --- a/Zurnal_Vizual/ViewModels/MainWindowViewModel.cs +++ b/Zurnal_Vizual/ViewModels/MainWindowViewModel.cs @@ -1,11 +1,13 @@ -using data.RemoteData.RemoteDataBase.DAO; +using Avalonia.Controls; +using data.RemoteData.RemoteDataBase.DAO; using ReactiveUI; +using System; using System.Collections.ObjectModel; using System.Reactive; -namespace Zurnal_Vizual.ViewModels +namespace Zurnal_Vizual.Views.MainWindow { - public class MainWindowViewModel : ReactiveObject + public class MainViewModel : ReactiveObject { private ObservableCollection _groups; private GroupDao _selectedGroup; @@ -21,7 +23,11 @@ namespace Zurnal_Vizual.ViewModels public GroupDao SelectedGroup { get => _selectedGroup; - set => this.RaiseAndSetIfChanged(ref _selectedGroup, value); + set + { + this.RaiseAndSetIfChanged(ref _selectedGroup, value); + LoadStudents(); + } } public ObservableCollection Students @@ -33,27 +39,63 @@ namespace Zurnal_Vizual.ViewModels public string SelectedSortOption { get => _selectedSortOption; - set => this.RaiseAndSetIfChanged(ref _selectedSortOption, value); + set + { + this.RaiseAndSetIfChanged(ref _selectedSortOption, value); + SortStudents(); + } } public ReactiveCommand DeleteAllStudentsCommand { get; } public ReactiveCommand ImportStudentsCommand { get; } + private ObservableCollection _sortOptions; + public ObservableCollection SortOptions + { + get => _sortOptions; + set => this.RaiseAndSetIfChanged(ref _sortOptions, value); + } - public MainWindowViewModel() + public MainViewModel() { DeleteAllStudentsCommand = ReactiveCommand.Create(DeleteAllStudents); ImportStudentsCommand = ReactiveCommand.Create(ImportStudents); Groups = new ObservableCollection(); Students = new ObservableCollection(); + SortOptions = new ObservableCollection { "По имени", "По дате" }; } - private void DeleteAllStudents() - { - + public void LoadStudents() + { + //реализовать загрузку студентов по выбранной группе } - private void ImportStudents() - { - + + public void SortStudents() + { + //реализовать сортеровку пользователей (студентов) по имени и Id + } + + public void DeleteAllStudents() + { + //реализовать удоление студентов по имени или Id + } + + public void ImportStudents() + { + //реализовать добавление студентов по средсвам 2 полей для ввода текста + } + + public void ShowContextMenu(Window window) + { + var contextMenu = new ContextMenu(); + var deleteItem = new MenuItem { Header = "Удалить всех студентов" }; + deleteItem.Click += (sender, e) => DeleteAllStudentsCommand.Execute().Subscribe(); + contextMenu.Items.Add(deleteItem); + + var importItem = new MenuItem { Header = "Импортировать студентов" }; + importItem.Click += (sender, e) => ImportStudentsCommand.Execute().Subscribe(); + contextMenu.Items.Add(importItem); + + window.ContextMenu = contextMenu; } } } \ No newline at end of file diff --git a/Zurnal_Vizual/Views/MainWindow.axaml b/Zurnal_Vizual/Views/MainWindow.axaml index d6c62f9..fa7ead9 100644 --- a/Zurnal_Vizual/Views/MainWindow.axaml +++ b/Zurnal_Vizual/Views/MainWindow.axaml @@ -1,17 +1,18 @@ - + - \ No newline at end of file + diff --git a/Zurnal_Vizual/Views/MainWindow.axaml.cs b/Zurnal_Vizual/Views/MainWindow.axaml.cs index b251869..e69de29 100644 --- a/Zurnal_Vizual/Views/MainWindow.axaml.cs +++ b/Zurnal_Vizual/Views/MainWindow.axaml.cs @@ -1,100 +0,0 @@ -using Avalonia.Controls; -using data.RemoteData.RemoteDataBase.DAO; -using ReactiveUI; -using System; -using System.Collections.ObjectModel; -using System.Reactive; - -namespace Views.MainWindow -{ - public class MainViewModel : ReactiveObject - { - private ObservableCollection _groups; - private GroupDao _selectedGroup; - private ObservableCollection _students; - private string _selectedSortOption; - - public ObservableCollection Groups - { - get => _groups; - set => this.RaiseAndSetIfChanged(ref _groups, value); - } - - public GroupDao SelectedGroup - { - get => _selectedGroup; - set - { - this.RaiseAndSetIfChanged(ref _selectedGroup, value); - LoadStudents(); - } - } - - public ObservableCollection Students - { - get => _students; - set => this.RaiseAndSetIfChanged(ref _students, value); - } - - public string SelectedSortOption - { - get => _selectedSortOption; - set - { - this.RaiseAndSetIfChanged(ref _selectedSortOption, value); - SortStudents(); - } - } - - public ReactiveCommand DeleteAllStudentsCommand { get; } - public ReactiveCommand ImportStudentsCommand { get; } - private ObservableCollection _sortOptions; - public ObservableCollection SortOptions - { - get => _sortOptions; - set => this.RaiseAndSetIfChanged(ref _sortOptions, value); - } - - - public MainViewModel() - { - DeleteAllStudentsCommand = ReactiveCommand.Create(DeleteAllStudents); - ImportStudentsCommand = ReactiveCommand.Create(ImportStudents); - Groups = new ObservableCollection(); - Students = new ObservableCollection(); - SortOptions = new ObservableCollection { " ", " " }; - } - public void LoadStudents() - { - // Excel - } - - public void SortStudents() - { - // () Id - } - - public void DeleteAllStudents() - { - // Id - } - - public void ImportStudents() - { - // 2 - } - public void ShowContextMenu(Window window) - { - var contextMenu = new ContextMenu(); - var deleteItem = new MenuItem { Header = " " }; - deleteItem.Click += (sender, e) => DeleteAllStudentsCommand.Execute().Subscribe(); - contextMenu.Items.Add(deleteItem); - - var importItem = new MenuItem { Header = " " }; - importItem.Click += (sender, e) => ImportStudentsCommand.Execute().Subscribe(); - contextMenu.Items.Add(importItem); - - window.ContextMenu = contextMenu; - } - } -} diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Avalonia/resources b/Zurnal_Vizual/obj/Debug/net8.0/Avalonia/resources index 369d625..3834268 100644 Binary files a/Zurnal_Vizual/obj/Debug/net8.0/Avalonia/resources and b/Zurnal_Vizual/obj/Debug/net8.0/Avalonia/resources differ diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfo.cs b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfo.cs index 9fe9541..18ba9f3 100644 --- a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfo.cs +++ b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Zurnal_Vizual")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8e78b129eaddfab72461facfad823b5dae9d0c3c")] [assembly: System.Reflection.AssemblyProductAttribute("Zurnal_Vizual")] [assembly: System.Reflection.AssemblyTitleAttribute("Zurnal_Vizual")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfoInputs.cache b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfoInputs.cache index 8ed8ee5..6a91128 100644 --- a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfoInputs.cache +++ b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.AssemblyInfoInputs.cache @@ -1 +1 @@ -7b8f114385c96dfbd5d3eae7021cb2e23f1277d557076db3ae1b5fe3dced7027 +d636cc88b6ff68f871fc141afef98bfe0709f6a184d9dd478a51cfb335e2b0cd diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.AssemblyReference.cache b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.AssemblyReference.cache index d3ada77..51a7969 100644 Binary files a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.AssemblyReference.cache and b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.AssemblyReference.cache differ diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.FileListAbsolute.txt b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.FileListAbsolute.txt index 086711f..78637b6 100644 --- a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.FileListAbsolute.txt +++ b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.csproj.FileListAbsolute.txt @@ -473,3 +473,4 @@ C:\Users\PC\source\repos\Zurnal_Vizual\Zurnal_Vizual\obj\Debug\net8.0\ref\Zurnal C:\Users\PC\source\repos\Zurnal_Vizual\Zurnal_Vizual\obj\Debug\net8.0\Zurnal_Vizual.dll C:\Users\PC\source\repos\Zurnal_Vizual\Zurnal_Vizual\obj\Debug\net8.0\refint\Zurnal_Vizual.dll C:\Users\PC\source\repos\Zurnal_Vizual\Zurnal_Vizual\obj\Debug\net8.0\Zurnal_Vizual.pdb +C:\Users\PC\source\repos\Zurnal_Vizual\Zurnal_Vizual\obj\Debug\net8.0\Zurnal_Vizual.sourcelink.json diff --git a/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.sourcelink.json b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.sourcelink.json new file mode 100644 index 0000000..45c2372 --- /dev/null +++ b/Zurnal_Vizual/obj/Debug/net8.0/Zurnal_Vizual.sourcelink.json @@ -0,0 +1 @@ +{"documents":{"C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\*":"https://raw.githubusercontent.com/NuclierOwl/Jornal/8e78b129eaddfab72461facfad823b5dae9d0c3c/*"}} \ No newline at end of file