Merge pull request #75 from DNNCommunity/develop

Merged `develop` into `master` to release `v9.2.0`
DNNCommunity · Jul 9, 2023 · 6798bac · 6798bac
2 parents 90aaacf + 36d6a0d
commit 6798bac
Show file tree

Hide file tree

Showing 30 changed files with 1,075 additions and 772 deletions.
diff --git a/DNN.Survey/App_LocalResources/Settings.ascx.resx b/DNN.Survey/App_LocalResources/Settings.ascx.resx
@@ -204,4 +204,7 @@
   <data name="Separator.Text" xml:space="preserve">
     <value>Separator</value>
   </data>
+  <data name="ModuleHelp.Text" xml:space="preserve">
+    <value>Need help? See the &lt;a href="https://dnn-survey.readme.io/docs/module-settings" target="_blank"&gt;module documentation&lt;/a&gt;.</value>
+  </data>
 </root>
diff --git a/DNN.Survey/App_LocalResources/SurveyEdit.ascx.resx b/DNN.Survey/App_LocalResources/SurveyEdit.ascx.resx
@@ -144,12 +144,21 @@
   <data name="ChartType.HorizontalBar.Text" xml:space="preserve">
     <value>Horizontal Bar</value>
   </data>
+  <data name="ChartType.List.Text" xml:space="preserve">
+    <value>List</value>
+  </data>
   <data name="ChartType.Pie.Text" xml:space="preserve">
     <value>Pie</value>
   </data>
+  <data name="ChartType.Table.Text" xml:space="preserve">
+    <value>Table</value>
+  </data>
   <data name="ChartType.Text" xml:space="preserve">
     <value>Chart</value>
   </data>
+  <data name="ControlTitle_edit.Text" xml:space="preserve">
+    <value>Add/Edit Survey Question</value>
+  </data>
   <data name="CorrectAnswer.Help" xml:space="preserve">
     <value>If it is the correct answer, activate the checkbox.</value>
   </data>
@@ -168,6 +177,9 @@
   <data name="IsStatistical.Text" xml:space="preserve">
     <value>Statistical question</value>
   </data>
+  <data name="ModuleHelp.Text" xml:space="preserve">
+    <value>Need help? See the &lt;a href="https://dnn-survey.readme.io/docs/addedit-questions" target="_blank"&gt;module documentation&lt;/a&gt;.</value>
+  </data>
   <data name="NoAnswersProvided.Text" xml:space="preserve">
     <value>You can't add a single- or multiple-choice questions and don't provide an answer.</value>
   </data>

diff --git a/DNN.Survey/App_LocalResources/SurveyOrganize.ascx.resx b/DNN.Survey/App_LocalResources/SurveyOrganize.ascx.resx
@@ -117,8 +117,11 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="OrganizeHelp.Text" xml:space="preserve">
-    <value>Drag and drop the questions to sort, or click the recycle bin image to delete the question.</value>
+  <data name="ControlTitle_organize.Text" xml:space="preserve">
+    <value>Organize survey questions</value>
+  </data>
+  <data name="ModuleHelp.Text" xml:space="preserve">
+    <value>Drag and drop the questions to sort, or click the recycle bin image to delete the question.&lt;br /&gt;More help can be found in the &lt;a href="https://dnn-survey.readme.io/docs/organize-survey-questions" target="_blank"&gt;module ducumentation&lt;/a&gt;.</value>
   </data>
   <data name="Question.Header" xml:space="preserve">
     <value>Question</value>

diff --git a/DNN.Survey/App_LocalResources/SurveyResults.ascx.resx b/DNN.Survey/App_LocalResources/SurveyResults.ascx.resx
@@ -117,9 +117,21 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Answer.Text" xml:space="preserve">
+    <value>Answer</value>
+  </data>
+  <data name="ControlTitle_surveyresults.text" xml:space="preserve">
+    <value>DNN Survey Results</value>
+  </data>
   <data name="CorrectAnswer.Text" xml:space="preserve">
     <value>(Correct answer)</value>
   </data>
