WIP

BookAStar/BookAStar/Model/BookQueryData.cs

@@ -3,12 +3,6 @@ using System;
 
 namespace BookAStar.Model
 {
-    public class ClientProviderInfo
-    {
-        public string UserName { get; set; }
-        public string UserId { get; set;  }
-        public int Rate { get; set; }
-    }
     public class BookQueryData
     {
         public ClientProviderInfo Client { get; set; }

BookAStar/BookAStar/Model/ClientProviderInfo.cs

@@ -0,0 +1,23 @@
+using BookAStar.Model.Social;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BookAStar.Model
+{
+    public class ClientProviderInfo
+    {
+        public string UserName { get; set; }
+        
+        public string Avatar { get; set; }
+        // private string avatar;
+        //  public string Avatar { get { return avatar ?? "icon-anon.png"; }  set { avatar = value; } }
+        public string UserId { get; set; }
+        public int Rate { get; set; }
+        public string EMail { get; set; }
+        public string Phone { get; set; }
+        public Location BillingAddress { get; set; }
+    }
+}

BookAStar/BookAStar/Model/Manager.cs

@@ -5,17 +5,14 @@ using System.Collections.ObjectModel;
 using System.Windows.Input;
 
 namespace BookAStar
-{
-
-   
-   
-
-       
+{      
+    [Obsolete("Use Helpers.DataManager")]
     public static class Manager
 	{
 	    static Manager ()
 		{
 		}
+
         public static ICommand RefreshBookQueries;
         // TODO WIP TEST rop this
         private static Location[] _places = new Location[] {

BookAStar/BookAStar/Model/Social/Location.cs

@@ -27,18 +27,16 @@ namespace BookAStar.Model.Social
     }
 
 
-    public class Location : Position {
-             
+    public class Location : Position
+    {
+
         public long Id { get; set; }
         public string Address { get; set; }
 
     }
 
-    public class  LocalizedEvent : YaEvent
+    public class LocalizedEvent : YaEvent
     {
-       
-
         public Location Location { get; set; }
-
-        }
+    }
 }

BookAStar/BookAStar/Model/Workflow/Estimate.cs

@@ -1,13 +1,17 @@
-using System.Collections.Generic;
+using BookAStar.Helpers;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace BookAStar.Model.Workflow
 {
     public partial class Estimate
     {
         public long Id { get; set; }
-        
         public long? CommandId { get; set; }
+        public string CommandType { get; set; }
+        // Markdown expected
         public string Description { get; set; }
         public int? Status { get; set; }
         public string Title { get; set; }
@@ -23,7 +27,7 @@ namespace BookAStar.Model.Workflow
 
         public string AttachedGraphicsString
         {
-            get { return string.Join(":", AttachedGraphicList); }
+            get { return AttachedGraphicList==null?null:string.Join(":", AttachedGraphicList); }
             set { AttachedGraphicList = value.Split(':').ToList(); }
         }
         /// <summary>
@@ -36,12 +40,32 @@ namespace BookAStar.Model.Workflow
         public List<string> AttachedFiles { get; set; }
         public string AttachedFilesString
         {
-            get { return string.Join(":", AttachedFiles); }
+            get { return AttachedFiles == null ? null : string.Join(":", AttachedFiles); }
             set { AttachedFiles = value.Split(':').ToList(); }
         }
         
         public string OwnerId { get; set; }
         
         public string ClientId { get; set; }
+        
+        public BookQueryData Query
+        {
+            get
+            {
+                if (CommandId.HasValue)
+                {
+                    return DataManager.Current.BookQueries.LocalGet(CommandId.Value);
+                }
+                return null;
+            }
+        }
+
+        public ClientProviderInfo Client
+        {
+            get
+            {
+                return DataManager.Current.Contacts.LocalGet(ClientId);
+            }
+        }
     }
 }