From 35f677a0fa0b2c321dd7fdc064c97bb14d447aa6 Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Fri, 15 Jul 2022 20:57:22 -0600 Subject: [PATCH] Added gridlines --- .../AvaloniaUI/Assets/DataGridTheme.xaml | 15 +++-- .../ViewModels/ProcessQueueViewModel.cs | 55 ++++++++++++++++ .../ViewModels/ProductsDisplayViewModel.cs | 13 +++- .../Views/ProcessQueueControl2.axaml.cs | 65 ++----------------- .../AvaloniaUI/Views/ProductsDisplay2.axaml | 1 + .../Views/ProductsDisplay2.axaml.cs | 5 ++ 6 files changed, 87 insertions(+), 67 deletions(-) diff --git a/Source/LibationWinForms/AvaloniaUI/Assets/DataGridTheme.xaml b/Source/LibationWinForms/AvaloniaUI/Assets/DataGridTheme.xaml index c10afcf4..22e58146 100644 --- a/Source/LibationWinForms/AvaloniaUI/Assets/DataGridTheme.xaml +++ b/Source/LibationWinForms/AvaloniaUI/Assets/DataGridTheme.xaml @@ -84,14 +84,21 @@ IsHitTestVisible="False" Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}" StrokeThickness="1" /> + + + + + ContentTemplate="{TemplateBinding ContentTemplate}"/> testList = new() + { + new ProcessBook2(book, Logger) + { + Result = ProcessBookResult.FailedAbort, + Status = ProcessBookStatus.Failed, + }, + new ProcessBook2(book, Logger) + { + Result = ProcessBookResult.FailedSkip, + Status = ProcessBookStatus.Failed, + }, + new ProcessBook2(book, Logger) + { + Result = ProcessBookResult.FailedRetry, + Status = ProcessBookStatus.Failed, + }, + new ProcessBook2(book, Logger) + { + Result = ProcessBookResult.ValidationFail, + Status = ProcessBookStatus.Failed, + }, + new ProcessBook2(book, Logger) + { + Result = ProcessBookResult.Cancelled, + Status = ProcessBookStatus.Cancelled, + }, + new ProcessBook2(book, Logger) + { + Result = ProcessBookResult.Success, + Status = ProcessBookStatus.Completed, + }, + new ProcessBook2(book, Logger) + { + Result = ProcessBookResult.None, + Status = ProcessBookStatus.Working, + }, + new ProcessBook2(book, Logger) + { + Result = ProcessBookResult.None, + Status = ProcessBookStatus.Queued, + }, + }; + + Items.Enqueue(testList); + return; + } + #endregion } private int _completedCount; diff --git a/Source/LibationWinForms/AvaloniaUI/ViewModels/ProductsDisplayViewModel.cs b/Source/LibationWinForms/AvaloniaUI/ViewModels/ProductsDisplayViewModel.cs index 15da47cf..9698c3d1 100644 --- a/Source/LibationWinForms/AvaloniaUI/ViewModels/ProductsDisplayViewModel.cs +++ b/Source/LibationWinForms/AvaloniaUI/ViewModels/ProductsDisplayViewModel.cs @@ -45,8 +45,17 @@ namespace LibationWinForms.AvaloniaUI.ViewModels if (Design.IsDesignMode) { using var context = DbContexts.GetContext(); - var book = context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"); - GridEntries = new GridEntryBindingList2(CreateGridEntries(new List { book })); + List sampleEntries = new() + { + context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"), + context.GetLibraryBook_Flat_NoTracking("B017V4IWVG"), + context.GetLibraryBook_Flat_NoTracking("B017V4JA2Q"), + context.GetLibraryBook_Flat_NoTracking("B017V4NUPO"), + context.GetLibraryBook_Flat_NoTracking("B017V4NMX4"), + context.GetLibraryBook_Flat_NoTracking("B017V4NOZ0"), + context.GetLibraryBook_Flat_NoTracking("B017WJ5ZK6"), + }; + GridEntries = new GridEntryBindingList2(CreateGridEntries(sampleEntries)); return; } } diff --git a/Source/LibationWinForms/AvaloniaUI/Views/ProcessQueueControl2.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/ProcessQueueControl2.axaml.cs index 31875264..6ba74cc1 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/ProcessQueueControl2.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/ProcessQueueControl2.axaml.cs @@ -1,8 +1,7 @@ using ApplicationServices; +using Avalonia; using Avalonia.Controls; -using Avalonia.Input; using Avalonia.Markup.Xaml; -using DataLayer; using LibationWinForms.AvaloniaUI.ViewModels; using System; using System.Collections.Generic; @@ -20,63 +19,7 @@ namespace LibationWinForms.AvaloniaUI.Views InitializeComponent(); ProcessBookControl2.PositionButtonClicked += ProcessBookControl2_ButtonClicked; - ProcessBookControl2.CancelButtonClicked += ProcessBookControl2_CancelButtonClicked; - - #region Design Mode Testing - /* - if (Design.IsDesignMode) - { - using var context = DbContexts.GetContext(); - var book = context.GetLibraryBook_Flat_NoTracking("B017V4IM1G"); - List testList = new() - { - new ProcessBook2(book, Logger) - { - Result = ProcessBookResult.FailedAbort, - Status = ProcessBookStatus.Failed, - }, - new ProcessBook2(book, Logger) - { - Result = ProcessBookResult.FailedSkip, - Status = ProcessBookStatus.Failed, - }, - new ProcessBook2(book, Logger) - { - Result = ProcessBookResult.FailedRetry, - Status = ProcessBookStatus.Failed, - }, - new ProcessBook2(book, Logger) - { - Result = ProcessBookResult.ValidationFail, - Status = ProcessBookStatus.Failed, - }, - new ProcessBook2(book, Logger) - { - Result = ProcessBookResult.Cancelled, - Status = ProcessBookStatus.Cancelled, - }, - new ProcessBook2(book, Logger) - { - Result = ProcessBookResult.Success, - Status = ProcessBookStatus.Completed, - }, - new ProcessBook2(book, Logger) - { - Result = ProcessBookResult.None, - Status = ProcessBookStatus.Working, - }, - new ProcessBook2(book, Logger) - { - Result = ProcessBookResult.None, - Status = ProcessBookStatus.Queued, - }, - }; - - _viewModel.Items.Enqueue(testList); - return; - } - */ - #endregion + ProcessBookControl2.CancelButtonClicked += ProcessBookControl2_CancelButtonClicked; } private void InitializeComponent() @@ -118,10 +61,10 @@ namespace LibationWinForms.AvaloniaUI.Views _viewModel.LogEntries.Clear(); } - private void LogCopyBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) + private async void LogCopyBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) { string logText = string.Join("\r\n", _viewModel.LogEntries.Select(r => $"{r.LogDate.ToShortDateString()} {r.LogDate.ToShortTimeString()}\t{r.LogMessage}")); - System.Windows.Forms.Clipboard.SetDataObject(logText, false, 5, 150); + await Application.Current.Clipboard.SetTextAsync(logText); } private async void cancelAllBtn_Click(object sender, EventArgs e) diff --git a/Source/LibationWinForms/AvaloniaUI/Views/ProductsDisplay2.axaml b/Source/LibationWinForms/AvaloniaUI/Views/ProductsDisplay2.axaml index 0219b810..47ad9b24 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/ProductsDisplay2.axaml +++ b/Source/LibationWinForms/AvaloniaUI/Views/ProductsDisplay2.axaml @@ -10,6 +10,7 @@