+  <data name="ModuleHelp.Text" xml:space="preserve">
+    <value>Need help? See the &lt;a href="https://dnn-survey.readme.io/docs/view-results" target="_blank"&gt;module documentation&lt;/a&gt;.</value>
+  </data>
+  <data name="Question.Text" xml:space="preserve">
+    <value>Question</value>
+  </data>
   <data name="ResultsNotPublicMessage.Text" xml:space="preserve">
     <value>You are not allowed to view the results, sorry...</value>
   </data>

diff --git a/DNN.Survey/App_LocalResources/SurveyView.ascx.resx b/DNN.Survey/App_LocalResources/SurveyView.ascx.resx
@@ -144,6 +144,9 @@
   <data name="CorrectAnswers.Text" xml:space="preserve">
     <value>Correct answers</value>
   </data>
+  <data name="CountResults.Text" xml:space="preserve">
+    <value>The survey has been submitted {0} times.</value>
+  </data>
   <data name="DeleteResults.Action" xml:space="preserve">
     <value>Delete results</value>
   </data>
@@ -153,6 +156,9 @@
   <data name="HasVoted.Text" xml:space="preserve">
     <value>Thank you for your participation.</value>
   </data>
+  <data name="ModuleHelp.Text" xml:space="preserve">
+    <value>Need help? See the &lt;a href="https://dnn-survey.readme.io/docs" target="_blank"&gt;module documentation&lt;/a&gt;.</value>
+  </data>
   <data name="MustBeSignedIn.Text" xml:space="preserve">
     <value>You must sign in to vote in this survey.</value>
   </data>

diff --git a/DNN.Survey/Components/Base.cs b/DNN.Survey/Components/Base.cs
@@ -34,7 +34,9 @@ public enum ChartType
       Bar = 0,
       HorizontalBar = 1,
       Pie = 2,
-      Doughnut = 3
+      Doughnut = 3,
+      List = 4,
+      Table = 5
    }
 
    public enum UseCaptcha

diff --git a/DNN.Survey/Components/Controllers/SurveyResultsController.cs b/DNN.Survey/Components/Controllers/SurveyResultsController.cs
@@ -82,6 +82,16 @@ public List<SurveyResultInfo> Get(int surveyID)
          }
          return surveyResult.ToList<SurveyResultInfo>();
       }
+
+      public int GetCount(int moduleID)
+      {
+         int count = 0;
+         using (IDataContext ctx = DataContext.Instance())
+         {
+            count = ctx.ExecuteScalar<int>(CommandType.StoredProcedure, "{databaseOwner}{objectQualifier}SurveyResults_Count", moduleID);
+         }
+         return count;
+      }
       #endregion
    }
 }
diff --git a/DNN.Survey/DNN.Survey.csproj b/DNN.Survey/DNN.Survey.csproj
@@ -240,13 +240,7 @@
     <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>
+    <Content Include="Providers\DataProviders\SqlDataProvider\09.02.00.SqlDataProvider" />
   </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.01.01">
