admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CHECKPOINT COMMIT - POST SERVICE BANK REMOVAL

Browse Source 
Service bank feature removed from front, back and e2e testing
mostly commented out in case need to add back again but in some places such as db schema it had to be removed entirely
so refer here if adding back in again
This commit is contained in:
John Cardinal
2021-06-04 22:23:21 +00:00
parent c936ff5e3e
commit 59fd41d8d0
27 changed files with 756 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -53,7 +53,7 @@
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "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_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"

3
docs/8.0/ayanova/docs/acc-service-banks.md
View File

@@ -1,3 +0,0 @@
# SERVICE BANK Placeholder
[Under construction]

1
docs/8.0/ayanova/docs/home-notify-subscriptions.md
View File

@@ -83,7 +83,6 @@ There are no settings adjustable for in app General notifications, however Users
| CSR Rejected | Customer service request rejected. (intended for Customer users) | | CSR Rejected | Customer service request rejected. (intended for Customer users) |
| QuoteStatusChange | Any *change* of Quote Status including from no status (new) to a *specific* selected status ID value | | QuoteStatusChange | Any *change* of Quote Status including from no status (new) to a *specific* selected status ID value |
| ObjectAge | Any object, Age (conditional on AgeValue) after creation event of any object of selected specific type and optionally selected tags | | ObjectAge | Any object, Age (conditional on AgeValue) after creation event of any object of selected specific type and optionally selected tags |
| ServiceBankDepleted | Service bank has run out and balance is within selected advance notice level |
| ReminderImminent | A Reminder in AyaNova is about to reach it's specified date/time | | ReminderImminent | A Reminder in AyaNova is about to reach it's specified date/time |
| ScheduledOnWorkorder | User is scheduled on (added to) a Work order | | ScheduledOnWorkorder | User is scheduled on (added to) a Work order |
| ScheduledOnWorkorderImminent | Scheduled date and time reached for workorder which User is scheduled | | ScheduledOnWorkorderImminent | Scheduled date and time reached for workorder which User is scheduled |

4
server/AyaNova/Controllers/EnumListController.cs
View File

@@ -384,7 +384,7 @@ namespace AyaNova.Api.Controllers
TranslationKeysToFetch.Add("NotifyEventQuoteStatusChange"); TranslationKeysToFetch.Add("NotifyEventQuoteStatusChange");
TranslationKeysToFetch.Add("NotifyEventQuoteStatusAge"); TranslationKeysToFetch.Add("NotifyEventQuoteStatusAge");
TranslationKeysToFetch.Add("NotifyEventObjectAge"); TranslationKeysToFetch.Add("NotifyEventObjectAge");
TranslationKeysToFetch.Add("NotifyEventServiceBankDepleted"); // TranslationKeysToFetch.Add("NotifyEventServiceBankDepleted");
TranslationKeysToFetch.Add("NotifyEventReminderImminent"); TranslationKeysToFetch.Add("NotifyEventReminderImminent");
TranslationKeysToFetch.Add("NotifyEventScheduledOnWorkorder"); TranslationKeysToFetch.Add("NotifyEventScheduledOnWorkorder");
TranslationKeysToFetch.Add("NotifyEventScheduledOnWorkorderImminent"); TranslationKeysToFetch.Add("NotifyEventScheduledOnWorkorderImminent");
@@ -419,7 +419,7 @@ namespace AyaNova.Api.Controllers
ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventQuoteStatusChange"], Id = (long)NotifyEventType.QuoteStatusChange }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventQuoteStatusChange"], Id = (long)NotifyEventType.QuoteStatusChange });
ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventQuoteStatusAge"], Id = (long)NotifyEventType.QuoteStatusAge }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventQuoteStatusAge"], Id = (long)NotifyEventType.QuoteStatusAge });
ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventObjectAge"], Id = (long)NotifyEventType.ObjectAge }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventObjectAge"], Id = (long)NotifyEventType.ObjectAge });
ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventServiceBankDepleted"], Id = (long)NotifyEventType.ServiceBankDepleted }); // ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventServiceBankDepleted"], Id = (long)NotifyEventType.ServiceBankDepleted });
ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventReminderImminent"], Id = (long)NotifyEventType.ReminderImminent }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventReminderImminent"], Id = (long)NotifyEventType.ReminderImminent });
ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventScheduledOnWorkorder"], Id = (long)NotifyEventType.ScheduledOnWorkorder }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventScheduledOnWorkorder"], Id = (long)NotifyEventType.ScheduledOnWorkorder });
ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventScheduledOnWorkorderImminent"], Id = (long)NotifyEventType.ScheduledOnWorkorderImminent }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventScheduledOnWorkorderImminent"], Id = (long)NotifyEventType.ScheduledOnWorkorderImminent });

204
server/AyaNova/Controllers/ServiceBankController.cs
View File

@@ -1,116 +1,116 @@
using System.Threading.Tasks; // using System.Threading.Tasks;
using Microsoft.AspNetCore.Http; // using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; // using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing; // using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.Authorization; // using Microsoft.AspNetCore.Authorization;
using Microsoft.Extensions.Logging; // using Microsoft.Extensions.Logging;
using AyaNova.Models; // using AyaNova.Models;
using AyaNova.Api.ControllerHelpers; // using AyaNova.Api.ControllerHelpers;
using AyaNova.Biz; // using AyaNova.Biz;
namespace AyaNova.Api.Controllers // namespace AyaNova.Api.Controllers
{ // {
[ApiController] // [ApiController]
[ApiVersion("8.0")] // [ApiVersion("8.0")]
[Route("api/v{version:apiVersion}/service-bank")] // [Route("api/v{version:apiVersion}/service-bank")]
[Produces("application/json")] // [Produces("application/json")]
[Authorize] // [Authorize]
public class ServiceBankController : ControllerBase // public class ServiceBankController : ControllerBase
{ // {
private readonly AyContext ct; // private readonly AyContext ct;
private readonly ILogger<ServiceBankController> log; // private readonly ILogger<ServiceBankController> log;
private readonly ApiServerState serverState; // private readonly ApiServerState serverState;
/// <summary> // /// <summary>
/// ctor // /// ctor
/// </summary> // /// </summary>
/// <param name="dbcontext"></param> // /// <param name="dbcontext"></param>
/// <param name="logger"></param> // /// <param name="logger"></param>
/// <param name="apiServerState"></param> // /// <param name="apiServerState"></param>
public ServiceBankController(AyContext dbcontext, ILogger<ServiceBankController> logger, ApiServerState apiServerState) // public ServiceBankController(AyContext dbcontext, ILogger<ServiceBankController> logger, ApiServerState apiServerState)
{ // {
ct = dbcontext; // ct = dbcontext;
log = logger; // log = logger;
serverState = apiServerState; // serverState = apiServerState;
} // }
/// <summary> // /// <summary>
/// Create ServiceBank // /// Create ServiceBank
/// (This object is create / get only, there is no update or delete only adjustments through new entries) // /// (This object is create / get only, there is no update or delete only adjustments through new entries)
/// </summary> // /// </summary>
/// <param name="newObject"></param> // /// <param name="newObject"></param>
/// <param name="apiVersion">From route path</param> // /// <param name="apiVersion">From route path</param>
/// <returns></returns> // /// <returns></returns>
[HttpPost] // [HttpPost]
public async Task<IActionResult> PostServiceBank([FromBody] dtServiceBank newObject, ApiVersion apiVersion) // public async Task<IActionResult> PostServiceBank([FromBody] dtServiceBank newObject, ApiVersion apiVersion)
{ // {
if (!serverState.IsOpen) // if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
ServiceBankBiz biz = ServiceBankBiz.GetBiz(ct, HttpContext); // ServiceBankBiz biz = ServiceBankBiz.GetBiz(ct, HttpContext);
if (!Authorized.HasCreateRole(HttpContext.Items, biz.BizType)) // if (!Authorized.HasCreateRole(HttpContext.Items, biz.BizType))
return StatusCode(403, new ApiNotAuthorizedResponse()); // return StatusCode(403, new ApiNotAuthorizedResponse());
if (!ModelState.IsValid) // if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState)); // return BadRequest(new ApiErrorResponse(ModelState));
ServiceBank o = await biz.CreateAsync(newObject); // ServiceBank o = await biz.CreateAsync(newObject);
if (o == null) // if (o == null)
return BadRequest(new ApiErrorResponse(biz.Errors)); // return BadRequest(new ApiErrorResponse(biz.Errors));
else // else
return CreatedAtAction(nameof(ServiceBankController.GetServiceBank), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o)); // return CreatedAtAction(nameof(ServiceBankController.GetServiceBank), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o));
} // }
/// <summary> // /// <summary>
/// Migrate ServiceBank // /// Migrate ServiceBank
/// (for migration from v7 only, do not use) // /// (for migration from v7 only, do not use)
/// </summary> // /// </summary>
/// <param name="newObject"></param> // /// <param name="newObject"></param>
/// <param name="apiVersion">From route path</param> // /// <param name="apiVersion">From route path</param>
/// <returns></returns> // /// <returns></returns>
[HttpPost("migrate")] // [HttpPost("migrate")]
public async Task<IActionResult> MigrateServiceBank([FromBody] ServiceBank newObject, ApiVersion apiVersion) // public async Task<IActionResult> MigrateServiceBank([FromBody] ServiceBank newObject, ApiVersion apiVersion)
{ // {
if (!serverState.IsOpen) // if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
ServiceBankBiz biz = ServiceBankBiz.GetBiz(ct, HttpContext); // ServiceBankBiz biz = ServiceBankBiz.GetBiz(ct, HttpContext);
if (!Authorized.HasCreateRole(HttpContext.Items, biz.BizType)) // if (!Authorized.HasCreateRole(HttpContext.Items, biz.BizType))
return StatusCode(403, new ApiNotAuthorizedResponse()); // return StatusCode(403, new ApiNotAuthorizedResponse());
if (!ModelState.IsValid) // if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState)); // return BadRequest(new ApiErrorResponse(ModelState));
ServiceBank o = await biz.CreateAsync(newObject); // ServiceBank o = await biz.CreateAsync(newObject);
if (o == null) // if (o == null)
return BadRequest(new ApiErrorResponse(biz.Errors)); // return BadRequest(new ApiErrorResponse(biz.Errors));
else // else
return CreatedAtAction(nameof(ServiceBankController.GetServiceBank), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o)); // return CreatedAtAction(nameof(ServiceBankController.GetServiceBank), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o));
} // }
/// <summary> // /// <summary>
/// Get ServiceBank // /// Get ServiceBank
/// (This object is create / get only, there is no update or delete. Only adjustments through new entries) // /// (This object is create / get only, there is no update or delete. Only adjustments through new entries)
/// </summary> // /// </summary>
/// <param name="id"></param> // /// <param name="id"></param>
/// <returns>ServiceBank</returns> // /// <returns>ServiceBank</returns>
[HttpGet("{id}")] // [HttpGet("{id}")]
public async Task<IActionResult> GetServiceBank([FromRoute] long id) // public async Task<IActionResult> GetServiceBank([FromRoute] long id)
{ // {
if (!serverState.IsOpen) // if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
ServiceBankBiz biz = ServiceBankBiz.GetBiz(ct, HttpContext); // ServiceBankBiz biz = ServiceBankBiz.GetBiz(ct, HttpContext);
if (!Authorized.HasReadFullRole(HttpContext.Items, biz.BizType)) // if (!Authorized.HasReadFullRole(HttpContext.Items, biz.BizType))
return StatusCode(403, new ApiNotAuthorizedResponse()); // return StatusCode(403, new ApiNotAuthorizedResponse());
if (!ModelState.IsValid) // if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState)); // return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id); // var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); // if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o)); // return Ok(ApiOkResponse.Response(o));
} // }
//------------ // //------------
}//eoc // }//eoc
}//eons // }//eons

