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
2021-07-27 18:11:13 +00:00
parent 228752e3f0
commit 9e62ff9006
7 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1110,9 +1110,7 @@ namespace AyaNova.Biz
l.Add(new FormField { TKey = "QuoteValidUntilDate", FieldKey = "QuoteValidUntilDate" });
l.Add(new FormField { TKey = "QuoteDateSubmitted", FieldKey = "QuoteDateSubmitted" });
l.Add(new FormField { TKey = "QuoteDateApproved", FieldKey = "QuoteDateApproved" });
l.Add(new FormField { TKey = "CopyWiki", FieldKey = "CopyWiki" });
l.Add(new FormField { TKey = "CopyAttachments", FieldKey = "CopyAttachments" });
l.Add(new FormField { TKey = "WorkOrderSummary", FieldKey = "WorkOrderSummary" });
l.Add(new FormField { TKey = "QuoteQuoteStatusType", FieldKey = "QuoteQuoteStatusType" });

3
server/AyaNova/models/Quote.cs
View File

@@ -30,8 +30,7 @@ namespace AyaNova.Models
public DateTime? ValidUntil { get; set; }
public DateTime? Submitted { get; set; }
public DateTime? Approved { get; set; }
public bool CopyWiki { get; set; }
public bool CopyAttachments { get; set; }
//----
[Required]

5
server/AyaNova/resource/de.json
View File

@@ -2287,5 +2287,8 @@
"WorkOrderConvertAllScheduledUsersToLabor":"Alles in Arbeit umwandeln",
"TimeToCompletion":"Zeit bis zur Fertigstellung",
"CopyAttachments": "Anhänge kopieren",
"CopyWiki": "WIKI kopieren"
"CopyWiki": "WIKI kopieren",
"GenerateWorkOrder": "Arbeitsauftrag erstellen",
"GenerateQuote": "Angebot erstellen",
"GeneratePM":"Präventive Wartung generieren"
}

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

@@ -1607,7 +1607,7 @@
"PMByUnitList": "Preventive Maintenance By Unit",
"QuoteDateApproved": "Approved",
"QuoteDateSubmitted": "Submitted",
"QuoteGenerateServiceWorkOrder": "Generate Service Work order from this Quote",
"QuoteGenerateServiceWorkOrder": "Convert to Work order",
"QuoteIntroduction": "Introductory Text",
"QuoteList": "Quotes",
"QuotePreparedByID": "Prepared by User",
@@ -2287,5 +2287,9 @@
"WorkOrderConvertAllScheduledUsersToLabor": "Convert all to labor",
"TimeToCompletion": "Time to completion",
"CopyAttachments": "Copy attachments",
"CopyWiki": "Copy WIKI"
"CopyWiki": "Copy WIKI",
"GenerateWorkOrder": "Generate Work order",
"GenerateQuote": "Generate Quote",
"GeneratePM":"Generate Preventive Maintenance"
}

5
server/AyaNova/resource/es.json
View File

@@ -2287,5 +2287,8 @@
"WorkOrderConvertAllScheduledUsersToLabor":"Convertir todo en mano de obra",
"TimeToCompletion":"Tiempo hasta el estado 'Completado'",
"CopyAttachments": "Copiar adjuntos",
"CopyWiki": "Copiar WIKI"
"CopyWiki": "Copiar WIKI",
"GenerateWorkOrder": "Generar orden de trabajo",
"GenerateQuote": "Generar Presupuesto",
"GeneratePM":"Generar mantenimiento preventivo"
}

5
server/AyaNova/resource/fr.json
View File

@@ -2287,5 +2287,8 @@
"WorkOrderConvertAllScheduledUsersToLabor":"Tout convertir en travail",
"TimeToCompletion":"Durée jusqu'à l'état terminé",
"CopyAttachments": "Copier les pièces jointes",
"CopyWiki": "Copier le WIKI"
"CopyWiki": "Copier le WIKI",
"GenerateWorkOrder": "Générer un ordre de travail",
"GenerateQuote": "Générer un devis",
"GeneratePM":"Générer une maintenance préventive"
}

9
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!!!!
private const int DESIRED_SCHEMA_LEVEL = 1;
internal const long EXPECTED_COLUMN_COUNT = 1097;
internal const long EXPECTED_COLUMN_COUNT = 1095;
internal const long EXPECTED_INDEX_COUNT = 137;
internal const long EXPECTED_CHECK_CONSTRAINTS = 462;
internal const long EXPECTED_CHECK_CONSTRAINTS = 460;
internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 156;
internal const long EXPECTED_VIEWS = 7;
internal const long EXPECTED_ROUTINES = 2;
//!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
///////////////////////////////////////////////////////////////// (C1097:I137:CC462:FC156:V7:R2)
///////////////////////////////////////////////////////////////// C1095:I137:CC460:FC156:V7:R2
/*
@@ -926,8 +926,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
+ "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY, customerid BIGINT NOT NULL REFERENCES acustomer (id), "
+ "projectid BIGINT REFERENCES aproject, laststatusid BIGINT REFERENCES aquotestatus(id), contractid BIGINT NULL, internalreferencenumber text, "
+ "customerreferencenumber text, customercontactname text, createddate TIMESTAMP NOT NULL, "
+ "preparedbyid BIGINT REFERENCES auser(id), introduction TEXT, requested TIMESTAMP, validuntil TIMESTAMP, submitted TIMESTAMP, approved TIMESTAMP, "
+ "copywiki BOOL NOT NULL, copyattachments BOOL NOT NULL, onsite BOOL NOT NULL, "
+ "preparedbyid BIGINT REFERENCES auser(id), introduction TEXT, requested TIMESTAMP, validuntil TIMESTAMP, submitted TIMESTAMP, approved TIMESTAMP, onsite BOOL NOT NULL, "
+ "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) "
+ ")");