Merge branch 'main' of https://github.com/aleksanderwlodarczyk/tpum i…

…nto main
aleksanderwlodarczyk · Apr 11, 2022 · d2f845f · d2f845f
2 parents 5fd5007 + af64098
commit d2f845f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/Shop1/ShopPresentation/PresentationModel/ModelAbstractApi.cs b/Shop1/ShopPresentation/PresentationModel/ModelAbstractApi.cs
@@ -1,6 +1,7 @@
 using ShopLogic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Timers;
 
 namespace TP.ConcurrentProgramming.PresentationModel
 {
@@ -12,6 +13,7 @@ public abstract class ModelAbstractApi
         public abstract string BasketViewVisibility { get; } 
         public abstract WarehousePresentation WarehousePresentation { get; }
         public abstract Basket Basket { get; }
+        public abstract Timer Timer { get; }
 
         public static ModelAbstractApi CreateApi()
         {
@@ -42,6 +44,8 @@ public ModelApi(LogicLayer logicLayer)
 
         public override WarehousePresentation WarehousePresentation => new WarehousePresentation(logicLayer.Shop);
 
+        public override Timer Timer => new Timer();
+
         private LogicLayer logicLayer;
     }
 }
diff --git a/Shop1/ShopPresentation/PresentationViewModel/MainWindowViewModel.cs b/Shop1/ShopPresentation/PresentationViewModel/MainWindowViewModel.cs
@@ -9,6 +9,7 @@
 using ShopLogic;
 using Microsoft.Toolkit.Mvvm;
 using GalaSoft.MvvmLight.Command;
+using System.Timers;
 
 namespace TP.ConcurrentProgramming.PresentationViewModel
 {
@@ -34,6 +35,7 @@ public MainWindowViewModel(ModelAbstractApi modelAbstractApi)
                 Fruits.Add(fruit);
             }
             basket = ModelLayer.Basket;
+            timer = ModelLayer.Timer;
             ButtomClick = new GalaSoft.MvvmLight.Command.RelayCommand(() => ClickHandler());
             BasketButtonClick = new GalaSoft.MvvmLight.Command.RelayCommand(() => BasketButtonClickHandler());
             MainPageButtonClick = new GalaSoft.MvvmLight.Command.RelayCommand(() => MainPagetButtonClickHandler());
@@ -45,6 +47,22 @@ public MainWindowViewModel(ModelAbstractApi modelAbstractApi)
             BuyButtonClick = new GalaSoft.MvvmLight.Command.RelayCommand(() => BuyButtonClickHandler());
 
             FruitButtonClick = new RelayCommand<Guid>((id) => FruitButtonClickHandler(id));
+            timer.Interval = 2;
+            timer.Elapsed += Timer_Elapsed;
+        }
+
+        ~MainWindowViewModel()
+        {
+            timer.Elapsed -= Timer_Elapsed;
+        }
+
+        private void Timer_Elapsed(object sender, ElapsedEventArgs e)
+        {
+            Fruits.Clear();
+            foreach (FruitDTO fruit in ModelLayer.WarehousePresentation.GetFruits())
+            {
+                Fruits.Add(fruit);
+            }
         }
 
         public string ColorString
@@ -267,6 +285,7 @@ private void MainPagetButtonClickHandler()
         private Basket basket;
         private float basketSum;
         private ObservableCollection<FruitDTO> fruits;
+        private Timer timer;
         private int b_Radious;
         private string b_colorString;
         private string b_mainViewVisibility;