Merge pull request #56 from DNNCommunity/develop

Merging for 9.1.0 release
DNNCommunity · Nov 7, 2020 · b05baa9 · b05baa9
2 parents 8856d40 + e4354e2
commit b05baa9
Show file tree

Hide file tree

Showing 22 changed files with 1,002 additions and 490 deletions.
diff --git a/DNN.Survey/App_LocalResources/Settings.ascx.resx b/DNN.Survey/App_LocalResources/Settings.ascx.resx
@@ -162,4 +162,46 @@
   <data name="SurveyType.Text" xml:space="preserve">
     <value>Survey type</value>
   </data>
+  <data name="AppearanceSecurityOptions.Text" xml:space="preserve">
+    <value>Appearance and Security Options</value>
+  </data>
+  <data name="CSVExportOptions.Text" xml:space="preserve">
+    <value>CSV Export Options</value>
+  </data>
+  <data name="TextQualifier.DoubleQuote.Text" xml:space="preserve">
+    <value>Double quotes</value>
+  </data>
+  <data name="TextQualifier.Help" xml:space="preserve">
+    <value>Select the text qualifier to use when exporting the results to a CSV file.</value>
+  </data>
+  <data name="TextQualifier.None.Text" xml:space="preserve">
+    <value>(none)</value>
+  </data>
+  <data name="TextQualifier.SingleQuote.Text" xml:space="preserve">
+    <value>Single quotes</value>
+  </data>
+  <data name="TextQualifier.Text" xml:space="preserve">
+    <value>Text Qualifier</value>
+  </data>
+  <data name="GeneralSettings.Text" xml:space="preserve">
+    <value>General Settings</value>
+  </data>
+  <data name="Separator.Comma.Text" xml:space="preserve">
+    <value>Comma</value>
+  </data>
+  <data name="Separator.Help" xml:space="preserve">
+    <value>Select the separator to use when exporting the results to a CSV file.</value>
+  </data>
+  <data name="Separator.SemiColon.Text" xml:space="preserve">
+    <value>Semicolon</value>
+  </data>
+  <data name="Separator.Space.Text" xml:space="preserve">
+    <value>Space</value>
+  </data>
+  <data name="Separator.Tab.Text" xml:space="preserve">
+    <value>Tab</value>
+  </data>
+  <data name="Separator.Text" xml:space="preserve">
+    <value>Separator</value>
+  </data>
 </root>
diff --git a/DNN.Survey/Components/Base.cs b/DNN.Survey/Components/Base.cs
@@ -50,6 +50,21 @@ public enum SurveyType
       Quiz = 1
    }
 
+   public enum Separator
+   {
+      SemiColon = 0,
+      Comma = 1,
+      Space = 2,
+      Tab = 3
+   }
+
+   public enum TextQualifier
+   {
+      None = 0,
+      DoubleQuote = 1,
+      SingleQuote = 2
+   }
+
    public static class Base
    {
       public const string DEFAULT_SURVEY_RESULTS_TEMPLATE = "[SURVEY_OPTION_NAME]&nbsp;([SURVEY_OPTION_VOTES])&nbsp;<img src=\"[SURVEY_OPTION_IMAGEPATH]/red.gif\" width=\"[SURVEY_OPTION_GRAPH_WIDTH]\" border=\"0\" height=\"15\" alt=\"\" />&nbsp;[SURVEY_OPTION_PERCENTAGE]%<br />";

diff --git a/DNN.Survey/Components/Controllers/SurveyBusinessController.cs b/DNN.Survey/Components/Controllers/SurveyBusinessController.cs
diff --git a/DNN.Survey/Controls/CanvasControl.ascx.cs b/DNN.Survey/Controls/CanvasControl.ascx.cs
@@ -21,6 +21,7 @@
 using DNN.Modules.Survey.Components;
 using System;
 using System.Text;
+using System.Web;
 using System.Web.UI;
 
 namespace DNN.Modules.Survey.Controls
@@ -58,7 +59,7 @@ protected void Page_Load(object sender, EventArgs e)
          for (int i = 0; i < labels.Length; i++)
          {
             // Let Google see the results...
-            Graph.InnerHtml += string.Format("<span>{0}: {1} ({2:0.00}%)</span>", Server.HtmlEncode(labels[i]), data[i], (data[i] == "0" ? 0 : Convert.ToDouble(data[i]) * 100 / sum));
+            Graph.InnerHtml += string.Format("<span>{0}: {1} ({2:0.00}%)</span>", labels[i], data[i], (data[i] == "0" ? 0 : Convert.ToDouble(data[i]) * 100 / sum));
          }
       }
 

