server/AyaNova/DataList/IAyaDataList.cs

@@ -17,6 +17,8 @@ namespace AyaNova.DataList
         AuthorizationRoles FullListAllowedRoles { get; set; }
 
         //allowed roles to access mini list templated fields
+        //generally this will be *any* because most forms will need to allow this for picklists such as usernames etc
+        // but this is a safety valve for sensitive lists like financial reports where there is just no need for untrusted roles to see it
         AuthorizationRoles MiniListAllowedRoles { get; set; }
 
 

server/AyaNova/DataList/TestWidgetDataList.cs

@@ -26,6 +26,7 @@ namespace AyaNova.DataList
             {
                 LtKey = "WidgetName",
                 FieldKey = "widgetname",
+                AyaObjectType = (int)AyaType.Widget,
                 UiFieldDataType = (int)AyaUiFieldDataType.Text,
                 SqlIdColumnName = "awidget.id",
                 SqlValueColumnName = "awidget.name"

server/AyaNova/DataList/TestWidgetUserEmailDataList.cs

@@ -18,7 +18,7 @@ namespace AyaNova.DataList
             ListKey = nameof(TestWidgetUserEmailDataList);
             SQLFrom = "from awidget left outer join auser on (awidget.userid=auser.id) left outer join auseroptions on (auser.id=auseroptions.userid)";
             FullListAllowedRoles = AuthorizationRoles.AllInternalStaff;//anyone but clients and subcontractors (just for test)
-            MiniListAllowedRoles = AuthorizationRoles.All;//anyone (so can select on forms)
+            MiniListAllowedRoles = AuthorizationRoles.AllExceptCustomers;//anyone but clients who shouldn't see users email addresses (so can select on forms)
             DefaultListObjectType = AyaType.Widget;
             DefaultDataListDisplayTemplate = @"
             {

server/AyaNova/DataList/UserDataList.cs

@@ -11,117 +11,91 @@ namespace AyaNova.DataList
             SQLFrom = "from auser";
             FullListAllowedRoles = AuthorizationRoles.AllInternalStaff;//anyone but clients and subcontractors (just for test)
             MiniListAllowedRoles = AuthorizationRoles.All;//anyone (so can select on forms)
-            DefaultListObjectType = AyaType.Widget;
+            DefaultListObjectType = AyaType.User;
             DefaultDataListDisplayTemplate = @"
             {
-                ""full"":[""widgetname"",""widgetserial"",""widgetdollaramount"",""widgetroles"",""widgetstartdate"",""widgetactive"",""username""],
-                ""mini"":[""widgetname"",""widgetserial""]
+                ""full"":[""username"",""useremployeenumber"",""useractive"",""usernotes"",""userroles""],
+                ""mini"":[""username""]
             }
             ";
 
             //NOTE: Due to the join, all the sql id and name fields that can conflict with the joined (in this case User) table need to be specified completely
             FieldDefinitions = new List<AyaDataListFieldDefinition>();
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "df", AyaObjectType = (int)AyaType.Widget, SqlIdColumnName = "awidget.id" });
+            FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "df", AyaObjectType = (int)AyaType.User, SqlIdColumnName = "auser.id" });
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
-                LtKey = "WidgetName",
-                FieldKey = "widgetname",
-                UiFieldDataType = (int)AyaUiFieldDataType.Text,
-                SqlIdColumnName = "awidget.id",
-                SqlValueColumnName = "awidget.name"
-            });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                LtKey = "WidgetSerial",
-                FieldKey = "widgetserial",
-                UiFieldDataType = (int)AyaUiFieldDataType.Integer,
-                SqlValueColumnName = "awidget.serial"
-            });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                LtKey = "WidgetDollarAmount",
-                FieldKey = "widgetdollaramount",
-                UiFieldDataType = (int)AyaUiFieldDataType.Currency,
-                SqlValueColumnName = "awidget.dollaramount"
-            });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                LtKey = "WidgetCount",
-                FieldKey = "widgetcount",
-                UiFieldDataType = (int)AyaUiFieldDataType.Integer,
-                SqlValueColumnName = "awidget.count"
-            });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                LtKey = "WidgetRoles",
-                FieldKey = "widgetroles",
-                UiFieldDataType = (int)AyaUiFieldDataType.Enum,
-                EnumType = typeof(AuthorizationRoles).ToString(),
-                SqlValueColumnName = "awidget.roles"
-            });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                LtKey = "WidgetStartDate",
-                FieldKey = "widgetstartdate",
-                UiFieldDataType = (int)AyaUiFieldDataType.DateTime,
-                SqlValueColumnName = "awidget.startdate"
-            });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                LtKey = "WidgetEndDate",
-                FieldKey = "widgetenddate",
-                UiFieldDataType = (int)AyaUiFieldDataType.DateTime,
-                SqlValueColumnName = "awidget.enddate"
-            });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                LtKey = "WidgetNotes",
-                FieldKey = "widgetnotes",
-                UiFieldDataType = (int)AyaUiFieldDataType.Text,
-                SqlValueColumnName = "awidget.notes"
-            });
-
-            //FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "User", FieldKey = "userid", UiFieldDataType = (int)AyaUiFieldDataType.Text, AyaObjectType = (int)AyaType.User });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                FieldKey = "username",
                 LtKey = "User",