14
server/AyaNova/DataList/CustomerDataList.cs
View File

@@ -100,13 +100,13 @@ namespace AyaNova.DataList
SqlValueColumnName = "acustomer.accountnumber" SqlValueColumnName = "acustomer.accountnumber"
}); });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "UsesBanking", // TKey = "UsesBanking",
FieldKey = "customerusesbanking", // FieldKey = "customerusesbanking",
UiFieldDataType = (int)UiFieldDataType.Bool, // UiFieldDataType = (int)UiFieldDataType.Bool,
SqlValueColumnName = "acustomer.usesbanking" // SqlValueColumnName = "acustomer.usesbanking"
}); // });
FieldDefinitions.Add(new DataListFieldDefinition FieldDefinitions.Add(new DataListFieldDefinition
{ {

14
server/AyaNova/DataList/HeadOfficeDataList.cs
View File

@@ -67,13 +67,13 @@ namespace AyaNova.DataList
SqlValueColumnName = "aheadoffice.accountnumber" SqlValueColumnName = "aheadoffice.accountnumber"
}); });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "UsesBanking", // TKey = "UsesBanking",
FieldKey = "headofficeusesbanking", // FieldKey = "headofficeusesbanking",
UiFieldDataType = (int)UiFieldDataType.Bool, // UiFieldDataType = (int)UiFieldDataType.Bool,
SqlValueColumnName = "aheadoffice.usesbanking" // SqlValueColumnName = "aheadoffice.usesbanking"
}); // });
FieldDefinitions.Add(new DataListFieldDefinition FieldDefinitions.Add(new DataListFieldDefinition
{ {

298
server/AyaNova/DataList/ServiceBankDataList.cs
View File

@@ -1,168 +1,168 @@
using System.Collections.Generic; // using System.Collections.Generic;
using AyaNova.Models; // using AyaNova.Models;
using AyaNova.Biz; // using AyaNova.Biz;
using System.Linq; // using System.Linq;
namespace AyaNova.DataList // namespace AyaNova.DataList
{ // {
internal class ServiceBankDataList : DataListProcessingBase, IDataListInternalCriteria // internal class ServiceBankDataList : DataListProcessingBase, IDataListInternalCriteria
{ // {
public ServiceBankDataList() // public ServiceBankDataList()
{ // {
DefaultListAType = AyaType.ServiceBank; // DefaultListAType = AyaType.ServiceBank;
SQLFrom = "from aservicebank"; // SQLFrom = "from aservicebank";
var RoleSet = BizRoles.GetRoleSet(DefaultListAType); // var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; // AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
DefaultColumns = new List<string>() { // DefaultColumns = new List<string>() {
"ServiceBankCreated", "Object", "ServiceBankCurrency", "ServiceBankCurrencyBalance", "ServiceBankIncidents", // "ServiceBankCreated", "Object", "ServiceBankCurrency", "ServiceBankCurrencyBalance", "ServiceBankIncidents",
"ServiceBankIncidentsBalance", "ServiceBankHours", "ServiceBankHoursBalance", "ServiceBankDescription" // "ServiceBankIncidentsBalance", "ServiceBankHours", "ServiceBankHoursBalance", "ServiceBankDescription"
}; // };
DefaultSortBy = new Dictionary<string, string>() { { "ServiceBankCreated", "-" } }; // DefaultSortBy = new Dictionary<string, string>() { { "ServiceBankCreated", "-" } };
FieldDefinitions = new List<DataListFieldDefinition>(); // FieldDefinitions = new List<DataListFieldDefinition>();
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "ServiceBankSourceRootAType", // TKey = "ServiceBankSourceRootAType",
FieldKey = "ServiceBankSourceRootAType", // FieldKey = "ServiceBankSourceRootAType",
UiFieldDataType = (int)UiFieldDataType.Text, // UiFieldDataType = (int)UiFieldDataType.Text,
SqlIdColumnName = "aservicebank.sourceid", // SqlIdColumnName = "aservicebank.sourceid",
SqlValueColumnName = "AYGETNAME(aservicebank.sourceid, aservicebank.sourcetype)", // SqlValueColumnName = "AYGETNAME(aservicebank.sourceid, aservicebank.sourcetype)",
SqlATypeColumnName = "aservicebank.sourcetype" // SqlATypeColumnName = "aservicebank.sourcetype"
}); // });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "Object", // TKey = "Object",
FieldKey = "Object", // FieldKey = "Object",
UiFieldDataType = (int)UiFieldDataType.Text, // UiFieldDataType = (int)UiFieldDataType.Text,
SqlIdColumnName = "aservicebank.objectid", // SqlIdColumnName = "aservicebank.objectid",
SqlValueColumnName = "AYGETNAME(aservicebank.objectid, aservicebank.aType)", // SqlValueColumnName = "AYGETNAME(aservicebank.objectid, aservicebank.aType)",
SqlATypeColumnName = "aservicebank.aType" // SqlATypeColumnName = "aservicebank.aType"
}); // });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "AyaType", // TKey = "AyaType",
FieldKey = "AyaType", // FieldKey = "AyaType",
UiFieldDataType = (int)UiFieldDataType.Enum, // UiFieldDataType = (int)UiFieldDataType.Enum,
EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()), // EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()),
SqlValueColumnName = "aservicebank.aType" // SqlValueColumnName = "aservicebank.aType"
}); // });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "ServiceBankDescription", // TKey = "ServiceBankDescription",
FieldKey = "ServiceBankDescription", // FieldKey = "ServiceBankDescription",
AType = (int)AyaType.ServiceBank, // AType = (int)AyaType.ServiceBank,
UiFieldDataType = (int)UiFieldDataType.Text, // UiFieldDataType = (int)UiFieldDataType.Text,
SqlIdColumnName = "aservicebank.id", // SqlIdColumnName = "aservicebank.id",
SqlValueColumnName = "aservicebank.name", // SqlValueColumnName = "aservicebank.name",
IsRowId = true // IsRowId = true
}); // });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "ServiceBankCreated", // TKey = "ServiceBankCreated",
FieldKey = "ServiceBankCreated", // FieldKey = "ServiceBankCreated",
UiFieldDataType = (int)UiFieldDataType.DateTime, // UiFieldDataType = (int)UiFieldDataType.DateTime,
SqlValueColumnName = "aservicebank.entrydate" // SqlValueColumnName = "aservicebank.entrydate"
}); // });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "ServiceBankCurrency", // TKey = "ServiceBankCurrency",
FieldKey = "ServiceBankCurrency", // FieldKey = "ServiceBankCurrency",
UiFieldDataType = (int)UiFieldDataType.Currency, // UiFieldDataType = (int)UiFieldDataType.Currency,
SqlValueColumnName = "aservicebank.currency" // SqlValueColumnName = "aservicebank.currency"
}); // });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "ServiceBankCurrencyBalance", // TKey = "ServiceBankCurrencyBalance",
FieldKey = "ServiceBankCurrencyBalance", // FieldKey = "ServiceBankCurrencyBalance",
UiFieldDataType = (int)UiFieldDataType.Currency, // UiFieldDataType = (int)UiFieldDataType.Currency,
SqlValueColumnName = "aservicebank.currencybalance" // SqlValueColumnName = "aservicebank.currencybalance"
}); // });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "ServiceBankIncidents", // TKey = "ServiceBankIncidents",
FieldKey = "ServiceBankIncidents", // FieldKey = "ServiceBankIncidents",
UiFieldDataType = (int)UiFieldDataType.Decimal, // UiFieldDataType = (int)UiFieldDataType.Decimal,
SqlValueColumnName = "aservicebank.incidents" // SqlValueColumnName = "aservicebank.incidents"
}); // });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "ServiceBankIncidentsBalance", // TKey = "ServiceBankIncidentsBalance",
FieldKey = "ServiceBankIncidentsBalance", // FieldKey = "ServiceBankIncidentsBalance",
UiFieldDataType = (int)UiFieldDataType.Decimal, // UiFieldDataType = (int)UiFieldDataType.Decimal,
SqlValueColumnName = "aservicebank.incidentsbalance" // SqlValueColumnName = "aservicebank.incidentsbalance"
}); // });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "ServiceBankHours", // TKey = "ServiceBankHours",
FieldKey = "ServiceBankHours", // FieldKey = "ServiceBankHours",
UiFieldDataType = (int)UiFieldDataType.Decimal, // UiFieldDataType = (int)UiFieldDataType.Decimal,
SqlValueColumnName = "aservicebank.hours" // SqlValueColumnName = "aservicebank.hours"
}); // });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "ServiceBankHoursBalance", // TKey = "ServiceBankHoursBalance",
FieldKey = "ServiceBankHoursBalance", // FieldKey = "ServiceBankHoursBalance",
UiFieldDataType = (int)UiFieldDataType.Decimal, // UiFieldDataType = (int)UiFieldDataType.Decimal,
SqlValueColumnName = "aservicebank.hoursbalance" // SqlValueColumnName = "aservicebank.hoursbalance"
}); // });
//META // //META
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
FieldKey = "metaobjectid", // FieldKey = "metaobjectid",
UiFieldDataType = (int)UiFieldDataType.InternalId, // UiFieldDataType = (int)UiFieldDataType.InternalId,
SqlIdColumnName = "aservicebank.objectid", // SqlIdColumnName = "aservicebank.objectid",
SqlValueColumnName = "aservicebank.objectid", // SqlValueColumnName = "aservicebank.objectid",
IsMeta = true // IsMeta = true
}); // });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
FieldKey = "metaobjecttype", // FieldKey = "metaobjecttype",
UiFieldDataType = (int)UiFieldDataType.Enum, // UiFieldDataType = (int)UiFieldDataType.Enum,
EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()), // EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()),
SqlValueColumnName = "aservicebank.aType", // SqlValueColumnName = "aservicebank.aType",
IsMeta = true // IsMeta = true
}); // });
} // }
public List<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria) // public List<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria)
{ // {
List<DataListFilterOption> ret = new List<DataListFilterOption>(); // List<DataListFilterOption> ret = new List<DataListFilterOption>();
//ClientCriteria format for this list is "OBJECTID,AYATYPE" // //ClientCriteria format for this list is "OBJECTID,AYATYPE"
var crit = (clientCriteria ?? "").Split(',').Select(z => z.Trim()).ToArray(); // var crit = (clientCriteria ?? "").Split(',').Select(z => z.Trim()).ToArray();
if (crit.Length > 1) // if (crit.Length > 1)
{ // {
//OBJECTID criteria // //OBJECTID criteria
if (crit[0] != "0") // if (crit[0] != "0")
{ // {
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metaobjectid" }; // DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metaobjectid" };
FilterOption.Items.Add(new DataListColumnFilter() { value = crit[0], op = DataListFilterComparisonOperator.Equality }); // FilterOption.Items.Add(new DataListColumnFilter() { value = crit[0], op = DataListFilterComparisonOperator.Equality });
ret.Add(FilterOption); // ret.Add(FilterOption);
} // }
//AYATYPE criteria // //AYATYPE criteria
if (!string.IsNullOrWhiteSpace(crit[1])) // if (!string.IsNullOrWhiteSpace(crit[1]))
{ // {
DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metaobjecttype" }; // DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metaobjecttype" };
FilterOption.Items.Add(new DataListColumnFilter() { value = crit[1], op = DataListFilterComparisonOperator.Equality }); // FilterOption.Items.Add(new DataListColumnFilter() { value = crit[1], op = DataListFilterComparisonOperator.Equality });
ret.Add(FilterOption); // ret.Add(FilterOption);
} // }
} // }
return ret; // return ret;
} // }
}//eoc // }//eoc
}//eons // }//eons

