Merge pull request #13 from markmcavoy/feature/account_created_data_e…

…xport Feature/account "Created data" field export
fordnn · Dec 9, 2021 · 66358c4 · 66358c4
2 parents 863781e + 10bc50f
commit 66358c4
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 53 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+*.suo
+*.user
+
+.vs/
+bin/
+obj/
diff --git a/App_LocalResources/MainControl.ascx.resx b/App_LocalResources/MainControl.ascx.resx
@@ -303,4 +303,10 @@
   <data name="ExportByRole.Text" xml:space="preserve">
     <value>Export By Role</value>
   </data>
+  <data name="ExportCreatedDate.Help" xml:space="preserve">
+    <value>Export the date when the user account was created</value>
+  </data>
+  <data name="ExportCreatedDate.Text" xml:space="preserve">
+    <value>Export Created Date</value>
+  </data>
 </root>
diff --git a/Components/ExportController.cs b/Components/ExportController.cs
@@ -134,13 +134,21 @@ FOR XML PATH('')) Roles
 						.Replace("{0}", objExportInfo.ExportByRole.ToString()));
 				}
 
+                if (objExportInfo.ExportCreatedDate)
+                {
+					sbSelect.Append(", u.CreatedOnDate");
+					htFieldNames["CreatedOnDate"] = 1;
+				}
+
 				idr = DotNetNuke.Data.DataProvider.Instance().ExecuteSQL(sbSelect.ToString() + sbFrom.ToString() + sbWhere.ToString());
 				DataTable dt = DotNetNuke.Common.Globals.ConvertDataReaderToDataTable(idr);
 				if (objExportInfo.ExportPasswords)
 				{
 					dt = AddPasswordsColumn(PortalId, dt);
 				}
 
+
+
 				string strResult = "";
 
 				switch (objExportInfo.ExportFileType)

diff --git a/MainControl.ascx b/MainControl.ascx
@@ -50,6 +50,10 @@
                 <dnn:Label runat="server" id="lblIncludeNonAuthorised" resourcekey="IncludeNonAuthorised" AssociatedControlID="cbIncludeNonAuthorised"></dnn:Label>
                 <asp:CheckBox runat="server" ID="cbIncludeNonAuthorised" CssClass="normalCheckBox" />
             </div>
+            <div class="dnnFormItem">
+                <dnn:Label runat="server" id="lblExportCreatedDate" resourcekey="ExportCreatedDate" AssociatedControlID="cbExportCreatedDate"></dnn:Label>
+                <asp:CheckBox runat="server" ID="cbExportCreatedDate" CssClass="normalCheckBox" />
+            </div>
             <div class="dnnFormItem">
                 <dnn:Label runat="server" id="lblExportRoles" resourcekey="ExportRoles" AssociatedControlID="cbExportRoles"></dnn:Label>
                 <asp:CheckBox runat="server" ID="cbExportRoles" CssClass="normalCheckBox" />
@@ -172,7 +176,8 @@
 		objValues.IncludeDeleted = $("#<%=cbIncludeDeleted.ClientID%>").prop("checked");
 		objValues.IncludeNonAuthorised = $("#<%=cbIncludeNonAuthorised.ClientID%>").prop("checked");
 		objValues.ExportRoles = $("#<%=cbExportRoles.ClientID%>").prop("checked");
-		objValues.ExportPasswords = $("#<%=cbExportPasswords.ClientID%>").prop("checked");
+        objValues.ExportPasswords = $("#<%=cbExportPasswords.ClientID%>").prop("checked");
+        objValues.ExportCreatedDate = $("#<%=cbExportCreatedDate.ClientID%>").prop("checked");
 		objValues.PropertiesToExport = "";
 		$("#<%=cblPropertiesToExport.ClientID%> input[type='checkbox']:checked").each(
 			function (ind, val)

diff --git a/MainControl.ascx.cs b/MainControl.ascx.cs
@@ -74,7 +74,7 @@ private void ExtraPageLoad()
 			ddlExportByRole.Items.Clear();
 			ddlExportByRole.Items.Add(new ListItem(Localization.GetString("AllRoles", this.LocalResourceFile), "-1"));
 			RoleController objRoleController = new RoleController();
-			foreach (RoleInfo objRole in objRoleController.GetRoles(this.PortalId))
+			foreach (RoleInfo objRole in objRoleController.GetPortalRoles(this.PortalId))
 			{
 				ddlExportByRole.Items.Add(new ListItem(objRole.RoleName, objRole.RoleID.ToString()));
 			}