From 2f94d37e5d9ba1c24731e1e0f7737e7ece0f1854 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 17 Jan 2019 16:44:15 +0000 Subject: [PATCH] --- server/AyaNova/models/License.cs | 8 +- server/AyaNova/resource/en.json | 334 +++++++++++++++++++------------ server/AyaNova/util/AySchema.cs | 20 +- server/AyaNova/util/License.cs | 4 +- 4 files changed, 206 insertions(+), 160 deletions(-) diff --git a/server/AyaNova/models/License.cs b/server/AyaNova/models/License.cs index 921ece974..12be024b 100644 --- a/server/AyaNova/models/License.cs +++ b/server/AyaNova/models/License.cs @@ -9,12 +9,6 @@ namespace AyaNova.Models { public long Id { get; set; } public string Key { get; set; } - public Guid DbId { get; set; } - //public int LastFetchStatus { get; set; } - // public string LastFetchMessage { get; set; } - - - + public Guid DbId { get; set; } } - } diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index e32b4df1..71f7bf27 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -38,16 +38,22 @@ "ClientBillHeadOffice": "Bill Head Office", "ClientContact": "Contact", "ClientContactNotes": "Other contacts", - "ClientCustom0": "My Custom0", - "ClientCustom1": "My Custom1", - "ClientCustom2": "My Custom2", - "ClientCustom3": "My Custom3", - "ClientCustom4": "My Custom4", - "ClientCustom5": "My Custom5", - "ClientCustom6": "My Custom6", - "ClientCustom7": "Custom field 7", - "ClientCustom8": "Custom field 8", - "ClientCustom9": "Custom field 9", + "ClientCustom1": "Custom1", + "ClientCustom2": "Custom2", + "ClientCustom3": "Custom3", + "ClientCustom4": "Custom4", + "ClientCustom5": "Custom5", + "ClientCustom6": "Custom6", + "ClientCustom7": "Custom7", + "ClientCustom8": "Custom8", + "ClientCustom9": "Custom9", + "ClientCustom10": "Custom10", + "ClientCustom11": "Custom11", + "ClientCustom12": "Custom12", + "ClientCustom13": "Custom13", + "ClientCustom14": "Custom14", + "ClientCustom15": "Custom15", + "ClientCustom16": "Custom16", "ClientEmail": "Email", "ClientEventContractExpire": "Client - contract expiring", "ClientList": "Clients", @@ -149,17 +155,23 @@ "ContactPhoneTypeObjectName": "Type", "ContactTitleList": "Contact Titles", "ContactTitleName": "Title Name", - "ContractContractRatesOnly": "Limit to contract rates only", - "ContractCustom0": "Custom field 0", - "ContractCustom1": "Custom field 1", - "ContractCustom2": "Custom field 2", - "ContractCustom3": "Custom field 3", - "ContractCustom4": "Custom field 4", - "ContractCustom5": "Custom field 5", - "ContractCustom6": "Custom field 6", - "ContractCustom7": "Custom field 7", - "ContractCustom8": "Custom field 8", - "ContractCustom9": "Custom field 9", + "ContractContractRatesOnly": "Limit to contract rates only", + "ContractCustom1": "Custom1", + "ContractCustom2": "Custom2", + "ContractCustom3": "Custom3", + "ContractCustom4": "Custom4", + "ContractCustom5": "Custom5", + "ContractCustom6": "Custom6", + "ContractCustom7": "Custom7", + "ContractCustom8": "Custom8", + "ContractCustom9": "Custom9", + "ContractCustom10": "Custom10", + "ContractCustom11": "Custom11", + "ContractCustom12": "Custom12", + "ContractCustom13": "Custom13", + "ContractCustom14": "Custom14", + "ContractCustom15": "Custom15", + "ContractCustom16": "Custom16", "ContractDiscountParts": "Discount Applied to All Parts", "ContractList": "Contracts", "ContractName": "Contract Name", @@ -297,17 +309,23 @@ "GridFilterName": "Filter name", "HeadOfficeAccountNumber": "Account Number", "HeadOfficeContact": "Contact", - "HeadOfficeContactNotes": "Other contacts", - "HeadOfficeCustom0": "Custom field 0", - "HeadOfficeCustom1": "Custom field 1", - "HeadOfficeCustom2": "Custom field 2", - "HeadOfficeCustom3": "Custom field 3", - "HeadOfficeCustom4": "Custom field 4", - "HeadOfficeCustom5": "Custom field 5", - "HeadOfficeCustom6": "Custom field 6", - "HeadOfficeCustom7": "Custom field 7", - "HeadOfficeCustom8": "Custom field 8", - "HeadOfficeCustom9": "Custom field 9", + "HeadOfficeContactNotes": "Other contacts", + "HeadOfficeCustom1": "Custom1", + "HeadOfficeCustom2": "Custom2", + "HeadOfficeCustom3": "Custom3", + "HeadOfficeCustom4": "Custom4", + "HeadOfficeCustom5": "Custom5", + "HeadOfficeCustom6": "Custom6", + "HeadOfficeCustom7": "Custom7", + "HeadOfficeCustom8": "Custom8", + "HeadOfficeCustom9": "Custom9", + "HeadOfficeCustom10": "Custom10", + "HeadOfficeCustom11": "Custom11", + "HeadOfficeCustom12": "Custom12", + "HeadOfficeCustom13": "Custom13", + "HeadOfficeCustom14": "Custom14", + "HeadOfficeCustom15": "Custom15", + "HeadOfficeCustom16": "Custom16", "HeadOfficeEmail": "Email", "HeadOfficeList": "Head Offices", "HeadOfficeName": "Head Office Name", @@ -320,17 +338,23 @@ "KeyNotFound": "No key was found on the clipboard", "KeyNotValid": "Key could not be validated", "KeySaved": "Key has been saved, restart AyaNova at all computers now", - "LoanItemCurrentWorkorderItemLoan": "Current workorder item loan ID", - "LoanItemCustom0": "Custom field 0", - "LoanItemCustom1": "Custom field 1", - "LoanItemCustom2": "Custom field 2", - "LoanItemCustom3": "Custom field 3", - "LoanItemCustom4": "Custom field 4", - "LoanItemCustom5": "Custom field 5", - "LoanItemCustom6": "Custom field 6", - "LoanItemCustom7": "Custom field 7", - "LoanItemCustom8": "Custom field 8", - "LoanItemCustom9": "Custom field 9", + "LoanItemCurrentWorkorderItemLoan": "Current workorder item loan ID", + "LoanItemCustom1": "Custom1", + "LoanItemCustom2": "Custom2", + "LoanItemCustom3": "Custom3", + "LoanItemCustom4": "Custom4", + "LoanItemCustom5": "Custom5", + "LoanItemCustom6": "Custom6", + "LoanItemCustom7": "Custom7", + "LoanItemCustom8": "Custom8", + "LoanItemCustom9": "Custom9", + "LoanItemCustom10": "Custom10", + "LoanItemCustom11": "Custom11", + "LoanItemCustom12": "Custom12", + "LoanItemCustom13": "Custom13", + "LoanItemCustom14": "Custom14", + "LoanItemCustom15": "Custom15", + "LoanItemCustom16": "Custom16", "LoanItemList": "Loan Items", "LoanItemName": "Name", "LoanItemNotes": "Notes", @@ -508,17 +532,23 @@ "PartTrackSerialHasInventory": "Track serial numbers can not be turned on as this part still has items in inventory", "PartAlert": "Alert text", "PartAlternativeWholesalerID": "Alternative Wholesaler", - "PartAlternativeWholesalerNumber": "Alternative Wholesaler Number", - "PartCustom0": "Custom field 0", - "PartCustom1": "Custom field 1", - "PartCustom2": "Custom field 2", - "PartCustom3": "Custom field 3", - "PartCustom4": "Custom field 4", - "PartCustom5": "Custom field 5", - "PartCustom6": "Custom field 6", - "PartCustom7": "Custom field 7", - "PartCustom8": "Custom field 8", - "PartCustom9": "Custom field 9", + "PartAlternativeWholesalerNumber": "Alternative Wholesaler Number", + "PartCustom1": "Custom1", + "PartCustom2": "Custom2", + "PartCustom3": "Custom3", + "PartCustom4": "Custom4", + "PartCustom5": "Custom5", + "PartCustom6": "Custom6", + "PartCustom7": "Custom7", + "PartCustom8": "Custom8", + "PartCustom9": "Custom9", + "PartCustom10": "Custom10", + "PartCustom11": "Custom11", + "PartCustom12": "Custom12", + "PartCustom13": "Custom13", + "PartCustom14": "Custom14", + "PartCustom15": "Custom15", + "PartCustom16": "Custom16", "PartList": "Parts", "PartManufacturerID": "Manufacturer", "PartManufacturerNumber": "Manufacturer Number", @@ -575,34 +605,46 @@ "PriorityColor": "Color", "PriorityList": "Priorities", "PriorityName": "Priority Name", - "ProjectAccountNumber": "Account Number", - "ProjectCustom0": "Custom field 0", - "ProjectCustom1": "Custom field 1", - "ProjectCustom2": "Custom field 2", - "ProjectCustom3": "Custom field 3", - "ProjectCustom4": "Custom field 4", - "ProjectCustom5": "Custom field 5", - "ProjectCustom6": "Custom field 6", - "ProjectCustom7": "Custom field 7", - "ProjectCustom8": "Custom field 8", - "ProjectCustom9": "Custom field 9", + "ProjectAccountNumber": "Account Number", + "ProjectCustom1": "Custom1", + "ProjectCustom2": "Custom2", + "ProjectCustom3": "Custom3", + "ProjectCustom4": "Custom4", + "ProjectCustom5": "Custom5", + "ProjectCustom6": "Custom6", + "ProjectCustom7": "Custom7", + "ProjectCustom8": "Custom8", + "ProjectCustom9": "Custom9", + "ProjectCustom10": "Custom10", + "ProjectCustom11": "Custom11", + "ProjectCustom12": "Custom12", + "ProjectCustom13": "Custom13", + "ProjectCustom14": "Custom14", + "ProjectCustom15": "Custom15", + "ProjectCustom16": "Custom16", "ProjectDateCompleted": "Date Completed", "ProjectDateStarted": "Date Started", "ProjectList": "Projects", "ProjectName": "Project Name", "ProjectNotes": "Notes", "ProjectProjectOverseerID": "Project Overseer", - "PurchaseOrderActualReceiveDate": "Due Date", - "PurchaseOrderCustom0": "Custom field 0", - "PurchaseOrderCustom1": "Custom field 1", - "PurchaseOrderCustom2": "Custom field 2", - "PurchaseOrderCustom3": "Custom field 3", - "PurchaseOrderCustom4": "Custom field 4", - "PurchaseOrderCustom5": "Custom field 5", - "PurchaseOrderCustom6": "Custom field 6", - "PurchaseOrderCustom7": "Custom field 7", - "PurchaseOrderCustom8": "Custom field 8", - "PurchaseOrderCustom9": "Custom field 9", + "PurchaseOrderActualReceiveDate": "Due Date", + "PurchaseOrderCustom1": "Custom1", + "PurchaseOrderCustom2": "Custom2", + "PurchaseOrderCustom3": "Custom3", + "PurchaseOrderCustom4": "Custom4", + "PurchaseOrderCustom5": "Custom5", + "PurchaseOrderCustom6": "Custom6", + "PurchaseOrderCustom7": "Custom7", + "PurchaseOrderCustom8": "Custom8", + "PurchaseOrderCustom9": "Custom9", + "PurchaseOrderCustom10": "Custom10", + "PurchaseOrderCustom11": "Custom11", + "PurchaseOrderCustom12": "Custom12", + "PurchaseOrderCustom13": "Custom13", + "PurchaseOrderCustom14": "Custom14", + "PurchaseOrderCustom15": "Custom15", + "PurchaseOrderCustom16": "Custom16", "PurchaseOrderDropShipToClientID": "Drop Ship to Client", "PurchaseOrderLocked": "Purchase order is locked due to it's status", "PurchaseOrderExpectedReceiveDate": "Expected", @@ -1004,17 +1046,23 @@ "UIGridLayoutLayoutContent": "Grid layout data", "UIGridLayoutLayoutSize": "Grid layout data size", "UIGridLayoutObjectName": "UI Grid Layout object", - "UnitBoughtHere": "Purchased Here", - "UnitCustom0": "Custom field 0", - "UnitCustom1": "Custom field 1", - "UnitCustom2": "Custom field 2", - "UnitCustom3": "Custom field 3", - "UnitCustom4": "Custom field 4", - "UnitCustom5": "Custom field 5", - "UnitCustom6": "Custom field 6", - "UnitCustom7": "Custom field 7", - "UnitCustom8": "Custom field 8", - "UnitCustom9": "Custom field 9", + "UnitBoughtHere": "Purchased Here", + "UnitCustom1": "Custom1", + "UnitCustom2": "Custom2", + "UnitCustom3": "Custom3", + "UnitCustom4": "Custom4", + "UnitCustom5": "Custom5", + "UnitCustom6": "Custom6", + "UnitCustom7": "Custom7", + "UnitCustom8": "Custom8", + "UnitCustom9": "Custom9", + "UnitCustom10": "Custom10", + "UnitCustom11": "Custom11", + "UnitCustom12": "Custom12", + "UnitCustom13": "Custom13", + "UnitCustom14": "Custom14", + "UnitCustom15": "Custom15", + "UnitCustom16": "Custom16", "UnitDescription": "Description", "UnitLastMeter": "Last meter reading", "UnitLifeSpan": "Life span", @@ -1045,17 +1093,23 @@ "UnitMeterReadingList": "Unit Meter Reading List", "UnitMeterReadingMeter": "Unit Meter Reading", "UnitMeterReadingMeterDate": "Meter reading date", - "UnitMeterReadingWorkorderItemID": "Meter read on workorder", - "UnitModelCustom0": "Custom field 0", - "UnitModelCustom1": "Custom field 1", - "UnitModelCustom2": "Custom field 2", - "UnitModelCustom3": "Custom field 3", - "UnitModelCustom4": "Custom field 4", - "UnitModelCustom5": "Custom field 5", - "UnitModelCustom6": "Custom field 6", - "UnitModelCustom7": "Custom field 7", - "UnitModelCustom8": "Custom field 8", - "UnitModelCustom9": "Custom field 9", + "UnitMeterReadingWorkorderItemID": "Meter read on workorder", + "UnitModelCustom1": "Custom1", + "UnitModelCustom2": "Custom2", + "UnitModelCustom3": "Custom3", + "UnitModelCustom4": "Custom4", + "UnitModelCustom5": "Custom5", + "UnitModelCustom6": "Custom6", + "UnitModelCustom7": "Custom7", + "UnitModelCustom8": "Custom8", + "UnitModelCustom9": "Custom9", + "UnitModelCustom10": "Custom10", + "UnitModelCustom11": "Custom11", + "UnitModelCustom12": "Custom12", + "UnitModelCustom13": "Custom13", + "UnitModelCustom14": "Custom14", + "UnitModelCustom15": "Custom15", + "UnitModelCustom16": "Custom16", "UnitModelDiscontinued": "Discontinued", "UnitModelDiscontinuedDate": "Discontinued Date", "UnitModelIntroducedDate": "Introduced Date", @@ -1086,17 +1140,23 @@ "UnitOfMeasureName": "Unit of Measure Name", "UnitServiceTypeDescription": "Description", "UnitServiceTypeList": "Unit Service Types", - "UnitServiceTypeName": "Name", - "UserCustom0": "Custom field 0", - "UserCustom1": "Custom field 1", - "UserCustom2": "Custom field 2", - "UserCustom3": "Custom field 3", - "UserCustom4": "Custom field 4", - "UserCustom5": "Custom field 5", - "UserCustom6": "Custom field 6", - "UserCustom7": "Custom field 7", - "UserCustom8": "Custom field 8", - "UserCustom9": "Custom field 9", + "UnitServiceTypeName": "Name", + "UserCustom1": "Custom1", + "UserCustom2": "Custom2", + "UserCustom3": "Custom3", + "UserCustom4": "Custom4", + "UserCustom5": "Custom5", + "UserCustom6": "Custom6", + "UserCustom7": "Custom7", + "UserCustom8": "Custom8", + "UserCustom9": "Custom9", + "UserCustom10": "Custom10", + "UserCustom11": "Custom11", + "UserCustom12": "Custom12", + "UserCustom13": "Custom13", + "UserCustom14": "Custom14", + "UserCustom15": "Custom15", + "UserCustom16": "Custom16", "UserDefaultWarehouseID": "Default warehouse", "UserEmailAddress": "User Email Address", "UserEmployeeNumber": "Employee Number", @@ -1144,17 +1204,23 @@ "UserTypesUtilityNotification": "Notification server account", "VendorAccountNumber": "Account Number", "VendorContact": "Contact", - "VendorContactNotes": "Other contacts", - "VendorCustom0": "Custom field 0", - "VendorCustom1": "Custom field 1", - "VendorCustom2": "Custom field 2", - "VendorCustom3": "Custom field 3", - "VendorCustom4": "Custom field 4", - "VendorCustom5": "Custom field 5", - "VendorCustom6": "Custom field 6", - "VendorCustom7": "Custom field 7", - "VendorCustom8": "Custom field 8", - "VendorCustom9": "Custom field 9", + "VendorContactNotes": "Other contacts", + "VendorCustom1": "Custom1", + "VendorCustom2": "Custom2", + "VendorCustom3": "Custom3", + "VendorCustom4": "Custom4", + "VendorCustom5": "Custom5", + "VendorCustom6": "Custom6", + "VendorCustom7": "Custom7", + "VendorCustom8": "Custom8", + "VendorCustom9": "Custom9", + "VendorCustom10": "Custom10", + "VendorCustom11": "Custom11", + "VendorCustom12": "Custom12", + "VendorCustom13": "Custom13", + "VendorCustom14": "Custom14", + "VendorCustom15": "Custom15", + "VendorCustom16": "Custom16", "VendorEmail": "Email", "VendorList": "Vendors", "VendorName": "Vendor Name", @@ -1212,17 +1278,23 @@ "WorkorderCategoryDescription": "Description", "WorkorderCategoryList": "Workorder Categories", "WorkorderCategoryName": "Workorder Category Name", - "WorkorderDetailsList": "Workorder Details", - "WorkorderItemCustom0": "Custom field 0", - "WorkorderItemCustom1": "Custom field 1", - "WorkorderItemCustom2": "Custom field 2", - "WorkorderItemCustom3": "Custom field 3", - "WorkorderItemCustom4": "Custom field 4", - "WorkorderItemCustom5": "Custom field 5", - "WorkorderItemCustom6": "Custom field 6", - "WorkorderItemCustom7": "Custom field 7", - "WorkorderItemCustom8": "Custom field 8", - "WorkorderItemCustom9": "Custom field 9", + "WorkorderDetailsList": "Workorder Details", + "WorkorderItemCustom1": "Custom1", + "WorkorderItemCustom2": "Custom2", + "WorkorderItemCustom3": "Custom3", + "WorkorderItemCustom4": "Custom4", + "WorkorderItemCustom5": "Custom5", + "WorkorderItemCustom6": "Custom6", + "WorkorderItemCustom7": "Custom7", + "WorkorderItemCustom8": "Custom8", + "WorkorderItemCustom9": "Custom9", + "WorkorderItemCustom10": "Custom10", + "WorkorderItemCustom11": "Custom11", + "WorkorderItemCustom12": "Custom12", + "WorkorderItemCustom13": "Custom13", + "WorkorderItemCustom14": "Custom14", + "WorkorderItemCustom15": "Custom15", + "WorkorderItemCustom16": "Custom16", "WorkorderItemCustomFields": "Custom Fields", "WorkorderItemEventNotServiced": "Workorder item - not serviced quickly enough", "WorkorderItemExpenses": "Expenses", diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 7d629edd..464adbe1 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -255,25 +255,7 @@ namespace AyaNova.Util setSchemaLevel(++currentSchema); } - - // ////////////////////////////////////////////////// - // //LICENSE table new columns - // //LOOKAT: DO I need this anymore??? - // //answer: no because it relates to ops stuff in other tables and logging, not to the license itself (except maybe dbid?) - // if (currentSchema < 7) - // { - // LogUpdateMessage(log); - - // //Add license related stuff - // exec("ALTER TABLE alicense ADD COLUMN dbid uuid"); - // exec("ALTER TABLE alicense ADD COLUMN LastFetchStatus integer"); - // exec("ALTER TABLE alicense ADD COLUMN LastFetchMessage text"); - - // setSchemaLevel(++currentSchema); - // } - - - + ////////////////////////////////////////////////// //DATAFILTER table if (currentSchema < 7) diff --git a/server/AyaNova/util/License.cs b/server/AyaNova/util/License.cs index bb24807d..347172b6 100644 --- a/server/AyaNova/util/License.cs +++ b/server/AyaNova/util/License.cs @@ -430,10 +430,8 @@ namespace AyaNova.Core if (ldb == null) { ldb = new Models.License(); - ldb.DbId = Guid.NewGuid(); - //ldb.LastFetchStatus = 0; + ldb.DbId = Guid.NewGuid(); ldb.Key = "none"; - //ldb.LastFetchMessage = "none"; ctx.License.Add(ldb); ctx.SaveChanges(); }