diff --git a/BookAStar/BookAStar.Droid/Services/GcmListenerService.cs b/BookAStar/BookAStar.Droid/Services/GcmListenerService.cs index 148fbdd5..98a21fc8 100644 --- a/BookAStar/BookAStar.Droid/Services/GcmListenerService.cs +++ b/BookAStar/BookAStar.Droid/Services/GcmListenerService.cs @@ -44,19 +44,21 @@ namespace BookAStar.Droid.Services if (topic == "BookQuery") { DateTime eventdate; - var sdatestr = data.GetString("EventDate"); DateTime.TryParse(sdatestr, out eventdate); var locationJson = data.GetString("Location"); var location = JsonConvert.DeserializeObject(locationJson); var cid = long.Parse(data.GetString("Id")); + var clientJson = data.GetString("Client"); + var client = JsonConvert.DeserializeObject(clientJson); var bq = new BookQueryData { Id = cid, - Location = location + Location = location, + Client = client, + Reason = data.GetString("Reason") }; - SendBookQueryNotification(bq); } else @@ -89,7 +91,7 @@ namespace BookAStar.Droid.Services var multiple = count > 1; var title = multiple ? $"{count} demandes" : bquery.Client.UserName; - var message = $"{bquery.EventDate} {bquery.Client.UserName} {bquery.Location.Address}"; + var message = $"{bquery.EventDate} {bquery.Client.UserName} {bquery.Location.Address}\n {bquery.Reason}"; var intent = new Intent(this, typeof(MainActivity)); intent.AddFlags(ActivityFlags.ClearTop); diff --git a/BookAStar/BookAStar/Model/BookQueryData.cs b/BookAStar/BookAStar/Model/BookQueryData.cs index 6f5ee97b..eb10dc88 100644 --- a/BookAStar/BookAStar/Model/BookQueryData.cs +++ b/BookAStar/BookAStar/Model/BookQueryData.cs @@ -4,12 +4,13 @@ using System; namespace BookAStar.Model { - public class BookQueryData : IBookQueryData + public class BookQueryData { 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; } + public string Reason { get; set; } } }