From 4a9d0c57c1c8383bb43810d00c96d1f7257f31e8 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 21 Jun 2021 17:29:18 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/biz/FormFieldReference.cs | 2 ++ server/AyaNova/generator/CoreJobLicense.cs | 6 +++--- server/AyaNova/resource/de.json | 4 +++- server/AyaNova/resource/en.json | 4 +++- server/AyaNova/resource/es.json | 4 +++- server/AyaNova/resource/fr.json | 4 +++- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b77f3b95..fcc80a75 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "false", + "AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index 71a74dfe..ca9cbc12 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -863,6 +863,8 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber" }); l.Add(new FormField { TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber" }); l.Add(new FormField { TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite" }); + l.Add(new FormField { TKey = "CustomerSignature", FieldKey = "CustomerSignature" }); + l.Add(new FormField { TKey = "TechSignature", FieldKey = "TechSignature" }); l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" }); l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" }); diff --git a/server/AyaNova/generator/CoreJobLicense.cs b/server/AyaNova/generator/CoreJobLicense.cs index ce8fbbb5..f11aaa92 100644 --- a/server/AyaNova/generator/CoreJobLicense.cs +++ b/server/AyaNova/generator/CoreJobLicense.cs @@ -71,9 +71,9 @@ namespace AyaNova.Biz var ret = await AyaNova.Core.License.FetchKeyAsync(ServerState, ct, log, true); //When this was enabled never saw a failed fetch, trying again without it - // #if (DEBUG) - // log.LogInformation("TEST FETCH OK"); - // #endif +#if (DEBUG) + log.LogInformation("CoreJobLicense - result is: " + ret); +#endif //most often the result will be "notfound" but in future might be other results if (ret == "ok") { diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index a5d8e6b6..a23955ec 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2266,5 +2266,7 @@ "CustomerAccessWorkOrderWiki":"Arbeitsauftragskopf anzeigen WIKI", "CSRInfoHTML":"Kundenservice-Anfrageinfo HTML", "CustomerAccessWorkOrderReport":"Kundenversion Arbeitsauftragsbericht", - "NoFeaturesAvailable":"Für Ihr Konto sind keine Funktionen aktiviert" + "NoFeaturesAvailable":"Für Ihr Konto sind keine Funktionen aktiviert", + "CustomerSignature":"Unterschrift des Kunden", + "TechSignature":"Unterschrift des Technikers" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 192aca6e..beebdf01 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -2266,7 +2266,9 @@ "CustomerAccessWorkOrderWiki":"View work order header WIKI", "CSRInfoHTML":"CSR info HTML", "CustomerAccessWorkOrderReport":"Customer work order report", - "NoFeaturesAvailable":"No features are enabled for your account" + "NoFeaturesAvailable":"No features are enabled for your account", + "CustomerSignature":"Customer signature", + "TechSignature":"Technician signature" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index a475529d..6345b90f 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2266,5 +2266,7 @@ "CustomerAccessWorkOrderWiki":"Ver el encabezado de la orden de trabajo WIKI", "CSRInfoHTML":"Información HTML de solicitud de servicio al cliente", "CustomerAccessWorkOrderReport":"Informe de orden de trabajo del cliente", - "NoFeaturesAvailable":"No hay funciones habilitadas para su cuenta" + "NoFeaturesAvailable":"No hay funciones habilitadas para su cuenta", + "CustomerSignature":"Firma del cliente", + "TechSignature":"Firma del técnico" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index dfee3968..b6415f6b 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2266,5 +2266,7 @@ "CustomerAccessWorkOrderWiki":"Voir l'en-tête de l'ordre de travail WIKI", "CSRInfoHTML":"Informations sur la demande de service client HTML", "CustomerAccessWorkOrderReport":"Rapport de bon de travail client", - "NoFeaturesAvailable":"Aucune fonctionnalité n'est activée pour votre compte" + "NoFeaturesAvailable":"Aucune fonctionnalité n'est activée pour votre compte", + "CustomerSignature":"Signature du client", + "TechSignature":"Signature du technicien" } \ No newline at end of file