14
server/AyaNova/DataList/UnitDataList.cs
View File

@@ -196,13 +196,13 @@ namespace AyaNova.DataList
SqlValueColumnName = "amainunit.contractexpires" SqlValueColumnName = "amainunit.contractexpires"
}); });
FieldDefinitions.Add(new DataListFieldDefinition // FieldDefinitions.Add(new DataListFieldDefinition
{ // {
TKey = "UsesBanking", // TKey = "UsesBanking",
FieldKey = "UsesBanking", // FieldKey = "UsesBanking",
UiFieldDataType = (int)UiFieldDataType.Bool, // UiFieldDataType = (int)UiFieldDataType.Bool,
SqlValueColumnName = "amainunit.usesbanking" // SqlValueColumnName = "amainunit.usesbanking"
}); // });
FieldDefinitions.Add(new DataListFieldDefinition FieldDefinitions.Add(new DataListFieldDefinition
{ {

2
server/AyaNova/biz/AyaType.cs
View File

@@ -113,7 +113,7 @@ namespace AyaNova.Biz
UnitMeterReading = 53, UnitMeterReading = 53,
[CoreBizObject] [CoreBizObject]
CustomerServiceRequest = 54, CustomerServiceRequest = 54,
ServiceBank = 55, // ServiceBank = 55,
OpsNotificationSettings = 56, OpsNotificationSettings = 56,
Report = 57, Report = 57,
DashboardView = 58, DashboardView = 58,

4
server/AyaNova/biz/BizObjectExistsInDatabase.cs
View File

@@ -120,8 +120,8 @@ namespace AyaNova.Biz
return await ct.TravelRate.AnyAsync(z => z.Id == id); return await ct.TravelRate.AnyAsync(z => z.Id == id);
case AyaType.TaxCode: case AyaType.TaxCode:
return await ct.TaxCode.AnyAsync(z => z.Id == id); return await ct.TaxCode.AnyAsync(z => z.Id == id);
case AyaType.ServiceBank: // case AyaType.ServiceBank:
return await ct.ServiceBank.AnyAsync(z => z.Id == id); // return await ct.ServiceBank.AnyAsync(z => z.Id == id);
case AyaType.CustomerServiceRequest: case AyaType.CustomerServiceRequest:
return await ct.CustomerServiceRequest.AnyAsync(z => z.Id == id); return await ct.CustomerServiceRequest.AnyAsync(z => z.Id == id);
default: default:

4
server/AyaNova/biz/BizObjectFactory.cs
View File

@@ -107,8 +107,8 @@ namespace AyaNova.Biz
return new TravelRateBiz(ct, userId, translationId, roles); return new TravelRateBiz(ct, userId, translationId, roles);
case AyaType.TaxCode: case AyaType.TaxCode:
return new TaxCodeBiz(ct, userId, translationId, roles); return new TaxCodeBiz(ct, userId, translationId, roles);
case AyaType.ServiceBank: // case AyaType.ServiceBank:
return new ServiceBankBiz(ct, userId, translationId, roles); // return new ServiceBankBiz(ct, userId, translationId, roles);
case AyaType.CustomerServiceRequest: case AyaType.CustomerServiceRequest:
return new CustomerServiceRequestBiz(ct, userId, translationId, roles); return new CustomerServiceRequestBiz(ct, userId, translationId, roles);
case AyaType.TaskGroup: case AyaType.TaskGroup:

46
server/AyaNova/biz/BizRoles.cs
View File

File diff suppressed because one or more lines are too long

26
server/AyaNova/biz/FormFieldReference.cs
View File

@@ -34,7 +34,7 @@ namespace AyaNova.Biz
} }
//No type / not corebiz form keys: //No type / not corebiz form keys:
_formFieldKeys.Add("Contact"); _formFieldKeys.Add("Contact");
_formFieldKeys.Add(AyaType.ServiceBank.ToString()); //_formFieldKeys.Add(AyaType.ServiceBank.ToString());
_formFieldKeys.Add(AyaType.WorkOrderStatus.ToString()); _formFieldKeys.Add(AyaType.WorkOrderStatus.ToString());
_formFieldKeys.Add(AyaType.WorkOrderItemStatus.ToString()); _formFieldKeys.Add(AyaType.WorkOrderItemStatus.ToString());
_formFieldKeys.Add(AyaType.WorkOrderItemPriority.ToString()); _formFieldKeys.Add(AyaType.WorkOrderItemPriority.ToString());
@@ -168,7 +168,7 @@ namespace AyaNova.Biz
l.Add(new FormField { TKey = "HeadOffice", FieldKey = "HeadOfficeId" }); l.Add(new FormField { TKey = "HeadOffice", FieldKey = "HeadOfficeId" });
l.Add(new FormField { TKey = "Contract", FieldKey = "ContractId" }); l.Add(new FormField { TKey = "Contract", FieldKey = "ContractId" });
l.Add(new FormField { TKey = "ContractExpires", FieldKey = "ContractExpires" }); l.Add(new FormField { TKey = "ContractExpires", FieldKey = "ContractExpires" });
l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" }); //l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" });
l.Add(new FormField { TKey = "CustomerNotes", FieldKey = "Notes" }); l.Add(new FormField { TKey = "CustomerNotes", FieldKey = "Notes" });
l.Add(new FormField { TKey = "CustomerTechNotes", FieldKey = "TechNotes" }); l.Add(new FormField { TKey = "CustomerTechNotes", FieldKey = "TechNotes" });
l.Add(new FormField { TKey = "AlertNotes", FieldKey = "PopUpNotes" }); l.Add(new FormField { TKey = "AlertNotes", FieldKey = "PopUpNotes" });
@@ -220,7 +220,7 @@ namespace AyaNova.Biz
l.Add(new FormField { TKey = "HeadOfficePhone5", FieldKey = "Phone5" }); l.Add(new FormField { TKey = "HeadOfficePhone5", FieldKey = "Phone5" });
l.Add(new FormField { TKey = "Contract", FieldKey = "ContractId" }); l.Add(new FormField { TKey = "Contract", FieldKey = "ContractId" });
l.Add(new FormField { TKey = "ContractExpires", FieldKey = "ContractExpires" }); l.Add(new FormField { TKey = "ContractExpires", FieldKey = "ContractExpires" });
l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" }); //l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" });
l.Add(new FormField { TKey = "HeadOfficeNotes", FieldKey = "Notes" }); l.Add(new FormField { TKey = "HeadOfficeNotes", FieldKey = "Notes" });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" }); l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
@@ -693,15 +693,15 @@ namespace AyaNova.Biz
} }
#endregion #endregion
#region ServiceBank // #region ServiceBank
{ // {
List<FormField> l = new List<FormField>(); // List<FormField> l = new List<FormField>();
l.Add(new FormField { TKey = "ServiceBankCurrency", FieldKey = "Currency" }); // l.Add(new FormField { TKey = "ServiceBankCurrency", FieldKey = "Currency" });
l.Add(new FormField { TKey = "ServiceBankHours", FieldKey = "Hours" }); // l.Add(new FormField { TKey = "ServiceBankHours", FieldKey = "Hours" });
l.Add(new FormField { TKey = "ServiceBankIncidents", FieldKey = "Incidents" }); // l.Add(new FormField { TKey = "ServiceBankIncidents", FieldKey = "Incidents" });
_formFields.Add(AyaType.ServiceBank.ToString(), l); // _formFields.Add(AyaType.ServiceBank.ToString(), l);
} // }
#endregion // #endregion
#region Unit #region Unit
{ {
@@ -712,7 +712,7 @@ namespace AyaNova.Biz
l.Add(new FormField { TKey = "UnitParentUnitID", FieldKey = "ParentUnitId" }); l.Add(new FormField { TKey = "UnitParentUnitID", FieldKey = "ParentUnitId" });
l.Add(new FormField { TKey = "Contract", FieldKey = "ContractId" }); l.Add(new FormField { TKey = "Contract", FieldKey = "ContractId" });
l.Add(new FormField { TKey = "ContractExpires", FieldKey = "ContractExpires" }); l.Add(new FormField { TKey = "ContractExpires", FieldKey = "ContractExpires" });
l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" }); //l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" });
l.Add(new FormField { TKey = "UnitMetered", FieldKey = "Metered" }); l.Add(new FormField { TKey = "UnitMetered", FieldKey = "Metered" });
l.Add(new FormField { TKey = "UnitBoughtHere", FieldKey = "BoughtHere" }); l.Add(new FormField { TKey = "UnitBoughtHere", FieldKey = "BoughtHere" });
l.Add(new FormField { TKey = "UnitPurchaseFromID", FieldKey = "PurchasedFromVendorId" }); l.Add(new FormField { TKey = "UnitPurchaseFromID", FieldKey = "PurchasedFromVendorId" });

2
server/AyaNova/biz/NotifyEventType.cs
View File

@@ -20,7 +20,7 @@ namespace AyaNova.Biz
CopyOfCustomerNotification = 8,//*User notification of what was sent to a Customer as a notification. In other words can subscribe to any customer notifications and be sent a copy of them. Tag filter is based on Customer's tags for this one so user can choose which customer group to subscribe to this or all. CopyOfCustomerNotification = 8,//*User notification of what was sent to a Customer as a notification. In other words can subscribe to any customer notifications and be sent a copy of them. Tag filter is based on Customer's tags for this one so user can choose which customer group to subscribe to this or all.
QuoteStatusChange = 9,//* Quote object, any *change* of status including from no status (new) to a specific conditional status ID value QuoteStatusChange = 9,//* Quote object, any *change* of status including from no status (new) to a specific conditional status ID value
ObjectAge = 10,//* Any object, Age (conditional on AgeValue) after creation event of any object of conditional specific AyaType and optionally conditional tags ObjectAge = 10,//* Any object, Age (conditional on AgeValue) after creation event of any object of conditional specific AyaType and optionally conditional tags
ServiceBankDepleted = 11,//*ServiceBank object, any change to balance triggers this check, conditional on decvalue as remaining balance left to trigger this notification //ServiceBankDepleted = 11,//*ServiceBank object, any change to balance triggers this check, conditional on decvalue as remaining balance left to trigger this notification
ReminderImminent = 12,//*Reminder object, Advance notice setting tag conditional ReminderImminent = 12,//*Reminder object, Advance notice setting tag conditional
ScheduledOnWorkorder = 13,//*Workorder / WorkorderItemScheduledUser object, instant notification when current user is scheduled on a service workorder ScheduledOnWorkorder = 13,//*Workorder / WorkorderItemScheduledUser object, instant notification when current user is scheduled on a service workorder
ScheduledOnWorkorderImminent = 14,//*Workorder / WorkorderItemScheduledUser object, advanced (settable) notification when current user's scheduled date/time is imminent ScheduledOnWorkorderImminent = 14,//*Workorder / WorkorderItemScheduledUser object, advanced (settable) notification when current user's scheduled date/time is imminent