diff --git a/DNN.Survey/DNN.Survey.csproj b/DNN.Survey/DNN.Survey.csproj
@@ -14,7 +14,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DNN.Modules.Survey</RootNamespace>
     <AssemblyName>DNN.Modules.Survey</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -24,6 +24,7 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -156,7 +157,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="App_LocalResources\Settings.ascx.resx" />
+    <Content Include="App_LocalResources\Settings.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="App_LocalResources\SurveyEdit.ascx.resx" />
     <Content Include="App_LocalResources\SurveyResults.ascx.resx" />
     <Content Include="App_LocalResources\SurveyView.ascx.resx" />
@@ -195,36 +198,39 @@
     <Content Include="Providers\DataProviders\SqlDataProvider\04.70.00.SqlDataProvider" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="DotNetNuke, Version=8.0.0.809, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNetNuke.Core.8.0.0.809\lib\net40\DotNetNuke.dll</HintPath>
+    <Reference Include="DotNetNuke, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetNuke.Core.9.4.0\lib\net45\DotNetNuke.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DotNetNuke.Web, Version=8.0.0.809, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNetNuke.Web.8.0.0.809\lib\net40\DotNetNuke.Web.dll</HintPath>
+    <Reference Include="DotNetNuke.Web, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.Web.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DotNetNuke.Web.Client, Version=8.0.1.239, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNetNuke.Web.Client.8.0.1.239\lib\net40\DotNetNuke.Web.Client.dll</HintPath>
+    <Reference Include="DotNetNuke.Web.Client, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetNuke.Web.Client.9.4.0\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
     <Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNetNuke.Web.8.0.0.809\lib\net40\DotNetNuke.WebUtility.dll</HintPath>
+      <HintPath>..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNetNuke.Core.8.0.0.809\lib\net40\Microsoft.ApplicationBlocks.Data.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
+      <HintPath>..\packages\DotNetNuke.Core.9.4.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="BuildScripts\Module.Targets">
@@ -233,6 +239,14 @@
     <Content Include="build.cake" />
     <Content Include="cake.config" />
     <None Include="packages.config" />
+    <Content Include="Providers\DataProviders\SqlDataProvider\09.01.00.SqlDataProvider" />
+    <Content Include="web.config" />
+    <None Include="web.Debug.config">
+      <DependentUpon>web.config</DependentUpon>
+    </None>
+    <None Include="web.Release.config">
+      <DependentUpon>web.config</DependentUpon>
+    </None>
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

