Compare commits
2 commits
8e8c558295
...
7f56afd7e0
| Author | SHA1 | Date | |
|---|---|---|---|
| 7f56afd7e0 | |||
| bed9c8a272 |
15 changed files with 36 additions and 36 deletions
|
|
@ -19,7 +19,7 @@ internal static class PlatformBootstrap
|
||||||
if (System.Threading.Interlocked.Exchange(ref _initialized, 1) != 0)
|
if (System.Threading.Interlocked.Exchange(ref _initialized, 1) != 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Platform.DefaultRedirectUri = Settings.AndroidRedirectUri;
|
Platform.DefaultRedirectUri = ViewModels.Settings.AndroidRedirectUri;
|
||||||
Platform.CreateBrowser = () =>
|
Platform.CreateBrowser = () =>
|
||||||
{
|
{
|
||||||
var activity = MainActivity.Current;
|
var activity = MainActivity.Current;
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ namespace Yavsc.ApiControllers
|
||||||
if (Request.Form.Files.Count!=1)
|
if (Request.Form.Files.Count!=1)
|
||||||
return new BadRequestResult();
|
return new BadRequestResult();
|
||||||
await User.ReceiveProSignatureAsync(billingCode,id,Request.Form.Files[0],"pro");
|
await User.ReceiveProSignatureAsync(billingCode,id,Request.Form.Files[0],"pro");
|
||||||
estimate.ProviderValidationDate = DateTime.Now;
|
estimate.ProviderValidationDate = DateTime.UtcNow;
|
||||||
dbContext.SaveChanges(User.GetUserId());
|
dbContext.SaveChanges(User.GetUserId());
|
||||||
// Notify the client
|
// Notify the client
|
||||||
var locstr = _localizer["EstimationMessageToClient"];
|
var locstr = _localizer["EstimationMessageToClient"];
|
||||||
|
|
@ -163,7 +163,7 @@ namespace Yavsc.ApiControllers
|
||||||
if (Request.Form.Files.Count!=1)
|
if (Request.Form.Files.Count!=1)
|
||||||
return new BadRequestResult();
|
return new BadRequestResult();
|
||||||
await User.ReceiveProSignatureAsync(billingCode,id,Request.Form.Files[0],"cli");
|
await User.ReceiveProSignatureAsync(billingCode,id,Request.Form.Files[0],"cli");
|
||||||
estimate.ClientValidationDate = DateTime.Now;
|
estimate.ClientValidationDate = DateTime.UtcNow;
|
||||||
dbContext.SaveChanges(User.GetUserId());
|
dbContext.SaveChanges(User.GetUserId());
|
||||||
return Ok (new { ClientValidationDate = estimate.ClientValidationDate });
|
return Ok (new { ClientValidationDate = estimate.ClientValidationDate });
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ namespace Yavsc.Controllers
|
||||||
public IEnumerable<RdvQueryProviderInfo> GetCommands(long maxId=long.MaxValue)
|
public IEnumerable<RdvQueryProviderInfo> GetCommands(long maxId=long.MaxValue)
|
||||||
{
|
{
|
||||||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||||
var now = DateTime.Now;
|
var now = DateTime.UtcNow;
|
||||||
|
|
||||||
var result = _context.RdvQueries.Include(c => c.Location).
|
var result = _context.RdvQueries.Include(c => c.Location).
|
||||||
Include(c => c.Client).Where(c => c.PerformerId == uid && c.Id < maxId && c.EventDate > now
|
Include(c => c.Client).Where(c => c.PerformerId == uid && c.Id < maxId && c.EventDate > now
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,7 @@ namespace Yavsc.Controllers
|
||||||
{
|
{
|
||||||
return BadRequest(ModelState);
|
return BadRequest(ModelState);
|
||||||
}
|
}
|
||||||
query.ValidationDate = DateTime.Now;
|
query.ValidationDate = DateTime.UtcNow;
|
||||||
_context.SaveChanges(User.GetUserId());
|
_context.SaveChanges(User.GetUserId());
|
||||||
_context.Entry(query).State = EntityState.Detached;
|
_context.Entry(query).State = EntityState.Detached;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ namespace Yavsc.ApiControllers
|
||||||
|
|
||||||
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
var uid = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||||
|
|
||||||
var now = DateTime.Now;
|
var now = DateTime.UtcNow;
|
||||||
var result = _context.HairCutQueries
|
var result = _context.HairCutQueries
|
||||||
.Include(q => q.Prestation)
|
.Include(q => q.Prestation)
|
||||||
.Include(q => q.Client)
|
.Include(q => q.Client)
|
||||||
|
|
|
||||||
|
|
@ -40,14 +40,14 @@ public class NativeConfidentialController : Controller
|
||||||
_logger.LogError("Invalid model for GCMD");
|
_logger.LogError("Invalid model for GCMD");
|
||||||
return new BadRequestObjectResult(ModelState);
|
return new BadRequestObjectResult(ModelState);
|
||||||
}
|
}
|
||||||
declaration.LatestActivityUpdate = DateTime.Now;
|
declaration.LatestActivityUpdate = DateTime.UtcNow;
|
||||||
|
|
||||||
_logger.LogInformation($"Registering device with id:{declaration.DeviceId} for {uid}");
|
_logger.LogInformation($"Registering device with id:{declaration.DeviceId} for {uid}");
|
||||||
DeviceDeclaration? alreadyRegisteredDevice = _context.DeviceDeclaration.FirstOrDefault(d => d.DeviceId == declaration.DeviceId);
|
DeviceDeclaration? alreadyRegisteredDevice = _context.DeviceDeclaration.FirstOrDefault(d => d.DeviceId == declaration.DeviceId);
|
||||||
var deviceAlreadyRegistered = (alreadyRegisteredDevice!=null);
|
var deviceAlreadyRegistered = (alreadyRegisteredDevice!=null);
|
||||||
if (alreadyRegisteredDevice==null)
|
if (alreadyRegisteredDevice==null)
|
||||||
{
|
{
|
||||||
declaration.DeclarationDate = DateTime.Now;
|
declaration.DeclarationDate = DateTime.UtcNow;
|
||||||
declaration.DeviceOwnerId = uid;
|
declaration.DeviceOwnerId = uid;
|
||||||
_context.DeviceDeclaration.Add(declaration);
|
_context.DeviceDeclaration.Add(declaration);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,7 @@ namespace Yavsc.Controllers
|
||||||
UserName = user.UserName,
|
UserName = user.UserName,
|
||||||
PostsCounter = pc,
|
PostsCounter = pc,
|
||||||
Balance = user.AccountBalance,
|
Balance = user.AccountBalance,
|
||||||
ActiveCommandCount = _dbContext.RdvQueries.Count(x => (x.ClientId == user.Id) && (x.EventDate > DateTime.Now)),
|
ActiveCommandCount = _dbContext.RdvQueries.Count(x => (x.ClientId == user.Id) && (x.EventDate > DateTime.UtcNow)),
|
||||||
HasDedicatedCalendar = !string.IsNullOrEmpty(user.DedicatedGoogleCalendar),
|
HasDedicatedCalendar = !string.IsNullOrEmpty(user.DedicatedGoogleCalendar),
|
||||||
Roles = await _userManager.GetRolesAsync(user),
|
Roles = await _userManager.GetRolesAsync(user),
|
||||||
PostalAddress = user.PostalAddress?.Address,
|
PostalAddress = user.PostalAddress?.Address,
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ namespace Yavsc.Controllers
|
||||||
ViewBag.GoogleSettings = _googleSettings;
|
ViewBag.GoogleSettings = _googleSettings;
|
||||||
var userid = User.GetUserId();
|
var userid = User.GetUserId();
|
||||||
var user = _userManager.FindByIdAsync(userid).Result;
|
var user = _userManager.FindByIdAsync(userid).Result;
|
||||||
return View("Create", new RdvQuery(activityCode, new Location(), DateTime.Now.AddHours(4))
|
return View("Create", new RdvQuery(activityCode, new Location(), DateTime.UtcNow.AddHours(4))
|
||||||
{
|
{
|
||||||
PerformerProfile = pro,
|
PerformerProfile = pro,
|
||||||
PerformerId = pro.PerformerId,
|
PerformerId = pro.PerformerId,
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ namespace Yavsc.Controllers
|
||||||
// FIXME Assert (command.ValidationDate == null)
|
// FIXME Assert (command.ValidationDate == null)
|
||||||
if (command.ValidationDate == null) {
|
if (command.ValidationDate == null) {
|
||||||
paymentOk = true;
|
paymentOk = true;
|
||||||
command.ValidationDate = DateTime.Now;
|
command.ValidationDate = DateTime.UtcNow;
|
||||||
}
|
}
|
||||||
else _logger.LogError
|
else _logger.LogError
|
||||||
("This Command were yet validated, and is now paied one more ...");
|
("This Command were yet validated, and is now paied one more ...");
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,7 @@ namespace Yavsc.Services
|
||||||
if (Channels.TryRemove(roomName, out deadchanInfo))
|
if (Channels.TryRemove(roomName, out deadchanInfo))
|
||||||
{
|
{
|
||||||
var room = _dbContext.ChatRoom.FirstOrDefault(r => r.Name == roomName);
|
var room = _dbContext.ChatRoom.FirstOrDefault(r => r.Name == roomName);
|
||||||
room.LatestJoinPart = DateTime.Now;
|
room.LatestJoinPart = DateTime.UtcNow;
|
||||||
_dbContext.SaveChanges();
|
_dbContext.SaveChanges();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ public class DiskUsageTracker : IDiskUsageTracker
|
||||||
{
|
{
|
||||||
public DUTInfo()
|
public DUTInfo()
|
||||||
{
|
{
|
||||||
Creation = DateTime.Now;
|
Creation = DateTime.UtcNow;
|
||||||
}
|
}
|
||||||
public long Usage { get; set; }
|
public long Usage { get; set; }
|
||||||
public long Quota { get; set; }
|
public long Quota { get; set; }
|
||||||
|
|
@ -46,7 +46,7 @@ public class DiskUsageTracker : IDiskUsageTracker
|
||||||
if (DiskUsage.Count > ulistLength)
|
if (DiskUsage.Count > ulistLength)
|
||||||
{
|
{
|
||||||
// remove the oldest
|
// remove the oldest
|
||||||
var oldestts = DateTime.Now;
|
var oldestts = DateTime.UtcNow;
|
||||||
DUTInfo oinfo = null;
|
DUTInfo oinfo = null;
|
||||||
string ouname = null;
|
string ouname = null;
|
||||||
foreach (var diskusage in DiskUsage)
|
foreach (var diskusage in DiskUsage)
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ namespace Yavsc.ViewComponents
|
||||||
string htmlFieldName,
|
string htmlFieldName,
|
||||||
string calId )
|
string calId )
|
||||||
{
|
{
|
||||||
var minDate = DateTime.Now;
|
var minDate = DateTime.UtcNow;
|
||||||
var maxDate = minDate.AddDays(20);
|
var maxDate = minDate.AddDays(20);
|
||||||
|
|
||||||
var model = await _manager.CreateViewModelAsync(
|
var model = await _manager.CreateViewModelAsync(
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ namespace Yavsc.Server.Helpers
|
||||||
string WRPostMultipart(string url, Dictionary<string, object> parameters, string authorizationHeader = null)
|
string WRPostMultipart(string url, Dictionary<string, object> parameters, string authorizationHeader = null)
|
||||||
{
|
{
|
||||||
|
|
||||||
string boundary = "---------------------------" + DateTime.Now.Ticks.ToString("x");
|
string boundary = "---------------------------" + DateTime.UtcNow.Ticks.ToString("x");
|
||||||
byte[] boundaryBytes = System.Text.Encoding.ASCII.GetBytes("\r\n--" + boundary + "\r\n");
|
byte[] boundaryBytes = System.Text.Encoding.ASCII.GetBytes("\r\n--" + boundary + "\r\n");
|
||||||
|
|
||||||
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
|
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
|
||||||
|
|
|
||||||
|
|
@ -204,7 +204,7 @@ namespace Yavsc.Server.Hubs
|
||||||
// TODO get and require some admin status for current user on this channel
|
// TODO get and require some admin status for current user on this channel
|
||||||
newRoom.Topic = channelInfo.Topic;
|
newRoom.Topic = channelInfo.Topic;
|
||||||
}
|
}
|
||||||
newRoom.LatestJoinPart = DateTime.Now;
|
newRoom.LatestJoinPart = DateTime.UtcNow;
|
||||||
|
|
||||||
_dbContext.ChatRoom.Add(newRoom);
|
_dbContext.ChatRoom.Add(newRoom);
|
||||||
_dbContext.SaveChanges(user.Id);
|
_dbContext.SaveChanges(user.Id);
|
||||||
|
|
|
||||||
|
|
@ -299,7 +299,7 @@ namespace Yavsc.Models
|
||||||
public DbSet<MusicLoverSettings> MusicLoverSettings { get; set; }
|
public DbSet<MusicLoverSettings> MusicLoverSettings { get; set; }
|
||||||
public DbSet<CoWorking> CoWorking { get; set; }
|
public DbSet<CoWorking> CoWorking { get; set; }
|
||||||
|
|
||||||
private void AddTimestamps(string userId)
|
private void AddTimestamps(string userId)
|
||||||
{ var entities =
|
{ var entities =
|
||||||
ChangeTracker.Entries()
|
ChangeTracker.Entries()
|
||||||
.Where(x => x.Entity.GetType().GetInterface(nameof(ITrackedEntity)) != null
|
.Where(x => x.Entity.GetType().GetInterface(nameof(ITrackedEntity)) != null
|
||||||
|
|
@ -310,11 +310,11 @@ namespace Yavsc.Models
|
||||||
{
|
{
|
||||||
if (entity.State == EntityState.Added)
|
if (entity.State == EntityState.Added)
|
||||||
{
|
{
|
||||||
((ITrackedEntity)entity.Entity).DateCreated = DateTime.Now;
|
((ITrackedEntity)entity.Entity).DateCreated = DateTime.UtcNow;
|
||||||
((ITrackedEntity)entity.Entity).UserCreated = userId;
|
((ITrackedEntity)entity.Entity).UserCreated = userId;
|
||||||
}
|
}
|
||||||
|
|
||||||
((ITrackedEntity)entity.Entity).DateModified = DateTime.Now;
|
((ITrackedEntity)entity.Entity).DateModified = DateTime.UtcNow;
|
||||||
((ITrackedEntity)entity.Entity).UserModified = userId;
|
((ITrackedEntity)entity.Entity).UserModified = userId;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue