diff --git a/.DS_Store b/.DS_Store
index c45cf84..affb85a 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/AdminWindow.axaml b/AdminWindow.axaml
index c250599..55422a2 100644
--- a/AdminWindow.axaml
+++ b/AdminWindow.axaml
@@ -7,10 +7,16 @@
Title="AdminWindow">
-
+
+
+
+
+
+
+
diff --git a/AdminWindow.axaml.cs b/AdminWindow.axaml.cs
index f436ad7..3e917f2 100644
--- a/AdminWindow.axaml.cs
+++ b/AdminWindow.axaml.cs
@@ -1,10 +1,13 @@
using System;
using System.Linq;
using Avalonia;
+using Avalonia.Collections;
using Avalonia.Controls;
+using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
using Avalonia.Media.Imaging;
using dmeo040225.Models;
+using dmeo040225.Services;
namespace dmeo040225;
@@ -20,7 +23,43 @@ public partial class AdminWindow : Window
Image.Source = new Bitmap(user.Photopath);
FioName.Text = user.Fio;
RoleName.Text = role;
+
+ TimerService.Instance.TimeUpdated += UpdateTimerText;
+ TimerService.Instance.TimerExpired += LogoutUser;
+
+ TimerService.Instance.Start();
}
+ private void Back_OnClick(object? sender, RoutedEventArgs e)
+ {
+ TimerService.Instance.Reset();
+ Close();
+ // MainWindow mainWindow = new MainWindow();
+ // mainWindow.ShowDialog(this);
+ }
+
+ private void History_OnClick(object? sender, RoutedEventArgs e)
+ {
+ HistoryWindow historyWindow = new HistoryWindow();
+ historyWindow.ShowDialog(this);
+ }
+ private void UpdateTimerText(TimeSpan time)
+ {
+ TimerText.Text = $"Осталось: {time:mm\\:ss}";
+ }
+
+ private void LogoutUser()
+ {
+ Close();
+ var mainWindow = new MainWindow();
+ mainWindow.Show();
+ }
+
+ protected override void OnClosed(EventArgs e)
+ {
+ TimerService.Instance.TimeUpdated -= UpdateTimerText;
+ TimerService.Instance.TimerExpired -= LogoutUser;
+ base.OnClosed(e);
+ }
}
\ No newline at end of file
diff --git a/HistoryWindow.axaml b/HistoryWindow.axaml
new file mode 100644
index 0000000..e908131
--- /dev/null
+++ b/HistoryWindow.axaml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HistoryWindow.axaml.cs b/HistoryWindow.axaml.cs
new file mode 100644
index 0000000..6d908d7
--- /dev/null
+++ b/HistoryWindow.axaml.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using dmeo040225.Models;
+using dmeo040225.Services;
+
+namespace dmeo040225;
+
+public partial class HistoryWindow : Window
+{
+ public ObservableCollection Users { get; set; } = new();
+ public HistoryWindow()
+ {
+ InitializeComponent();
+ using var context = new DatabaseContext();
+ var users = context.Users.Select(user => new UserPresenter
+ {
+ Id = user.Id,
+ RoleId = user.RoleId,
+ Login = user.Login,
+ Password = user.Password,
+ Lastlogin = user.Lastlogin,
+ Logorno = user.Logorno,
+ }).ToList();
+
+ Users = new ObservableCollection(users);
+ ListBoxHistory.ItemsSource = Users;
+
+ TimerService.Instance.TimeUpdated += UpdateTimerText;
+ TimerService.Instance.TimerExpired += LogoutUser;
+ }
+
+ public class UserPresenter() : User
+ {
+ String logOrNoText
+ {
+ get
+ {
+ if (Logorno == true)
+ {
+ return "accessed";
+ }
+ else
+ {
+ return "denied";
+ }
+ }
+ }
+ }
+
+ private void Back_OnClick(object? sender, RoutedEventArgs e)
+ {
+ Close();
+ // MainWindow mainWindow = new MainWindow();
+ // mainWindow.Show();
+ }
+
+ private void UpdateTimerText(TimeSpan time)
+ {
+ TimerText.Text = $"Осталось: {time:mm\\:ss}";
+ }
+
+ private void LogoutUser()
+ {
+ Close();
+ var mainWindow = new MainWindow();
+ mainWindow.Show();
+ }
+
+ protected override void OnClosed(EventArgs e)
+ {
+ TimerService.Instance.TimeUpdated -= UpdateTimerText;
+ TimerService.Instance.TimerExpired -= LogoutUser;
+ base.OnClosed(e);
+ }
+}
\ No newline at end of file
diff --git a/NewOrder.axaml b/NewOrder.axaml
index 76dc469..3a72185 100644
--- a/NewOrder.axaml
+++ b/NewOrder.axaml
@@ -5,5 +5,8 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="dmeo040225.NewOrder"
Title="NewOrder">
- Welcome to Avalonia!
+
+
+
+
diff --git a/NewOrder.axaml.cs b/NewOrder.axaml.cs
index f686a31..b32f603 100644
--- a/NewOrder.axaml.cs
+++ b/NewOrder.axaml.cs
@@ -1,6 +1,7 @@
-using Avalonia;
+using System;
using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Interactivity;
+using dmeo040225.Services;
namespace dmeo040225;
@@ -9,5 +10,33 @@ public partial class NewOrder : Window
public NewOrder()
{
InitializeComponent();
+
+ // Подключаемся к обновлениям таймера
+ TimerService.Instance.TimeUpdated += UpdateTimerText;
+ TimerService.Instance.TimerExpired += LogoutUser;
+ }
+
+ private void UpdateTimerText(TimeSpan time)
+ {
+ TimerText.Text = $"Осталось: {time:mm\\:ss}";
+ }
+
+ private void LogoutUser()
+ {
+ Close();
+ var mainWindow = new MainWindow();
+ mainWindow.Show();
+ }
+
+ private void Back_OnClick(object? sender, RoutedEventArgs e)
+ {
+ Close();
+ }
+
+ protected override void OnClosed(EventArgs e)
+ {
+ TimerService.Instance.TimeUpdated -= UpdateTimerText;
+ TimerService.Instance.TimerExpired -= LogoutUser;
+ base.OnClosed(e);
}
}
\ No newline at end of file
diff --git a/OlderWindow.axaml b/OlderWindow.axaml
index b51c671..55bd61d 100644
--- a/OlderWindow.axaml
+++ b/OlderWindow.axaml
@@ -7,8 +7,9 @@
Title="OlderWindow">
-
-
+
+
+
diff --git a/OlderWindow.axaml.cs b/OlderWindow.axaml.cs
index afd47d5..be26747 100644
--- a/OlderWindow.axaml.cs
+++ b/OlderWindow.axaml.cs
@@ -6,6 +6,7 @@ using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
using Avalonia.Media.Imaging;
using dmeo040225.Models;
+using dmeo040225.Services;
namespace dmeo040225;
@@ -21,6 +22,11 @@ public partial class OlderWindow : Window
Image.Source = new Bitmap(user.Photopath);
FioName.Text = user.Fio;
RoleName.Text = role;
+
+ TimerService.Instance.TimeUpdated += UpdateTimerText;
+ TimerService.Instance.TimerExpired += LogoutUser;
+
+ TimerService.Instance.Start();
}
private void NewOrder_OnClick(object? sender, RoutedEventArgs e)
@@ -37,7 +43,28 @@ public partial class OlderWindow : Window
private void Back_OnClick(object? sender, RoutedEventArgs e)
{
- MainWindow mainWindow = new MainWindow();
- mainWindow.ShowDialog(this);
+ TimerService.Instance.Reset();
+ Close();
+ // MainWindow mainWindow = new MainWindow();
+ // mainWindow.ShowDialog(this);
+ }
+
+ private void UpdateTimerText(TimeSpan time)
+ {
+ TimerText.Text = $"Осталось: {time:mm\\:ss}";
+ }
+
+ private void LogoutUser()
+ {
+ Close();
+ var mainWindow = new MainWindow();
+ mainWindow.Show();
+ }
+
+ protected override void OnClosed(EventArgs e)
+ {
+ TimerService.Instance.TimeUpdated -= UpdateTimerText;
+ TimerService.Instance.TimerExpired -= LogoutUser;
+ base.OnClosed(e);
}
}
\ No newline at end of file
diff --git a/SellerWindow.axaml b/SellerWindow.axaml
index 34ffae8..1efa227 100644
--- a/SellerWindow.axaml
+++ b/SellerWindow.axaml
@@ -7,14 +7,16 @@
Title="SellerWindow">
-
-
+
+
+
+
-
+
diff --git a/SellerWindow.axaml.cs b/SellerWindow.axaml.cs
index 2a229da..fc52398 100644
--- a/SellerWindow.axaml.cs
+++ b/SellerWindow.axaml.cs
@@ -1,28 +1,48 @@
using System;
using System.Linq;
-using System.Threading.Tasks;
-using Avalonia;
using Avalonia.Controls;
using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
using Avalonia.Media.Imaging;
-using Avalonia.Platform.Storage;
using dmeo040225.Models;
+using dmeo040225.Services;
namespace dmeo040225;
public partial class SellerWindow : Window
{
+ private readonly User _currentUser;
+
public SellerWindow(User user)
{
InitializeComponent();
+ _currentUser = user;
using var context = new DatabaseContext();
var role = context.Roles.FirstOrDefault(it => it.Id == user.RoleId).Name;
-
+
Image.Source = new Bitmap(user.Photopath);
FioName.Text = user.Fio;
RoleName.Text = role;
+
+ TimerService.Instance.TimeUpdated += UpdateTimerText;
+ TimerService.Instance.TimerExpired += LogoutUser;
+
+ if (_currentUser.RoleId == 2)
+ {
+ TimerService.Instance.Start(); // Начинаем отсчёт, если ещё не запущен
+ }
+ }
+
+ private void UpdateTimerText(TimeSpan time)
+ {
+ TimerText.Text = $"Осталось: {time:mm\\:ss}";
+ }
+
+ private void LogoutUser()
+ {
+ Close();
+ var mainWindow = new MainWindow();
+ mainWindow.Show();
}
private void NewOrder_OnClick(object? sender, RoutedEventArgs e)
@@ -30,11 +50,19 @@ public partial class SellerWindow : Window
NewOrder newOrder = new NewOrder();
newOrder.ShowDialog(this);
}
-
+
private void Back_OnClick(object? sender, RoutedEventArgs e)
{
- MainWindow mainWindow = new MainWindow();
- mainWindow.ShowDialog(this);
+ TimerService.Instance.Reset();
+ Close();
+ // MainWindow mainWindow = new MainWindow();
+ // mainWindow.Show();
}
-}
+ protected override void OnClosed(EventArgs e)
+ {
+ TimerService.Instance.TimeUpdated -= UpdateTimerText;
+ TimerService.Instance.TimerExpired -= LogoutUser;
+ base.OnClosed(e);
+ }
+}
\ No newline at end of file
diff --git a/TimeService.cs b/TimeService.cs
new file mode 100644
index 0000000..6992d74
--- /dev/null
+++ b/TimeService.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Threading;
+
+namespace dmeo040225.Services;
+
+public class TimerService
+{
+ private TimeSpan _timeRemaining = TimeSpan.FromMinutes(20);
+ private CancellationTokenSource _cts = new();
+ public event Action? TimeUpdated;
+ public event Action? TimerExpired;
+
+ private static TimerService? _instance;
+ public static TimerService Instance => _instance ??= new TimerService();
+
+ private TimerService() { }
+
+ public void Start()
+ {
+ _cts.Cancel();
+ _cts = new CancellationTokenSource();
+
+ Task.Run(async () =>
+ {
+ while (_timeRemaining > TimeSpan.Zero)
+ {
+ await Task.Delay(TimeSpan.FromSeconds(1), _cts.Token);
+ _timeRemaining -= TimeSpan.FromSeconds(1);
+ Dispatcher.UIThread.Post(() => TimeUpdated?.Invoke(_timeRemaining));
+ }
+ Dispatcher.UIThread.Post(() => TimerExpired?.Invoke());
+ }, _cts.Token);
+ }
+
+ public void Reset()
+ {
+ _timeRemaining = TimeSpan.FromMinutes(20);
+ }
+
+ public void Stop()
+ {
+ _cts.Cancel();
+ }
+}
\ No newline at end of file
diff --git a/bin/.DS_Store b/bin/.DS_Store
index a18af76..6216286 100644
Binary files a/bin/.DS_Store and b/bin/.DS_Store differ
diff --git a/bin/Debug/.DS_Store b/bin/Debug/.DS_Store
index 278cb96..431371f 100644
Binary files a/bin/Debug/.DS_Store and b/bin/Debug/.DS_Store differ
diff --git a/bin/Debug/net8.0/dmeo040225.dll b/bin/Debug/net8.0/dmeo040225.dll
index dcb0119..6de3cf1 100644
Binary files a/bin/Debug/net8.0/dmeo040225.dll and b/bin/Debug/net8.0/dmeo040225.dll differ
diff --git a/bin/Debug/net8.0/dmeo040225.pdb b/bin/Debug/net8.0/dmeo040225.pdb
index c06957b..a2eb1b5 100644
Binary files a/bin/Debug/net8.0/dmeo040225.pdb and b/bin/Debug/net8.0/dmeo040225.pdb differ
diff --git a/bin/Debug/net8.0/workers/Беляева.jpeg b/bin/Debug/net8.0/workers/Беляева.jpeg
new file mode 100644
index 0000000..16d9377
Binary files /dev/null and b/bin/Debug/net8.0/workers/Беляева.jpeg differ
diff --git a/bin/Debug/net8.0/workers/Иванов.jpeg b/bin/Debug/net8.0/workers/Иванов.jpeg
new file mode 100644
index 0000000..3e5af20
Binary files /dev/null and b/bin/Debug/net8.0/workers/Иванов.jpeg differ
diff --git a/bin/Debug/net8.0/workers/Игнатов.jpg b/bin/Debug/net8.0/workers/Игнатов.jpg
new file mode 100644
index 0000000..ca7cc45
Binary files /dev/null and b/bin/Debug/net8.0/workers/Игнатов.jpg differ
diff --git a/bin/Debug/net8.0/workers/Миронов.jpeg b/bin/Debug/net8.0/workers/Миронов.jpeg
new file mode 100644
index 0000000..6340243
Binary files /dev/null and b/bin/Debug/net8.0/workers/Миронов.jpeg differ
diff --git a/bin/Debug/net8.0/workers/Петров.jpeg b/bin/Debug/net8.0/workers/Петров.jpeg
new file mode 100644
index 0000000..68b2546
Binary files /dev/null and b/bin/Debug/net8.0/workers/Петров.jpeg differ
diff --git a/bin/Debug/net8.0/workers/Смирнова.jpeg b/bin/Debug/net8.0/workers/Смирнова.jpeg
new file mode 100644
index 0000000..d04e3f0
Binary files /dev/null and b/bin/Debug/net8.0/workers/Смирнова.jpeg differ
diff --git a/bin/Debug/net8.0/workers/Сотрудники.csv b/bin/Debug/net8.0/workers/Сотрудники.csv
new file mode 100644
index 0000000..426e85b
--- /dev/null
+++ b/bin/Debug/net8.0/workers/Сотрудники.csv
@@ -0,0 +1,11 @@
+Код сотрудника;Должность;ФИО ;Логин ;Пароль;Последний вход;Тип входа;photopath
+101;Продавец;Иванов Иван Иванович;Ivanov@namecomp.ru;2L6KZG;2022-05-15 13:13:00;true;workers/Иванов.jpeg
+102;Продавец;Петров Петр Петрович;petrov@namecomp.ru;uzWC67;2022-05-15 13:13:00;true;workers/Петров.jpeg
+103;Администратор;Федоров Федор Федорович;fedorov@namecomp.ru;8ntwUp;2022-05-15 13:13:00;true;workers/Федоров.jpeg
+104;Старший смены;Миронов Вениамин Куприянович;mironov@namecomp.ru;YOyhfR1;2022-05-15 13:13:00;true;workers/Миронов.jpeg
+105;Старший смены;Ширяев Ермолай Вениаминович;shiryev@namecomp.ru;RSbvHv;2022-05-15 13:13:00;false;workers/Ширяев.jpeg
+106;Старший смены;Игнатов Кассиан Васильевич;ignatov@namecomp.ru;rwVDh9;2022-05-15 13:13:00;true;workers/Игнатов.jpg
+107;Продавец;Хохлов Владимир Мэлсович;hohlov@namecomp.ru;LdNyos;2022-05-15 13:13:00;true;workers/Хохлов.jpeg
+108;Продавец;Стрелков Мстислав Георгьевич;strelkov@namecomp.ru;gynQMT;2022-05-15 13:13:00;false;workers/Стрелков.jpeg
+109;Продавец;Беляева Лилия Наумовна;belyeva@@namecomp.ru;AtnDjr;2022-05-15 13:13:00;true;workers/Беляева.jpeg
+110;Продавец;Смирнова Ульяна Гордеевна;smirnova@@namecomp.ru;JlFRCZ;2022-05-15 13:13:00;true;workers/Смирнова.jpeg
\ No newline at end of file
diff --git a/bin/Debug/net8.0/workers/Сотрудники2.csv b/bin/Debug/net8.0/workers/Сотрудники2.csv
new file mode 100644
index 0000000..b5aa4a4
--- /dev/null
+++ b/bin/Debug/net8.0/workers/Сотрудники2.csv
@@ -0,0 +1,11 @@
+Код сотрудника;Должность;ФИО ;Логин ;Пароль;Последний вход;Тип входа;photopath
+101;2;Иванов Иван Иванович;Ivanov@namecomp.ru;2L6KZG;2022-05-15 13:13:00;true;workers/Иванов.jpeg
+102;2;Петров Петр Петрович;petrov@namecomp.ru;uzWC67;2022-05-15 13:13:00;true;workers/Петров.jpeg
+103;4;Федоров Федор Федорович;fedorov@namecomp.ru;8ntwUp;2022-05-15 13:13:00;true;workers/Федоров.jpeg
+104;3;Миронов Вениамин Куприянович;mironov@namecomp.ru;YOyhfR1;2022-05-15 13:13:00;true;workers/Миронов.jpeg
+105;3;Ширяев Ермолай Вениаминович;shiryev@namecomp.ru;RSbvHv;2022-05-15 13:13:00;false;workers/Ширяев.jpeg
+106;3;Игнатов Кассиан Васильевич;ignatov@namecomp.ru;rwVDh9;2022-05-15 13:13:00;true;workers/Игнатов.jpg
+107;2;Хохлов Владимир Мэлсович;hohlov@namecomp.ru;LdNyos;2022-05-15 13:13:00;true;workers/Хохлов.jpeg
+108;2;Стрелков Мстислав Георгьевич;strelkov@namecomp.ru;gynQMT;2022-05-15 13:13:00;false;workers/Стрелков.jpeg
+109;2;Беляева Лилия Наумовна;belyeva@@namecomp.ru;AtnDjr;2022-05-15 13:13:00;true;workers/Беляева.jpeg
+110;2;Смирнова Ульяна Гордеевна;smirnova@@namecomp.ru;JlFRCZ;2022-05-15 13:13:00;true;workers/Смирнова.jpeg
\ No newline at end of file
diff --git a/bin/Debug/net8.0/workers/Сотрудники_import.xlsx b/bin/Debug/net8.0/workers/Сотрудники_import.xlsx
new file mode 100644
index 0000000..c2f8f95
Binary files /dev/null and b/bin/Debug/net8.0/workers/Сотрудники_import.xlsx differ
diff --git a/bin/Debug/net8.0/workers/Стрелков.jpeg b/bin/Debug/net8.0/workers/Стрелков.jpeg
new file mode 100644
index 0000000..3fc5d7d
Binary files /dev/null and b/bin/Debug/net8.0/workers/Стрелков.jpeg differ
diff --git a/bin/Debug/net8.0/workers/Федоров.jpeg b/bin/Debug/net8.0/workers/Федоров.jpeg
new file mode 100644
index 0000000..af30570
Binary files /dev/null and b/bin/Debug/net8.0/workers/Федоров.jpeg differ
diff --git a/bin/Debug/net8.0/workers/Хохлов.jpeg b/bin/Debug/net8.0/workers/Хохлов.jpeg
new file mode 100644
index 0000000..88e3a88
Binary files /dev/null and b/bin/Debug/net8.0/workers/Хохлов.jpeg differ
diff --git a/bin/Debug/net8.0/workers/Ширяев.jpeg b/bin/Debug/net8.0/workers/Ширяев.jpeg
new file mode 100644
index 0000000..a8decfc
Binary files /dev/null and b/bin/Debug/net8.0/workers/Ширяев.jpeg differ
diff --git a/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache
index 0cab826..c56fc2d 100644
--- a/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache
+++ b/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache
@@ -1 +1 @@
-6d54fb711d9acdb6b2c7611c5a77422f1b7d0e4af32dcd64c1eba265817e60f8
+9c5a83e323ce663250b73e7575c34163289414f249acdba51b22aba1084d01f2
diff --git a/obj/Debug/net8.0/Avalonia/dmeo040225.dll b/obj/Debug/net8.0/Avalonia/dmeo040225.dll
index dcb0119..6de3cf1 100644
Binary files a/obj/Debug/net8.0/Avalonia/dmeo040225.dll and b/obj/Debug/net8.0/Avalonia/dmeo040225.dll differ
diff --git a/obj/Debug/net8.0/Avalonia/dmeo040225.pdb b/obj/Debug/net8.0/Avalonia/dmeo040225.pdb
index c06957b..a2eb1b5 100644
Binary files a/obj/Debug/net8.0/Avalonia/dmeo040225.pdb and b/obj/Debug/net8.0/Avalonia/dmeo040225.pdb differ
diff --git a/obj/Debug/net8.0/Avalonia/resources b/obj/Debug/net8.0/Avalonia/resources
index 5e75a14..1866828 100644
Binary files a/obj/Debug/net8.0/Avalonia/resources and b/obj/Debug/net8.0/Avalonia/resources differ
diff --git a/obj/Debug/net8.0/dmeo040225.AssemblyInfo.cs b/obj/Debug/net8.0/dmeo040225.AssemblyInfo.cs
index d2372bd..f78b921 100644
--- a/obj/Debug/net8.0/dmeo040225.AssemblyInfo.cs
+++ b/obj/Debug/net8.0/dmeo040225.AssemblyInfo.cs
@@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("dmeo040225")]
[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+7df29eaed73ff8157467edb785b5cec0c2f2baac")]
[assembly: System.Reflection.AssemblyProductAttribute("dmeo040225")]
[assembly: System.Reflection.AssemblyTitleAttribute("dmeo040225")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/obj/Debug/net8.0/dmeo040225.AssemblyInfoInputs.cache b/obj/Debug/net8.0/dmeo040225.AssemblyInfoInputs.cache
index 025c75e..9ceb25d 100644
--- a/obj/Debug/net8.0/dmeo040225.AssemblyInfoInputs.cache
+++ b/obj/Debug/net8.0/dmeo040225.AssemblyInfoInputs.cache
@@ -1 +1 @@
-00dd253d9c5ee06441472aef7a12a9eb1d9894c532dc0be719a7504cd0e28660
+8148ae1978269f085dafca0635f8af2746f8bdf7cc4fe5ae6804146ebc19fd26
diff --git a/obj/Debug/net8.0/dmeo040225.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net8.0/dmeo040225.GeneratedMSBuildEditorConfig.editorconfig
index 9961379..21ca448 100644
--- a/obj/Debug/net8.0/dmeo040225.GeneratedMSBuildEditorConfig.editorconfig
+++ b/obj/Debug/net8.0/dmeo040225.GeneratedMSBuildEditorConfig.editorconfig
@@ -31,6 +31,9 @@ build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
[/Users/rinchi/RiderProjects/dmeo040225/dmeo040225/GetOrderWindow.axaml]
build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
+[/Users/rinchi/RiderProjects/dmeo040225/dmeo040225/HistoryWindow.axaml]
+build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
+
[/Users/rinchi/RiderProjects/dmeo040225/dmeo040225/MainWindow.axaml]
build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
diff --git a/obj/Debug/net8.0/dmeo040225.csproj.CoreCompileInputs.cache b/obj/Debug/net8.0/dmeo040225.csproj.CoreCompileInputs.cache
index 78952d0..e5593bc 100644
--- a/obj/Debug/net8.0/dmeo040225.csproj.CoreCompileInputs.cache
+++ b/obj/Debug/net8.0/dmeo040225.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-b3408bdf4bdb48c636211bfdad1a3f0cb8e7a420b31eb12f065351d62dfa6d8d
+0b05098f3f71254ca45e1232f99c259a51d1496f0902c9f964f503e1b88344d5
diff --git a/obj/Debug/net8.0/dmeo040225.dll b/obj/Debug/net8.0/dmeo040225.dll
index d12e526..6fec024 100644
Binary files a/obj/Debug/net8.0/dmeo040225.dll and b/obj/Debug/net8.0/dmeo040225.dll differ
diff --git a/obj/Debug/net8.0/dmeo040225.pdb b/obj/Debug/net8.0/dmeo040225.pdb
index e57d584..5a59d9b 100644
Binary files a/obj/Debug/net8.0/dmeo040225.pdb and b/obj/Debug/net8.0/dmeo040225.pdb differ
diff --git a/obj/Debug/net8.0/ref/dmeo040225.dll b/obj/Debug/net8.0/ref/dmeo040225.dll
index 0d10bc9..9b6405e 100644
Binary files a/obj/Debug/net8.0/ref/dmeo040225.dll and b/obj/Debug/net8.0/ref/dmeo040225.dll differ
diff --git a/obj/Debug/net8.0/refint/Avalonia/dmeo040225.dll b/obj/Debug/net8.0/refint/Avalonia/dmeo040225.dll
index 0d10bc9..9b6405e 100644
Binary files a/obj/Debug/net8.0/refint/Avalonia/dmeo040225.dll and b/obj/Debug/net8.0/refint/Avalonia/dmeo040225.dll differ
diff --git a/obj/Debug/net8.0/refint/dmeo040225.dll b/obj/Debug/net8.0/refint/dmeo040225.dll
index da42ef4..bb5e099 100644
Binary files a/obj/Debug/net8.0/refint/dmeo040225.dll and b/obj/Debug/net8.0/refint/dmeo040225.dll differ
diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info
index 81d4618..4c871e4 100644
--- a/obj/rider.project.model.nuget.info
+++ b/obj/rider.project.model.nuget.info
@@ -1 +1 @@
-17386674006127744
\ No newline at end of file
+17386674969008260
\ No newline at end of file