-                UiFieldDataType = (int)AyaUiFieldDataType.Text,
+                FieldKey = "username",
                 AyaObjectType = (int)AyaType.User,
+                UiFieldDataType = (int)AyaUiFieldDataType.Text,
                 SqlIdColumnName = "auser.id",
                 SqlValueColumnName = "auser.name"
             });
+
             FieldDefinitions.Add(new AyaDataListFieldDefinition
             {
                 LtKey = "Active",
-                FieldKey = "widgetactive",
+                FieldKey = "useractive",
                 UiFieldDataType = (int)AyaUiFieldDataType.Bool,
-                SqlValueColumnName = "awidget.active"
-            });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
-            {
-                LtKey = "Tags",
-                FieldKey = "widgettags",
-                UiFieldDataType = (int)AyaUiFieldDataType.Tags,
-                SqlValueColumnName = "awidget.tags"
+                SqlValueColumnName = "auser.active"
             });
 
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom1", FieldKey = "widgetcustom1", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom2", FieldKey = "widgetcustom2", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom3", FieldKey = "widgetcustom3", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom4", FieldKey = "widgetcustom4", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom5", FieldKey = "widgetcustom5", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom6", FieldKey = "widgetcustom6", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom7", FieldKey = "widgetcustom7", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom8", FieldKey = "widgetcustom8", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom9", FieldKey = "widgetcustom9", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom10", FieldKey = "widgetcustom10", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom11", FieldKey = "widgetcustom11", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom12", FieldKey = "widgetcustom12", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom13", FieldKey = "widgetcustom13", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom14", FieldKey = "widgetcustom14", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom15", FieldKey = "widgetcustom15", IsCustomField = true });
-            FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom16", FieldKey = "widgetcustom16", IsCustomField = true });
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                LtKey = "AuthorizationRoles",
+                FieldKey = "userroles",
+                UiFieldDataType = (int)AyaUiFieldDataType.Enum,
+                EnumType = typeof(AuthorizationRoles).ToString(),
+                SqlValueColumnName = "auser.roles"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                LtKey = "UserUserType",
+                FieldKey = "usertype",
+                UiFieldDataType = (int)AyaUiFieldDataType.Enum,
+                EnumType = typeof(UserType).ToString(),
+                SqlValueColumnName = "auser.usertype"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                LtKey = "UserEmployeeNumber",
+                FieldKey = "useremployeenumber",
+                UiFieldDataType = (int)AyaUiFieldDataType.Text,
+                SqlValueColumnName = "auser.employeenumber"
+            });
+
+            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            {
+                LtKey = "UserNotes",
+                FieldKey = "usernotes",
+                UiFieldDataType = (int)AyaUiFieldDataType.Text,
+                SqlValueColumnName = "auser.notes"
+            });
+
+
+            // //-------------------------
+            //NOT SURE ABOUT CUSTOM FIELDS
+            //NEED TO COME BACK TO THIS ONCE CLIENT IS CONSUMING THESE LISTS
+            //WIDGETLIST has custom fields so good test before doing here
+
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom1", FieldKey = "widgetcustom1", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom2", FieldKey = "widgetcustom2", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom3", FieldKey = "widgetcustom3", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom4", FieldKey = "widgetcustom4", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom5", FieldKey = "widgetcustom5", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom6", FieldKey = "widgetcustom6", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom7", FieldKey = "widgetcustom7", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom8", FieldKey = "widgetcustom8", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom9", FieldKey = "widgetcustom9", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom10", FieldKey = "widgetcustom10", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom11", FieldKey = "widgetcustom11", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom12", FieldKey = "widgetcustom12", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom13", FieldKey = "widgetcustom13", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom14", FieldKey = "widgetcustom14", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom15", FieldKey = "widgetcustom15", IsCustomField = true });
+            // FieldDefinitions.Add(new AyaDataListFieldDefinition { LtKey = "WidgetCustom16", FieldKey = "widgetcustom16", IsCustomField = true });
         }
     }//eoc
 }//eons