diff --git a/DNN.Survey/DNN_Survey.dnn b/DNN.Survey/DNN_Survey.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_Survey" type="Module" version="09.00.01">
+    <package name="DNN_Survey" type="Module" version="09.01.00">
       <friendlyName>Survey</friendlyName>
       <description>
         <![CDATA[
@@ -17,7 +17,7 @@
       <license src="Documentation\License.html" />
       <releaseNotes src="Documentation\ReleaseNotes.html" />
       <dependencies>
-        <dependency type="CoreVersion">08.00.00</dependency>
+        <dependency type="CoreVersion">09.04.00</dependency>
       </dependencies>
       <components>
         <component type="Config">
@@ -664,15 +664,20 @@
                      <name>04.70.00.SqlDataProvider</name>
                      <version>04.70.00</version>
                   </script -->
-            <script type="Install">
-              <path>Providers\DataProviders\SqlDataProvider</path>
-              <name>09.00.00.SqlDataProvider</name>
-              <version>09.00.00</version>
-            </script>
-            <script type="UnInstall">
+             <script type="Install">
+                <path>Providers\DataProviders\SqlDataProvider</path>
+                <name>09.00.00.SqlDataProvider</name>
+                <version>09.00.00</version>
+             </script>
+             <script type="Install">
+                <path>Providers\DataProviders\SqlDataProvider</path>
+                <name>09.01.00.SqlDataProvider</name>
+                <version>09.01.00</version>
+             </script>
+             <script type="UnInstall">
               <path>Providers\DataProviders\SqlDataProvider</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>09.00.01</version>
+              <version>09.01.00</version>
             </script>
           </scripts>
         </component>
@@ -760,7 +765,7 @@
             <attributes>
               <businessControllerClass>DNN.Modules.Survey.Components.Controllers.SurveyBusinessController</businessControllerClass>
               <desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-              <upgradeVersionsList>03.01.00,03.03.00,04.00.20,04.00.60,04.00.70,04.00.85,04.01.00,04.05.00,04.06.00,04.07.00,09.00.00,09.00.01</upgradeVersionsList>
+              <upgradeVersionsList>03.01.00,03.03.00,04.00.20,04.00.60,04.00.70,04.00.85,04.01.00,04.05.00,04.06.00,04.07.00,09.00.00,09.01.00,09.01.00</upgradeVersionsList>
             </attributes>
           </eventMessage>
         </component>
@@ -770,7 +775,7 @@
             <assembly>
               <path>bin</path>
               <name>DNN.Modules.Survey.dll</name>
-              <version>9.0.1.0</version>
+              <version>9.1.0.0</version>
             </assembly>
           </assemblies>
         </component>

diff --git a/DNN.Survey/Documentation/ReleaseNotes.html b/DNN.Survey/Documentation/ReleaseNotes.html
@@ -1,17 +1,15 @@
 <h3>DNN Survey Module</h3>
 <p class="Owner">
    DNN&reg; - <a href="https://www.dnnsoftware.com" target="_blank">www.dnnsoftware.com</a><br />
-   &copy; 2002-2019 by DNN Corp.<br />
+   &copy; 2002-2020 by DNN Corp.<br />
 </p>
 <div class="License">
    <h3>DNN Survey Project 09.00.00</h3>
    <p>
       Minimum System requirements:
    </p>
    <ul>
-      <li>DNN Platform version 09.02.02 or higher</li>
-      <li>DNN JavaScript Library for Chart.js v2.7.3</li>
-      <li>SQL Server 2016 (any edition, also Express)</li>
+      <li>DNN Platform version 08.00.00 or higher</li>
    </ul>
    <p>
       Changes:
@@ -27,4 +25,33 @@ <h3>DNN Survey Project 09.00.00</h3>
       <li>Added text answers</li>
       <li>Added quiz result view</li>
    </ul>
+   <h3>DNN Survey Project 09.00.01</h3>
+   <p>
+      Bugfixes:
+   </p>
+   <ul>
+      <li>#39 - Show closing date message" and "Add consent checkbox?" check boxes are not saved correctly when the values are changed from checked to unchecked.</li>
+   </ul>
+   <h3>DNN Survey Project 09.01.00</h3>
+   <p>
+      Minimum System requirements:
+   </p>
+   <ul>
+      <li>DNN Platform version 09.04.04 or higher</li>
+   </ul>
+   <p>
+      Changes:
+   </p>
+   <ul>
+      <li>Updated Chart.js to version 2.9.3</li>
+      <li>#14 - CSV Export: Add setting for separator and delimiter</li>
+   </ul>
+   <p>
+      Bugfixes:
+   </p>
+   <ul>
+      <li>#44 - Error when installing DNN Survey module 9.00.01 on DNN 9.2.2</li>
+      <li>#47 - Missing Surveys</li>
+      <li>#48 - Charts don't display when a double quote was entered in a free text response</li>
+   </ul>
 </div>
diff --git a/DNN.Survey/Properties/AssemblyInfo.cs b/DNN.Survey/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 //
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
-[assembly: AssemblyVersion("9.0.1.0")]
-[assembly: AssemblyFileVersion("9.0.1.0")]
+[assembly: AssemblyVersion("9.1.0.0")]
+[assembly: AssemblyFileVersion("9.1.0.0")]
 
 // Add assembly reference to allow for WebResource.axd access to JavaScript files
 // see: http://aspnet.4guysfromrolla.com/articles/080906-1.aspx