2
server/AyaNova/biz/PartInventoryBiz.cs
View File

@@ -220,7 +220,7 @@ namespace AyaNova.Biz
return; return;
} }
//New entry must have *something* to bank //New entry must have *something* that would affect quantities
if (proposedObj.Quantity == 0) if (proposedObj.Quantity == 0)
{ {
AddError(ApiErrorCode.VALIDATION_REQUIRED, "Quantity"); AddError(ApiErrorCode.VALIDATION_REQUIRED, "Quantity");

620
server/AyaNova/biz/ServiceBankBiz.cs
View File

@@ -1,369 +1,369 @@
using System; // using System;
using System.Threading.Tasks; // using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore; // using Microsoft.EntityFrameworkCore;
using System.Linq; // using System.Linq;
using AyaNova.Util; // using AyaNova.Util;
using AyaNova.Api.ControllerHelpers; // using AyaNova.Api.ControllerHelpers;
using Microsoft.Extensions.Logging; // using Microsoft.Extensions.Logging;
using AyaNova.Models; // using AyaNova.Models;
using Newtonsoft.Json.Linq; // using Newtonsoft.Json.Linq;
using System.Collections.Generic; // using System.Collections.Generic;
namespace AyaNova.Biz // namespace AyaNova.Biz
{ // {
internal class ServiceBankBiz : BizObject, ISearchAbleObject, IReportAbleObject, IExportAbleObject, INotifiableObject // internal class ServiceBankBiz : BizObject, ISearchAbleObject, IReportAbleObject, IExportAbleObject, INotifiableObject
{ // {
internal ServiceBankBiz(AyContext dbcontext, long currentUserId, long userTranslationId, AuthorizationRoles UserRoles) // internal ServiceBankBiz(AyContext dbcontext, long currentUserId, long userTranslationId, AuthorizationRoles UserRoles)
{ // {
ct = dbcontext; // ct = dbcontext;
UserId = currentUserId; // UserId = currentUserId;
UserTranslationId = userTranslationId; // UserTranslationId = userTranslationId;
CurrentUserRoles = UserRoles; // CurrentUserRoles = UserRoles;
BizType = AyaType.ServiceBank; // BizType = AyaType.ServiceBank;
} // }
internal static ServiceBankBiz GetBiz(AyContext ct, Microsoft.AspNetCore.Http.HttpContext httpContext = null) // internal static ServiceBankBiz GetBiz(AyContext ct, Microsoft.AspNetCore.Http.HttpContext httpContext = null)
{ // {
if (httpContext != null) // if (httpContext != null)
return new ServiceBankBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); // return new ServiceBankBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items));
else // else
return new ServiceBankBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); // return new ServiceBankBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull);
} // }
//////////////////////////////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////////////////////////////
//EXISTS // //EXISTS
internal async Task<bool> ExistsAsync(long id) // internal async Task<bool> ExistsAsync(long id)
{ // {
return await ct.ServiceBank.AnyAsync(z => z.Id == id); // return await ct.ServiceBank.AnyAsync(z => z.Id == id);
} // }
//////////////////////////////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////////////////////////////
//CREATE // //CREATE
// // //
internal async Task<ServiceBank> CreateAsync(dtServiceBank newDtObject) // internal async Task<ServiceBank> CreateAsync(dtServiceBank newDtObject)
{ // {
using (var transaction = await ct.Database.BeginTransactionAsync()) // using (var transaction = await ct.Database.BeginTransactionAsync())
{ // {
//get the last record // //get the last record
var LastEntry = await ct.ServiceBank.OrderByDescending(m => m.EntryDate).FirstOrDefaultAsync(m => m.ObjectId == newDtObject.ObjectId && m.AType == newDtObject.AType); // var LastEntry = await ct.ServiceBank.OrderByDescending(m => m.EntryDate).FirstOrDefaultAsync(m => m.ObjectId == newDtObject.ObjectId && m.AType == newDtObject.AType);
ServiceBank newObject = new ServiceBank(); // ServiceBank newObject = new ServiceBank();
newObject.Name = newDtObject.Name; // newObject.Name = newDtObject.Name;
newObject.EntryDate = DateTime.UtcNow; // newObject.EntryDate = DateTime.UtcNow;
newObject.ObjectId = newDtObject.ObjectId; // newObject.ObjectId = newDtObject.ObjectId;
newObject.AType = newDtObject.AType; // newObject.AType = newDtObject.AType;
newObject.SourceId = newDtObject.SourceId; // newObject.SourceId = newDtObject.SourceId;
newObject.SourceType = newDtObject.SourceType; // newObject.SourceType = newDtObject.SourceType;
newObject.Incidents = newDtObject.Incidents; // newObject.Incidents = newDtObject.Incidents;
newObject.Currency = newDtObject.Currency; // newObject.Currency = newDtObject.Currency;
newObject.Hours = newDtObject.Hours; // newObject.Hours = newDtObject.Hours;
if (LastEntry != null) // if (LastEntry != null)
{ // {
newObject.LastEntryDate = LastEntry.EntryDate; // newObject.LastEntryDate = LastEntry.EntryDate;
newObject.LastCurrencyBalance = LastEntry.CurrencyBalance; // newObject.LastCurrencyBalance = LastEntry.CurrencyBalance;
newObject.LastHoursBalance = LastEntry.HoursBalance; // newObject.LastHoursBalance = LastEntry.HoursBalance;
newObject.LastIncidentsBalance = LastEntry.IncidentsBalance; // newObject.LastIncidentsBalance = LastEntry.IncidentsBalance;
newObject.HoursBalance = LastEntry.HoursBalance + newObject.Hours; // newObject.HoursBalance = LastEntry.HoursBalance + newObject.Hours;
newObject.IncidentsBalance = LastEntry.IncidentsBalance + newObject.Incidents; // newObject.IncidentsBalance = LastEntry.IncidentsBalance + newObject.Incidents;
newObject.CurrencyBalance = LastEntry.CurrencyBalance + newObject.Currency; // newObject.CurrencyBalance = LastEntry.CurrencyBalance + newObject.Currency;
} // }
else // else
{ // {
newObject.HoursBalance = newObject.Hours; // newObject.HoursBalance = newObject.Hours;
newObject.IncidentsBalance = newObject.Incidents; // newObject.IncidentsBalance = newObject.Incidents;
newObject.CurrencyBalance = newObject.Currency; // newObject.CurrencyBalance = newObject.Currency;
} // }
await ValidateAsync(newObject); // await ValidateAsync(newObject);
if (HasErrors) // if (HasErrors)
return null; // return null;
else // else
{ // {
await ct.ServiceBank.AddAsync(newObject); // await ct.ServiceBank.AddAsync(newObject);
await ct.SaveChangesAsync(); // await ct.SaveChangesAsync();
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, BizType, AyaEvent.Created), ct); // await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, BizType, AyaEvent.Created), ct);
await SearchIndexAsync(newObject, true); // await SearchIndexAsync(newObject, true);
await transaction.CommitAsync(); // await transaction.CommitAsync();
await HandlePotentialNotificationEvent(AyaEvent.Created, newObject); // await HandlePotentialNotificationEvent(AyaEvent.Created, newObject);
return newObject; // return newObject;
} // }
} // }
} // }
//version for v8 migration purposes only // //version for v8 migration purposes only
internal async Task<ServiceBank> CreateAsync(ServiceBank newObject) // internal async Task<ServiceBank> CreateAsync(ServiceBank newObject)
{ // {
using (var transaction = await ct.Database.BeginTransactionAsync()) // using (var transaction = await ct.Database.BeginTransactionAsync())
{ // {
await ValidateAsync(newObject); // await ValidateAsync(newObject);
if (HasErrors) // if (HasErrors)
return null; // return null;
else // else
{ // {
await ct.ServiceBank.AddAsync(newObject); // await ct.ServiceBank.AddAsync(newObject);
await ct.SaveChangesAsync(); // await ct.SaveChangesAsync();
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, BizType, AyaEvent.Created), ct); // await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, BizType, AyaEvent.Created), ct);
await SearchIndexAsync(newObject, true); // await SearchIndexAsync(newObject, true);
await transaction.CommitAsync(); // await transaction.CommitAsync();
await HandlePotentialNotificationEvent(AyaEvent.Created, newObject); // await HandlePotentialNotificationEvent(AyaEvent.Created, newObject);
return newObject; // return newObject;
} // }
} // }
} // }
//////////////////////////////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////////////////////////////
//GET // //GET
// // //
internal async Task<ServiceBank> GetAsync(long id, bool logTheGetEvent = true) // internal async Task<ServiceBank> GetAsync(long id, bool logTheGetEvent = true)
{ // {
var ret = await ct.ServiceBank.AsNoTracking().SingleOrDefaultAsync(m => m.Id == id); // var ret = await ct.ServiceBank.AsNoTracking().SingleOrDefaultAsync(m => m.Id == id);
if (logTheGetEvent && ret != null) // if (logTheGetEvent && ret != null)
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct); // await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct);
return ret; // return ret;
} // }
// //////////////////////////////////////////////////////////////////////////////////////////////// // // ////////////////////////////////////////////////////////////////////////////////////////////////
// //GET LAST // // //GET LAST
// // // // //
// internal async Task<ServiceBank> GetLastForObjectAsync(AyaType aType, long objectId) // // internal async Task<ServiceBank> GetLastForObjectAsync(AyaType aType, long objectId)
// { // // {
// var ret = await ct.ServiceBank.OrderByDescending(m => m.EntryDate).SingleOrDefaultAsync(m => m.ObjectId == objectId && m.AType == aType); // // var ret = await ct.ServiceBank.OrderByDescending(m => m.EntryDate).SingleOrDefaultAsync(m => m.ObjectId == objectId && m.AType == aType);
// return ret; // // return ret;
// } // // }
//////////////////////////////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////////////////////////////
//SEARCH // //SEARCH
// // //
private async Task SearchIndexAsync(ServiceBank obj, bool isNew) // private async Task SearchIndexAsync(ServiceBank obj, bool isNew)
{ // {
var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, BizType); // var SearchParams = new Search.SearchIndexProcessObjectParameters(UserTranslationId, obj.Id, BizType);
DigestSearchText(obj, SearchParams); // DigestSearchText(obj, SearchParams);
if (isNew) // if (isNew)
await Search.ProcessNewObjectKeywordsAsync(SearchParams); // await Search.ProcessNewObjectKeywordsAsync(SearchParams);
else // else
await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); // await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams);
} // }
public async Task<Search.SearchIndexProcessObjectParameters> GetSearchResultSummary(long id) // public async Task<Search.SearchIndexProcessObjectParameters> GetSearchResultSummary(long id)
{ // {
var obj = await GetAsync(id,false); // var obj = await GetAsync(id,false);
var SearchParams = new Search.SearchIndexProcessObjectParameters(); // var SearchParams = new Search.SearchIndexProcessObjectParameters();
DigestSearchText(obj, SearchParams); // DigestSearchText(obj, SearchParams);
return SearchParams; // return SearchParams;
} // }
public void DigestSearchText(ServiceBank obj, Search.SearchIndexProcessObjectParameters searchParams) // public void DigestSearchText(ServiceBank obj, Search.SearchIndexProcessObjectParameters searchParams)
{ // {
if (obj != null) // if (obj != null)
searchParams.AddText(obj.Name); // searchParams.AddText(obj.Name);
} // }
//////////////////////////////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////////////////////////////
//VALIDATION // //VALIDATION
// // //
private async Task ValidateAsync(ServiceBank proposedObj) // private async Task ValidateAsync(ServiceBank proposedObj)
{ // {
//Name required // //Name required
if (string.IsNullOrWhiteSpace(proposedObj.Name)) // if (string.IsNullOrWhiteSpace(proposedObj.Name))
{ // {
AddError(ApiErrorCode.VALIDATION_REQUIRED, "Name"); // AddError(ApiErrorCode.VALIDATION_REQUIRED, "Name");
return; // return;
} // }
//Object exists? // //Object exists?
if (!await BizObjectExistsInDatabase.ExistsAsync(proposedObj.AType, proposedObj.ObjectId, ct)) // if (!await BizObjectExistsInDatabase.ExistsAsync(proposedObj.AType, proposedObj.ObjectId, ct))
{ // {
AddError(ApiErrorCode.NOT_FOUND, "generalerror", $"Bankable source object specified doesn't exist [type:{proposedObj.AType}, id:{proposedObj.ObjectId}]"); // AddError(ApiErrorCode.NOT_FOUND, "generalerror", $"Bankable source object specified doesn't exist [type:{proposedObj.AType}, id:{proposedObj.ObjectId}]");
return; // return;
} // }
/* // /*
"CONSTRAINT UNQ_ServiceBank UNIQUE (entrydate, objectid, aType, incidentsbalance, hoursbalance, currencybalance), " + // "CONSTRAINT UNQ_ServiceBank UNIQUE (entrydate, objectid, aType, incidentsbalance, hoursbalance, currencybalance), " +
"CONSTRAINT UNQ_ServiceBank_Previous_values UNIQUE (lastentrydate, objectid, aType, lastincidentsbalance, lasthoursbalance, lastcurrencybalance), " + // "CONSTRAINT UNQ_ServiceBank_Previous_values UNIQUE (lastentrydate, objectid, aType, lastincidentsbalance, lasthoursbalance, lastcurrencybalance), " +
"CONSTRAINT fk_ServiceBank_self FOREIGN KEY (lastentrydate, objectid, aType, lastincidentsbalance, lasthoursbalance, lastcurrencybalance) references aservicebank(entrydate, objectid, aType, incidentsbalance, hoursbalance, currencybalance), " + // "CONSTRAINT fk_ServiceBank_self FOREIGN KEY (lastentrydate, objectid, aType, lastincidentsbalance, lasthoursbalance, lastcurrencybalance) references aservicebank(entrydate, objectid, aType, incidentsbalance, hoursbalance, currencybalance), " +
"CONSTRAINT CHK_Servicebank_Valid_IncidentBalance CHECK(incidentsbalance = COALESCE(lastincidentsbalance, 0) + incidents), " + // "CONSTRAINT CHK_Servicebank_Valid_IncidentBalance CHECK(incidentsbalance = COALESCE(lastincidentsbalance, 0) + incidents), " +
"CONSTRAINT CHK_Servicebank_Valid_CurrencyBalance CHECK(currencybalance = COALESCE(lastcurrencybalance, 0) + currency), " + // "CONSTRAINT CHK_Servicebank_Valid_CurrencyBalance CHECK(currencybalance = COALESCE(lastcurrencybalance, 0) + currency), " +
"CONSTRAINT CHK_Servicebank_Valid_HoursBalance CHECK(hoursbalance = COALESCE(lasthoursbalance, 0) + hours), " + // "CONSTRAINT CHK_Servicebank_Valid_HoursBalance CHECK(hoursbalance = COALESCE(lasthoursbalance, 0) + hours), " +
"CONSTRAINT CHK_ServiceBank_Valid_Dates_Sequence CHECK(lastentrydate < entrydate), " + // "CONSTRAINT CHK_ServiceBank_Valid_Dates_Sequence CHECK(lastentrydate < entrydate), " +
"CONSTRAINT CHK_ServiceBank_Valid_Previous_Columns CHECK((lastentrydate IS NULL AND lastincidentsbalance IS NULL AND lastcurrencybalance IS NULL AND lasthoursbalance IS NULL) OR (lastentrydate IS NOT NULL AND lastincidentsbalance IS NOT NULL AND lastcurrencybalance IS NOT NULL AND lasthoursbalance IS NOT NULL)) "+ // "CONSTRAINT CHK_ServiceBank_Valid_Previous_Columns CHECK((lastentrydate IS NULL AND lastincidentsbalance IS NULL AND lastcurrencybalance IS NULL AND lasthoursbalance IS NULL) OR (lastentrydate IS NOT NULL AND lastincidentsbalance IS NOT NULL AND lastcurrencybalance IS NOT NULL AND lasthoursbalance IS NOT NULL)) "+
*/ // */
//New entry must have *something* to bank // //New entry must have *something* to bank
if (proposedObj.Incidents == 0 && proposedObj.Hours == 0 && proposedObj.Currency == 0) // if (proposedObj.Incidents == 0 && proposedObj.Hours == 0 && proposedObj.Currency == 0)
{ // {
AddError(ApiErrorCode.INVALID_OPERATION, null, "Nothing to bank"); // AddError(ApiErrorCode.INVALID_OPERATION, null, "Nothing to bank");
return; // return;
} // }
//values must add up // //values must add up
if (proposedObj.IncidentsBalance != (proposedObj.Incidents + (proposedObj.LastIncidentsBalance ?? 0))) // if (proposedObj.IncidentsBalance != (proposedObj.Incidents + (proposedObj.LastIncidentsBalance ?? 0)))
{ // {
AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "generalerror", await Translate("ServiceBankIncidentsBalance")); // AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "generalerror", await Translate("ServiceBankIncidentsBalance"));
return; // return;
} // }
if (proposedObj.CurrencyBalance != (proposedObj.Currency + (proposedObj.LastCurrencyBalance ?? 0))) // if (proposedObj.CurrencyBalance != (proposedObj.Currency + (proposedObj.LastCurrencyBalance ?? 0)))
{ // {
AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "generalerror", await Translate("ServiceBankCurrencyBalance")); // AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "generalerror", await Translate("ServiceBankCurrencyBalance"));
return; // return;
} // }
if (proposedObj.HoursBalance != (proposedObj.Hours + (proposedObj.LastHoursBalance ?? 0))) // if (proposedObj.HoursBalance != (proposedObj.Hours + (proposedObj.LastHoursBalance ?? 0)))
{ // {
AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "generalerror", await Translate("ServiceBankHoursBalance")); // AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "generalerror", await Translate("ServiceBankHoursBalance"));
return; // return;
} // }
//date is newer than last entry date? // //date is newer than last entry date?
if (proposedObj.LastEntryDate != null && proposedObj.LastEntryDate > proposedObj.EntryDate) // if (proposedObj.LastEntryDate != null && proposedObj.LastEntryDate > proposedObj.EntryDate)
{ // {
AddError(ApiErrorCode.VALIDATION_STARTDATE_AFTER_ENDDATE, "generalerror", "LastEntryDate is newer than EntryDate"); // AddError(ApiErrorCode.VALIDATION_STARTDATE_AFTER_ENDDATE, "generalerror", "LastEntryDate is newer than EntryDate");
return; // return;
} // }
//valid previous columns? // //valid previous columns?
//either they're all null or none of them are null // //either they're all null or none of them are null
//fix and re-test // //fix and re-test
if (!((proposedObj.LastEntryDate == null // if (!((proposedObj.LastEntryDate == null
&& proposedObj.LastCurrencyBalance == null // && proposedObj.LastCurrencyBalance == null
&& proposedObj.LastHoursBalance == null // && proposedObj.LastHoursBalance == null
&& proposedObj.LastIncidentsBalance == null) || // && proposedObj.LastIncidentsBalance == null) ||
(proposedObj.LastEntryDate != null // (proposedObj.LastEntryDate != null
&& proposedObj.LastCurrencyBalance != null // && proposedObj.LastCurrencyBalance != null
&& proposedObj.LastHoursBalance != null // && proposedObj.LastHoursBalance != null
&& proposedObj.LastIncidentsBalance != null) // && proposedObj.LastIncidentsBalance != null)
)) // ))
{ // {
AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "generalerror", "Last* entries must be all empty (opening entry) or none of them empty (any later entry)"); // AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "generalerror", "Last* entries must be all empty (opening entry) or none of them empty (any later entry)");
return; // return;
} // }
//Any form customizations to validate? // //Any form customizations to validate?
var FormCustomization = await ct.FormCustom.AsNoTracking().SingleOrDefaultAsync(x => x.FormKey == AyaType.ServiceBank.ToString()); // var FormCustomization = await ct.FormCustom.AsNoTracking().SingleOrDefaultAsync(x => x.FormKey == AyaType.ServiceBank.ToString());
if (FormCustomization != null) // if (FormCustomization != null)
{ // {
//Yeppers, do the validation, there are two, the custom fields and the regular fields that might be set to required // //Yeppers, do the validation, there are two, the custom fields and the regular fields that might be set to required
//validate users choices for required non custom fields // //validate users choices for required non custom fields
RequiredFieldsValidator.Validate(this, FormCustomization, proposedObj); // RequiredFieldsValidator.Validate(this, FormCustomization, proposedObj);
} // }
} // }
//////////////////////////////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING // //REPORTING
// // //
public async Task<JArray> GetReportData(long[] idList) // public async Task<JArray> GetReportData(long[] idList)
{ // {
JArray ReportData = new JArray(); // JArray ReportData = new JArray();
while (idList.Any()) // while (idList.Any())
{ // {
var batch = idList.Take(IReportAbleObject.REPORT_DATA_BATCH_SIZE); // var batch = idList.Take(IReportAbleObject.REPORT_DATA_BATCH_SIZE);
idList = idList.Skip(IReportAbleObject.REPORT_DATA_BATCH_SIZE).ToArray(); // idList = idList.Skip(IReportAbleObject.REPORT_DATA_BATCH_SIZE).ToArray();
//query for this batch, comes back in db natural order unfortunately // //query for this batch, comes back in db natural order unfortunately
var batchResults = await ct.ServiceBank.Where(z => batch.Contains(z.Id)).ToArrayAsync(); // var batchResults = await ct.ServiceBank.Where(z => batch.Contains(z.Id)).ToArrayAsync();
//order the results back into original // //order the results back into original
var orderedList = from id in batch join z in batchResults on id equals z.Id select z; // var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (ServiceBank w in orderedList) // foreach (ServiceBank w in orderedList)
{ // {
var jo = JObject.FromObject(w); // var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"])) // if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]); // jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]);
ReportData.Add(jo); // ReportData.Add(jo);
} // }
} // }
return ReportData; // return ReportData;
} // }
//////////////////////////////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////////////////////////////
// IMPORT EXPORT // // IMPORT EXPORT
// // //
public async Task<JArray> GetExportData(long[] idList) // public async Task<JArray> GetExportData(long[] idList)
{ // {
//for now just re-use the report data code // //for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time // //this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(idList); // return await GetReportData(idList);
} // }
//////////////////////////////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////////////////////////////
// NOTIFICATION PROCESSING // // NOTIFICATION PROCESSING
// // //
public async Task HandlePotentialNotificationEvent(AyaEvent ayaEvent, ICoreBizObjectModel proposedObj, ICoreBizObjectModel currentObj = null) // public async Task HandlePotentialNotificationEvent(AyaEvent ayaEvent, ICoreBizObjectModel proposedObj, ICoreBizObjectModel currentObj = null)
{ // {
ILogger log = AyaNova.Util.ApplicationLogging.CreateLogger<ServiceBankBiz>(); // ILogger log = AyaNova.Util.ApplicationLogging.CreateLogger<ServiceBankBiz>();
if (ServerBootConfig.SEEDING) return; // if (ServerBootConfig.SEEDING) return;
log.LogDebug($"HandlePotentialNotificationEvent processing: [AyaType:{this.BizType}, AyaEvent:{ayaEvent}]"); // log.LogDebug($"HandlePotentialNotificationEvent processing: [AyaType:{this.BizType}, AyaEvent:{ayaEvent}]");
bool isNew = currentObj == null; // bool isNew = currentObj == null;
//STANDARD EVENTS FOR ALL OBJECTS // //STANDARD EVENTS FOR ALL OBJECTS
await NotifyEventHelper.ProcessStandardObjectEvents(ayaEvent, proposedObj, ct); // await NotifyEventHelper.ProcessStandardObjectEvents(ayaEvent, proposedObj, ct);
//SPECIFIC EVENTS FOR THIS OBJECT // //SPECIFIC EVENTS FOR THIS OBJECT
var o = (ServiceBank)proposedObj; // var o = (ServiceBank)proposedObj;
//SERVICE BANK DEPLETED // //SERVICE BANK DEPLETED
{ // {
var subs = await ct.NotifySubscription.Where(z => z.EventType == NotifyEventType.ServiceBankDepleted).ToListAsync(); // var subs = await ct.NotifySubscription.Where(z => z.EventType == NotifyEventType.ServiceBankDepleted).ToListAsync();
string SourceName = string.Empty; // string SourceName = string.Empty;
if (subs.Count > 0) // if (subs.Count > 0)
SourceName = BizObjectNameFetcherDirect.Name(o.AType, o.ObjectId, ct); // SourceName = BizObjectNameFetcherDirect.Name(o.AType, o.ObjectId, ct);
foreach (var sub in subs) // foreach (var sub in subs)
{ // {
//not for inactive users // //not for inactive users
if (!await UserBiz.UserIsActive(sub.UserId)) continue; // if (!await UserBiz.UserIsActive(sub.UserId)) continue;
//Has any of the balances changed and is that changed balance within this users selected threshold? // //Has any of the balances changed and is that changed balance within this users selected threshold?
//decvalue here refers to the balance left // //decvalue here refers to the balance left
if ( // if (
(o.LastCurrencyBalance != null && o.CurrencyBalance != o.LastCurrencyBalance && o.CurrencyBalance <= sub.DecValue) // (o.LastCurrencyBalance != null && o.CurrencyBalance != o.LastCurrencyBalance && o.CurrencyBalance <= sub.DecValue)
|| (o.LastHoursBalance != null && o.HoursBalance != o.LastHoursBalance && o.HoursBalance <= sub.DecValue) // || (o.LastHoursBalance != null && o.HoursBalance != o.LastHoursBalance && o.HoursBalance <= sub.DecValue)
|| (o.LastIncidentsBalance != null && o.IncidentsBalance != o.LastIncidentsBalance && o.IncidentsBalance <= sub.DecValue) // || (o.LastIncidentsBalance != null && o.IncidentsBalance != o.LastIncidentsBalance && o.IncidentsBalance <= sub.DecValue)
) // )
{ // {
NotifyEvent n = new NotifyEvent() // NotifyEvent n = new NotifyEvent()
{ // {
EventType = NotifyEventType.ServiceBankDepleted, // EventType = NotifyEventType.ServiceBankDepleted,
UserId = sub.UserId, // UserId = sub.UserId,
AyaType = o.AType, // AyaType = o.AType,
ObjectId = o.ObjectId, // ObjectId = o.ObjectId,
NotifySubscriptionId = sub.Id, // NotifySubscriptionId = sub.Id,
Name = SourceName // Name = SourceName
}; // };
await ct.NotifyEvent.AddAsync(n); // await ct.NotifyEvent.AddAsync(n);
log.LogDebug($"Adding NotifyEvent: [{n.ToString()}]"); // log.LogDebug($"Adding NotifyEvent: [{n.ToString()}]");
await ct.SaveChangesAsync(); // await ct.SaveChangesAsync();
} // }
} // }
} // }
}//end of process notifications // }//end of process notifications
///////////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////////
}//eoc // }//eoc
}//eons // }//eons

