Rective programming

aleksanderwlodarczyk · Apr 11, 2022 · 04d3aee · 04d3aee
1 parent d2f845f
commit 04d3aee
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/Shop1/ShopLogic/PromotionManager.cs b/Shop1/ShopLogic/PromotionManager.cs
@@ -8,7 +8,7 @@ internal class PromotionManager : IPromotionManager
     {
         public PromotionManager(IWarehouse warehouse)
         {
-            PromotionTimer = new System.Timers.Timer(2000);
+            PromotionTimer = new System.Timers.Timer(10000);
             PromotionTimer.Elapsed += GetNewPromotion;
             PromotionTimer.AutoReset = true;
             PromotionTimer.Enabled = true;

diff --git a/Shop1/ShopPresentation/GraphicalUserInterface/MainWindow.xaml b/Shop1/ShopPresentation/GraphicalUserInterface/MainWindow.xaml
@@ -35,7 +35,7 @@
                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                             <Image Source="apple.png" Margin="50 0"></Image>
                                             <TextBlock VerticalAlignment="Center" FontSize="25" Margin="50 0" Text="{Binding Name}"></TextBlock>
-                                            <TextBlock VerticalAlignment="Center" FontSize="25" Margin="50 0" Text="{Binding Price, StringFormat='0. PLN'}"></TextBlock>
+                                            <TextBlock VerticalAlignment="Center" FontSize="25" Margin="50 0" Text="{Binding Price, StringFormat='0.00 PLN'}"></TextBlock>
                                         </StackPanel>
                                     </Button>
                                 </DataTemplate>
@@ -62,7 +62,7 @@
                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                             <Image Source="apple.png" Margin="50 0"></Image>
                                             <TextBlock VerticalAlignment="Center" FontSize="25" Margin="50 0" Text="{Binding Name}"></TextBlock>
-                                            <TextBlock VerticalAlignment="Center" FontSize="25" Margin="50 0" Text="{Binding Price, StringFormat='0. PLN'}"></TextBlock>
+                                            <TextBlock VerticalAlignment="Center" FontSize="25" Margin="50 0" Text="{Binding Price, StringFormat='0.00 PLN'}"></TextBlock>
                                         </StackPanel>
                                     </Button>
                                 </DataTemplate>
@@ -72,7 +72,7 @@
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <Button Content="Kup" Width="300" Height="200" FontSize="36" Margin="30" Command= "{Binding BuyButtonClick}"></Button>
-                    <TextBlock VerticalAlignment="Center" FontSize="48" Margin="100 0" Text="{Binding BasketSum, StringFormat='0. PLN'}"></TextBlock>
+                    <TextBlock VerticalAlignment="Center" FontSize="48" Margin="100 0" Text="{Binding BasketSum, StringFormat='0.00 PLN'}"></TextBlock>
                 </StackPanel>
 
             </StackPanel>

diff --git a/Shop1/ShopPresentation/PresentationViewModel/MainWindowViewModel.cs b/Shop1/ShopPresentation/PresentationViewModel/MainWindowViewModel.cs
@@ -47,7 +47,8 @@ public MainWindowViewModel(ModelAbstractApi modelAbstractApi)
             BuyButtonClick = new GalaSoft.MvvmLight.Command.RelayCommand(() => BuyButtonClickHandler());
 
             FruitButtonClick = new RelayCommand<Guid>((id) => FruitButtonClickHandler(id));
-            timer.Interval = 2;
+            timer.Interval = 10000;
+            timer.Enabled = true;
             timer.Elapsed += Timer_Elapsed;
         }
 
@@ -58,8 +59,10 @@ public MainWindowViewModel(ModelAbstractApi modelAbstractApi)
 
         private void Timer_Elapsed(object sender, ElapsedEventArgs e)
         {
-            Fruits.Clear();
-            foreach (FruitDTO fruit in ModelLayer.WarehousePresentation.GetFruits())
+            List<FruitDTO> fruitsInShop = ModelLayer.WarehousePresentation.GetFruits();
+            Fruits = new ObservableCollection<FruitDTO>();
+
+            foreach (FruitDTO fruit in fruitsInShop)
             {
                 Fruits.Add(fruit);
             }