Feature/#100 (#101)

* WatchList - Add window "AddCinemaWindow" and fixed bug. Incomplete implementation of the task functionality.

* WatchList.WPF - Fixed bug and remove unused classes.

* WatchItem.WPF - Moved properties from "CinemaModel" to "AddCinemaViewModel".

* WatchList.WPF - Implemented the ability to add an item.

WatchList.Core/Model/Load/Components/TypeLoadingCinema.cs

@@ -3,7 +3,7 @@
 
 namespace WatchList.Core.Model.Load.Components
 {
-    public class TypeLoadingCinema : SmartEnumBaseWrapper<TypeCinema?>
+    public class TypeLoadingCinema : SmartEnumBaseWrapper<TypeCinema?>, IEquatable<TypeLoadingCinema>
     {
         public static ObservableCollection<TypeLoadingCinema> GetItemsType = GetItems(TypeCinema.List, e => new TypeLoadingCinema(e));
 
@@ -13,6 +13,19 @@ public TypeLoadingCinema(TypeCinema? value = null)
         public override string Name
             => Value != null ? Value.Name : "All Type";
 
+        public bool Equals(TypeLoadingCinema? other)
+        {
+            return ReferenceEquals(other, null)
+                    ? false
+                    : Value == other.Value && Name == other.Name;
+        }
+
+        public override bool Equals(object? obj)
+            => Equals(obj as TypeLoadingCinema);
+
+        public override int GetHashCode()
+            => HashCode.Combine(Name, Value);
+
         public override string ToString() => Name;
     }
 }

WatchList.Core/Model/Load/Grade.cs

@@ -1,3 +1,4 @@
+using System.Collections.ObjectModel;
 using Ardalis.SmartEnum;
 using WatchList.Core.Enums;
 
@@ -23,5 +24,8 @@ public Grade(string name, Grades grade)
         }
 
         public static Grade FromValue(Grades grade) => FromValue((int)grade);
+
+        public static ObservableCollection<Grade> GetItems()
+            => new ObservableCollection<Grade>(List.OrderBy(x => x.Value));
     }
 }

WatchList.WPF/App.xaml

@@ -11,6 +11,9 @@
             <ResourceDictionary.MergedDictionaries>
                 <materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign2.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

WatchList.WPF/App.xaml.cs

@@ -23,7 +23,8 @@ public App()
             var serviceCollection = new ServiceCollection();
             ViewModelLocator.AddViewModels(serviceCollection)
                             .AppServiceContainer()
-                            .AppServicePageContainer();
+                            .AppServicePageContainer()
+                            .AddSerilog(Log.Logger);
             _serviceProvider = serviceCollection.BuildServiceProvider();
         }
 
@@ -41,14 +42,13 @@ private void OnStartup(object sender, StartupEventArgs e)
             {
                 Log.Fatal(ex, "Application terminated unexpectedly");
             }
-            finally
-            {
-                Log.CloseAndFlush();
-            }
         }
 
         private void OnExit(object sender, ExitEventArgs e)
