paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Paul Schneider
2016-12-12 14:30:15 +01:00
parent 4dc4a40988
commit 32eaa116ad
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BookAStar/BookAStar.Droid/Services/GcmListenerService.cs
View File

@ -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<Location>(locationJson);
var cid = long.Parse(data.GetString("Id"));
var clientJson = data.GetString("Client");
var client = JsonConvert.DeserializeObject<ClientProviderInfo>(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);

3
BookAStar/BookAStar/Model/BookQueryData.cs
View File

@ -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; }
}
}