From 295f8bd66034de6c04810abf60094a4489309e02 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 28 Jan 2020 23:00:46 +0000 Subject: [PATCH] --- server/AyaNova/DataList/UserDataList.cs | 2 +- server/AyaNova/biz/AyaFormFieldDefinitions.cs | 2 +- server/AyaNova/biz/LocaleBiz.cs | 22 ++++++++++++++----- server/AyaNova/resource/de.json | 2 +- server/AyaNova/resource/en.json | 2 +- server/AyaNova/resource/es.json | 2 +- server/AyaNova/resource/fr.json | 2 +- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/server/AyaNova/DataList/UserDataList.cs b/server/AyaNova/DataList/UserDataList.cs index 5787c2e4..8ed02cb3 100644 --- a/server/AyaNova/DataList/UserDataList.cs +++ b/server/AyaNova/DataList/UserDataList.cs @@ -51,7 +51,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "UserUserType", + LtKey = "UserType", FieldKey = "usertype", UiFieldDataType = (int)UiFieldDataType.Enum, EnumType = typeof(UserType).ToString(), diff --git a/server/AyaNova/biz/AyaFormFieldDefinitions.cs b/server/AyaNova/biz/AyaFormFieldDefinitions.cs index beba9fd8..e02e54ba 100644 --- a/server/AyaNova/biz/AyaFormFieldDefinitions.cs +++ b/server/AyaNova/biz/AyaFormFieldDefinitions.cs @@ -85,7 +85,7 @@ namespace AyaNova.Biz l.Add(new AyaFormFieldDefinition { LtKey = "UserEmployeeNumber", FieldKey = "EmployeeNumber" }); l.Add(new AyaFormFieldDefinition { LtKey = "AuthorizationRoles", FieldKey = "Roles", Hideable = false }); l.Add(new AyaFormFieldDefinition { LtKey = "UserNotes", FieldKey = "Notes" }); - l.Add(new AyaFormFieldDefinition { LtKey = "UserUserType", FieldKey = "UserType", Hideable = false }); + l.Add(new AyaFormFieldDefinition { LtKey = "UserType", FieldKey = "UserType", Hideable = false }); l.Add(new AyaFormFieldDefinition { LtKey = "Active", FieldKey = "Active", Hideable = false }); l.Add(new AyaFormFieldDefinition { LtKey = "Tags", FieldKey = "Tags" }); diff --git a/server/AyaNova/biz/LocaleBiz.cs b/server/AyaNova/biz/LocaleBiz.cs index e12550f0..23d9a79a 100644 --- a/server/AyaNova/biz/LocaleBiz.cs +++ b/server/AyaNova/biz/LocaleBiz.cs @@ -445,12 +445,6 @@ namespace AyaNova.Biz s = s.Replace("ScheduleNewScheduleMarker", "ScheduleNewReminder", StringComparison.InvariantCultureIgnoreCase); - //FUTURE - // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); - // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); - // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); - // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); - // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); //Custom fields were 0 to 9, now 1 to 16 @@ -470,6 +464,22 @@ namespace AyaNova.Biz //CommonActive CommonID etc remove Common s = s.Replace("Common", ""); + //Misc + s = s.Replace("FormFieldDataType", "UiFieldDataType", StringComparison.InvariantCultureIgnoreCase); + s = s.Replace("UserUserType", "UserType", StringComparison.InvariantCultureIgnoreCase); + + + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + + //FUTURE + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + // s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase); + return s; } diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 37587e0e..56385fab 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1195,7 +1195,7 @@ "UserUIClearAllLayoutCustomization": "Alle Formularanpassungen des Benutzers löschen", "UserUserCertifications": "Zertifizierungen", "UserUserSkills": "Fähigkeiten", - "UserUserType": "Benutzertyp", + "UserType": "Benutzertyp", "UserVendorID": "Subunternehmer - Lieferant", "UserCertificationDescription": "Beschreibung", "UserCertificationList": "Benutzerzertifizierungen", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 045955af..9982a087 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1195,7 +1195,7 @@ "UserUIClearAllLayoutCustomization": "Clear all user's form customizations", "UserUserCertifications": "Certifications", "UserUserSkills": "Skills", - "UserUserType": "User type", + "UserType": "User type", "UserVendorID": "Subcontractor Vendor", "UserCertificationDescription": "Description", "UserCertificationList": "User Certifications", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index a679f6fe..42d3502d 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1195,7 +1195,7 @@ "UserUIClearAllLayoutCustomization": "Borrar elementos personalizados del formulario", "UserUserCertifications": "Certificados", "UserUserSkills": "Habilidades", - "UserUserType": "Tipo de usuario", + "UserType": "Tipo de usuario", "UserVendorID": "Proveedor subcontratista", "UserCertificationDescription": "Descripción", "UserCertificationList": "Certificados del usuario", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index b0919d77..69a11560 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1195,7 +1195,7 @@ "UserUIClearAllLayoutCustomization": "Effacer tous les formulaires personnalisés d'utilisateur", "UserUserCertifications": "Certificats", "UserUserSkills": "Aptitudes", - "UserUserType": "Type d'utilisateur", + "UserType": "Type d'utilisateur", "UserVendorID": "Fournisseur sous-traitant", "UserCertificationDescription": "Description", "UserCertificationList": "Certifications d'utilisateur",