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/DataList/WorkOrderDataList.cs b/server/AyaNova/DataList/WorkOrderDataList.cs index 2f0f8550..da0f75bf 100644 --- a/server/AyaNova/DataList/WorkOrderDataList.cs +++ b/server/AyaNova/DataList/WorkOrderDataList.cs @@ -264,6 +264,14 @@ namespace AyaNova.DataList SqlValueColumnName = "expwoage" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "TimeToCompletion", + FieldKey = "TimeToCompletion", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "durationtocompleted" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index d492f4b3..b569e6fc 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2282,5 +2282,6 @@ "WarrantyExpires":"Gültig bis", "RecentWorkOrders":"Letzte Arbeitsaufträge", "ApplyUnitContract":"Vertrag '{0}' dieser Einheit auf Arbeitsauftrag anwenden?", - "WorkOrderConvertAllScheduledUsersToLabor":"Alles in Arbeit umwandeln" + "WorkOrderConvertAllScheduledUsersToLabor":"Alles in Arbeit umwandeln", + "TimeToCompletion":"Zeit bis zur Fertigstellung" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index e3783c9d..637fce20 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -2282,7 +2282,7 @@ "WarrantyExpires":"Valid until", "RecentWorkOrders":"Recent Work orders", "ApplyUnitContract":"Apply this Unit's Contract '{0}' to Work order?", - "WorkOrderConvertAllScheduledUsersToLabor":"Convert all to labor" - + "WorkOrderConvertAllScheduledUsersToLabor":"Convert all to labor", + "TimeToCompletion":"Time to completion" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index e54fb8de..e73125ea 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2282,5 +2282,6 @@ "WarrantyExpires":"Válido hasta", "RecentWorkOrders":"Órdenes de trabajo recientes", "ApplyUnitContract":"¿Aplicar el contrato '{0}' de esta unidad a la orden de trabajo?", - "WorkOrderConvertAllScheduledUsersToLabor":"Convertir todo en mano de obra" + "WorkOrderConvertAllScheduledUsersToLabor":"Convertir todo en mano de obra", + "TimeToCompletion":"Tiempo hasta el estado 'Completado'" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 762f9ccc..28b9c9b5 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2282,5 +2282,6 @@ "WarrantyExpires":"Valable jusque", "RecentWorkOrders":"Ordres de travail récents", "ApplyUnitContract":"Appliquer le contrat '{0}' de cette unité à l'ordre de travail?", - "WorkOrderConvertAllScheduledUsersToLabor":"Tout convertir en travail" + "WorkOrderConvertAllScheduledUsersToLabor":"Tout convertir en travail", + "TimeToCompletion":"Durée jusqu'à l'état terminé" } \ No newline at end of file