2
server/AyaNova/models/AyContext.cs
View File

@@ -99,7 +99,7 @@ namespace AyaNova.Models
public virtual DbSet<Logo> Logo { get; set; } public virtual DbSet<Logo> Logo { get; set; }
public virtual DbSet<Report> Report { get; set; } public virtual DbSet<Report> Report { get; set; }
public virtual DbSet<DashboardView> DashboardView { get; set; } public virtual DbSet<DashboardView> DashboardView { get; set; }
public virtual DbSet<ServiceBank> ServiceBank { get; set; } // public virtual DbSet<ServiceBank> ServiceBank { get; set; }
public virtual DbSet<ViewRestockRequired> ViewRestockRequired { get; set; } public virtual DbSet<ViewRestockRequired> ViewRestockRequired { get; set; }

4
server/AyaNova/models/Customer.cs
View File

@@ -34,7 +34,7 @@ namespace AyaNova.Models
public string HeadOfficeViz { get; set; } public string HeadOfficeViz { get; set; }
public string TechNotes { get; set; } public string TechNotes { get; set; }
public string AccountNumber { get; set; } public string AccountNumber { get; set; }
public bool UsesBanking { get; set; } //public bool UsesBanking { get; set; }
public long? ContractId { get; set; } public long? ContractId { get; set; }
[NotMapped] [NotMapped]
public string ContractViz { get; set; } public string ContractViz { get; set; }
@@ -67,7 +67,7 @@ namespace AyaNova.Models
{ {
Tags = new List<string>(); Tags = new List<string>();
BillHeadOffice = false; BillHeadOffice = false;
UsesBanking = false; //UsesBanking = false;
} }
[NotMapped, JsonIgnore] [NotMapped, JsonIgnore]

