admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-01-28 23:00:46 +00:00
parent 512b2757b9
commit 295f8bd660
7 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/DataList/UserDataList.cs
View File

@@ -51,7 +51,7 @@ namespace AyaNova.DataList
FieldDefinitions.Add(new AyaDataListFieldDefinition FieldDefinitions.Add(new AyaDataListFieldDefinition
{ {
LtKey = "UserUserType", LtKey = "UserType",
FieldKey = "usertype", FieldKey = "usertype",
UiFieldDataType = (int)UiFieldDataType.Enum, UiFieldDataType = (int)UiFieldDataType.Enum,
EnumType = typeof(UserType).ToString(), EnumType = typeof(UserType).ToString(),

2
server/AyaNova/biz/AyaFormFieldDefinitions.cs
View File

@@ -85,7 +85,7 @@ namespace AyaNova.Biz
l.Add(new AyaFormFieldDefinition { LtKey = "UserEmployeeNumber", FieldKey = "EmployeeNumber" }); l.Add(new AyaFormFieldDefinition { LtKey = "UserEmployeeNumber", FieldKey = "EmployeeNumber" });
l.Add(new AyaFormFieldDefinition { LtKey = "AuthorizationRoles", FieldKey = "Roles", Hideable = false }); l.Add(new AyaFormFieldDefinition { LtKey = "AuthorizationRoles", FieldKey = "Roles", Hideable = false });
l.Add(new AyaFormFieldDefinition { LtKey = "UserNotes", FieldKey = "Notes" }); 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 = "Active", FieldKey = "Active", Hideable = false });
l.Add(new AyaFormFieldDefinition { LtKey = "Tags", FieldKey = "Tags" }); l.Add(new AyaFormFieldDefinition { LtKey = "Tags", FieldKey = "Tags" });

22
server/AyaNova/biz/LocaleBiz.cs
View File

@@ -445,12 +445,6 @@ namespace AyaNova.Biz
s = s.Replace("ScheduleNewScheduleMarker", "ScheduleNewReminder", StringComparison.InvariantCultureIgnoreCase); 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 //Custom fields were 0 to 9, now 1 to 16
@@ -470,6 +464,22 @@ namespace AyaNova.Biz
//CommonActive CommonID etc remove Common //CommonActive CommonID etc remove Common
s = s.Replace("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; return s;
} }

2
server/AyaNova/resource/de.json
View File

@@ -1195,7 +1195,7 @@
"UserUIClearAllLayoutCustomization": "Alle Formularanpassungen des Benutzers löschen", "UserUIClearAllLayoutCustomization": "Alle Formularanpassungen des Benutzers löschen",
"UserUserCertifications": "Zertifizierungen", "UserUserCertifications": "Zertifizierungen",
"UserUserSkills": "Fähigkeiten", "UserUserSkills": "Fähigkeiten",
"UserUserType": "Benutzertyp", "UserType": "Benutzertyp",
"UserVendorID": "Subunternehmer - Lieferant", "UserVendorID": "Subunternehmer - Lieferant",
"UserCertificationDescription": "Beschreibung", "UserCertificationDescription": "Beschreibung",
"UserCertificationList": "Benutzerzertifizierungen", "UserCertificationList": "Benutzerzertifizierungen",

2
server/AyaNova/resource/en.json
View File

@@ -1195,7 +1195,7 @@
"UserUIClearAllLayoutCustomization": "Clear all user's form customizations", "UserUIClearAllLayoutCustomization": "Clear all user's form customizations",
"UserUserCertifications": "Certifications", "UserUserCertifications": "Certifications",
"UserUserSkills": "Skills", "UserUserSkills": "Skills",
"UserUserType": "User type", "UserType": "User type",
"UserVendorID": "Subcontractor Vendor", "UserVendorID": "Subcontractor Vendor",
"UserCertificationDescription": "Description", "UserCertificationDescription": "Description",
"UserCertificationList": "User Certifications", "UserCertificationList": "User Certifications",

2
server/AyaNova/resource/es.json
View File

@@ -1195,7 +1195,7 @@
"UserUIClearAllLayoutCustomization": "Borrar elementos personalizados del formulario", "UserUIClearAllLayoutCustomization": "Borrar elementos personalizados del formulario",
"UserUserCertifications": "Certificados", "UserUserCertifications": "Certificados",
"UserUserSkills": "Habilidades", "UserUserSkills": "Habilidades",
"UserUserType": "Tipo de usuario", "UserType": "Tipo de usuario",
"UserVendorID": "Proveedor subcontratista", "UserVendorID": "Proveedor subcontratista",
"UserCertificationDescription": "Descripción", "UserCertificationDescription": "Descripción",
"UserCertificationList": "Certificados del usuario", "UserCertificationList": "Certificados del usuario",

2
server/AyaNova/resource/fr.json
View File

@@ -1195,7 +1195,7 @@
"UserUIClearAllLayoutCustomization": "Effacer tous les formulaires personnalisés d'utilisateur", "UserUIClearAllLayoutCustomization": "Effacer tous les formulaires personnalisés d'utilisateur",
"UserUserCertifications": "Certificats", "UserUserCertifications": "Certificats",
"UserUserSkills": "Aptitudes", "UserUserSkills": "Aptitudes",
"UserUserType": "Type d'utilisateur", "UserType": "Type d'utilisateur",
"UserVendorID": "Fournisseur sous-traitant", "UserVendorID": "Fournisseur sous-traitant",
"UserCertificationDescription": "Description", "UserCertificationDescription": "Description",
"UserCertificationList": "Certifications d'utilisateur", "UserCertificationList": "Certifications d'utilisateur",