From 3ebd4ce24381df4fa01e7716a6bea440dfa87700 Mon Sep 17 00:00:00 2001 From: MBucari Date: Tue, 7 Mar 2023 19:36:15 -0700 Subject: [PATCH] Show AbsentFromLastScan book status in grid --- Source/ApplicationServices/LibraryCommands.cs | 1 + .../DataLayer/QueryObjects/LibraryBookQueries.cs | 5 +++-- Source/LibationAvalonia/Assets/LibationStyles.xaml | 2 ++ Source/LibationAvalonia/ViewModels/GridEntry.cs | 1 - .../ViewModels/LiberateButtonStatus.cs | 14 ++++++++++++-- .../ViewModels/LibraryBookEntry.cs | 4 ++-- Source/LibationAvalonia/ViewModels/SeriesEntry.cs | 3 +-- .../Views/MainWindow.VisibleBooks.cs | 1 + .../LibationAvalonia/Views/ProductsDisplay.axaml | 10 +++++++--- .../Views/ProductsDisplay.axaml.cs | 6 +++--- Source/LibationWinForms/Form1.VisibleBooks.cs | 2 +- .../GridView/LiberateButtonStatus.cs | 12 +++++++++++- .../LiberateDataGridViewImageButtonColumn.cs | 14 ++++++++++++-- .../LibationWinForms/GridView/LibraryBookEntry.cs | 2 +- .../LibationWinForms/GridView/ProductsDisplay.cs | 3 ++- Source/LibationWinForms/GridView/ProductsGrid.cs | 2 +- Source/LibationWinForms/GridView/SeriesEntry.cs | 2 +- 17 files changed, 61 insertions(+), 23 deletions(-) diff --git a/Source/ApplicationServices/LibraryCommands.cs b/Source/ApplicationServices/LibraryCommands.cs index d166a158..e5a9b04f 100644 --- a/Source/ApplicationServices/LibraryCommands.cs +++ b/Source/ApplicationServices/LibraryCommands.cs @@ -467,6 +467,7 @@ namespace ApplicationServices var results = libraryBooks .AsParallel() + .Where(lb => !lb.AbsentFromLastScan) .Select(lb => Liberated_Status(lb.Book)) .ToList(); var booksFullyBackedUp = results.Count(r => r == LiberatedStatus.Liberated); diff --git a/Source/DataLayer/QueryObjects/LibraryBookQueries.cs b/Source/DataLayer/QueryObjects/LibraryBookQueries.cs index 24063f0c..f10350f5 100644 --- a/Source/DataLayer/QueryObjects/LibraryBookQueries.cs +++ b/Source/DataLayer/QueryObjects/LibraryBookQueries.cs @@ -107,8 +107,9 @@ namespace DataLayer => bookList .Where( lb => - lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload - || lb.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload + !lb.AbsentFromLastScan && + (lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload + || lb.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload) ); } } diff --git a/Source/LibationAvalonia/Assets/LibationStyles.xaml b/Source/LibationAvalonia/Assets/LibationStyles.xaml index 7b3ae474..e3569ba2 100644 --- a/Source/LibationAvalonia/Assets/LibationStyles.xaml +++ b/Source/LibationAvalonia/Assets/LibationStyles.xaml @@ -8,6 +8,8 @@ + +