This commit is contained in:
2021-11-04 23:52:28 +00:00
parent a899d880c2
commit 384365af8b
11 changed files with 17 additions and 13 deletions

2
.vscode/launch.json vendored
View File

@@ -55,7 +55,7 @@
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
"AYANOVA_SERVER_TEST_MODE": "false",
"AYANOVA_SERVER_TEST_MODE": "true",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin\\"

View File

@@ -387,8 +387,8 @@ namespace AyaNova.Biz
using (var dr = await command.ExecuteReaderAsync())
if (await dr.ReadAsync())
{
o.LastCompletedWorkOrderViz = dr.GetInt64(0);
o.LastCompletedServiceDateViz = dr.GetDateTime(1);
o.LastWorkOrderViz = dr.GetInt64(0);
o.LastServiceDateViz = dr.GetDateTime(1);
}
await ct.Database.CloseConnectionAsync();

View File

@@ -291,7 +291,7 @@ namespace AyaNova.Biz
{
o.CustomerViz = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => x.Name).FirstOrDefaultAsync();
if (o.UnitModelId != null)
o.UnitModelViz = await ct.UnitModel.AsNoTracking().Where(x => x.Id == o.UnitModelId).Select(x => x.Name).FirstOrDefaultAsync();
o.UnitModelNameViz = await ct.UnitModel.AsNoTracking().Where(x => x.Id == o.UnitModelId).Select(x => x.Name).FirstOrDefaultAsync();
if (o.ParentUnitId != null)
o.ParentUnitViz = await ct.Unit.AsNoTracking().Where(x => x.Id == o.ParentUnitId).Select(x => x.Serial).FirstOrDefaultAsync();
@@ -335,8 +335,8 @@ namespace AyaNova.Biz
using (var dr = await command.ExecuteReaderAsync())
if (await dr.ReadAsync())
{
o.LastCompletedWorkOrderViz = dr.GetInt64(0);
o.LastCompletedServiceDateViz = dr.GetDateTime(1);
o.LastWorkOrderViz = dr.GetInt64(0);
o.LastServiceDateViz = dr.GetDateTime(1);
}
await ct.Database.CloseConnectionAsync();

View File

@@ -40,9 +40,9 @@ namespace AyaNova.Models
public string ContractViz { get; set; }
public DateTime? ContractExpires { get; set; }
[NotMapped]
public long? LastCompletedWorkOrderViz { get; set; }
public long? LastWorkOrderViz { get; set; }
[NotMapped]
public DateTime? LastCompletedServiceDateViz { get; set; }
public DateTime? LastServiceDateViz { get; set; }
public string Phone1 { get; set; }
public string Phone2 { get; set; }
public string Phone3 { get; set; }

View File

@@ -32,7 +32,7 @@ namespace AyaNova.Models
public string ParentUnitViz { get; set; }
public long? UnitModelId { get; set; }
[NotMapped]
public string UnitModelViz { get; set; }
public string UnitModelNameViz { get; set; }
public bool UnitHasOwnAddress { get; set; }
public bool BoughtHere { get; set; }
public long? PurchasedFromVendorId { get; set; }
@@ -60,9 +60,9 @@ namespace AyaNova.Models
public DateTime? LastMeterDateViz { get; set; }
[NotMapped]
public long? LastCompletedWorkOrderViz { get; set; }
public long? LastWorkOrderViz { get; set; }
[NotMapped]
public DateTime? LastCompletedServiceDateViz { get; set; }
public DateTime? LastServiceDateViz { get; set; }
[NotMapped]
public string LastMeterNotesViz { get; set; }

File diff suppressed because one or more lines are too long

View File

@@ -5,7 +5,7 @@ namespace AyaNova.Util
/// </summary>
internal static class AyaNovaVersion
{
public const string VersionString = "8.0.0-alpha.135";
public const string VersionString = "8.0.0-alpha.137";
public const string FullNameAndVersion = "AyaNova server " + VersionString;
}//eoc
}//eons