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

Browse Source
This commit is contained in:
John Cardinal
2019-01-17 16:44:15 +00:00
parent 2730043507
commit 2f94d37e5d
4 changed files with 206 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/AyaNova/models/License.cs
View File

@@ -10,11 +10,5 @@ namespace AyaNova.Models
public long Id { get; set; } public long Id { get; set; }
public string Key { get; set; } public string Key { get; set; }
public Guid DbId { get; set; } public Guid DbId { get; set; }
//public int LastFetchStatus { get; set; }
// public string LastFetchMessage { get; set; }
} }
} }

312
server/AyaNova/resource/en.json
View File

@@ -38,16 +38,22 @@
"ClientBillHeadOffice": "Bill Head Office", "ClientBillHeadOffice": "Bill Head Office",
"ClientContact": "Contact", "ClientContact": "Contact",
"ClientContactNotes": "Other contacts", "ClientContactNotes": "Other contacts",
"ClientCustom0": "My Custom0", "ClientCustom1": "Custom1",
"ClientCustom1": "My Custom1", "ClientCustom2": "Custom2",
"ClientCustom2": "My Custom2", "ClientCustom3": "Custom3",
"ClientCustom3": "My Custom3", "ClientCustom4": "Custom4",
"ClientCustom4": "My Custom4", "ClientCustom5": "Custom5",
"ClientCustom5": "My Custom5", "ClientCustom6": "Custom6",
"ClientCustom6": "My Custom6", "ClientCustom7": "Custom7",
"ClientCustom7": "Custom field 7", "ClientCustom8": "Custom8",
"ClientCustom8": "Custom field 8", "ClientCustom9": "Custom9",
"ClientCustom9": "Custom field 9", "ClientCustom10": "Custom10",
"ClientCustom11": "Custom11",
"ClientCustom12": "Custom12",
"ClientCustom13": "Custom13",
"ClientCustom14": "Custom14",
"ClientCustom15": "Custom15",
"ClientCustom16": "Custom16",
"ClientEmail": "Email", "ClientEmail": "Email",
"ClientEventContractExpire": "Client - contract expiring", "ClientEventContractExpire": "Client - contract expiring",
"ClientList": "Clients", "ClientList": "Clients",
@@ -150,16 +156,22 @@
"ContactTitleList": "Contact Titles", "ContactTitleList": "Contact Titles",
"ContactTitleName": "Title Name", "ContactTitleName": "Title Name",
"ContractContractRatesOnly": "Limit to contract rates only", "ContractContractRatesOnly": "Limit to contract rates only",
"ContractCustom0": "Custom field 0", "ContractCustom1": "Custom1",
"ContractCustom1": "Custom field 1", "ContractCustom2": "Custom2",
"ContractCustom2": "Custom field 2", "ContractCustom3": "Custom3",
"ContractCustom3": "Custom field 3", "ContractCustom4": "Custom4",
"ContractCustom4": "Custom field 4", "ContractCustom5": "Custom5",
"ContractCustom5": "Custom field 5", "ContractCustom6": "Custom6",
"ContractCustom6": "Custom field 6", "ContractCustom7": "Custom7",
"ContractCustom7": "Custom field 7", "ContractCustom8": "Custom8",
"ContractCustom8": "Custom field 8", "ContractCustom9": "Custom9",
"ContractCustom9": "Custom field 9", "ContractCustom10": "Custom10",
"ContractCustom11": "Custom11",
"ContractCustom12": "Custom12",
"ContractCustom13": "Custom13",
"ContractCustom14": "Custom14",
"ContractCustom15": "Custom15",
"ContractCustom16": "Custom16",
"ContractDiscountParts": "Discount Applied to All Parts", "ContractDiscountParts": "Discount Applied to All Parts",
"ContractList": "Contracts", "ContractList": "Contracts",
"ContractName": "Contract Name", "ContractName": "Contract Name",
@@ -298,16 +310,22 @@
"HeadOfficeAccountNumber": "Account Number", "HeadOfficeAccountNumber": "Account Number",
"HeadOfficeContact": "Contact", "HeadOfficeContact": "Contact",
"HeadOfficeContactNotes": "Other contacts", "HeadOfficeContactNotes": "Other contacts",
"HeadOfficeCustom0": "Custom field 0", "HeadOfficeCustom1": "Custom1",
"HeadOfficeCustom1": "Custom field 1", "HeadOfficeCustom2": "Custom2",
"HeadOfficeCustom2": "Custom field 2", "HeadOfficeCustom3": "Custom3",
"HeadOfficeCustom3": "Custom field 3", "HeadOfficeCustom4": "Custom4",
"HeadOfficeCustom4": "Custom field 4", "HeadOfficeCustom5": "Custom5",
"HeadOfficeCustom5": "Custom field 5", "HeadOfficeCustom6": "Custom6",
"HeadOfficeCustom6": "Custom field 6", "HeadOfficeCustom7": "Custom7",
"HeadOfficeCustom7": "Custom field 7", "HeadOfficeCustom8": "Custom8",
"HeadOfficeCustom8": "Custom field 8", "HeadOfficeCustom9": "Custom9",
"HeadOfficeCustom9": "Custom field 9", "HeadOfficeCustom10": "Custom10",
"HeadOfficeCustom11": "Custom11",
"HeadOfficeCustom12": "Custom12",
"HeadOfficeCustom13": "Custom13",
"HeadOfficeCustom14": "Custom14",
"HeadOfficeCustom15": "Custom15",
"HeadOfficeCustom16": "Custom16",
"HeadOfficeEmail": "Email", "HeadOfficeEmail": "Email",
"HeadOfficeList": "Head Offices", "HeadOfficeList": "Head Offices",
"HeadOfficeName": "Head Office Name", "HeadOfficeName": "Head Office Name",
@@ -321,16 +339,22 @@
"KeyNotValid": "Key could not be validated", "KeyNotValid": "Key could not be validated",
"KeySaved": "Key has been saved, restart AyaNova at all computers now", "KeySaved": "Key has been saved, restart AyaNova at all computers now",
"LoanItemCurrentWorkorderItemLoan": "Current workorder item loan ID", "LoanItemCurrentWorkorderItemLoan": "Current workorder item loan ID",
"LoanItemCustom0": "Custom field 0", "LoanItemCustom1": "Custom1",
"LoanItemCustom1": "Custom field 1", "LoanItemCustom2": "Custom2",
"LoanItemCustom2": "Custom field 2", "LoanItemCustom3": "Custom3",
"LoanItemCustom3": "Custom field 3", "LoanItemCustom4": "Custom4",
"LoanItemCustom4": "Custom field 4", "LoanItemCustom5": "Custom5",
"LoanItemCustom5": "Custom field 5", "LoanItemCustom6": "Custom6",
"LoanItemCustom6": "Custom field 6", "LoanItemCustom7": "Custom7",
"LoanItemCustom7": "Custom field 7", "LoanItemCustom8": "Custom8",
"LoanItemCustom8": "Custom field 8", "LoanItemCustom9": "Custom9",
"LoanItemCustom9": "Custom field 9", "LoanItemCustom10": "Custom10",
"LoanItemCustom11": "Custom11",
"LoanItemCustom12": "Custom12",
"LoanItemCustom13": "Custom13",
"LoanItemCustom14": "Custom14",
"LoanItemCustom15": "Custom15",
"LoanItemCustom16": "Custom16",
"LoanItemList": "Loan Items", "LoanItemList": "Loan Items",
"LoanItemName": "Name", "LoanItemName": "Name",
"LoanItemNotes": "Notes", "LoanItemNotes": "Notes",
@@ -509,16 +533,22 @@
"PartAlert": "Alert text", "PartAlert": "Alert text",
"PartAlternativeWholesalerID": "Alternative Wholesaler", "PartAlternativeWholesalerID": "Alternative Wholesaler",
"PartAlternativeWholesalerNumber": "Alternative Wholesaler Number", "PartAlternativeWholesalerNumber": "Alternative Wholesaler Number",
"PartCustom0": "Custom field 0", "PartCustom1": "Custom1",
"PartCustom1": "Custom field 1", "PartCustom2": "Custom2",
"PartCustom2": "Custom field 2", "PartCustom3": "Custom3",
"PartCustom3": "Custom field 3", "PartCustom4": "Custom4",
"PartCustom4": "Custom field 4", "PartCustom5": "Custom5",
"PartCustom5": "Custom field 5", "PartCustom6": "Custom6",
"PartCustom6": "Custom field 6", "PartCustom7": "Custom7",
"PartCustom7": "Custom field 7", "PartCustom8": "Custom8",
"PartCustom8": "Custom field 8", "PartCustom9": "Custom9",
"PartCustom9": "Custom field 9", "PartCustom10": "Custom10",
"PartCustom11": "Custom11",
"PartCustom12": "Custom12",
"PartCustom13": "Custom13",
"PartCustom14": "Custom14",
"PartCustom15": "Custom15",
"PartCustom16": "Custom16",
"PartList": "Parts", "PartList": "Parts",
"PartManufacturerID": "Manufacturer", "PartManufacturerID": "Manufacturer",
"PartManufacturerNumber": "Manufacturer Number", "PartManufacturerNumber": "Manufacturer Number",
@@ -576,16 +606,22 @@
"PriorityList": "Priorities", "PriorityList": "Priorities",
"PriorityName": "Priority Name", "PriorityName": "Priority Name",
"ProjectAccountNumber": "Account Number", "ProjectAccountNumber": "Account Number",
"ProjectCustom0": "Custom field 0", "ProjectCustom1": "Custom1",
"ProjectCustom1": "Custom field 1", "ProjectCustom2": "Custom2",
"ProjectCustom2": "Custom field 2", "ProjectCustom3": "Custom3",
"ProjectCustom3": "Custom field 3", "ProjectCustom4": "Custom4",
"ProjectCustom4": "Custom field 4", "ProjectCustom5": "Custom5",
"ProjectCustom5": "Custom field 5", "ProjectCustom6": "Custom6",
"ProjectCustom6": "Custom field 6", "ProjectCustom7": "Custom7",
"ProjectCustom7": "Custom field 7", "ProjectCustom8": "Custom8",
"ProjectCustom8": "Custom field 8", "ProjectCustom9": "Custom9",
"ProjectCustom9": "Custom field 9", "ProjectCustom10": "Custom10",
"ProjectCustom11": "Custom11",
"ProjectCustom12": "Custom12",
"ProjectCustom13": "Custom13",
"ProjectCustom14": "Custom14",
"ProjectCustom15": "Custom15",
"ProjectCustom16": "Custom16",
"ProjectDateCompleted": "Date Completed", "ProjectDateCompleted": "Date Completed",
"ProjectDateStarted": "Date Started", "ProjectDateStarted": "Date Started",
"ProjectList": "Projects", "ProjectList": "Projects",
@@ -593,16 +629,22 @@
"ProjectNotes": "Notes", "ProjectNotes": "Notes",
"ProjectProjectOverseerID": "Project Overseer", "ProjectProjectOverseerID": "Project Overseer",
"PurchaseOrderActualReceiveDate": "Due Date", "PurchaseOrderActualReceiveDate": "Due Date",
"PurchaseOrderCustom0": "Custom field 0", "PurchaseOrderCustom1": "Custom1",
"PurchaseOrderCustom1": "Custom field 1", "PurchaseOrderCustom2": "Custom2",
"PurchaseOrderCustom2": "Custom field 2", "PurchaseOrderCustom3": "Custom3",
"PurchaseOrderCustom3": "Custom field 3", "PurchaseOrderCustom4": "Custom4",
"PurchaseOrderCustom4": "Custom field 4", "PurchaseOrderCustom5": "Custom5",
"PurchaseOrderCustom5": "Custom field 5", "PurchaseOrderCustom6": "Custom6",
"PurchaseOrderCustom6": "Custom field 6", "PurchaseOrderCustom7": "Custom7",
"PurchaseOrderCustom7": "Custom field 7", "PurchaseOrderCustom8": "Custom8",
"PurchaseOrderCustom8": "Custom field 8", "PurchaseOrderCustom9": "Custom9",
"PurchaseOrderCustom9": "Custom field 9", "PurchaseOrderCustom10": "Custom10",
"PurchaseOrderCustom11": "Custom11",
"PurchaseOrderCustom12": "Custom12",
"PurchaseOrderCustom13": "Custom13",
"PurchaseOrderCustom14": "Custom14",
"PurchaseOrderCustom15": "Custom15",
"PurchaseOrderCustom16": "Custom16",
"PurchaseOrderDropShipToClientID": "Drop Ship to Client", "PurchaseOrderDropShipToClientID": "Drop Ship to Client",
"PurchaseOrderLocked": "Purchase order is locked due to it's status", "PurchaseOrderLocked": "Purchase order is locked due to it's status",
"PurchaseOrderExpectedReceiveDate": "Expected", "PurchaseOrderExpectedReceiveDate": "Expected",
@@ -1005,16 +1047,22 @@
"UIGridLayoutLayoutSize": "Grid layout data size", "UIGridLayoutLayoutSize": "Grid layout data size",
"UIGridLayoutObjectName": "UI Grid Layout object", "UIGridLayoutObjectName": "UI Grid Layout object",
"UnitBoughtHere": "Purchased Here", "UnitBoughtHere": "Purchased Here",
"UnitCustom0": "Custom field 0", "UnitCustom1": "Custom1",
"UnitCustom1": "Custom field 1", "UnitCustom2": "Custom2",
"UnitCustom2": "Custom field 2", "UnitCustom3": "Custom3",
"UnitCustom3": "Custom field 3", "UnitCustom4": "Custom4",
"UnitCustom4": "Custom field 4", "UnitCustom5": "Custom5",
"UnitCustom5": "Custom field 5", "UnitCustom6": "Custom6",
"UnitCustom6": "Custom field 6", "UnitCustom7": "Custom7",
"UnitCustom7": "Custom field 7", "UnitCustom8": "Custom8",
"UnitCustom8": "Custom field 8", "UnitCustom9": "Custom9",
"UnitCustom9": "Custom field 9", "UnitCustom10": "Custom10",
"UnitCustom11": "Custom11",
"UnitCustom12": "Custom12",
"UnitCustom13": "Custom13",
"UnitCustom14": "Custom14",
"UnitCustom15": "Custom15",
"UnitCustom16": "Custom16",
"UnitDescription": "Description", "UnitDescription": "Description",
"UnitLastMeter": "Last meter reading", "UnitLastMeter": "Last meter reading",
"UnitLifeSpan": "Life span", "UnitLifeSpan": "Life span",
@@ -1046,16 +1094,22 @@
"UnitMeterReadingMeter": "Unit Meter Reading", "UnitMeterReadingMeter": "Unit Meter Reading",
"UnitMeterReadingMeterDate": "Meter reading date", "UnitMeterReadingMeterDate": "Meter reading date",
"UnitMeterReadingWorkorderItemID": "Meter read on workorder", "UnitMeterReadingWorkorderItemID": "Meter read on workorder",
"UnitModelCustom0": "Custom field 0", "UnitModelCustom1": "Custom1",
"UnitModelCustom1": "Custom field 1", "UnitModelCustom2": "Custom2",
"UnitModelCustom2": "Custom field 2", "UnitModelCustom3": "Custom3",
"UnitModelCustom3": "Custom field 3", "UnitModelCustom4": "Custom4",
"UnitModelCustom4": "Custom field 4", "UnitModelCustom5": "Custom5",
"UnitModelCustom5": "Custom field 5", "UnitModelCustom6": "Custom6",
"UnitModelCustom6": "Custom field 6", "UnitModelCustom7": "Custom7",
"UnitModelCustom7": "Custom field 7", "UnitModelCustom8": "Custom8",
"UnitModelCustom8": "Custom field 8", "UnitModelCustom9": "Custom9",
"UnitModelCustom9": "Custom field 9", "UnitModelCustom10": "Custom10",
"UnitModelCustom11": "Custom11",
"UnitModelCustom12": "Custom12",
"UnitModelCustom13": "Custom13",
"UnitModelCustom14": "Custom14",
"UnitModelCustom15": "Custom15",
"UnitModelCustom16": "Custom16",
"UnitModelDiscontinued": "Discontinued", "UnitModelDiscontinued": "Discontinued",
"UnitModelDiscontinuedDate": "Discontinued Date", "UnitModelDiscontinuedDate": "Discontinued Date",
"UnitModelIntroducedDate": "Introduced Date", "UnitModelIntroducedDate": "Introduced Date",
@@ -1087,16 +1141,22 @@
"UnitServiceTypeDescription": "Description", "UnitServiceTypeDescription": "Description",
"UnitServiceTypeList": "Unit Service Types", "UnitServiceTypeList": "Unit Service Types",
"UnitServiceTypeName": "Name", "UnitServiceTypeName": "Name",
"UserCustom0": "Custom field 0", "UserCustom1": "Custom1",
"UserCustom1": "Custom field 1", "UserCustom2": "Custom2",
"UserCustom2": "Custom field 2", "UserCustom3": "Custom3",
"UserCustom3": "Custom field 3", "UserCustom4": "Custom4",
"UserCustom4": "Custom field 4", "UserCustom5": "Custom5",
"UserCustom5": "Custom field 5", "UserCustom6": "Custom6",
"UserCustom6": "Custom field 6", "UserCustom7": "Custom7",
"UserCustom7": "Custom field 7", "UserCustom8": "Custom8",
"UserCustom8": "Custom field 8", "UserCustom9": "Custom9",
"UserCustom9": "Custom field 9", "UserCustom10": "Custom10",
"UserCustom11": "Custom11",
"UserCustom12": "Custom12",
"UserCustom13": "Custom13",
"UserCustom14": "Custom14",
"UserCustom15": "Custom15",
"UserCustom16": "Custom16",
"UserDefaultWarehouseID": "Default warehouse", "UserDefaultWarehouseID": "Default warehouse",
"UserEmailAddress": "User Email Address", "UserEmailAddress": "User Email Address",
"UserEmployeeNumber": "Employee Number", "UserEmployeeNumber": "Employee Number",
@@ -1145,16 +1205,22 @@
"VendorAccountNumber": "Account Number", "VendorAccountNumber": "Account Number",
"VendorContact": "Contact", "VendorContact": "Contact",
"VendorContactNotes": "Other contacts", "VendorContactNotes": "Other contacts",
"VendorCustom0": "Custom field 0", "VendorCustom1": "Custom1",
"VendorCustom1": "Custom field 1", "VendorCustom2": "Custom2",
"VendorCustom2": "Custom field 2", "VendorCustom3": "Custom3",
"VendorCustom3": "Custom field 3", "VendorCustom4": "Custom4",
"VendorCustom4": "Custom field 4", "VendorCustom5": "Custom5",
"VendorCustom5": "Custom field 5", "VendorCustom6": "Custom6",
"VendorCustom6": "Custom field 6", "VendorCustom7": "Custom7",
"VendorCustom7": "Custom field 7", "VendorCustom8": "Custom8",
"VendorCustom8": "Custom field 8", "VendorCustom9": "Custom9",
"VendorCustom9": "Custom field 9", "VendorCustom10": "Custom10",
"VendorCustom11": "Custom11",
"VendorCustom12": "Custom12",
"VendorCustom13": "Custom13",
"VendorCustom14": "Custom14",
"VendorCustom15": "Custom15",
"VendorCustom16": "Custom16",
"VendorEmail": "Email", "VendorEmail": "Email",
"VendorList": "Vendors", "VendorList": "Vendors",
"VendorName": "Vendor Name", "VendorName": "Vendor Name",
@@ -1213,16 +1279,22 @@
"WorkorderCategoryList": "Workorder Categories", "WorkorderCategoryList": "Workorder Categories",
"WorkorderCategoryName": "Workorder Category Name", "WorkorderCategoryName": "Workorder Category Name",
"WorkorderDetailsList": "Workorder Details", "WorkorderDetailsList": "Workorder Details",
"WorkorderItemCustom0": "Custom field 0", "WorkorderItemCustom1": "Custom1",
"WorkorderItemCustom1": "Custom field 1", "WorkorderItemCustom2": "Custom2",
"WorkorderItemCustom2": "Custom field 2", "WorkorderItemCustom3": "Custom3",
"WorkorderItemCustom3": "Custom field 3", "WorkorderItemCustom4": "Custom4",
"WorkorderItemCustom4": "Custom field 4", "WorkorderItemCustom5": "Custom5",
"WorkorderItemCustom5": "Custom field 5", "WorkorderItemCustom6": "Custom6",
"WorkorderItemCustom6": "Custom field 6", "WorkorderItemCustom7": "Custom7",
"WorkorderItemCustom7": "Custom field 7", "WorkorderItemCustom8": "Custom8",
"WorkorderItemCustom8": "Custom field 8", "WorkorderItemCustom9": "Custom9",
"WorkorderItemCustom9": "Custom field 9", "WorkorderItemCustom10": "Custom10",
"WorkorderItemCustom11": "Custom11",
"WorkorderItemCustom12": "Custom12",
"WorkorderItemCustom13": "Custom13",
"WorkorderItemCustom14": "Custom14",
"WorkorderItemCustom15": "Custom15",
"WorkorderItemCustom16": "Custom16",
"WorkorderItemCustomFields": "Custom Fields", "WorkorderItemCustomFields": "Custom Fields",
"WorkorderItemEventNotServiced": "Workorder item - not serviced quickly enough", "WorkorderItemEventNotServiced": "Workorder item - not serviced quickly enough",
"WorkorderItemExpenses": "Expenses", "WorkorderItemExpenses": "Expenses",

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

@@ -256,24 +256,6 @@ namespace AyaNova.Util
} }
// //////////////////////////////////////////////////
// //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 //DATAFILTER table
if (currentSchema < 7) if (currentSchema < 7)

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

@@ -431,9 +431,7 @@ namespace AyaNova.Core
{ {
ldb = new Models.License(); ldb = new Models.License();
ldb.DbId = Guid.NewGuid(); ldb.DbId = Guid.NewGuid();
//ldb.LastFetchStatus = 0;
ldb.Key = "none"; ldb.Key = "none";
//ldb.LastFetchMessage = "none";
ctx.License.Add(ldb); ctx.License.Add(ldb);
ctx.SaveChanges(); ctx.SaveChanges();
} }