From 9e62ff9006d35d090ee406603ce4cd95962802f0 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 27 Jul 2021 18:11:13 +0000 Subject: [PATCH] --- server/AyaNova/biz/FormFieldReference.cs | 4 +--- server/AyaNova/models/Quote.cs | 3 +-- server/AyaNova/resource/de.json | 5 ++++- server/AyaNova/resource/en.json | 8 ++++++-- server/AyaNova/resource/es.json | 5 ++++- server/AyaNova/resource/fr.json | 5 ++++- server/AyaNova/util/AySchema.cs | 9 ++++----- 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index ff09576c..80c9071b 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -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" }); diff --git a/server/AyaNova/models/Quote.cs b/server/AyaNova/models/Quote.cs index b5fcf76f..df08473d 100644 --- a/server/AyaNova/models/Quote.cs +++ b/server/AyaNova/models/Quote.cs @@ -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] diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 9ab8ff00..9067ecda 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -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" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index c5819fd6..4dc3fb98 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -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" + } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index d5924f03..24773914 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -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" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index a820f819..9ec6c3b4 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -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" } \ No newline at end of file diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 7f1e64cf..53a8a901 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -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) " + ")");