Skip to content

Commit

Permalink
Release 06.02.02, the last DNN7 release
Browse files Browse the repository at this point in the history
  • Loading branch information
EPTamminga committed Jan 8, 2016
1 parent e3853fb commit eda2a28
Show file tree
Hide file tree
Showing 11 changed files with 126 additions and 11 deletions.
10 changes: 5 additions & 5 deletions AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyTitle("DotNetNuke.Modules.Events")>
<Assembly: AssemblyDescription("Open Source Web Application Framework")>
<Assembly: AssemblyCompany("DNN Corp")>
<Assembly: AssemblyProduct("http://www.dnnsoftware.com")>
<Assembly: AssemblyCopyright("DotNetNuke® is copyright 2002-2015 by DNN Corp. All Rights Reserved.")>
<Assembly: AssemblyProduct("http://www.dnnsoftware.com")>
<Assembly: AssemblyCopyright("DotNetNuke® is copyright 2002-2016 by DNN Corp. All Rights Reserved.")>
<Assembly: AssemblyTrademark("DotNetNuke")>
<Assembly: CLSCompliant(True)>
<Assembly: ComVisibleAttribute(False)>

'The following GUID is for the ID of the typelib if this project is exposed to COM
<Assembly: Guid("8796CA21-77F8-48A8-902D-C71872C048D3")>
<Assembly: Guid("8796CA21-77F8-48A8-902D-C71872C048D3")>

' Version information for an assembly consists of the following four values:
'
Expand All @@ -48,5 +48,5 @@ Imports System.Runtime.InteropServices
' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below:

<Assembly: AssemblyVersion("6.2.1.0")>
<Assembly: AssemblyFileVersionAttribute("6.2.1.0")>
<Assembly: AssemblyVersion("6.2.2.0")>
<Assembly: AssemblyFileVersion("6.2.2.0")>
7 changes: 3 additions & 4 deletions DotNetNuke.Events.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DotNetNuke.Events.ScheduleControl", "Controls\DotNetNuke.Events.ScheduleControl\DotNetNuke.Events.ScheduleControl.vbproj", "{E90DA1B8-E75D-4E59-AE77-407BE089CF1A}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DotNetNuke.Events", "DotNetNuke.Events.vbproj", "{F13CD116-F8CC-4108-8691-F855EEBF7A4F}"
ProjectSection(ProjectDependencies) = postProject
{E90DA1B8-E75D-4E59-AE77-407BE089CF1A} = {E90DA1B8-E75D-4E59-AE77-407BE089CF1A}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
5 changes: 5 additions & 0 deletions DotNetNuke.Events.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,9 @@
<Content Include="Installation\CleanUp\Cleanup.06.01.02.txt" />
<Content Include="Installation\CleanUp\Cleanup.06.01.03.txt" />
<Content Include="Installation\CleanUp\Cleanup.06.01.04.txt" />
<Content Include="Installation\CleanUp\Cleanup.06.02.00.txt" />
<Content Include="Installation\CleanUp\Cleanup.06.02.01.txt" />
<Content Include="Installation\CleanUp\Cleanup.06.02.02.txt" />
<Content Include="Installation\DNN_Events.png" />
<Content Include="Installation\ReleaseNotes\Release.06.01.05.txt" />
<Content Include="Installation\ReleaseNotes\Release.06.02.00.txt" />
Expand All @@ -383,6 +385,8 @@
<Content Include="Installation\ReleaseNotes\Release.05.02.04.txt" />
<Content Include="Installation\ReleaseNotes\Release.06.00.00.txt" />
<Content Include="Installation\ReleaseNotes\Release.06.00.01.txt" />
<Content Include="Installation\ReleaseNotes\Release.06.02.01.txt" />
<Content Include="Installation\ReleaseNotes\Release.06.02.02.txt" />
<Content Include="SubControls\SelectLocation.ascx" />
<Content Include="SubControls\EventIcons.ascx" />
<Content Include="EventIPN.aspx" />
Expand Down Expand Up @@ -563,6 +567,7 @@
<None Include="Installation\06.01.02.SqlDataProvider" />
<None Include="Installation\06.01.03.SqlDataProvider" />
<Content Include="Installation\06.02.00.SqlDataProvider" />
<Content Include="Installation\06.02.02.SqlDataProvider" />
<None Include="Installation\Install.05.02.04.SqlDataProvider" />
<None Include="Installation\Project.targets" />
<None Include="Installation\Uninstall.SqlDataProvider" />
Expand Down
95 changes: 95 additions & 0 deletions Installation/06.02.02.SqlDataProvider
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/************************************************************/
/***** *****/
/***** SqlDataProvider *****/
/***** Install/Upgrade for Events module 06.02.02 *****/
/***** *****/
/***** Note: To manually execute this script you must *****/
/***** perform a search AND replace operation *****/
/***** for {databaseOwner} AND {objectQualifier} *****/
/***** or use 'SQL' FROM Host Menu AND run this. *****/
/***** *****/
/************************************************************/

if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}EventsSignupsMyEnrollments]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
drop procedure {databaseOwner}[{objectQualifier}EventsSignupsMyEnrollments]
GO

/** EventsSignupsMyEnrollments **/

CREATE PROCEDURE {databaseOwner}[{objectQualifier}EventsSignupsMyEnrollments]
(
@ModuleID int,
@UserID int,
@SocialGroupId int,
@CategoryIDs as nvarchar(1024),
@BeginDate datetime,
@EndDate datetime
)
AS
BEGIN
SET NOCOUNT ON;
SET DATEFORMAT mdy;

