This commit is contained in:
Userok 2024-12-09 12:21:48 +03:00
parent 8e78b129ea
commit 9644a4176c
26 changed files with 105 additions and 192 deletions

Binary file not shown.

Binary file not shown.

View File

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

View File

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

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
0cc1957e508d216bc16edfba63c7cd6a92394d06eb6458ec124cc01a0abbb768
c5502f7c89d530558f505dccc9e3a90a66adde1b9ee387e1332c24a922915912

View File

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

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1 @@
{"documents":{"C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\*":"https://raw.githubusercontent.com/NuclierOwl/Jornal/8e78b129eaddfab72461facfad823b5dae9d0c3c/*"}}

View File

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

View File

@ -1,5 +1,5 @@
using Avalonia.Controls;
using Views.MainWindow;
using Zurnal_Vizual.Views.MainWindow;
namespace Zurnal_Vizual
{

View File

@ -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<GroupDao> _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<UserDao> 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<Unit, Unit> DeleteAllStudentsCommand { get; }
public ReactiveCommand<Unit, Unit> ImportStudentsCommand { get; }
private ObservableCollection<string> _sortOptions;
public ObservableCollection<string> SortOptions
{
get => _sortOptions;
set => this.RaiseAndSetIfChanged(ref _sortOptions, value);
}
public MainWindowViewModel()
public MainViewModel()
{
DeleteAllStudentsCommand = ReactiveCommand.Create(DeleteAllStudents);
ImportStudentsCommand = ReactiveCommand.Create(ImportStudents);
Groups = new ObservableCollection<GroupDao>();
Students = new ObservableCollection<UserDao>();
SortOptions = new ObservableCollection<string> { "По имени", "По дате" };
}
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;
}
}
}

View File

@ -1,17 +1,18 @@
<Window xmlns="https://github.com/avaloniaui"
<Window
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Views.MainWindow"
xmlns:vm="using:Zurnal_Vizual.Views"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
d:DesignWidth="800"
d:DesignHeight="450"
x:DataType="vm:MainViewModel"
x:DataType="vm:MainWindowViewModel"
Icon="/Assets/avalonia-logo.ico"
x:Class="Views.MainWindow"
Title="Управление студентами"
Width="800"
Height="600">
Width="1200"
Height="800">
<StackPanel>
<ComboBox x:Name="GroupComboBox"
Items="{Binding Groups}"

View File

@ -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<GroupDao> _groups;
private GroupDao _selectedGroup;
private ObservableCollection<UserDao> _students;
private string _selectedSortOption;
public ObservableCollection<GroupDao> Groups
{
get => _groups;
set => this.RaiseAndSetIfChanged(ref _groups, value);
}
public GroupDao SelectedGroup
{
get => _selectedGroup;
set
{
this.RaiseAndSetIfChanged(ref _selectedGroup, value);
LoadStudents();
}
}
public ObservableCollection<UserDao> Students
{
get => _students;
set => this.RaiseAndSetIfChanged(ref _students, value);
}
public string SelectedSortOption
{
get => _selectedSortOption;
set
{
this.RaiseAndSetIfChanged(ref _selectedSortOption, value);
SortStudents();
}
}
public ReactiveCommand<Unit, Unit> DeleteAllStudentsCommand { get; }
public ReactiveCommand<Unit, Unit> ImportStudentsCommand { get; }
private ObservableCollection<string> _sortOptions;
public ObservableCollection<string> SortOptions
{
get => _sortOptions;
set => this.RaiseAndSetIfChanged(ref _sortOptions, value);
}
public MainViewModel()
{
DeleteAllStudentsCommand = ReactiveCommand.Create(DeleteAllStudents);
ImportStudentsCommand = ReactiveCommand.Create(ImportStudents);
Groups = new ObservableCollection<GroupDao>();
Students = new ObservableCollection<UserDao>();
SortOptions = new ObservableCollection<string> { "Ïî èìåíè", "Ïî äàòå" };
}
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;
}
}
}

View File

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

View File

@ -1 +1 @@
7b8f114385c96dfbd5d3eae7021cb2e23f1277d557076db3ae1b5fe3dced7027
d636cc88b6ff68f871fc141afef98bfe0709f6a184d9dd478a51cfb335e2b0cd

View File

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

View File

@ -0,0 +1 @@
{"documents":{"C:\\Users\\PC\\source\\repos\\Zurnal_Vizual\\*":"https://raw.githubusercontent.com/NuclierOwl/Jornal/8e78b129eaddfab72461facfad823b5dae9d0c3c/*"}}