From f514211b7ca056914f7aab42a82e9c271c4c0358 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 23 Jul 2021 23:53:42 +0000 Subject: [PATCH] --- server/AyaNova/biz/FormFieldReference.cs | 2 +- server/AyaNova/models/Customer.cs | 2 +- server/AyaNova/util/AySchema.cs | 23 ++++++++++++++++------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index c6d4ffed..3bb731e5 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -163,7 +163,7 @@ namespace AyaNova.Biz 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 = "WorkOrderTemplate", FieldKey = "DefaultServiceTemplateId" }); + // 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" }); diff --git a/server/AyaNova/models/Customer.cs b/server/AyaNova/models/Customer.cs index 7d6f3b20..c9a1fd07 100644 --- a/server/AyaNova/models/Customer.cs +++ b/server/AyaNova/models/Customer.cs @@ -39,7 +39,7 @@ namespace AyaNova.Models [NotMapped] public string ContractViz { get; set; } public DateTime? ContractExpires { get; set; } - public long? DefaultServiceTemplateId { get; set; } + //public long? DefaultServiceTemplateId { get; set; } public string Phone1 { get; set; } public string Phone2 { get; set; } public string Phone3 { get; set; } diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 064d554d..3bc5a373 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -388,14 +388,14 @@ BEGIN when 20 then aytable = 'apart'; aynamecolumn ='partnumber'; when 21 then aytable = 'apm'; aynamecolumn ='serial'; when 22 then aytable = 'apmitem'; - when 23 then aytable = 'apmtemplate'; - when 24 then aytable = 'apmtemplateitem'; + when 23 then return 'LT:WorkOrderItemExpense'; + when 24 then return 'LT:WorkOrderItemLabor'; when 25 then aytable = 'aproject'; when 26 then aytable = 'apurchaseorder'; aynamecolumn = 'serial'; when 27 then aytable = 'aquote'; aynamecolumn = 'serial'; - when 28 then aytable = 'aquoteitem'; - when 29 then aytable = 'aquotetemplate'; - when 30 then aytable = 'aquotetemplateitem'; + when 28 then return 'LT:WorkOrderItem'; + when 29 then return 'LT:aworkorderitemloan'; + when 30 then return 'LT:WorkOrderItemPart'; when 31 then aytable = 'aunit'; aynamecolumn = 'serial'; when 32 then aytable = 'aunitmodel'; aynamecolumn = 'number'; when 33 then aytable = 'avendor'; @@ -410,8 +410,8 @@ BEGIN when 42 then return 'LT:WorkOrderItemTask'; when 43 then return 'LT:WorkOrderItemTravel'; when 44 then return 'LT:WorkOrderItemUnit'; - when 45 then aytable = 'aworkordertemplate'; - when 46 then aytable = 'aworkordertemplateitem'; + when 45 then return 'LT:WorkOrderItemScheduledUser'; + when 46 then return 'LT:WorkOrderItemTask'; when 47 then return 'LT:GlobalOps'; when 48 then return 'LT:BizMetrics'; when 49 then return 'LT:Backup'; @@ -434,6 +434,15 @@ BEGIN when 67 then aytable = 'apartinventory'; aynamecolumn='description'; when 68 then return format('DataListColumnView %L', ayobjectid); when 71 then aytable = 'aworkorderstatus'; + when 72 then aytable = 'aTaskGroup'; + when 73 then return 'LT:WorkOrderItemOutsideService'; + when 74 then aytable = 'aWorkOrderItemPriority'; + when 75 then aytable = 'aWorkOrderItemStatus'; + when 76 then return 'LT:WorkOrderItemTravel'; + when 77 then return 'LT:WorkOrderItemUnit'; + when 78 then aytable = 'aquotestatus'; + when 79 then return 'LT:WorkOrderItemOutsideService'; + else RETURN returnstr; end case;