diff --git a/docs/8.0/ayanova/docs/api-response-format.md b/docs/8.0/ayanova/docs/api-response-format.md index a7c2b6e2..9af009ba 100644 --- a/docs/8.0/ayanova/docs/api-response-format.md +++ b/docs/8.0/ayanova/docs/api-response-format.md @@ -99,7 +99,7 @@ Response: "dt": 8 }, { - "cm": "WidgetRoles", + "cm": "WidgetUserType", "dt": 10 }, { diff --git a/server/AyaNova/DataList/TestWidgetDataList.cs b/server/AyaNova/DataList/TestWidgetDataList.cs index 6413abd1..5d920e71 100644 --- a/server/AyaNova/DataList/TestWidgetDataList.cs +++ b/server/AyaNova/DataList/TestWidgetDataList.cs @@ -56,11 +56,11 @@ namespace AyaNova.DataList }); FieldDefinitions.Add(new AyaDataListFieldDefinition { - LtKey = "WidgetRoles", - FieldKey = "widgetroles", + LtKey = "WidgetUserType", + FieldKey = "widgetusertype", UiFieldDataType = (int)UiFieldDataType.Enum, EnumType = typeof(AuthorizationRoles).ToString(), - SqlValueColumnName = "awidget.roles" + SqlValueColumnName = "awidget.usertype" }); FieldDefinitions.Add(new AyaDataListFieldDefinition { diff --git a/server/AyaNova/biz/AyaFormFieldDefinitions.cs b/server/AyaNova/biz/AyaFormFieldDefinitions.cs index e02e54ba..cae2288b 100644 --- a/server/AyaNova/biz/AyaFormFieldDefinitions.cs +++ b/server/AyaNova/biz/AyaFormFieldDefinitions.cs @@ -51,7 +51,7 @@ namespace AyaNova.Biz l.Add(new AyaFormFieldDefinition { LtKey = "WidgetSerial", FieldKey = "Serial" }); l.Add(new AyaFormFieldDefinition { LtKey = "WidgetDollarAmount", FieldKey = "DollarAmount" }); l.Add(new AyaFormFieldDefinition { LtKey = "WidgetCount", FieldKey = "Count" }); - l.Add(new AyaFormFieldDefinition { LtKey = "WidgetRoles", FieldKey = "Roles" }); + l.Add(new AyaFormFieldDefinition { LtKey = "WidgetUserType", FieldKey = "UserType" }); l.Add(new AyaFormFieldDefinition { LtKey = "WidgetStartDate", FieldKey = "StartDate" }); l.Add(new AyaFormFieldDefinition { LtKey = "WidgetEndDate", FieldKey = "EndDate" }); l.Add(new AyaFormFieldDefinition { LtKey = "WidgetNotes", FieldKey = "Notes" }); diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index c192c34b..c175492f 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -265,12 +265,10 @@ namespace AyaNova.Biz if (proposedObj.StartDate > proposedObj.EndDate) AddError(ApiErrorCode.VALIDATION_STARTDATE_AFTER_ENDDATE, "StartDate"); - //Enum is valid value - //Note: because of the way the flags work as powers of 2 and with the 1 being the first flag value, basically any value up to the "All" value will be valid - //because you can make any number from 0 to all using any combination of the flags so the only thing that will fail is less than zero or greater than All - if (!proposedObj.Roles.IsValid()) + //Enum is valid value + if (!proposedObj.UserType.IsValid()) { - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Roles"); + AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "UserType"); } //Any form customizations to validate? diff --git a/server/AyaNova/models/Widget.cs b/server/AyaNova/models/Widget.cs index e324359c..ac4c85cc 100644 --- a/server/AyaNova/models/Widget.cs +++ b/server/AyaNova/models/Widget.cs @@ -19,7 +19,7 @@ namespace AyaNova.Models public uint Serial { get; set; } public decimal? DollarAmount { get; set; } public bool? Active { get; set; } - public AuthorizationRoles Roles { get; set; } + public UserType UserType { get; set; } public DateTime? StartDate { get; set; } public DateTime? EndDate { get; set; } public string Notes { get; set; } diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 3a2aad3b..25e1491e 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1521,7 +1521,7 @@ "WidgetSerial":"Seriennummer", "WidgetDollarAmount":"Betrag", "WidgetCount":"Anzahl", - "WidgetRoles":"Rollen", + "WidgetUserType":"Benutzertyp", "WidgetStartDate":"Startdatum", "WidgetEndDate":"Enddatum", "WidgetNotes":"Notizen", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 95044919..22b3442d 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1520,7 +1520,7 @@ "WidgetSerial":"Serial #", "WidgetDollarAmount":"Price", "WidgetCount":"Count", - "WidgetRoles":"Roles", + "WidgetUserType":"User type", "WidgetStartDate":"Start", "WidgetEndDate":"End", "WidgetNotes":"Notes", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index e9af6de1..875d7ba0 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1521,7 +1521,7 @@ "WidgetSerial":"Número de serie", "WidgetDollarAmount":"Importe", "WidgetCount":"Recuento", - "WidgetRoles":"Funciones", + "WidgetUserType":"Tipo de usuario", "WidgetStartDate":"Fecha de comienzo", "WidgetEndDate":"Fecha de fin", "WidgetNotes":"Notas", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 350e57c5..3184eec4 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1520,7 +1520,7 @@ "WidgetSerial": "Numéro de série", "WidgetDollarAmount": "Montant", "WidgetCount": "Nombre", - "WidgetRoles": "Rôles", + "WidgetUserType": "Type d'utilisateur", "WidgetStartDate": "Date de début", "WidgetEndDate": "Date de fin", "WidgetNotes": "Notes", diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index e4979b3e..1cde02e7 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -209,7 +209,7 @@ namespace AyaNova.Util //Add widget table //id, text, longtext, boolean, currency, await ExecQueryAsync("CREATE TABLE awidget (id BIGSERIAL PRIMARY KEY, name varchar(255) not null, serial bigint not null," + - "startdate timestamp, enddate timestamp, dollaramount decimal(19,5), active bool, roles int4, count integer," + + "startdate timestamp, enddate timestamp, dollaramount decimal(19,5), active bool, usertype int4, count integer," + "notes text, userid bigint null, customfields text, tags varchar(255) ARRAY)"); //TEST TEST TEST ONLY FOR DEVELOPMENT TESTING TO ENSURE UNIQUENESS diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index f7959412..382ff0d8 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -585,7 +585,7 @@ namespace AyaNova.Util var f = new Bogus.Faker(); //RANDOM ROLES - Array values = Enum.GetValues(typeof(AuthorizationRoles)); + Array values = Enum.GetValues(typeof(UserType)); Random random = new Random(); @@ -600,8 +600,8 @@ namespace AyaNova.Util o.EndDate = DateTime.Now.AddMinutes(60).ToUniversalTime(); o.DollarAmount = Convert.ToDecimal(f.Commerce.Price()); //Random but valid enum - AuthorizationRoles randomRole = (AuthorizationRoles)values.GetValue(random.Next(values.Length)); - o.Roles = randomRole; + UserType randomUserType = (UserType)values.GetValue(random.Next(values.Length)); + o.UserType = randomUserType; o.Notes = f.Lorem.Sentence(); o.Tags = RandomTags(f);