Skip to content

Commit 941d89d

Browse files
valadasvaladas
authored
Merge pull request #111 from DNNCommunity/development
Merged `development` into `mater` to release `v6.5.8`
2 parents bf91ee4 + 0042677 commit 941d89d

18 files changed

+553
-92
lines changed

‎App_LocalResources/ExportCSV.ascx.resx‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="plFolder.Text" xml:space="preserve">
121121
<value>Folder</value>
@@ -165,4 +165,28 @@
165165
<data name="semicolon.Text" xml:space="preserve">
166166
<value>Semicolon ";"</value>
167167
</data>
168+
<data name="plSystemFields.Help" xml:space="preserve">
169+
<value>Include Created by, Created at, Changed by and Changed at Fields</value>
170+
</data>
171+
<data name="plSystemFields.Text" xml:space="preserve">
172+
<value>Include System Fields</value>
173+
</data>
174+
<data name="plFinalDate.Help" xml:space="preserve">
175+
<value>Select final date to export records, if blank all records will be exported</value>
176+
</data>
177+
<data name="plFinalDate.Text" xml:space="preserve">
178+
<value>Final date</value>
179+
</data>
180+
<data name="plInitialDate.Help" xml:space="preserve">
181+
<value>Select initial date to export records, if blank all records will be exported</value>
182+
</data>
183+
<data name="plInitialDate.Text" xml:space="preserve">
184+
<value>Initial date</value>
185+
</data>
186+
<data name="customDateMessage.Text" xml:space="preserve">
187+
<value>You must select both or no dates</value>
188+
</data>
189+
<data name="errorDateMessage.Text" xml:space="preserve">
190+
<value>Initial date must be earlier than final date</value>
191+
</data>
168192
</root>

‎AssemblyInfo.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
using System.Runtime.InteropServices;
44
[assembly: AssemblyTitle("DotNetNuke.Modules.UserDefinedTable")]
55
[assembly: AssemblyDescription("DNN Form and List ")]
6-
[assembly: AssemblyCompany("DNN Corp")]
7-
[assembly: AssemblyCopyright("DotNetNuke® is copyright 2002-2016 by DNN Corp. All Rights Reserved.")]
8-
[assembly: AssemblyTrademark("DotNetNuke")]
6+
[assembly: AssemblyCompany("DNN Community")]
7+
[assembly: AssemblyCopyright("2021 DNN Community")]
8+
[assembly: AssemblyTrademark("")]
99
[assembly: ComVisible(false)]
1010

1111

12-
[assembly: AssemblyVersion("06.05.05.00")]
12+
[assembly: AssemblyVersion("06.05.08.00")]
1313
[assembly: CLSCompliant(true)]
14-
[assembly: AssemblyFileVersion("06.05.05.00")]
14+
[assembly: AssemblyFileVersion("06.05.08.00")]
1515

‎Components/DataProvider.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ public abstract int AddField(int ModuleID, string FieldTitle, int before, string
7171
public abstract IDataReader GetRow(int UserDefinedRowId, int ModuleId);
7272

7373
public abstract IDataReader GetRows(int ModuleId);
74+
75+
public abstract IDataReader GetRowsWithDates(int ModuleId, DateTime initialDate, DateTime finalDate);
76+
7477
public abstract IDataReader GetFieldSettings(int moduleId);
7578
public abstract void UpdateFieldSetting(int fieldid, string key, string value);
7679

‎Components/UserDefinedTableController.cs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,34 @@ public DataSet GetDataSet(bool withPreRenderedValues)
253253
return ds;
254254
}
255255

