This commit is contained in:
2021-02-22 15:33:50 +00:00
parent 9a1f4e25f2
commit ffec79c61b
2 changed files with 55 additions and 103 deletions

View File

@@ -58,22 +58,18 @@ namespace AyaNova.Biz
#region WIDGET_KEY
{
List<FormField> l = new List<FormField>();
//l.Add(new FormField { TKey = "WidgetName", FieldKey = "Name", Hideable = false });
l.Add(new FormField { TKey = "WidgetSerial", FieldKey = "Serial" });
l.Add(new FormField { TKey = "WidgetDollarAmount", FieldKey = "DollarAmount" });
l.Add(new FormField { TKey = "WidgetCount", FieldKey = "Count" });
l.Add(new FormField { TKey = "UserType", FieldKey = "UserType" });
l.Add(new FormField { TKey = "WidgetDollarAmount", FieldKey = "DollarAmount" });
l.Add(new FormField { TKey = "WidgetStartDate", FieldKey = "StartDate" });
l.Add(new FormField { TKey = "WidgetEndDate", FieldKey = "EndDate" });
l.Add(new FormField { TKey = "WidgetNotes", FieldKey = "Notes" });
//More to do on this, maybe the datatype should be a LINK or something for UI purposes
//circle back on this when there is enough infrastructure to test
l.Add(new FormField { TKey = "User", FieldKey = "UserId" });
// l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false });
l.Add(new FormField { TKey = "UserType", FieldKey = "UserType" });
l.Add(new FormField { TKey = "WidgetNotes", FieldKey = "Notes" });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
l.Add(new FormField { TKey = "WidgetCustom1", FieldKey = "WidgetCustom1", IsCustomField = true });
l.Add(new FormField { TKey = "WidgetCustom2", FieldKey = "WidgetCustom2", IsCustomField = true });
l.Add(new FormField { TKey = "WidgetCustom3", FieldKey = "WidgetCustom3", IsCustomField = true });
@@ -97,17 +93,12 @@ namespace AyaNova.Biz
#region USER_KEY
{
List<FormField> l = new List<FormField>();
// l.Add(new FormField { TKey = "Name", FieldKey = "Name", Hideable = false });
l.Add(new FormField { TKey = "UserEmployeeNumber", FieldKey = "EmployeeNumber" });
//l.Add(new FormField { TKey = "AuthorizationRoles", FieldKey = "Roles", Hideable = false });
l.Add(new FormField { TKey = "UserNotes", FieldKey = "Notes" });
// l.Add(new FormField { TKey = "UserType", FieldKey = "UserType", Hideable = false });
//l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false });
l.Add(new FormField { TKey = "LastLogin", FieldKey = "LastLogin" });
l.Add(new FormField { TKey = "UserNotes", FieldKey = "Notes" });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
l.Add(new FormField { TKey = "UserCustom1", FieldKey = "UserCustom1", IsCustomField = true });
l.Add(new FormField { TKey = "UserCustom2", FieldKey = "UserCustom2", IsCustomField = true });
l.Add(new FormField { TKey = "UserCustom3", FieldKey = "UserCustom3", IsCustomField = true });
@@ -131,17 +122,12 @@ namespace AyaNova.Biz
#region CONTACT_KEY
{
List<FormField> l = new List<FormField>();
//l.Add(new FormField { TKey = "Name", FieldKey = "Name", Hideable = false });
l.Add(new FormField { TKey = "UserEmployeeNumber", FieldKey = "EmployeeNumber" });
//l.Add(new FormField { TKey = "AuthorizationRoles", FieldKey = "Roles", Hideable = false });
l.Add(new FormField { TKey = "UserNotes", FieldKey = "Notes" });
//l.Add(new FormField { TKey = "UserType", FieldKey = "UserType", Hideable = false });
//l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false });
l.Add(new FormField { TKey = "LastLogin", FieldKey = "LastLogin" });
l.Add(new FormField { TKey = "UserNotes", FieldKey = "Notes" });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
l.Add(new FormField { TKey = "UserCustom1", FieldKey = "UserCustom1", IsCustomField = true });
l.Add(new FormField { TKey = "UserCustom2", FieldKey = "UserCustom2", IsCustomField = true });
l.Add(new FormField { TKey = "UserCustom3", FieldKey = "UserCustom3", IsCustomField = true });
@@ -166,46 +152,38 @@ namespace AyaNova.Biz
#region Customer
{
List<FormField> l = new List<FormField>();
//STANDARD FIELDS
// l.Add(new FormField { TKey = "CustomerName", FieldKey = "Name", Hideable = false });
l.Add(new FormField { TKey = "CustomerNotes", FieldKey = "Notes" });
//l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
//CUSTOMER FIELDS
l.Add(new FormField { TKey = "WebAddress", FieldKey = "WebAddress" });
l.Add(new FormField { TKey = "CustomerPopUpNotes", FieldKey = "PopUpNotes" });
l.Add(new FormField { TKey = "CustomerBillHeadOffice", FieldKey = "BillHeadOffice" });
l.Add(new FormField { TKey = "HeadOffice", FieldKey = "HeadOfficeId" });
l.Add(new FormField { TKey = "CustomerTechNotes", FieldKey = "TechNotes" });
l.Add(new FormField { TKey = "CustomerAccountNumber", FieldKey = "AccountNumber" });
l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" });
l.Add(new FormField { TKey = "Contract", FieldKey = "ContractId" });
l.Add(new FormField { TKey = "ContractExpires", FieldKey = "ContractExpires" });
l.Add(new FormField { TKey = "WorkOrderTemplate", FieldKey = "DefaultServiceTemplateId" });
l.Add(new FormField { TKey = "WebAddress", FieldKey = "WebAddress" });
l.Add(new FormField { TKey = "CustomerEmail", FieldKey = "EmailAddress" });
l.Add(new FormField { TKey = "CustomerPhone1", FieldKey = "Phone1" });
l.Add(new FormField { TKey = "CustomerPhone2", FieldKey = "Phone2" });
l.Add(new FormField { TKey = "CustomerPhone3", FieldKey = "Phone3" });
l.Add(new FormField { TKey = "CustomerPhone4", FieldKey = "Phone4" });
l.Add(new FormField { TKey = "CustomerPhone5", FieldKey = "Phone5" });
l.Add(new FormField { TKey = "CustomerEmail", FieldKey = "EmailAddress" });
//ADDRESS FIELDS
l.Add(new FormField { TKey = "AddressPostalDeliveryAddress", FieldKey = "PostAddress" });
l.Add(new FormField { TKey = "AddressPostalCity", FieldKey = "PostCity" });
l.Add(new FormField { TKey = "AddressPostalStateProv", FieldKey = "PostRegion" });
l.Add(new FormField { TKey = "AddressPostalCountry", FieldKey = "PostCountry" });
l.Add(new FormField { TKey = "AddressPostalPostal", FieldKey = "PostCode" });
l.Add(new FormField { TKey = "WorkOrderTemplate", FieldKey = "DefaultServiceTemplateId" });
l.Add(new FormField { TKey = "CustomerBillHeadOffice", FieldKey = "BillHeadOffice" });
l.Add(new FormField { TKey = "HeadOffice", FieldKey = "HeadOfficeId" });
l.Add(new FormField { TKey = "Contract", FieldKey = "ContractId" });
l.Add(new FormField { TKey = "ContractExpires", FieldKey = "ContractExpires" });
l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" });
l.Add(new FormField { TKey = "CustomerNotes", FieldKey = "Notes" });
l.Add(new FormField { TKey = "CustomerTechNotes", FieldKey = "TechNotes" });
l.Add(new FormField { TKey = "CustomerPopUpNotes", FieldKey = "PopUpNotes" });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
l.Add(new FormField { TKey = "AddressDeliveryAddress", FieldKey = "Address" });
l.Add(new FormField { TKey = "AddressCity", FieldKey = "City" });
l.Add(new FormField { TKey = "AddressStateProv", FieldKey = "Region" });
l.Add(new FormField { TKey = "AddressCountry", FieldKey = "Country" });
l.Add(new FormField { TKey = "AddressLatitude", FieldKey = "Latitude" });
l.Add(new FormField { TKey = "AddressLongitude", FieldKey = "Longitude" });
l.Add(new FormField { TKey = "AddressPostalDeliveryAddress", FieldKey = "PostAddress" });
l.Add(new FormField { TKey = "AddressPostalCity", FieldKey = "PostCity" });
l.Add(new FormField { TKey = "AddressPostalStateProv", FieldKey = "PostRegion" });
l.Add(new FormField { TKey = "AddressPostalCountry", FieldKey = "PostCountry" });
l.Add(new FormField { TKey = "AddressPostalPostal", FieldKey = "PostCode" });
//CUSTOM FIELDS
l.Add(new FormField { TKey = "CustomerCustom1", FieldKey = "CustomerCustom1", IsCustomField = true });
l.Add(new FormField { TKey = "CustomerCustom2", FieldKey = "CustomerCustom2", IsCustomField = true });
l.Add(new FormField { TKey = "CustomerCustom3", FieldKey = "CustomerCustom3", IsCustomField = true });
@@ -229,40 +207,32 @@ namespace AyaNova.Biz
#region HeadOffice
{
List<FormField> l = new List<FormField>();
// l.Add(new FormField { TKey = "Name", FieldKey = "Name", Hideable = false });
l.Add(new FormField { TKey = "HeadOfficeNotes", FieldKey = "Notes" });
// l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
//HEAD-OFFICE FIELDS
l.Add(new FormField { TKey = "WebAddress", FieldKey = "WebAddress" });
l.Add(new FormField { TKey = "HeadOfficeAccountNumber", FieldKey = "AccountNumber" });
l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" });
l.Add(new FormField { TKey = "Contract", FieldKey = "ContractId" });
l.Add(new FormField { TKey = "ContractExpires", FieldKey = "ContractExpires" });
l.Add(new FormField { TKey = "WebAddress", FieldKey = "WebAddress" });
l.Add(new FormField { TKey = "HeadOfficeEmail", FieldKey = "EmailAddress" });
l.Add(new FormField { TKey = "HeadOfficePhone1", FieldKey = "Phone1" });
l.Add(new FormField { TKey = "HeadOfficePhone2", FieldKey = "Phone2" });
l.Add(new FormField { TKey = "HeadOfficePhone3", FieldKey = "Phone3" });
l.Add(new FormField { TKey = "HeadOfficePhone4", FieldKey = "Phone4" });
l.Add(new FormField { TKey = "HeadOfficePhone5", FieldKey = "Phone5" });
l.Add(new FormField { TKey = "HeadOfficeEmail", FieldKey = "EmailAddress" });
//ADDRESS FIELDS
l.Add(new FormField { TKey = "AddressPostalDeliveryAddress", FieldKey = "PostAddress" });
l.Add(new FormField { TKey = "AddressPostalCity", FieldKey = "PostCity" });
l.Add(new FormField { TKey = "AddressPostalStateProv", FieldKey = "PostRegion" });
l.Add(new FormField { TKey = "AddressPostalCountry", FieldKey = "PostCountry" });
l.Add(new FormField { TKey = "AddressPostalPostal", FieldKey = "PostCode" });
l.Add(new FormField { TKey = "Contract", FieldKey = "ContractId" });
l.Add(new FormField { TKey = "ContractExpires", FieldKey = "ContractExpires" });
l.Add(new FormField { TKey = "UsesBanking", FieldKey = "UsesBanking" });
l.Add(new FormField { TKey = "HeadOfficeNotes", FieldKey = "Notes" });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
l.Add(new FormField { TKey = "AddressDeliveryAddress", FieldKey = "Address" });
l.Add(new FormField { TKey = "AddressCity", FieldKey = "City" });
l.Add(new FormField { TKey = "AddressStateProv", FieldKey = "Region" });
l.Add(new FormField { TKey = "AddressCountry", FieldKey = "Country" });
l.Add(new FormField { TKey = "AddressLatitude", FieldKey = "Latitude" });
l.Add(new FormField { TKey = "AddressLongitude", FieldKey = "Longitude" });
l.Add(new FormField { TKey = "AddressPostalDeliveryAddress", FieldKey = "PostAddress" });
l.Add(new FormField { TKey = "AddressPostalCity", FieldKey = "PostCity" });
l.Add(new FormField { TKey = "AddressPostalStateProv", FieldKey = "PostRegion" });
l.Add(new FormField { TKey = "AddressPostalCountry", FieldKey = "PostCountry" });
l.Add(new FormField { TKey = "AddressPostalPostal", FieldKey = "PostCode" });
l.Add(new FormField { TKey = "HeadOfficeCustom1", FieldKey = "HeadOfficeCustom1", IsCustomField = true });
l.Add(new FormField { TKey = "HeadOfficeCustom2", FieldKey = "HeadOfficeCustom2", IsCustomField = true });
@@ -287,9 +257,7 @@ namespace AyaNova.Biz
#region Contract
{
List<FormField> l = new List<FormField>();
//l.Add(new FormField { TKey = "Name", FieldKey = "Name", Hideable = false });
l.Add(new FormField { TKey = "ContractNotes", FieldKey = "Notes" });
//l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
@@ -316,29 +284,22 @@ namespace AyaNova.Biz
#region LoanUnit
{
List<FormField> l = new List<FormField>();
// l.Add(new FormField { TKey = "LoanUnitName", FieldKey = "LoanUnitName", Hideable = false });
l.Add(new FormField { TKey = "LoanUnitSerial", FieldKey = "Serial" });
//Note, rates are required but I'm allowing them to be hidden and will ensure client properly sets even if not visible, this is because many shops probably don't need all rates
l.Add(new FormField { TKey = "LoanUnitRateHour", FieldKey = "RateHour" });
l.Add(new FormField { TKey = "LoanUnitRateHalfDay", FieldKey = "RateHalfDay" });
l.Add(new FormField { TKey = "LoanUnitRateDay", FieldKey = "RateDay" });
l.Add(new FormField { TKey = "LoanUnitRateWeek", FieldKey = "RateWeek" });
l.Add(new FormField { TKey = "LoanUnitRateMonth", FieldKey = "RateMonth" });
l.Add(new FormField { TKey = "LoanUnitRateYear", FieldKey = "RateYear" });
l.Add(new FormField { TKey = "LoanUnitDefaultRate", FieldKey = "DefaultRate" });
l.Add(new FormField { TKey = "LoanUnitShadowUnit", FieldKey = "UnitId" });
l.Add(new FormField { TKey = "LoanUnitNotes", FieldKey = "Notes" });
//l.Add(new FormField { TKey = "Active", FieldKey = "Active", Hideable = false });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
l.Add(new FormField { TKey = "LoanUnitSerial", FieldKey = "LoanUnitSerial" });
//Not a user editable field on form so no need to add it here
//l.Add(new AyaFormFieldDefinition { TKey = "LoanUnitCurrentWorkOrderItemLoan", FieldKey = "LoanUnitCurrentWorkOrderItemLoan" });
//Note, rates are required but I'm allowing them to be hidden and will ensure client properly sets even if not visible, this is because many shops probably don't need all rates
l.Add(new FormField { TKey = "LoanUnitRateDay", FieldKey = "LoanUnitRateDay" });
l.Add(new FormField { TKey = "LoanUnitRateHalfDay", FieldKey = "LoanUnitRateHalfDay" });
l.Add(new FormField { TKey = "LoanUnitRateHour", FieldKey = "LoanUnitRateHour" });
l.Add(new FormField { TKey = "LoanUnitRateMonth", FieldKey = "LoanUnitRateMonth" });
l.Add(new FormField { TKey = "LoanUnitRateWeek", FieldKey = "LoanUnitRateWeek" });
l.Add(new FormField { TKey = "LoanUnitRateYear", FieldKey = "LoanUnitRateYear" });
l.Add(new FormField { TKey = "LoanUnitDefaultRate", FieldKey = "LoanUnitDefaultRate" });
l.Add(new FormField { TKey = "LoanUnitShadowUnit", FieldKey = "LoanUnitShadowUnit" });
l.Add(new FormField { TKey = "LoanUnitCustom1", FieldKey = "LoanUnitCustom1", IsCustomField = true });
l.Add(new FormField { TKey = "LoanUnitCustom2", FieldKey = "LoanUnitCustom2", IsCustomField = true });
l.Add(new FormField { TKey = "LoanUnitCustom3", FieldKey = "LoanUnitCustom3", IsCustomField = true });
@@ -363,11 +324,6 @@ namespace AyaNova.Biz
#region Memo
{
List<FormField> l = new List<FormField>();
// l.Add(new FormField { TKey = "MemoSubject", FieldKey = "MemoSubject", Hideable = false });
// l.Add(new FormField { TKey = "MemoMessage", FieldKey = "MemoMessage", Hideable = false });
// l.Add(new FormField { TKey = "MemoToID", FieldKey = "MemoToID", Hideable = false });
// l.Add(new FormField { TKey = "MemoFromID", FieldKey = "MemoFromID", Hideable = false });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
@@ -394,12 +350,8 @@ namespace AyaNova.Biz
#region Reminder
{
List<FormField> l = new List<FormField>();
// l.Add(new FormField { TKey = "ReminderName", FieldKey = "ReminderName", Hideable = false });
// l.Add(new FormField { TKey = "ReminderNotes", FieldKey = "ReminderNotes", Hideable = false });
// l.Add(new FormField { TKey = "ReminderStartDate", FieldKey = "ReminderStartDate", Hideable = false });
// l.Add(new FormField { TKey = "ReminderStopDate", FieldKey = "ReminderStopDate", Hideable = false });
l.Add(new FormField { TKey = "ReminderColor", FieldKey = "ReminderColor" });
List<FormField> l = new List<FormField>();
l.Add(new FormField { TKey = "ReminderColor", FieldKey = "Color" });
l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
@@ -1064,7 +1016,7 @@ namespace AyaNova.Biz
public string TKey { get; set; }
//CLIENT form customization
// public bool Hideable { get; set; }
// public bool Hideable { get; set; }
//CLIENT / SERVER - client display server validation purposes
public bool IsCustomField { get; set; }
@@ -1073,7 +1025,7 @@ namespace AyaNova.Biz
public FormField()
{
//most common defaults
// Hideable = true;
// Hideable = true;
IsCustomField = false;
}
}//eoc

View File

@@ -26,7 +26,7 @@ namespace AyaNova.Models
public string Serial { get; set; }
//MIGRATE_OUTSTANDING this needs to be set in migrate v8 once workorderitemloan is coded and importable
public long? WorkOrderItemLoanId { get; set; }//deliberately named for efcore relationship magic
public long? WorkOrderItemLoanId { get; set; }
[Required]
public decimal RateHour { get; set; }
@@ -43,7 +43,7 @@ namespace AyaNova.Models
[Required]
public LoanUnitRateUnit DefaultRate { get; set; }
public long? UnitId { get; set; }//deliberately named for efcore relationship magic Shadow unit
public long? UnitId { get; set; }//Shadow unit
public LoanUnit()