4
server/AyaNova/models/HeadOffice.cs
View File

@@ -27,7 +27,7 @@ namespace AyaNova.Models
public string WebAddress { get; set; } public string WebAddress { get; set; }
public string AccountNumber { get; set; } public string AccountNumber { get; set; }
public bool UsesBanking { get; set; } //public bool UsesBanking { get; set; }
public long? ContractId { get; set; } public long? ContractId { get; set; }
[NotMapped] [NotMapped]
public string ContractViz { get; set; } public string ContractViz { get; set; }
@@ -58,7 +58,7 @@ namespace AyaNova.Models
public HeadOffice() public HeadOffice()
{ {
Tags = new List<string>(); Tags = new List<string>();
UsesBanking = false; //UsesBanking = false;
} }
[NotMapped, JsonIgnore] [NotMapped, JsonIgnore]

182
server/AyaNova/models/ServiceBank.cs
View File

@@ -1,109 +1,109 @@
using System; // using System;
using AyaNova.Biz; // using AyaNova.Biz;
using System.ComponentModel.DataAnnotations; // using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; // using System.ComponentModel.DataAnnotations.Schema;
using Newtonsoft.Json; // using Newtonsoft.Json;
namespace AyaNova.Models // namespace AyaNova.Models
{ // {
//SERVICEBANK LEDGER // //SERVICEBANK LEDGER
//NOTE: following pattern outlined here: // //NOTE: following pattern outlined here:
//https://dba.stackexchange.com/a/19368 // //https://dba.stackexchange.com/a/19368
public class ServiceBank : ICoreBizObjectModel // public class ServiceBank : ICoreBizObjectModel
{ // {
public long Id { get; set; } // public long Id { get; set; }
public uint Concurrency { get; set; } // public uint Concurrency { get; set; }
[Required] // [Required]
public string Name { get; set; } // public string Name { get; set; }
[Required] // [Required]
public DateTime EntryDate { get; set; } // public DateTime EntryDate { get; set; }
public DateTime? LastEntryDate { get; set; } // public DateTime? LastEntryDate { get; set; }
[Required] // [Required]
public long ObjectId { get; set; } // public long ObjectId { get; set; }
[Required] // [Required]
public AyaType AType { get; set; } // public AyaType AType { get; set; }
[Required] // [Required]
public long SourceId { get; set; } // public long SourceId { get; set; }
[Required] // [Required]
public AyaType SourceType { get; set; } // public AyaType SourceType { get; set; }
[Required] // [Required]
public decimal Incidents { get; set; } // public decimal Incidents { get; set; }
[Required] // [Required]
public decimal IncidentsBalance { get; set; } // public decimal IncidentsBalance { get; set; }
public decimal? LastIncidentsBalance { get; set; } // public decimal? LastIncidentsBalance { get; set; }
[Required] // [Required]
public decimal Currency { get; set; } // public decimal Currency { get; set; }
[Required] // [Required]
public decimal CurrencyBalance { get; set; } // public decimal CurrencyBalance { get; set; }
public decimal? LastCurrencyBalance { get; set; } // public decimal? LastCurrencyBalance { get; set; }
[Required] // [Required]
public decimal Hours { get; set; } // public decimal Hours { get; set; }
[Required] // [Required]
public decimal HoursBalance { get; set; } // public decimal HoursBalance { get; set; }
public decimal? LastHoursBalance { get; set; } // public decimal? LastHoursBalance { get; set; }
public ServiceBank() // public ServiceBank()
{ // {
EntryDate = DateTime.UtcNow; // EntryDate = DateTime.UtcNow;
} // }
[NotMapped, JsonIgnore] // [NotMapped, JsonIgnore]
public AyaType AyaType { get => AyaType.ServiceBank; } // public AyaType AyaType { get => AyaType.ServiceBank; }
}//eoc // }//eoc
//Data transfer version used by UI to make new entry or consume banked time // //Data transfer version used by UI to make new entry or consume banked time
//this way the client doesn't need to bother with balances or last entries and such // //this way the client doesn't need to bother with balances or last entries and such
public class dtServiceBank // public class dtServiceBank
{ // {
public long Id { get; set; } // public long Id { get; set; }
public uint Concurrency { get; set; } // public uint Concurrency { get; set; }
[Required] // [Required]
public string Name { get; set; } // public string Name { get; set; }
[Required] // [Required]
public long ObjectId { get; set; } // public long ObjectId { get; set; }
[Required] // [Required]
public AyaType AType { get; set; } // public AyaType AType { get; set; }
[Required] // [Required]
public long SourceId { get; set; } // public long SourceId { get; set; }
[Required] // [Required]
public AyaType SourceType { get; set; } // public AyaType SourceType { get; set; }
[Required] // [Required]
public decimal Incidents { get; set; } // public decimal Incidents { get; set; }
[Required] // [Required]
public decimal Currency { get; set; } // public decimal Currency { get; set; }
[Required] // [Required]
public decimal Hours { get; set; } // public decimal Hours { get; set; }
}//eoc // }//eoc
}//eons // }//eons
/* // /*
CREATE TABLE [dbo].[ASERVICEBANK]( // CREATE TABLE [dbo].[ASERVICEBANK](
[AID] [uniqueidentifier] NOT NULL, // [AID] [uniqueidentifier] NOT NULL,
[ACREATED] [datetime] NOT NULL,//displays as "Entered" in v7 ui // [ACREATED] [datetime] NOT NULL,//displays as "Entered" in v7 ui
[ACREATOR] [uniqueidentifier] NOT NULL, // [ACREATOR] [uniqueidentifier] NOT NULL,
[ADESCRIPTION] [nvarchar](255) NULL, // [ADESCRIPTION] [nvarchar](255) NULL,
[ASOURCEROOTOBJECTTYPE] [smallint] NOT NULL, // [ASOURCEROOTOBJECTTYPE] [smallint] NOT NULL,
[AEFFECTIVEDATE] [datetime] NULL,//docs for v7 say for what have you purposes, not relevant, for v8 IMPORT AS transactiondat // [AEFFECTIVEDATE] [datetime] NULL,//docs for v7 say for what have you purposes, not relevant, for v8 IMPORT AS transactiondat
[AINCIDENTS] [decimal](19, 5) NULL, // [AINCIDENTS] [decimal](19, 5) NULL,
[AINCIDENTSBALANCE] [decimal](19, 5) NULL, // [AINCIDENTSBALANCE] [decimal](19, 5) NULL,
[ACURRENCY] [decimal](19, 5) NULL, // [ACURRENCY] [decimal](19, 5) NULL,
[ACURRENCYBALANCE] [decimal](19, 5) NULL, // [ACURRENCYBALANCE] [decimal](19, 5) NULL,
[AHOURS] [decimal](19, 5) NULL, // [AHOURS] [decimal](19, 5) NULL,
[AHOURSBALANCE] [decimal](19, 5) NULL, // [AHOURSBALANCE] [decimal](19, 5) NULL,
[AAPPLIESTOROOTOBJECTID] [uniqueidentifier] NOT NULL, // [AAPPLIESTOROOTOBJECTID] [uniqueidentifier] NOT NULL,
[AAPPLIESTOROOTOBJECTTYPE] [smallint] NOT NULL, // [AAPPLIESTOROOTOBJECTTYPE] [smallint] NOT NULL,
[ASOURCEROOTOBJECTID] [uniqueidentifier] NULL, // [ASOURCEROOTOBJECTID] [uniqueidentifier] NULL,
*/ // */

