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-02-11 19:25:12 +00:00
parent cb30a41381
commit ef063d5864
9 changed files with 118 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
server/AyaNova/Controllers/EnumPickListController.cs
View File

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Authorization;
using AyaNova.Models;
using AyaNova.Api.ControllerHelpers;
using AyaNova.Biz;
using AyaNova.Util;
namespace AyaNova.Api.Controllers
@@ -59,109 +60,104 @@ namespace AyaNova.Api.Controllers
List<NameIdItem> ReturnList = new List<NameIdItem>();
switch (enumkey.ToLowerInvariant())
var keyNameInLowerCase = enumkey.ToLowerInvariant();
if (keyNameInLowerCase == StringUtil.TrimTypeName(typeof(UiFieldDataType).ToString()).ToLowerInvariant())
{
case "datatypes":
{
//Iterate the enum and get the values
Type t = typeof(UiFieldDataType);
Enum.GetName(t, UiFieldDataType.NoType);
foreach (var dt in Enum.GetValues(t))
{
ReturnList.Add(new NameIdItem() { Name = Enum.GetName(t, dt), Id = (int)dt });
}
}
break;
case "ayatype":
{
var values = Enum.GetValues(typeof(AyaType));
foreach (AyaType t in values)
{
string name = t.ToString();
if (t.HasAttribute(typeof(AttachableAttribute)))
{
name += " [Attachable]";
}
ReturnList.Add(new NameIdItem() { Name = name, Id = (long)t });
}
}
break;
case "usertypes":
{
LocaleKeysToFetch.Add("UserTypesAdministrator");
LocaleKeysToFetch.Add("UserTypesSchedulable");
LocaleKeysToFetch.Add("UserTypesNonSchedulable");
LocaleKeysToFetch.Add("UserTypesClient");
LocaleKeysToFetch.Add("UserTypesHeadOffice");
LocaleKeysToFetch.Add("UserTypesSubContractor");
var LT = LocaleBiz.GetSubsetStaticAsync(LocaleKeysToFetch, LocaleId).Result;
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesAdministrator"], Id = (long)UserType.Administrator });
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesSchedulable"], Id = (long)UserType.Schedulable });
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesNonSchedulable"], Id = (long)UserType.NonSchedulable });
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesClient"], Id = (long)UserType.Customer });
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesHeadOffice"], Id = (long)UserType.HeadOffice });
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesSubContractor"], Id = (long)UserType.Subcontractor });
}
break;
case "authorizationroles":
{
LocaleKeysToFetch.Add("AuthorizationRoleNoRole");
LocaleKeysToFetch.Add("AuthorizationRoleBizAdminLimited");
LocaleKeysToFetch.Add("AuthorizationRoleBizAdminFull");
LocaleKeysToFetch.Add("AuthorizationRoleDispatchLimited");
LocaleKeysToFetch.Add("AuthorizationRoleDispatchFull");
LocaleKeysToFetch.Add("AuthorizationRoleInventoryLimited");
LocaleKeysToFetch.Add("AuthorizationRoleInventoryFull");
LocaleKeysToFetch.Add("AuthorizationRoleAccountingFull");
LocaleKeysToFetch.Add("AuthorizationRoleTechLimited");
LocaleKeysToFetch.Add("AuthorizationRoleTechFull");
LocaleKeysToFetch.Add("AuthorizationRoleSubContractorLimited");
LocaleKeysToFetch.Add("AuthorizationRoleSubContractorFull");
LocaleKeysToFetch.Add("AuthorizationRoleCustomerLimited");
LocaleKeysToFetch.Add("AuthorizationRoleCustomerFull");
LocaleKeysToFetch.Add("AuthorizationRoleOpsAdminLimited");
LocaleKeysToFetch.Add("AuthorizationRoleOpsAdminFull");
LocaleKeysToFetch.Add("AuthorizationRoleSalesLimited");
LocaleKeysToFetch.Add("AuthorizationRoleSalesFull");
LocaleKeysToFetch.Add("AuthorizationRoleAll");
var LT = LocaleBiz.GetSubsetStaticAsync(LocaleKeysToFetch, LocaleId).Result;
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleNoRole"], Id = (long)AuthorizationRoles.NoRole });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleBizAdminLimited"], Id = (long)AuthorizationRoles.BizAdminLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleBizAdminFull"], Id = (long)AuthorizationRoles.BizAdminFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleDispatchLimited"], Id = (long)AuthorizationRoles.DispatchLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleDispatchFull"], Id = (long)AuthorizationRoles.DispatchFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleInventoryLimited"], Id = (long)AuthorizationRoles.InventoryLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleInventoryFull"], Id = (long)AuthorizationRoles.InventoryFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleAccountingFull"], Id = (long)AuthorizationRoles.AccountingFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleTechLimited"], Id = (long)AuthorizationRoles.TechLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleTechFull"], Id = (long)AuthorizationRoles.TechFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSubContractorLimited"], Id = (long)AuthorizationRoles.SubContractorLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSubContractorFull"], Id = (long)AuthorizationRoles.SubContractorFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleCustomerLimited"], Id = (long)AuthorizationRoles.CustomerLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleCustomerFull"], Id = (long)AuthorizationRoles.CustomerFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleOpsAdminLimited"], Id = (long)AuthorizationRoles.OpsAdminLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleOpsAdminFull"], Id = (long)AuthorizationRoles.OpsAdminFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSalesLimited"], Id = (long)AuthorizationRoles.SalesLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSalesFull"], Id = (long)AuthorizationRoles.SalesFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleAll"], Id = (long)AuthorizationRoles.All });
}
break;
default:
ReturnList.Add(new NameIdItem() { Name = $"Unknown enum type list key value {enumkey}", Id = (long)UserType.Administrator });
break;
//Iterate the enum and get the values
Type t = typeof(UiFieldDataType);
Enum.GetName(t, UiFieldDataType.NoType);
foreach (var dt in Enum.GetValues(t))
{
ReturnList.Add(new NameIdItem() { Name = Enum.GetName(t, dt), Id = (int)dt });
}
}
else if (keyNameInLowerCase == StringUtil.TrimTypeName(typeof(AyaType).ToString()).ToLowerInvariant())
{
var values = Enum.GetValues(typeof(AyaType));
foreach (AyaType t in values)
{
string name = t.ToString();
if (t.HasAttribute(typeof(AttachableAttribute)))
{
name += " [Attachable]";
}
ReturnList.Add(new NameIdItem() { Name = name, Id = (long)t });
}
}
else if (keyNameInLowerCase == StringUtil.TrimTypeName(typeof(UserType).ToString()).ToLowerInvariant())
{
LocaleKeysToFetch.Add("UserTypesAdministrator");
LocaleKeysToFetch.Add("UserTypesSchedulable");
LocaleKeysToFetch.Add("UserTypesNonSchedulable");
LocaleKeysToFetch.Add("UserTypesClient");
LocaleKeysToFetch.Add("UserTypesHeadOffice");
LocaleKeysToFetch.Add("UserTypesSubContractor");
LocaleKeysToFetch.Add("UserTypesUtility");
var LT = LocaleBiz.GetSubsetStaticAsync(LocaleKeysToFetch, LocaleId).Result;
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesAdministrator"], Id = (long)UserType.Administrator });
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesSchedulable"], Id = (long)UserType.Schedulable });
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesNonSchedulable"], Id = (long)UserType.NonSchedulable });
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesClient"], Id = (long)UserType.Customer });
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesHeadOffice"], Id = (long)UserType.HeadOffice });
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesUtility"], Id = (long)UserType.Utility });
ReturnList.Add(new NameIdItem() { Name = LT["UserTypesSubContractor"], Id = (long)UserType.Subcontractor });
}
else if (keyNameInLowerCase == StringUtil.TrimTypeName(typeof(AuthorizationRoles).ToString()).ToLowerInvariant())
{
LocaleKeysToFetch.Add("AuthorizationRoleNoRole");
LocaleKeysToFetch.Add("AuthorizationRoleBizAdminLimited");
LocaleKeysToFetch.Add("AuthorizationRoleBizAdminFull");
LocaleKeysToFetch.Add("AuthorizationRoleDispatchLimited");
LocaleKeysToFetch.Add("AuthorizationRoleDispatchFull");
LocaleKeysToFetch.Add("AuthorizationRoleInventoryLimited");
LocaleKeysToFetch.Add("AuthorizationRoleInventoryFull");
LocaleKeysToFetch.Add("AuthorizationRoleAccountingFull");
LocaleKeysToFetch.Add("AuthorizationRoleTechLimited");
LocaleKeysToFetch.Add("AuthorizationRoleTechFull");
LocaleKeysToFetch.Add("AuthorizationRoleSubContractorLimited");
LocaleKeysToFetch.Add("AuthorizationRoleSubContractorFull");
LocaleKeysToFetch.Add("AuthorizationRoleCustomerLimited");
LocaleKeysToFetch.Add("AuthorizationRoleCustomerFull");
LocaleKeysToFetch.Add("AuthorizationRoleOpsAdminLimited");
LocaleKeysToFetch.Add("AuthorizationRoleOpsAdminFull");
LocaleKeysToFetch.Add("AuthorizationRoleSalesLimited");
LocaleKeysToFetch.Add("AuthorizationRoleSalesFull");
LocaleKeysToFetch.Add("AuthorizationRoleAll");
var LT = LocaleBiz.GetSubsetStaticAsync(LocaleKeysToFetch, LocaleId).Result;
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleNoRole"], Id = (long)AuthorizationRoles.NoRole });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleBizAdminLimited"], Id = (long)AuthorizationRoles.BizAdminLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleBizAdminFull"], Id = (long)AuthorizationRoles.BizAdminFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleDispatchLimited"], Id = (long)AuthorizationRoles.DispatchLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleDispatchFull"], Id = (long)AuthorizationRoles.DispatchFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleInventoryLimited"], Id = (long)AuthorizationRoles.InventoryLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleInventoryFull"], Id = (long)AuthorizationRoles.InventoryFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleAccountingFull"], Id = (long)AuthorizationRoles.AccountingFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleTechLimited"], Id = (long)AuthorizationRoles.TechLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleTechFull"], Id = (long)AuthorizationRoles.TechFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSubContractorLimited"], Id = (long)AuthorizationRoles.SubContractorLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSubContractorFull"], Id = (long)AuthorizationRoles.SubContractorFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleCustomerLimited"], Id = (long)AuthorizationRoles.CustomerLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleCustomerFull"], Id = (long)AuthorizationRoles.CustomerFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleOpsAdminLimited"], Id = (long)AuthorizationRoles.OpsAdminLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleOpsAdminFull"], Id = (long)AuthorizationRoles.OpsAdminFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSalesLimited"], Id = (long)AuthorizationRoles.SalesLimited });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleSalesFull"], Id = (long)AuthorizationRoles.SalesFull });
ReturnList.Add(new NameIdItem() { Name = LT["AuthorizationRoleAll"], Id = (long)AuthorizationRoles.All });
}
else
{
ReturnList.Add(new NameIdItem() { Name = $"Unknown enum type list key value {enumkey}", Id = (long)UserType.Administrator });
}
return Ok(ApiOkResponse.Response(ReturnList, true));
}
@@ -182,10 +178,10 @@ namespace AyaNova.Api.Controllers
}
List<KeyValuePair<string, string>> ret = new List<KeyValuePair<string, string>>();
ret.Add(new KeyValuePair<string, string>("UserTypes", "AyaNova user account types"));
ret.Add(new KeyValuePair<string, string>("AuthorizationRoles", "AyaNova user account role types"));
ret.Add(new KeyValuePair<string, string>("AyaType", "All AyaNova object types"));
ret.Add(new KeyValuePair<string, string>("DataTypes", "Types of data used in AyaNova for display and formatting UI purposes"));
ret.Add(new KeyValuePair<string, string>(typeof(UserType).ToString(), "AyaNova user account types"));
ret.Add(new KeyValuePair<string, string>(typeof(AuthorizationRoles).ToString(), "AyaNova user account role types"));
ret.Add(new KeyValuePair<string, string>(typeof(AyaType).ToString(), "All AyaNova object types"));
ret.Add(new KeyValuePair<string, string>(typeof(UiFieldDataType).ToString(), "Types of data used in AyaNova for display and formatting UI purposes"));
return Ok(ApiOkResponse.Response(ret, true));
}