-            => _serviceProvider.Dispose();
+        {
+            _serviceProvider.Dispose();
+            Log.CloseAndFlush();
+        }
 
         private static Logger CreateLogger(string logDirectory = "log")
         {

WatchList.WPF/Data/ViewModelLocator.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using WatchList.WPF.ViewModel;
+using WatchList.WPF.ViewModel.ItemsView;
 
 namespace WatchList.WPF.Data
 {
@@ -16,15 +17,18 @@ public CinemaPageViewModel CinemaPageViewModel
         public MergeDatabaseViewModel MergeDatabaseViewModel
             => _provider!.GetRequiredService<MergeDatabaseViewModel>();
 
-        public DataReplaceMessageViewModel DataReplaceMessageViewModel
-            => _provider!.GetRequiredService<DataReplaceMessageViewModel>();
+        public DataReplaceMessageVM DataReplaceMessageVM
+            => _provider!.GetRequiredService<DataReplaceMessageVM>();
+        public AddCinemaViewModel AddCinemaViewModel
+            => _provider!.GetRequiredService<AddCinemaViewModel>();
 
         public static IServiceCollection AddViewModels(ServiceCollection serviceCollection)
             => serviceCollection
                 .AddTransient<CinemaWindowViewModel>()
                 .AddTransient<CinemaPageViewModel>()
                 .AddTransient<MergeDatabaseViewModel>()
-                .AddTransient<DataReplaceMessageViewModel>();
+                .AddTransient<DataReplaceMessageVM>()
+                .AddTransient<AddCinemaViewModel>();
 
         public static void Init(ServiceProvider provider) => _provider = provider;
     }

WatchList.WPF/Extension/AppServiceDIExtension.cs

@@ -1,11 +1,12 @@
+using DevExpress.Mvvm.POCO;
 using Microsoft.Extensions.DependencyInjection;
-using Serilog;
 using WatchList.Core.Repository;
 using WatchList.Core.Service;
 using WatchList.Core.Service.Component;
 using WatchList.Core.Service.DataLoading;
 using WatchList.Migrations.SQLite;
 using WatchList.WPF.Data;
+using WatchList.WPF.Models;
 using WatchList.WPF.Models.Filter;
 using WatchList.WPF.Models.ModelDataLoad;
 using WatchList.WPF.Models.Sorter;
@@ -21,15 +22,15 @@ public static IServiceCollection AppServiceContainer(this IServiceCollection ser
                                       .AddScoped(e => e.GetRequiredService<DbContextFactoryMigrator>().Create())
                                       .AddScoped<WatchItemRepository>()
                                       .AddScoped<IMessageBox, MessageWindow>()
+                                      .AddScoped<WatchItemCreator>()
                                       .AddScoped<WatchItemService>()
                                       .AddScoped<DownloadDataService>()
                                       .AddScoped<SortWatchItemModel>()
                                       .AddScoped<FilterItemModel>()
                                       .AddSingleton<PageService>()
                                       .AddScoped<ViewModelLocator>()
-                                      .AddScoped<FiileLoaderDB>()
-                                      .AddLogging()
-                                      .AddSerilog();
+                                      .AddScoped<FileLoaderDB>()
+                                      .AddLogging();
 
         public static IServiceCollection AppServicePageContainer(this IServiceCollection serviceCollection)
             => serviceCollection.AddTransient<CinemaWindow>()

WatchList.WPF/Models/ModelDataLoad/FiileLoaderDB.cs → WatchList.WPF/Models/ModelDataLoad/FileLoaderDB.cs

@@ -6,12 +6,12 @@
 
 namespace WatchList.WPF.Models.ModelDataLoad
 {
-    public class FiileLoaderDB
+    public class FileLoaderDB
     {
         private readonly DownloadDataService _downloadDataService;
         private readonly ILogger<WatchItemRepository> _logger;
 
-        public FiileLoaderDB(DownloadDataService downloadDataService, ILogger<WatchItemRepository> logger)
+        public FileLoaderDB(DownloadDataService downloadDataService, ILogger<WatchItemRepository> logger)
         {
             _downloadDataService = downloadDataService;
             _logger = logger;

WatchList.WPF/Models/WatchItemCreator.cs

@@ -0,0 +1,30 @@
+using WatchList.Core.Model.ItemCinema;
+using WatchList.Core.Model.ItemCinema.Components;
+
+namespace WatchList.WPF.Models
+{
+    public class WatchItemCreator
+    {
+        public WatchItemCreator()
+        {
+        }
+
+        public WatchItem CreateNonPlanned(
+                                        string title,
+                                        int sequel,
+                                        StatusCinema status,
+                                        TypeCinema type,
+                                        DateTime? date = null,
+                                        int? grade = null,
+                                        Guid? id = null)
+            => new WatchItem(title, sequel, status, type, id, date, grade);
+
+        public WatchItem CreatePlanned(
+                                    string title,
+                                    int sequel,
+                                    StatusCinema status,
+                                    TypeCinema type,
+                                    Guid? id)
+            => new WatchItem(title, sequel, status, type, id, null, null);
+    }
+}

WatchList.WPF/ViewModel/CinemaPageViewModel.cs

@@ -14,6 +14,7 @@
 using WatchList.WPF.Models.Filter;
 using WatchList.WPF.Models.Sorter;
 using WatchList.WPF.Views;
+using WatchList.WPF.Views.CinemaView;
 
 namespace WatchList.WPF.ViewModel
 {
@@ -70,7 +71,7 @@ public ObservableCollection<WatchItem> WatchItems
 
         public string PageDisplayText => $"Page {CurPage} of {_pagedList.PageCount}";
 
-        public List<CinemaModel> PageWatchItems { get; set; }
+        public List<WatchItemCreator> PageWatchItems { get; set; }
 
         public RelayCommandApp MoveToPreviousPage
             => new RelayCommandApp(async _ => await LoadDataAsyncPage(--Page.Number), _ => _pagedList.HasPreviousPage);
@@ -82,9 +83,23 @@ public RelayCommandApp MoveToNextPage
         public RelayCommandApp MoveToLastPage
             => new RelayCommandApp(async _ => await LoadDataAsyncPage(_pagedList.PageCount), _ => _pagedList.HasNextPage);
 
+        public RelayCommandApp AddItemCommand
+            => new RelayCommandApp(async async => await MoveAddItem());
+
         public RelayCommandApp MoveAddDataDB
             => new RelayCommandApp(_ => new MergeDatabaseWindow().Show());
 
+        private async Task MoveAddItem()
+        {
+            var addWindow = new AddCinemaWindow();
+            if (addWindow.ShowDialog() != true)
+            {
+                return;
+            }
+
+            await LoadDataAsync();
+        }
+
         /// <summary>
         /// Load data in table.
         /// </summary>