From 867e2d502de0cb24a68cd982e8407f4bb6de6a62 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sun, 18 Sep 2016 00:30:15 +0200 Subject: [PATCH] WIP estimate --- BookAStar/BookAStar/BookAStar.csproj | 10 +++ BookAStar/BookAStar/Model/BookQueryData.cs | 18 +++-- BookAStar/BookAStar/Pages/BookQueryPage.xaml | 8 ++- .../BookAStar/Pages/BookQueryPage.xaml.cs | 72 ++++++++++--------- .../BookAStar/Pages/MakeAnEstimatePage.xaml | 3 +- .../Pages/MakeAnEstimatePage.xaml.cs | 15 ++-- 6 files changed, 80 insertions(+), 46 deletions(-) diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj index 21bc8cc7..45bd3104 100644 --- a/BookAStar/BookAStar/BookAStar.csproj +++ b/BookAStar/BookAStar/BookAStar.csproj @@ -39,7 +39,11 @@ App.xaml + + + BookQueriesPage.xaml + BookQueryPage.xaml @@ -212,6 +216,12 @@ Designer + + + MSBuild:UpdateDesignTimeXaml + Designer + + diff --git a/BookAStar/BookAStar/Model/BookQueryData.cs b/BookAStar/BookAStar/Model/BookQueryData.cs index f12268b7..c413dc16 100644 --- a/BookAStar/BookAStar/Model/BookQueryData.cs +++ b/BookAStar/BookAStar/Model/BookQueryData.cs @@ -3,14 +3,18 @@ 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 string Title { get; set; } - public string Description { set; get; } - public string Comment { get; set; } - public long CommandId { get; set; } - public DateTime StartDate { get; set; } - public DateTime EndDate { get; set; } - public Location Address { get; set; } + public ClientProviderInfo Client { get; set; } + public Location Location { get; set; } + public long Id { get; set; } + public DateTime EventDate { get; set; } + public decimal? Previsionnal { get; set; } } } diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml b/BookAStar/BookAStar/Pages/BookQueryPage.xaml index 1a60295b..9067855d 100644 --- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml +++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml @@ -1,15 +1,19 @@  + xmlns:maps="clr-namespace:Xamarin.Forms.Maps;assembly=Xamarin.Forms.Maps.dll" + x:Class="BookAStar.Pages.BookQueryPage"> + +