diff --git a/.vscode/launch.json b/.vscode/launch.json index 0e2049e9..8fd97968 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/PartAssemblyDataList.cs b/server/AyaNova/DataList/PartAssemblyDataList.cs index b0647cd2..bf792dae 100644 --- a/server/AyaNova/DataList/PartAssemblyDataList.cs +++ b/server/AyaNova/DataList/PartAssemblyDataList.cs @@ -42,7 +42,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { - TKey = "Notes", + TKey = "PartAssemblyNotes", FieldKey = "Notes", UiFieldDataType = (int)UiFieldDataType.Text, SqlValueColumnName = "apartassembly.notes" diff --git a/server/AyaNova/biz/AyaFormFieldDefinitions.cs b/server/AyaNova/biz/AyaFormFieldDefinitions.cs index 92088dea..b9846330 100644 --- a/server/AyaNova/biz/AyaFormFieldDefinitions.cs +++ b/server/AyaNova/biz/AyaFormFieldDefinitions.cs @@ -489,7 +489,7 @@ namespace AyaNova.Biz List l = new List(); l.Add(new AyaFormFieldDefinition { TKey = "PartAssemblyName", FieldKey = "Name", Hideable = false }); - l.Add(new AyaFormFieldDefinition { TKey = "Notes", FieldKey = "Notes" }); + l.Add(new AyaFormFieldDefinition { TKey = "PartAssemblyNotes", FieldKey = "Notes" }); l.Add(new AyaFormFieldDefinition { TKey = "Active", FieldKey = "Active", Hideable = false }); l.Add(new AyaFormFieldDefinition { TKey = "Tags", FieldKey = "Tags" }); l.Add(new AyaFormFieldDefinition { TKey = "Wiki", FieldKey = "Wiki" }); diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 7abb5ce3..8a16b425 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -597,6 +597,7 @@ "PartAssemblyDescription": "Beschreibung", "PartAssemblyList": "Teilebaugruppen", "PartAssemblyName": "Teilebaugruppe - Name", + "PartAssemblyNotes": "Anmerkungen", "PartAssemblyCustom1": "Angepasstes Feld 1", "PartAssemblyCustom2": "Angepasstes Feld 2", "PartAssemblyCustom3": "Angepasstes Feld 3", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index a7be350d..21cb1cab 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -597,6 +597,7 @@ "PartAssemblyDescription": "Description", "PartAssemblyList": "Part Assemblies", "PartAssemblyName": "Part Assembly Name", + "PartAssemblyNotes": "Notes", "PartAssemblyCustom1": "Custom1", "PartAssemblyCustom2": "Custom2", "PartAssemblyCustom3": "Custom3", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 5995ca06..a0ec968f 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -596,6 +596,7 @@ "PartAssemblyDescription": "Descripción", "PartAssemblyList": "Montajes de piezas", "PartAssemblyName": "Nombre de montaje de la pieza", + "PartAssemblyNotes": "Notas", "PartAssemblyCustom1": "Campo personalizado 1", "PartAssemblyCustom2": "Campo personalizado 2", "PartAssemblyCustom3": "Campo personalizado 3", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index efa6df3e..dfccdb3c 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -597,6 +597,7 @@ "PartAssemblyDescription": "Description", "PartAssemblyList": "Assemblages de pièces", "PartAssemblyName": "Nom d'assemblage de pièce", + "PartAssemblyNotes": "Remarques", "PartAssemblyCustom1": "Champ personnalisé 1", "PartAssemblyCustom2": "Champ personnalisé 2", "PartAssemblyCustom3": "Champ personnalisé 3",