+    <package name="DNN_Survey" type="Module" version="09.02.00">
       <friendlyName>Survey</friendlyName>
       <description>
         <![CDATA[
@@ -17,7 +17,7 @@
       <license src="Documentation\License.html" />
       <releaseNotes src="Documentation\ReleaseNotes.html" />
       <dependencies>
-        <dependency type="CoreVersion">09.04.00</dependency>
+        <dependency type="CoreVersion">09.11.00</dependency>
       </dependencies>
       <components>
         <component type="Config">
@@ -674,10 +674,15 @@
                 <name>09.01.00.SqlDataProvider</name>
                 <version>09.01.00</version>
              </script>
+             <script type="Install">
+                <path>Providers\DataProviders\SqlDataProvider</path>
+                <name>09.02.00.SqlDataProvider</name>
+                <version>09.02.00</version>
+             </script>
              <script type="UnInstall">
               <path>Providers\DataProviders\SqlDataProvider</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>09.01.01</version>
+              <version>09.02.00</version>
             </script>
           </scripts>
         </component>
@@ -765,7 +770,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.01.00,09.01.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.01,09.02.00</upgradeVersionsList>
             </attributes>
           </eventMessage>
         </component>
@@ -775,7 +780,7 @@
             <assembly>
               <path>bin</path>
               <name>DNN.Modules.Survey.dll</name>
-              <version>9.1.1.0</version>
+              <version>9.2.0.0</version>
             </assembly>
           </assemblies>
         </component>

diff --git a/DNN.Survey/Documentation/License.html b/DNN.Survey/Documentation/License.html
@@ -2,7 +2,7 @@
    <h3>License</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-2023 by DNN Corp.<br />
    </p>
    <p>
       Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated

diff --git a/DNN.Survey/Documentation/ReleaseNotes.html b/DNN.Survey/Documentation/ReleaseNotes.html
@@ -1,15 +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-2020 by DNN Corp.<br />
+   &copy; 2002-2023 by DNN Corp.<br />
 </p>
 <div class="License">
-   <h3>DNN Survey Project 09.00.00</h3>
+   <h3>DNN Survey Project 09.02.00</h3>
    <p>
       Minimum System requirements:
    </p>
    <ul>
-      <li>DNN Platform version 08.00.00 or higher</li>
+      <li>DNN Platform version 09.11.00 or higher</li>
    </ul>
    <p>
       Changes:
@@ -54,4 +54,51 @@ <h3>DNN Survey Project 09.01.00</h3>
       <li>#47 - Missing Surveys</li>
       <li>#48 - Charts don't display when a double quote was entered in a free text response</li>
    </ul>
+   <h3>DNN Survey Project 09.01.01</h3>
+   <p>
+      Minimum System requirements:
+   </p>
+   <ul>
+      <li>DNN Platform version 09.04.04 or higher</li>
+   </ul>
+   <p>
+      Changes:
+   </p>
+   <ul>
+      <li>Hide buttons related to results when no results available</li>
+      <li>Added "List" and "Table" as new "chart" options, esp. for free text answers</li>
+      <li>Allows giving a custom name to the Survey results page</li>
+   </ul>
+   <p>
+      Bugfixes:
+   </p>
+   <ul>
+      <li>#57 - Unable to install Release 9.1.0</li>
+   </ul>
+   <h3>DNN Survey Project 09.02.00</h3>
+   <p>
+      Minimum System requirements:
+   </p>
+   <ul>
+      <li>DNN Platform version 09.11.00 or higher</li>
+   </ul>
+   <p>
+      Changes:
+   </p>
+   <ul>
+      <li>Buttons and action menu option related to results when no results available are hidden</li>
+      <li>Added "List" and "Table" as new "chart" options, esp. for free text answers</li>
+      <li>Name to the Survey results page is localizable</li>
+      <li>Help links are displayed to administrators</li>
+      <li>Bumps DNN Core version to 09.11.00</li>
+   </ul>
+   <p>
+      Bugfixes:
+   </p>
+   <ul>
+      <li>#62 - Bug/feature? View survey results when there are no responses</li>
+      <li>#63 - Cannot give a custom name to the Survey results page</li>
+      <li>#64 - The Survey module doesn't create a 'donuts' chart</li>
+      <li>#65 - Starttext of a sentence not displayed</li>
+   </ul>
 </div>
diff --git a/DNN.Survey/Module.css b/DNN.Survey/Module.css
@@ -38,4 +38,37 @@ div.surveyQuizResult
 {
    font-size: 18px !important;
    font-weight: bold;
+}
+
+table.surveyResultsTable
+{
+   width: 98%;
+   padding: 0;
+   border: 0;
+   font-size: 1.2em;
+}
+
+tr.surveyResultsGridHeader {
+   vertical-align: top;
+   padding: 0.5em;
+   font-weight: bold;
+}
+
+tr.surveyGridItem {
+   background-color: #ffffff;
+}
+
+tr.surveyGridAltItem {
+   background-color: #f1f1f1;
+}
+
+td.surveyQuestionsRow {
+   padding: 0.5em;
+   width: 90%;
+}
+
+td.surveyVotesRow {
+   text-align: right;
+   padding: 0.5em;
+   width: 10%;
 }
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.1.1.0")]
-[assembly: AssemblyFileVersion("9.1.1.0")]
+[assembly: AssemblyVersion("9.2.0.0")]
+[assembly: AssemblyFileVersion("9.2.0.0")]
 
 // Add assembly reference to allow for WebResource.axd access to JavaScript files
 // see: http://aspnet.4guysfromrolla.com/articles/080906-1.aspx

diff --git a/DNN.Survey/Providers/DataProviders/SqlDataProvider/09.02.00.SqlDataProvider b/DNN.Survey/Providers/DataProviders/SqlDataProvider/09.02.00.SqlDataProvider
@@ -0,0 +1,32 @@
+/************************************************************/
+/*****                  SqlDataProvider                 *****/
+/*****                 Version: 09.02.00                *****/
+/*****                                                  *****/
+/*****  Note: To manually execute this script you must  *****/
+/*****        perform a search and replace operation    *****/
+/*****        for {databaseOwner} and {objectQualifier} *****/
+/*****                                                  *****/
+/************************************************************/
+
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}SurveyResults_Count') AND type = N'P')
+   DROP PROCEDURE {databaseOwner}{objectQualifier}SurveyResults_Count
+GO
+
+CREATE PROCEDURE {databaseOwner}{objectQualifier}SurveyResults_Count
+   @ModuleID int
+AS
+BEGIN
+   SELECT
+      COUNT(DISTINCT sr.ResultUserID)
+   FROM
+      {databaseOwner}{objectQualifier}Surveys s
+      INNER JOIN {databaseOwner}{objectQualifier}SurveyOptions so ON so.SurveyID = s.SurveyID
+      INNER JOIN {databaseOwner}{objectQualifier}SurveyResults sr ON sr.SurveyOptionID = so.SurveyOptionID
+   WHERE
+      ModuleID = @ModuleID
+END
+GO
+
+/************************************************************/
+/*****              SqlDataProvider                     *****/
+/************************************************************/
diff --git a/DNN.Survey/Providers/DataProviders/SqlDataProvider/Uninstall.SqlDataProvider b/DNN.Survey/Providers/DataProviders/SqlDataProvider/Uninstall.SqlDataProvider
@@ -1,6 +1,6 @@
 /************************************************************/
 /*****             Uninstall.SqlDataProvider            *****/
-/*****                 Version: 09.00.00                *****/
+/*****                 Version: 09.02.00                *****/
 /*****                                                  *****/
 /*****  Note: To manually execute this script you must  *****/
 /*****        perform a search and replace operation    *****/
@@ -56,6 +56,10 @@ IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwne
 DROP PROCEDURE {databaseOwner}{objectQualifier}SurveyResults_Get
 GO
 
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}SurveyResults_Count') AND type = N'P')
+   DROP PROCEDURE {databaseOwner}{objectQualifier}SurveyResults_Count
+GO
+
 IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}vSurveys_CsvExport') AND type = N'V')
 DROP VIEW {databaseOwner}{objectQualifier}vSurveys_CsvExport
 GO

diff --git a/DNN.Survey/Settings.ascx b/DNN.Survey/Settings.ascx
@@ -4,6 +4,8 @@
 
 <dnn:DnnCssInclude runat="server" FilePath="~/DesktopModules/Survey/css/Settings.css" />
 
+<div class="dnnFormMessage dnnFormInfo"><asp:Label ID="ModuleHelpLabel" runat="server" ResourceKey="ModuleHelp" /></div>
+
 <div class="dnnForm" id="SurveySettings">
    <h2 id="GeneralSettings" class="dnnFormSectionHead"><a href="#"><asp:Label ID="GeneralSettingsLabel" runat="server" ResourceKey="GeneralSettings" /></a></h2>
    <fieldset>