Select s.EventID,
s.SignupID,
s.ModuleID,
s.Userid,
s.Approved,
u.displayName as UserName,
u.Email,
e.EventTimeBegin,
DATEADD(mi, e.Duration, e.EventTimeBegin) as EventTimeEnd,
e.EventName,
e.Importance,
e.Approved as EventApproved,
e.MaxEnrollment,
(Select Sum(NoEnrolees) from {databaseOwner}[{objectQualifier}EventsSignups] WHERE EventID = e.EventID and e.Signups = 1) as Enrolled,
PayPalStatus,
PayPalReason,
PayPalTransID,
PayPalPayerID,
PayPalPayerStatus,
PayPalRecieverEmail,
PayPalUserEmail,
PayPalPayerEmail,
PayPalFirstName,
PayPalLastName,
PayPalAddress,
PayPalCity,
PayPalState,
PayPalZip,
PayPalCountry,
PayPalCurrency,
PayPalPaymentDate,
PayPalAmount,
PayPalFee,
NoEnrolees,
r.EventTimeZoneId,
AnonEmail,
AnonName,
AnonTelephone,
AnonCulture,
AnonTimeZoneId,
S.FirstName,
S.LastName,
S.Company,
S.JobTitle,
S.ReferenceNumber,
S.Street,
S.PostalCode,
S.City,
S.Region,
S.Country
FROM {databaseOwner}[{objectQualifier}EventsRecurMaster] AS r RIGHT OUTER JOIN
{databaseOwner}[{objectQualifier}Events] AS e ON r.RecurMasterID = e.RecurMasterID RIGHT OUTER JOIN
{databaseOwner}[{objectQualifier}EventsSignups] AS s LEFT OUTER JOIN
{databaseOwner}[{objectQualifier}Users] AS u ON s.UserID = u.UserID ON e.EventID = s.EventID LEFT OUTER JOIN
{databaseOwner}[{objectQualifier}EventsMaster] AS M ON s.ModuleID = M.SubEventID
Where s.Userid = @UserID AND (s.ModuleID = @ModuleID Or M.ModuleID = @ModuleID)
AND (r.SocialGroupId = @SocialGroupId or (r.SocialGroupId is null and @SocialGroupId = -1))
AND (e.Category in (SELECT * FROM {databaseOwner}[{objectQualifier}EventsSplitIDs](@CategoryIDs)) or @CategoryIDs = '-1')
AND ((e.EventTimeBegin < DATEADD(DAY,1,@EndDate) AND DATEADD(minute,e.Duration,e.EventTimeBegin) >= @BeginDate) OR
(e.EventTimeBegin >= @BeginDate AND e.EventTimeBegin < DATEADD(DAY,1, @EndDate)))
ORDER BY e.EventTimeBegin desc
END
GO
3 changes: 3 additions & 0 deletions Installation/CleanUp/Cleanup.06.02.02.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'Remove old versions of events
Install\Module\Events_06.02.01_Source.zip
Install\Module\Events_06.02.01_Install.zip
10 changes: 8 additions & 2 deletions Installation/DNN_Events.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN_Events" type="Module" version="6.2.1">
<package name="DNN_Events" type="Module" version="6.2.2">
<friendlyName>Events</friendlyName>
<description>This module renders single and recurring events and includes Master and Sub Calendars with Event Rollup, TimeZone Adjustment, Event Enrollment, and Event Notification.</description>
<iconFile>DesktopModules\Events\DNN_Events.png</iconFile>
Expand All @@ -11,7 +11,7 @@
<email>[email protected]</email>
</owner>
<license src="License.txt"></license>
<releaseNotes src="Release.06.02.01.txt"></releaseNotes>
<releaseNotes src="Release.06.02.02.txt"></releaseNotes>
<azureCompatible>true</azureCompatible>
<dependencies>
<dependency type="CoreVersion">07.02.00</dependency>
Expand Down Expand Up @@ -205,6 +205,11 @@
<name>06.02.01.SqlDataProvider</name>
<version>06.02.01</version>
</script>
<script type="Install">
<path>Installation</path>
<name>06.02.02.SqlDataProvider</name>
<version>06.02.02</version>
</script>
<script type="Install">
<path>Installation</path>
<name>Install.05.02.04.SqlDataProvider</name>
Expand Down Expand Up @@ -405,6 +410,7 @@
<component type="Cleanup" version="06.01.04" fileName="Installation\CleanUp\Cleanup.06.01.04.txt" />
<component type="Cleanup" version="06.02.00" fileName="Installation\CleanUp\Cleanup.06.02.00.txt" />
<component type="Cleanup" version="06.02.01" fileName="Installation\CleanUp\Cleanup.06.02.01.txt" />
<component type="Cleanup" version="06.02.02" fileName="Installation\CleanUp\Cleanup.06.02.02.txt" />
<component type="Config">
<config>
<configFile>web.config</configFile>
Expand Down
Binary file removed Installation/DNN_Events_06.02.01_Install.zip
Binary file not shown.
Binary file removed Installation/DNN_Events_06.02.01_Source.zip
Binary file not shown.
Binary file added Installation/DNN_Events_06.02.02_Install.zip
Binary file not shown.
Binary file added Installation/DNN_Events_06.02.02_Source.zip
Binary file not shown.
7 changes: 7 additions & 0 deletions Installation/ReleaseNotes/Release.06.02.02.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<h2>Release notes DNN Events 06.02.02</h2>
<p>Events 06.02.02 will work for any DNN version <strong>7.2.0</strong> and up. Full details on the changes can be found in great detail at <a href="http://dnnevents.codeplex.com/workitem/list/basic">http://dnnevents.codeplex.com/workitem/list/basic</a>. </p>

<h3>BUG FIXES</h3>
<ul>
<li>Enrollment approval did not show up correctly. Fixed.</li>
</ul>

0 comments on commit eda2a28

Please sign in to comment.