Updated the Json Parser

added attributes field

Author: gmich

OrderManagerPrototype/OrderManagerPrototype.v12.suo

@@ -10,10 +10,11 @@ public Order()
             Products = new List<Product>();
         }
 
-        public Order(int orderID,string tableNumber,string dateTime,List<Product> products)
+        public Order(int orderID,string tableNumber,string dateTime,List<Product> products,double totalPrice)
         {
            Products = new List<Product>();
             this.TableNumber = tableNumber;
+            this.TotalPrice = totalPrice;
             this.DateTime = dateTime;
             this.Products = products;
             this.OrderID = orderID;
@@ -41,15 +42,8 @@ public string DateTime
 
         public double TotalPrice
         {
-            get
-            {
-                double price =0;
-                foreach (Product product in Products)
-                    price += product.Price;
-
-                return price;
-            }
-            
+            get;
+            set;
         }
 
         public List<Product> Products

OrderManagerPrototype/OrderManagerPrototype/Model/Order.cs

@@ -11,12 +11,13 @@ public class Product
 
         #region Public Constructors
 
-        public Product(string name,double price,string notes,int quantity)
+        public Product(string name,double price,string notes,int quantity,string attributes=" ")
         {
             this.Name = name;
             this.Price = price;
             this.Notes = notes;
             this.Quantity = quantity;
+            this.Attributes = attributes;
         }
 
         public Product()
@@ -65,6 +66,13 @@ public int Quantity
             set;
         }
 
+        [JsonProperty("attributes")]
+        public string Attributes
+        {
+            get;
+            set;
+        }
+
         static public int Fields
         {
             get
@@ -75,6 +83,21 @@ static public int Fields
 
         #endregion
 
+        #region Public Helper Properties
+
+        public String Title
+        {
+            get
+            {
+                if (Attributes != null)
+                    return (this.Name + " " + Attributes.Replace("-", " ") + "x" + Quantity);
+                else
+                    return (this.Name + " x" + Quantity);
+            }
+        }
+
+        #endregion
+
         #region Override Equality
 
         public override bool Equals(Object obj)

OrderManagerPrototype/OrderManagerPrototype/Model/Product.cs

@@ -79,7 +79,7 @@ int TableNumberHeight
 
         int TotalPriceWidth
         {
-            get { return 90; }
+            get { return 100; }
         }
 
         int TotalPriceHeight
@@ -246,9 +246,9 @@ void InitializeViewboxesAndLabels(Product product)
             CurrentHeight += ProductFieldHeight;
 
             Label productNameLabel = new Label();
-            productNameLabel.Width = BorderWidth / 4;
+            productNameLabel.Width = product.Title.Length * 10 + 1;
             productNameLabel.FontWeight = FontWeights.Bold;
-            productNameLabel.Content = product.Name + " x" + product.Quantity;
+            productNameLabel.Content = product.Title;
             productViewbox.Child = productNameLabel;
             this.wrapPanel.Children.Add(productViewbox);
 

OrderManagerPrototype/OrderManagerPrototype/Templates/DynamicVisualTemplate.cs

@@ -61,12 +61,13 @@ public MainWindow()
 
         }
 
+        //Add mock product
         private void Button_Click(object sender, System.Windows.RoutedEventArgs e)
         {
             List<Product> products =  new List<Product>();
-            products.Add(new Product("name",1.1,"notes",2));
+            products.Add(new Product("name",1.1,"notes",2,"attribute-at"));
             products.Add(new Product("name2", 1.12, "this is a really really long message",1));
-            DynamicVisualTemplate mock1 = new DynamicVisualTemplate(new Order(1,"1","16.00 - 1/1/2006",products));
+            DynamicVisualTemplate mock1 = new DynamicVisualTemplate(new Order(1,"1","16.00 - 1/1/2006",products,10));
 			mock1.removeEvent+=removeOrderEvent;
 			this.InboxView.Items.Add(mock1.OrderTemplate);
 			this.InboxCounter.Content=this.InboxView.Items.Count;
@@ -79,7 +80,7 @@ private void InboxView_MouseRightButtonUp(object sender, System.Windows.Input.Mo
 
 		#region Handle Events
 
-     		//TODO: review remove algorithm
+     	//TODO: review remove algorithm
 	    void removeOrderEvent(object sender, EventArgs e)
         {
 			OrderEventArgs eventArgs = (OrderEventArgs)e;

OrderManagerPrototype/OrderManagerPrototype/UI/MainWindow.xaml.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Threading;
 
 namespace OrderManagerPrototype.Updater
 {
@@ -31,22 +32,31 @@ public static JObject GetJson(string url)
             }
         }
 
-        public static void NotifyWebService(int id,string uript1 = "http://snf-185147.vm.okeanos.grnet.gr:8080/qorderws/orders/order/", string uript2 = "/order?status=ACCEPTED")
+        public static void NotifyWebService(int id, string uript1 = "http://snf-185147.vm.okeanos.grnet.gr:8080/qorderws/orders/order/", string uript2 = "/order?status=ACCEPTED")
         {
-            try
+            using (var wb = new WebClient())
             {
-                using (var wb = new WebClient())
+                Console.WriteLine("Notified " + id);
+                Byte[] bytes = new byte[] { 0x20 };
+                Thread notifierThread = new Thread(
+                o =>
                 {
-                    Console.WriteLine("Notified " +id);
-                    Byte[] bytes = new byte[] { 0x20};
-                    var response = wb.UploadData(uript1 + id + uript2, "POST", bytes);
-                }
-            }catch(Exception ex)
-            {
-                Console.WriteLine(ex.Message);
+                    try
+                    {
+                        var response = wb.UploadData(uript1 + id + uript2, "POST", bytes);
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine(ex.Message);
+                    }
+                });
+                notifierThread.IsBackground = true;
+                notifierThread.Start();
             }
         }
 
+        
+
         public static List<Order> GetOrderList(string url)
         {
 
@@ -71,7 +81,7 @@ public static List<Order> GetOrderList(string url)
 
                     orderitem.TableNumber = (string)orderArrayItem["tableNumber"];
                     orderitem.DateTime = (string)orderArrayItem["dateTime"];
-                    //orderitem.TotalPrice = (double)orderArrayItem["totalPrice"];
+                    orderitem.TotalPrice = (double)orderArrayItem["totalPrice"];
                     JArray orders = (JArray)orderArrayItem["orderedProducts"];
 
                     foreach (JObject order in orders)
@@ -81,6 +91,7 @@ public static List<Order> GetOrderList(string url)
                         JObject orderDTO = (JObject)order["productDTO"];
                         product.Name = (string)orderDTO["name"];
                         product.Price = (double)orderDTO["price"];
+                        product.Attributes = (string)order["attributes"];
                         product.Quantity = (int)order["quantity"];
                         product.Notes = (string)order["notes"];
                         productList.Add(product);