2
server/AyaNova/models/Unit.cs
View File

@@ -47,7 +47,7 @@ namespace AyaNova.Models
public bool OverrideModelWarranty { get; set; } public bool OverrideModelWarranty { get; set; }
public int? WarrantyLength { get; set; } public int? WarrantyLength { get; set; }
public string WarrantyTerms { get; set; } public string WarrantyTerms { get; set; }
public bool UsesBanking { get; set; } // public bool UsesBanking { get; set; }
public long? ContractId { get; set; } public long? ContractId { get; set; }
[NotMapped] [NotMapped]
public string ContractViz { get; set; } public string ContractViz { get; set; }

2
server/AyaNova/models/WorkOrderItemLabor.cs
View File

@@ -23,7 +23,7 @@ namespace AyaNova.Models
public string ServiceDetails { get; set; } public string ServiceDetails { get; set; }
public decimal ServiceRateQuantity { get; set; } public decimal ServiceRateQuantity { get; set; }
public decimal NoChargeQuantity { get; set; } public decimal NoChargeQuantity { get; set; }
public long? ServiceBankId { get; set; } //public long? ServiceBankId { get; set; }
public long? TaxCodeSaleId { get; set; } public long? TaxCodeSaleId { get; set; }
[NotMapped] [NotMapped]
public string TaxCodeSaleViz { get; set; } public string TaxCodeSaleViz { get; set; }

2
server/AyaNova/models/WorkOrderItemTravel.cs
View File

@@ -22,7 +22,7 @@ namespace AyaNova.Models
public string TravelDetails { get; set; } public string TravelDetails { get; set; }
public decimal TravelRateQuantity { get; set; } public decimal TravelRateQuantity { get; set; }
public decimal NoChargeQuantity { get; set; } public decimal NoChargeQuantity { get; set; }
public long? ServiceBankId { get; set; } //public long? ServiceBankId { get; set; }
public long? TaxCodeSaleId { get; set; } public long? TaxCodeSaleId { get; set; }
[NotMapped] [NotMapped]
public string TaxCodeSaleViz { get; set; } public string TaxCodeSaleViz { get; set; }

55
server/AyaNova/util/AySchema.cs
View File