256+
/// -----------------------------------------------------------------------------
257+
/// <summary>
258+
/// Gets all Data values of an UDT table (module) from the Database as DataSet
259+
/// </summary>
260+
/// <param name = "withPreRenderedValues">specifies, whether links, dates etc. shall be prerendered for XML output</param>
261+
/// <returns>All field values as DataSet</returns>
262+
/// -----------------------------------------------------------------------------
263+
public DataSet GetDataSetWithDates(bool withPreRenderedValues, DateTime initialDate, DateTime finalDate)
264+
{
265+
var fieldsTable = FieldController.GetFieldsTable(ModuleId, addNewColumn: false, addAuditColumns: false);
266+
DataSet ds;
267+
using (var dr = DataProvider.Instance().GetRowsWithDates(ModuleId,initialDate,finalDate))
268+
{
269+
ds = BuildMainDataSet(fieldsTable, dr, !withPreRenderedValues);
270+
}
271+
var fieldSettingsTable = FieldSettingsController.GetFieldSettingsTable(ModuleId);
272+
ds.Tables.Add(fieldSettingsTable);
273+
274+
SetEditLinksAndVisibilityBasedOnPermissions(ds);
275+
276+
if (withPreRenderedValues)
277+
{
278+
RenderValuesToHtmlInsideDataSet(ds);
279+
}
280+
ds.Namespace = "DotNetNuke/UserDefinedTable";
281+
return ds;
282+
}
283+
256284
public DataSet GetSchemaDataset()
257285
{
258286
var ds = GetRow(-1);

‎DotNetNuke.Modules.UserDefinedTable.xml‎

Lines changed: 90 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ExportCSV.ascx‎

Lines changed: 106 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,110 @@
11
<%@ Control Language="C#" CodeBehind="ExportCSV.ascx.cs" Inherits="DotNetNuke.Modules.UserDefinedTable.ExportCsv" AutoEventWireup="false" %>
22
<%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
3+
<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.Client.ClientResourceManagement" Assembly="DotNetNuke.Web.Client" %>
4+
5+
<dnn:DnnCssInclude runat="server" FilePath="~/Resources/Shared/components/TimePicker/Themes/jquery-ui.css" />
6+
<dnn:DnnCssInclude runat="server" FilePath="~/Resources/Shared/components/TimePicker/Themes/jquery.ui.theme.css" />
7+
38
<div class="dnnForm">
4-
<div class="dnnFormItem">
5-
<dnn:Label ID="plFolder" runat="server" ControlName="cboFolders" Suffix=":" />
6-
<asp:DropDownList ID="cboFolders" runat="server" CssClass="NormalTextBox" Width="300" />
7-
</div>
8-
<div class="dnnFormItem">
9-
<dnn:Label ID="plFile" runat="server" ControlName="txtFile" Suffix=":" />
10-
<asp:TextBox ID="txtFile" CssClass="NormalTextBox" runat="server" MaxLength="200"
11-
Width="300" />
12-
</div>
13-
<div class="dnnFormItem">
14-
<dnn:label id="plDelimiter" runat="server" controlname="rblDelimiter" suffix=":" />
15-
<asp:RadioButtonList ID="rblDelimiter" runat="server" RepeatDirection="Horizontal"
16-
CssClass="dnnFormRadioButtons ">
17-
<asp:ListItem Selected="True" Value="," resourcekey="comma"></asp:ListItem>
18-
<asp:ListItem Value=";" resourcekey="semicolon"></asp:ListItem>
19-
</asp:RadioButtonList>
9+
<div class="dnnFormItem">
10+
<dnn:Label ID="plFolder" runat="server" ControlName="cboFolders" Suffix=":" />
11+
<asp:DropDownList ID="cboFolders" runat="server" CssClass="NormalTextBox" Width="300" />
12+
</div>
13+
<div class="dnnFormItem">
14+
<dnn:Label ID="plFile" runat="server" ControlName="txtFile" Suffix=":" />
15+
<asp:TextBox ID="txtFile" CssClass="NormalTextBox" runat="server" MaxLength="200"
16+
Width="300" />
17+
</div>
18+
<div class="dnnFormItem">
19+
<dnn:label id="plDelimiter" runat="server" controlname="rblDelimiter" suffix=":" />
20+
<asp:RadioButtonList ID="rblDelimiter" runat="server" RepeatDirection="Horizontal"
21+
CssClass="dnnFormRadioButtons ">
22+
<asp:ListItem Selected="True" Value="," resourcekey="comma"></asp:ListItem>
23+
<asp:ListItem Value=";" resourcekey="semicolon"></asp:ListItem>
24+
</asp:RadioButtonList>
25+
</div>
26+
<div class="dnnFormItem">
27+
<dnn:label id="plSystemFields" runat="server" controlname="cbSystemFields" />
28+
<asp:CheckBox ID="cbSystemFields" runat="server" />
29+
</div>
30+
<div class="dnnFormItem">
31+
<dnn:label id="plInitialDate" runat="server" controlname="txtInitialDate" />
32+
<asp:TextBox ID="txtInitialDate" CssClass="NormalTextBox" runat="server" MaxLength="200"
33+
Width="300" onchange="TriggerChanges();" />
34+
</div>
35+
<div>
36+
37+
</div>
38+
<div class="dnnFormItem">
39+
<dnn:label id="plFinalDate" runat="server" controlname="txtFinalDate" />
40+
<asp:TextBox ID="txtFinalDate" CssClass="NormalTextBox" runat="server" MaxLength="200"
41+
Width="300" onchange="TriggerChanges();" />
42+
</div>
43+
<div class="dnnFormItem">
44+
<dnn:label id="plDatesValidator" value="" runat="server" controlname="cvtxtStartDate" />
45+
<asp:CompareValidator id="compareValidatorDates" runat="server"
46+
ControlToCompare="txtInitialDate" cultureinvariantvalues="true"
47+
display="Dynamic" enableclientscript="true"
48+
ControlToValidate="txtFinalDate"
49+
type="Date" Operator="GreaterThanEqual"
50+
CssClass="validator-error" resourcekey="errorDateMessage" >
51+
</asp:CompareValidator>
52+
<asp:CustomValidator id="CustomValidatorDates"
53+
ControlToValidate="txtInitialDate"
54+
ClientValidationFunction="ValidateDatesClient"
55+
Display="Dynamic"
56+
runat="server"
57+
resourcekey="customDateMessage" CssClass="validator-error"/>
58+
</div>
59+
<ul class="dnnActions dnnClear">
60+
<li>
61+
<asp:LinkButton ID="cmdExport" resourcekey="cmdExport" runat="server" CssClass="dnnPrimaryAction"
62+
Text="Export" BorderStyle="none"></asp:LinkButton></li>
63+
<li>
64+
<asp:LinkButton ID="cmdCancel" resourcekey="cmdCancel" runat="server" CssClass="dnnSecondaryAction"
65+
Text="Cancel" BorderStyle="none" CausesValidation="False"></asp:LinkButton></li>
66+
</ul>
67+
2068
</div>
21-
<ul class="dnnActions dnnClear">
22-
<li>
23-
<asp:LinkButton ID="cmdExport" resourcekey="cmdExport" runat="server" CssClass="dnnPrimaryAction"
24-
Text="Export" BorderStyle="none"></asp:LinkButton></li>
25-
<li>
26-
<asp:LinkButton ID="cmdCancel" resourcekey="cmdCancel" runat="server" CssClass="dnnSecondaryAction"
27-
Text="Cancel" BorderStyle="none" CausesValidation="False"></asp:LinkButton></li>
28-
</ul>
29-
30-
</div>
69+
70+
<script>
71+
$(function () {
72+
$("#<%= txtInitialDate.ClientID %>").datepicker({
73+
dateFormat: "yy/mm/dd",
74+
showButtonPanel: true,
75+
closeText: 'Clear',
76+
onClose: function () {
77+
var event = arguments.callee.caller.caller.arguments[0];
78+
if ($(event.delegateTarget).hasClass('ui-datepicker-close')) {
79+
$(this).val('');
80+
TriggerChanges();
81+
}
82+
}
83+
});
84+
$("#<%= txtFinalDate.ClientID %>").datepicker({
85+
dateFormat: "yy/mm/dd",
86+
showButtonPanel: true,
87+
closeText: 'Clear',
88+
onClose: function () {
89+
var event = arguments.callee.caller.caller.arguments[0];
90+
if ($(event.delegateTarget).hasClass('ui-datepicker-close')) {
91+
$(this).val('');
92+
TriggerChanges();
93+
}
94+
}
95+
});
96+
});
97+
98+
function TriggerChanges() {
99+
ValidatorValidate(document.getElementById('<%= CustomValidatorDates.ClientID %>'));
100+
}
101+
102+
function ValidateDatesClient(source, arguments) {
103+
if (($("#<%= txtInitialDate.ClientID %>").val().length == 0 && $("#<%= txtFinalDate.ClientID %>").val().length == 0) || ($("#<%= txtInitialDate.ClientID %>").val().length > 0 && $("#<%= txtFinalDate.ClientID %>").val().length > 0)) {
104+
arguments.IsValid = true;
105+
106+
} else {
107+
arguments.IsValid = false;
108+
}
109+
}
110+
</script>

0 commit comments

Comments
 (0)