This commit is contained in:
2018-12-10 17:25:13 +00:00
parent f01fe2e458
commit 221f8f8091
4 changed files with 18 additions and 4 deletions

View File

@@ -355,11 +355,12 @@ namespace AyaNova
var ct = context.RequestServices.GetService<AyContext>();
//get the user record
var u = ct.User.AsNoTracking().Where(a => a.Id == userId).Select(m => new { roles = m.Roles, name = m.Name, id = m.Id, localeId = m.LocaleId }).First();
var u = ct.User.AsNoTracking().Where(a => a.Id == userId).Select(m => new { roles = m.Roles, name = m.Name, id = m.Id, localeId = m.LocaleId, tzOffset = m.UserOptions.TimeZoneOffset }).First();
context.Request.HttpContext.Items["AY_ROLES"] = u.roles;
context.Request.HttpContext.Items["AY_USERNAME"] = u.name;
context.Request.HttpContext.Items["AY_USER_ID"] = u.id;
context.Request.HttpContext.Items["AY_LOCALE_ID"] = u.localeId;
context.Request.HttpContext.Items["AY_USER_TZ_OFFSET"] = u.tzOffset;

View File

@@ -9,7 +9,7 @@ namespace AyaNova.Biz
public static class FilterSqlCriteriaBuilder
{
//"SELECT *, xmin FROM AWIDGET name Like 'BoolDataFilterTest%' AND active = true AND "
public static string DataFilterToSQLCriteria(AyaNova.Models.DataFilter dataFilter, FilterOptions filterOptions)
public static string DataFilterToSQLCriteria(AyaNova.Models.DataFilter dataFilter, FilterOptions filterOptions, decimal timeZoneOffset)
{
if (string.IsNullOrWhiteSpace(dataFilter.Filter))
@@ -38,7 +38,7 @@ namespace AyaNova.Biz
var dataType = filterOptions.Flds.Find(x => x.Fld == fld).Type;
sb.Append(DataFilterToColumnCriteria(fld, dataType, opType, val, tagList));
sb.Append(DataFilterToColumnCriteria(fld, dataType, opType, val, tagList, timeZoneOffset));
if (i < FilterArray.Count - 1)
{
sb.Append(" AND ");
@@ -51,7 +51,7 @@ namespace AyaNova.Biz
/// <summary>
/// Translate DataFilter to Postgres friendly SQL criteria
/// </summary>
private static string DataFilterToColumnCriteria(string sColumn, string sDataType, string sOperator, string sValue, List<string> sTags)//, bool IsCompound)
private static string DataFilterToColumnCriteria(string sColumn, string sDataType, string sOperator, string sValue, List<string> sTags, decimal timeZoneOffset)//, bool IsCompound)
{
bool TagFilter = sTags.Count < 0;
StringBuilder sb = new StringBuilder();

View File

@@ -16,6 +16,12 @@ namespace AyaNova.Models
//-------------
[EmailAddress]
public string EmailAddress { get; set; }
/// <summary>
/// As of today Dec 10 2018 all time zones in the world are either on the hour, half hour or 45 minute mark from utc so
/// keeping this value as decimal hours for back compatibility with v7 and easier for user to enter
/// 8.5 for 8:30 time difference or 12.75 for 12:45 time differnce for example
/// </summary>
/// <value></value>
public decimal TimeZoneOffset { get; set; }
public int UiColor { get; set; }