WIP

BookAStar/BookAStar/Model/Auth/User.cs

@@ -1,11 +1,12 @@
-using System;
+using BookAStar.Helpers;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
+using Xamarin.Forms;
 
 namespace BookAStar.Model.Auth.Account
 { 
@@ -79,6 +80,13 @@ namespace BookAStar.Model.Auth.Account
                 OnPropertyChanged("Avatar");
             }
         }
+        public ImageSource AvatarSource
+        {
+            get
+            {
+                return UserHelpers.Avatar(avatar);
+            }
+        }
         private Tokens yavscTokens;
         public Tokens YavscTokens
         {

BookAStar/BookAStar/Model/BookQueryData.cs

@@ -1,9 +1,10 @@
-using BookAStar.Model.Social;
+using BookAStar.Interfaces;
+using BookAStar.Model.Social;
 using System;
 
 namespace BookAStar.Model
 {
-    public class BookQueryData
+    public class BookQueryData : IBookQueryData
     {
         public ClientProviderInfo Client { get; set; }
         public Location Location { get; set; }

BookAStar/BookAStar/Model/ClientProviderInfo.cs

@@ -1,4 +1,5 @@
-using BookAStar.Model.Social;
+using BookAStar.Helpers;
+using BookAStar.Model.Social;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,18 +14,18 @@ namespace BookAStar.Model
         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; }
+        // TODO Get User Professional status existence as a boolean
+        // And hack the avatar with
         public ImageSource AvatarOrNot
         {
             get
             {
-                return Avatar ?? ImageSource.FromResource("BookAStar.icon-anon.png");
+                return UserHelpers.Avatar(Avatar);
             }
         }
     }

BookAStar/BookAStar/Model/Workflow/BillingLine.cs

@@ -1,13 +1,14 @@
 
+using BookAStar.Interfaces;
 using System;
 
 namespace BookAStar.Model.Workflow
 {
-    public class CommandLine
+    public class BillingLine : IBillingLine
     {
         public string Description { get; set; }
         public TimeSpan Duration { get; set; }
-        public int Count { get; set; }
+        public int Count { get; set; } = 1;
         public decimal UnitaryCost { get; set; }
     }
 }

BookAStar/BookAStar/Model/Workflow/Estimate.cs

@@ -1,4 +1,5 @@
 using BookAStar.Helpers;
+using BookAStar.Model.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +8,7 @@ using Xamarin.Forms;
 
 namespace BookAStar.Model.Workflow
 {
-    public partial class Estimate
+    public partial class Estimate : IEstimate
     {
         public long Id { get; set; }
         public long? CommandId { get; set; }
@@ -16,7 +17,7 @@ namespace BookAStar.Model.Workflow
         public string Description { get; set; }
         public int? Status { get; set; }
         public string Title { get; set; }
-        public List<CommandLine> Bill { get; set; }
+        public List<BillingLine> Bill { get; set; }
         /// <summary>
         /// List of attached graphic files
         /// to this estimate, as relative pathes to