12
server/AyaNova/DataList/AyaDataList.cs
View File

@@ -73,7 +73,7 @@ namespace AyaNova.DataList
//Has a Enumtype?
if (!string.IsNullOrEmpty(o.EnumType))
sb.Append($",\"et\":\"{TrimTypeName(o.EnumType)}\"");
sb.Append($",\"et\":\"{AyaNova.Util.StringUtil.TrimTypeName(o.EnumType)}\"");
sb.Append("}");
@@ -85,16 +85,6 @@ namespace AyaNova.DataList
}
//used to trim an enum type down to only it's most relevant (rightmost) portion
private string TrimTypeName(string str)
{
if (str.Contains('.'))
{
return str.Substring(str.LastIndexOf('.') + 1);
}
return str;
}
//make sure the template parses and all the fields specified are really existant
//this is more for dev errors or api users becuase the client shouldn't generate bad templates
public bool ValidateTemplate(string template)

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

@@ -59,7 +59,7 @@ namespace AyaNova.DataList
LtKey = "WidgetUserType",
FieldKey = "widgetusertype",
UiFieldDataType = (int)UiFieldDataType.Enum,
EnumType = typeof(AuthorizationRoles).ToString(),
EnumType = typeof(UserType).ToString(),
SqlValueColumnName = "awidget.usertype"
});
FieldDefinitions.Add(new AyaDataListFieldDefinition

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

@@ -467,7 +467,7 @@ namespace AyaNova.Biz
//Misc
s = s.Replace("FormFieldDataType", "UiFieldDataType", StringComparison.InvariantCultureIgnoreCase);
s = s.Replace("UserUserType", "UserType", StringComparison.InvariantCultureIgnoreCase);
s = s.Replace("UserTypesUtilityNotification", "UserTypesUtility", StringComparison.InvariantCultureIgnoreCase);
// s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase);
// s = s.Replace("WASXXX", "NOWXXXX", StringComparison.InvariantCultureIgnoreCase);

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

@@ -1213,7 +1213,7 @@
"UserTypesHeadOffice": "Benutzer am Hauptsitz des Kunden",
"UserTypesNonSchedulable": "Nicht planbarer Benutzer",
"UserTypesSchedulable": "Planbarer Benutzer",
"UserTypesUtilityNotification": "Benachrichtigungsserverkonto",
"UserTypesUtility": "Dienstprogrammkonto",
"VendorAccountNumber": "Kontonummer",
"VendorContact": "Contact",
"VendorContactNotes": "Other contacts",

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

@@ -1213,7 +1213,7 @@
"UserTypesHeadOffice": "Head office user",
"UserTypesNonSchedulable": "Non-schedulable user",
"UserTypesSchedulable": "Schedulable user",
"UserTypesUtilityNotification": "Notification server account",
"UserTypesUtility": "Utility account",
"VendorAccountNumber": "Account Number",
"VendorContact": "Contact",
"VendorContactNotes": "Other contacts",

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

@@ -1213,7 +1213,7 @@
"UserTypesHeadOffice": "Usuario cliente de sede",
"UserTypesNonSchedulable": "Usuario no programable",
"UserTypesSchedulable": "Usuario programable",
"UserTypesUtilityNotification": "Cuenta servidor de notificación",
"UserTypesUtility": "Cuenta de utilidad",
"VendorAccountNumber": "Número de cuenta",
"VendorContact": "Contact",
"VendorContactNotes": "Other contacts",

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

@@ -1213,7 +1213,7 @@
"UserTypesHeadOffice": "Utilisateur client de siège social",
"UserTypesNonSchedulable": "Utilisateur non programmable",
"UserTypesSchedulable": "Utilisateur programmable",
"UserTypesUtilityNotification": "Compte de serveur de notifications",
"UserTypesUtility": "Compte utilitaire",
"VendorAccountNumber": "Numéro de compte",
"VendorContact": "Contact",
"VendorContactNotes": "Other contacts",

12
server/AyaNova/util/StringUtil.cs
View File

@@ -111,10 +111,20 @@ namespace AyaNova.Util
}
ret = s.Substring(0, Math.Abs(diff)) + unique;
}
return ret;
}
//used to trim an enum type down to only it's most relevant (rightmost) portion
public static string TrimTypeName(string str)
{
if (str.Contains('.'))
{
return str.Substring(str.LastIndexOf('.') + 1);
}
return str;
}
}//eoc