POS ksu-cis#2 progress

Author: trevorprond

Data/Drinks/AretinoAppleJuice.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 using System.Text;
 using BleakwindBuffet.Data.Enums;
 
@@ -11,9 +13,20 @@
 namespace BleakwindBuffet.Data.Drinks
 {
 
-    public class AretinoAppleJuice : Drink, IOrderItem
+    public class AretinoAppleJuice : Drink, IOrderItem, INotifyPropertyChanged
+
+     
     {
+        /// <summary>
+        /// 
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
 
+        private void NotifyPropertyChanged([CallerMemberName] String propertyName = "" )
+        { 
+           PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
         /// <summary>
         /// Gets the price of the juice
         /// </summary>
@@ -72,8 +85,23 @@ public override uint Calories
         /// <summary>
         /// Gets whether or not to add ice
         /// </summary>
-        public bool Ice { get; set; } = false;
+        public bool Ice
+        {
+            get
+            {
+                return this.ice;
+            }
+            set
+            {
+                if (value != this.ice)
+                {
+                    this.ice = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        } 
 
+        private bool ice = false;
         /// <summary>
         /// Allows customization on the juice
         /// </summary>

DataTests/UnitTests/DrinkTests/AretinoAppleJuiceTests.cs

@@ -14,6 +14,13 @@ namespace BleakwindBuffet.DataTests.UnitTests.DrinkTests
 {
     public class AretinoAppleJuiceTests
     {
+        [Fact]
+        public void ChangingIceNotifiesIceProperty()
+        {
+            var AJ = new AretinoAppleJuice();
+
+            Assert.PropertyChanged(AJ, "Ice", () => AJ.Ice = true);
+        }
         [Fact]
         public void ShouldBeADrink()
         {

PointOfSale/DrinkList.xaml.cs

@@ -1,4 +1,5 @@
-using PointOfSale.DrinkCustomization;
+using BleakwindBuffet.Data.Drinks;
+using PointOfSale.DrinkCustomization;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -59,7 +60,10 @@ private void MarkarthMilk_Click(object sender, RoutedEventArgs e)
         /// <param name="e">button pressed</param>
         private void AretinoAppleJuice_Click(object sender, RoutedEventArgs e)
         {
+            var Aj = new AretinoAppleJuice();
+
             this.NavigationService.Navigate(new AretinoApple_Juice());
+
         }
 
         /// <summary>

PointOfSale/MainWindow.xaml

@@ -9,14 +9,16 @@
     <Grid>
         <Border BorderThickness="1" BorderBrush="Black" Margin="0,0,600,0" Background="#FF1E3BD4"/>
         <Image HorizontalAlignment="Left" Height="100" Margin="454,190,0,0" VerticalAlignment="Top" Width="100"/>
-        <Border BorderThickness="1" BorderBrush="Black" Margin="650,0,0,0" Background="#FFE73D28">
+        <Border BorderThickness="1" BorderBrush="Black" Margin="635,0,0,0" Background="#FFE73D28">
             <TextBox Text="Order Details" TextWrapping="Wrap" Margin="29,9,29,639" RenderTransformOrigin="0.551,0.783"/>
         </Border>
         <Button Content="Drinks" HorizontalAlignment="Left" Margin="40,140,0,0" VerticalAlignment="Top" Height="66" Width="120" Click="Button_Click"/>
         <Button x:Name="Entrees" Content="Entrees" HorizontalAlignment="Left" Margin="40,233,0,0" VerticalAlignment="Top" Height="66" Width="120" Click="EntreesClick"/>
         <Button Content="Sides" HorizontalAlignment="Left" Margin="40,342,0,0" VerticalAlignment="Top" Height="66" Width="120" Click="Button_Click_1"/>
         <Image Margin="44,26,644,567" Stretch="Fill" Source="pack://siteoforigin:,,,/buffet.jpg"/>
-        <Frame x:Name="frame" Content="" Width="450" Margin="200,-13,150,-3" NavigationUIVisibility="Hidden" />
+        <Frame x:Name="frame" Content="" Margin="200,-13,165,-3" NavigationUIVisibility="Hidden" />
+        <Button Content="Finish" HorizontalAlignment="Left" Margin="658,574,0,0" VerticalAlignment="Top" Height="66" Width="120" Click="Button_Click"/>
+        <Button Content="Cancel Order" HorizontalAlignment="Left" Margin="658,479,0,0" VerticalAlignment="Top" Height="66" Width="120" Click="Button_Click"/>
 
 
     </Grid>