@@ -22,16 +22,16 @@ namespace AyaNova.Util
//!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
private const int DESIRED_SCHEMA_LEVEL = 1; private const int DESIRED_SCHEMA_LEVEL = 1;
internal const long EXPECTED_COLUMN_COUNT = 947; internal const long EXPECTED_COLUMN_COUNT = 925;
internal const long EXPECTED_INDEX_COUNT = 141; internal const long EXPECTED_INDEX_COUNT = 137;
internal const long EXPECTED_CHECK_CONSTRAINTS = 433; internal const long EXPECTED_CHECK_CONSTRAINTS = 415;
internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 119; internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 116;
internal const long EXPECTED_VIEWS = 6; internal const long EXPECTED_VIEWS = 6;
internal const long EXPECTED_ROUTINES = 2; internal const long EXPECTED_ROUTINES = 2;
//!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
///////////////////////////////////////////////////////////////// C947:I141:CC433:FC119:V6:R2 ///////////////////////////////////////////////////////////////// C925:I137:CC415:FC116:V6:R2
/* /*
@@ -406,7 +406,6 @@ BEGIN
when 52 then aytable = 'areminder'; when 52 then aytable = 'areminder';
when 53 then return 'LT:UnitMeterReading'; when 53 then return 'LT:UnitMeterReading';
when 54 then aytable = 'acustomerservicerequest'; when 54 then aytable = 'acustomerservicerequest';
when 55 then aytable = 'aservicebank';
when 56 then return 'LT:OpsNotificationSettings'; when 56 then return 'LT:OpsNotificationSettings';
when 57 then aytable = 'areport'; when 57 then aytable = 'areport';
when 58 then return 'LT:DashBoardView'; when 58 then return 'LT:DashBoardView';
@@ -541,23 +540,23 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
await ExecQueryAsync("CREATE INDEX idx_areview_duedate ON areview (duedate);"); await ExecQueryAsync("CREATE INDEX idx_areview_duedate ON areview (duedate);");
await ExecQueryAsync("CREATE INDEX idx_areview_completeddate ON areview (completeddate);"); await ExecQueryAsync("CREATE INDEX idx_areview_completeddate ON areview (completeddate);");
//SERVICE BANK // //SERVICE BANK
//Note: I'm allowing negative balances so this code differs slightly from the example it was drawn from https://dba.stackexchange.com/a/19368 // //Note: I'm allowing negative balances so this code differs slightly from the example it was drawn from https://dba.stackexchange.com/a/19368
await ExecQueryAsync("CREATE TABLE aservicebank (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL, " // await ExecQueryAsync("CREATE TABLE aservicebank (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL, "
+ "entrydate TIMESTAMP NOT NULL, lastentrydate TIMESTAMP NULL, atype INTEGER NOT NULL, objectid BIGINT NOT NULL, sourcetype INTEGER NOT NULL, sourceid BIGINT NOT NULL, " // + "entrydate TIMESTAMP NOT NULL, lastentrydate TIMESTAMP NULL, atype INTEGER NOT NULL, objectid BIGINT NOT NULL, sourcetype INTEGER NOT NULL, sourceid BIGINT NOT NULL, "
+ "incidents DECIMAL(19,5) NOT NULL, incidentsbalance DECIMAL(19,5) NOT NULL, lastincidentsbalance DECIMAL(19,5) NULL, " // + "incidents DECIMAL(19,5) NOT NULL, incidentsbalance DECIMAL(19,5) NOT NULL, lastincidentsbalance DECIMAL(19,5) NULL, "
+ "currency DECIMAL(38,18) NOT NULL, currencybalance DECIMAL(38,18) NOT NULL, lastcurrencybalance DECIMAL(38,18) NULL, " // + "currency DECIMAL(38,18) NOT NULL, currencybalance DECIMAL(38,18) NOT NULL, lastcurrencybalance DECIMAL(38,18) NULL, "
+ "hours DECIMAL(19,5) NOT NULL, hoursbalance DECIMAL(19,5) NOT NULL, lasthoursbalance DECIMAL(19,5) NULL, " // + "hours DECIMAL(19,5) NOT NULL, hoursbalance DECIMAL(19,5) NOT NULL, lasthoursbalance DECIMAL(19,5) NULL, "
+ "CONSTRAINT unq_servicebank UNIQUE (entrydate, objectid, atype, incidentsbalance, hoursbalance, currencybalance), " // + "CONSTRAINT unq_servicebank UNIQUE (entrydate, objectid, atype, incidentsbalance, hoursbalance, currencybalance), "
+ "CONSTRAINT unq_servicebank_previous_values UNIQUE (lastentrydate, objectid, atype, lastincidentsbalance, lasthoursbalance, lastcurrencybalance), " // + "CONSTRAINT unq_servicebank_previous_values UNIQUE (lastentrydate, objectid, atype, lastincidentsbalance, lasthoursbalance, lastcurrencybalance), "
+ "CONSTRAINT fk_servicebank_self FOREIGN KEY (lastentrydate, objectid, atype, lastincidentsbalance, lasthoursbalance, lastcurrencybalance) REFERENCES aservicebank(entrydate, objectid, atype, incidentsbalance, hoursbalance, currencybalance), " // + "CONSTRAINT fk_servicebank_self FOREIGN KEY (lastentrydate, objectid, atype, lastincidentsbalance, lasthoursbalance, lastcurrencybalance) REFERENCES aservicebank(entrydate, objectid, atype, incidentsbalance, hoursbalance, currencybalance), "
+ "CONSTRAINT chk_servicebank_valid_incidentbalance CHECK(incidentsbalance = COALESCE(lastincidentsbalance, 0) + incidents), " // + "CONSTRAINT chk_servicebank_valid_incidentbalance CHECK(incidentsbalance = COALESCE(lastincidentsbalance, 0) + incidents), "
+ "CONSTRAINT chk_servicebank_valid_currencybalance CHECK(currencybalance = COALESCE(lastcurrencybalance, 0) + currency), " // + "CONSTRAINT chk_servicebank_valid_currencybalance CHECK(currencybalance = COALESCE(lastcurrencybalance, 0) + currency), "
+ "CONSTRAINT chk_servicebank_valid_hoursbalance CHECK(hoursbalance = COALESCE(lasthoursbalance, 0) + hours), " // + "CONSTRAINT chk_servicebank_valid_hoursbalance CHECK(hoursbalance = COALESCE(lasthoursbalance, 0) + hours), "
+ "CONSTRAINT chk_servicebank_valid_dates_sequence CHECK(lastentrydate < entrydate), " // + "CONSTRAINT chk_servicebank_valid_dates_sequence CHECK(lastentrydate < entrydate), "
+ "CONSTRAINT chk_servicebank_valid_previous_columns CHECK((lastentrydate IS NULL AND lastincidentsbalance IS NULL AND lastcurrencybalance IS NULL AND lasthoursbalance IS NULL) OR (lastentrydate IS NOT NULL AND lastincidentsbalance IS NOT NULL AND lastcurrencybalance IS NOT NULL AND lasthoursbalance IS NOT NULL)) " // + "CONSTRAINT chk_servicebank_valid_previous_columns CHECK((lastentrydate IS NULL AND lastincidentsbalance IS NULL AND lastcurrencybalance IS NULL AND lasthoursbalance IS NULL) OR (lastentrydate IS NOT NULL AND lastincidentsbalance IS NOT NULL AND lastcurrencybalance IS NOT NULL AND lasthoursbalance IS NOT NULL)) "
+ " )"); // + " )");
await ExecQueryAsync("CREATE INDEX idx_aservicebank_objectid_atype ON aservicebank (objectid, atype );"); // await ExecQueryAsync("CREATE INDEX idx_aservicebank_objectid_atype ON aservicebank (objectid, atype );");
//CONTRACT //CONTRACT
await ExecQueryAsync("CREATE TABLE acontract (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL UNIQUE, active BOOL NOT NULL, " await ExecQueryAsync("CREATE TABLE acontract (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL UNIQUE, active BOOL NOT NULL, "
@@ -570,7 +569,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
//CUSTOMER //CUSTOMER
await ExecQueryAsync("CREATE TABLE acustomer (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL UNIQUE, active BOOL NOT NULL, " await ExecQueryAsync("CREATE TABLE acustomer (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL UNIQUE, active BOOL NOT NULL, "
+ "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY, " + "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY, "
+ "webaddress TEXT, popupnotes TEXT, billheadoffice BOOL, technotes TEXT, accountnumber TEXT, usesbanking BOOL, contractexpires TIMESTAMP NULL, contractid BIGINT NULL REFERENCES acontract(id), " + "webaddress TEXT, popupnotes TEXT, billheadoffice BOOL, technotes TEXT, accountnumber TEXT, contractexpires TIMESTAMP NULL, contractid BIGINT NULL REFERENCES acontract(id), "
+ "phone1 TEXT, phone2 TEXT, phone3 TEXT, phone4 TEXT, phone5 TEXT, emailaddress TEXT, " + "phone1 TEXT, phone2 TEXT, phone3 TEXT, phone4 TEXT, phone5 TEXT, emailaddress TEXT, "
+ "postaddress TEXT, postcity TEXT, postregion TEXT, postcountry TEXT, postcode TEXT, address TEXT, city TEXT, region TEXT, country TEXT, latitude DECIMAL(9,6), longitude DECIMAL(9,6), " + "postaddress TEXT, postcity TEXT, postregion TEXT, postcountry TEXT, postcode TEXT, address TEXT, city TEXT, region TEXT, country TEXT, latitude DECIMAL(9,6), longitude DECIMAL(9,6), "
+ "CONSTRAINT chk_contract_valid CHECK((contractid IS NULL) OR (contractid IS NOT NULL AND contractexpires IS NOT NULL)) " + "CONSTRAINT chk_contract_valid CHECK((contractid IS NULL) OR (contractid IS NOT NULL AND contractexpires IS NOT NULL)) "
@@ -607,7 +606,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
//HEADOFFICE //HEADOFFICE
await ExecQueryAsync("CREATE TABLE aheadoffice (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL UNIQUE, active BOOL NOT NULL, " await ExecQueryAsync("CREATE TABLE aheadoffice (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL UNIQUE, active BOOL NOT NULL, "
+ "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY," + "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY,"
+ "webaddress TEXT, accountnumber TEXT, usesbanking BOOL, contractexpires TIMESTAMP NULL, contractid BIGINT NULL REFERENCES acontract(id), " + "webaddress TEXT, accountnumber TEXT, contractexpires TIMESTAMP NULL, contractid BIGINT NULL REFERENCES acontract(id), "
+ "phone1 TEXT, phone2 TEXT, phone3 TEXT, phone4 TEXT, phone5 TEXT, emailaddress TEXT, " + "phone1 TEXT, phone2 TEXT, phone3 TEXT, phone4 TEXT, phone5 TEXT, emailaddress TEXT, "
+ "postaddress TEXT, postcity TEXT, postregion TEXT, postcountry TEXT, postcode TEXT, address TEXT, city TEXT, region TEXT, country TEXT, latitude DECIMAL(9,6), longitude DECIMAL(9,6), " + "postaddress TEXT, postcity TEXT, postregion TEXT, postcountry TEXT, postcode TEXT, address TEXT, city TEXT, region TEXT, country TEXT, latitude DECIMAL(9,6), longitude DECIMAL(9,6), "
+ "CONSTRAINT chk_contract_valid CHECK((contractid IS NULL) OR (contractid IS NOT NULL AND contractexpires IS NOT NULL)) " + "CONSTRAINT chk_contract_valid CHECK((contractid IS NULL) OR (contractid IS NOT NULL AND contractexpires IS NOT NULL)) "
@@ -716,7 +715,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
+ "unitmodelid BIGINT NULL REFERENCES aunitmodel(id), unithasownaddress BOOL, boughthere BOOL, purchasedfromvendorid BIGINT NULL REFERENCES avendor(id), " + "unitmodelid BIGINT NULL REFERENCES aunitmodel(id), unithasownaddress BOOL, boughthere BOOL, purchasedfromvendorid BIGINT NULL REFERENCES avendor(id), "
+ "receipt TEXT NULL, purchaseddate TIMESTAMP NULL, description TEXT NULL, replacedbyunitid BIGINT NULL REFERENCES aunit(id), " + "receipt TEXT NULL, purchaseddate TIMESTAMP NULL, description TEXT NULL, replacedbyunitid BIGINT NULL REFERENCES aunit(id), "
+ "overridemodelwarranty BOOL, warrantylength INTEGER NULL, warrantyterms TEXT NULL, contractid BIGINT NULL REFERENCES acontract, " + "overridemodelwarranty BOOL, warrantylength INTEGER NULL, warrantyterms TEXT NULL, contractid BIGINT NULL REFERENCES acontract, "
+ "contractexpires TIMESTAMP NULL, usesbanking BOOL, metered BOOL, lifetimewarranty BOOL, " + "contractexpires TIMESTAMP NULL, metered BOOL, lifetimewarranty BOOL, "
+ "text1 TEXT NULL, text2 TEXT NULL, text3 TEXT NULL, text4 TEXT NULL, address TEXT NULL, city TEXT NULL, region TEXT NULL, country TEXT NULL, latitude DECIMAL(9,6) NULL, longitude DECIMAL(9,6) NULL, " + "text1 TEXT NULL, text2 TEXT NULL, text3 TEXT NULL, text4 TEXT NULL, address TEXT NULL, city TEXT NULL, region TEXT NULL, country TEXT NULL, latitude DECIMAL(9,6) NULL, longitude DECIMAL(9,6) NULL, "
+ "CONSTRAINT unq_unitserialmodelid UNIQUE (serial, unitmodelid), " + "CONSTRAINT unq_unitserialmodelid UNIQUE (serial, unitmodelid), "
+ "CONSTRAINT chk_contract_valid CHECK((contractid IS NULL) OR (contractid IS NOT NULL AND contractexpires IS NOT NULL)) " + "CONSTRAINT chk_contract_valid CHECK((contractid IS NULL) OR (contractid IS NOT NULL AND contractexpires IS NOT NULL)) "
@@ -788,7 +787,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
//WORKORDERITEM LABOR //WORKORDERITEM LABOR
await ExecQueryAsync("CREATE TABLE aworkorderitemlabor (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderitemid BIGINT NOT NULL REFERENCES aworkorderitem (id), " await ExecQueryAsync("CREATE TABLE aworkorderitemlabor (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderitemid BIGINT NOT NULL REFERENCES aworkorderitem (id), "
+ "userid BIGINT REFERENCES auser, servicestartdate TIMESTAMP, servicestopdate TIMESTAMP, servicerateid BIGINT REFERENCES aservicerate, servicedetails text, " + "userid BIGINT REFERENCES auser, servicestartdate TIMESTAMP, servicestopdate TIMESTAMP, servicerateid BIGINT REFERENCES aservicerate, servicedetails text, "
+ "serviceratequantity DECIMAL(19,5) NOT NULL default 0, nochargequantity DECIMAL(19,5) NOT NULL default 0, servicebankid BIGINT REFERENCES aservicebank, " + "serviceratequantity DECIMAL(19,5) NOT NULL default 0, nochargequantity DECIMAL(19,5) NOT NULL default 0, "
+ "taxcodesaleid BIGINT REFERENCES ataxcode, priceoverride DECIMAL(38,18) " + "taxcodesaleid BIGINT REFERENCES ataxcode, priceoverride DECIMAL(38,18) "
+ ")"); + ")");
@@ -825,7 +824,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
//WORKORDERITEM TRAVEL //WORKORDERITEM TRAVEL
await ExecQueryAsync("CREATE TABLE aworkorderitemtravel (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderitemid BIGINT NOT NULL REFERENCES aworkorderitem (id), " await ExecQueryAsync("CREATE TABLE aworkorderitemtravel (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderitemid BIGINT NOT NULL REFERENCES aworkorderitem (id), "
+ "userid BIGINT REFERENCES auser, travelstartdate TIMESTAMP, travelstopdate TIMESTAMP, travelrateid BIGINT REFERENCES atravelrate, traveldetails text, " + "userid BIGINT REFERENCES auser, travelstartdate TIMESTAMP, travelstopdate TIMESTAMP, travelrateid BIGINT REFERENCES atravelrate, traveldetails text, "
+ "travelratequantity DECIMAL(19,5) NOT NULL default 0, nochargequantity DECIMAL(19,5) NOT NULL default 0, servicebankid BIGINT REFERENCES aservicebank, " + "travelratequantity DECIMAL(19,5) NOT NULL default 0, nochargequantity DECIMAL(19,5) NOT NULL default 0, "
+ "taxcodesaleid BIGINT REFERENCES ataxcode, distance DECIMAL(19,5) NOT NULL default 0, priceoverride DECIMAL(38,18) " + "taxcodesaleid BIGINT REFERENCES ataxcode, distance DECIMAL(19,5) NOT NULL default 0, priceoverride DECIMAL(38,18) "
+ ")"); + ")");

2
server/AyaNova/util/DbUtil.cs
View File

@@ -422,7 +422,7 @@ namespace AyaNova.Util
await EraseTableAsync("aservicerate", conn); await EraseTableAsync("aservicerate", conn);
await EraseTableAsync("atravelrate", conn); await EraseTableAsync("atravelrate", conn);
await EraseTableAsync("ataxcode", conn); await EraseTableAsync("ataxcode", conn);
await EraseTableAsync("aservicebank", conn); //await EraseTableAsync("aservicebank", conn);
await EraseTableAsync("aworkorderstatus", conn); await EraseTableAsync("aworkorderstatus", conn);
await EraseTableAsync("aworkorderitemstatus", conn); await EraseTableAsync("aworkorderitemstatus", conn);

2
server/AyaNova/util/Seeder.cs
View File

@@ -2070,7 +2070,7 @@ namespace AyaNova.Util
} }
//for now no banked units in seeds //for now no banked units in seeds
o.UsesBanking = false; //o.UsesBanking = false;
o.Metered = false;//for now no meters either o.Metered = false;//for now no meters either
o.Text1 = null; o.Text1 = null;
o.Text2 = null; o.Text2 = null;