From ad8452df14e30b41a5bc67bb24b77f13095e9c49 Mon Sep 17 00:00:00 2001 From: Ernst Peter Tamminga Date: Thu, 12 Feb 2015 17:55:33 +0100 Subject: [PATCH] Correction of SProc for enrollments & new version --- AssemblyInfo.vb | 6 +- .../My Project/AssemblyInfo.vb | 6 +- DotNetNuke.Events.sln | 15 --- DotNetNuke.Events.vbproj | 9 +- Installation/06.02.01.SqlDataProvider | 95 ++++++++++++++++++ Installation/CleanUp/Cleanup.06.02.01.txt | 3 + Installation/DNN_Events.dnn | 10 +- Installation/DNN_Events_06.02.01_Install.zip | Bin 0 -> 539330 bytes Installation/DNN_Events_06.02.01_Source.zip | Bin 0 -> 1166835 bytes .../ReleaseNotes/Release.06.02.01.txt | 7 ++ 10 files changed, 120 insertions(+), 31 deletions(-) create mode 100644 Installation/06.02.01.SqlDataProvider create mode 100644 Installation/CleanUp/Cleanup.06.02.01.txt create mode 100644 Installation/DNN_Events_06.02.01_Install.zip create mode 100644 Installation/DNN_Events_06.02.01_Source.zip create mode 100644 Installation/ReleaseNotes/Release.06.02.01.txt diff --git a/AssemblyInfo.vb b/AssemblyInfo.vb index 2356db4..03e874e 100644 --- a/AssemblyInfo.vb +++ b/AssemblyInfo.vb @@ -30,7 +30,7 @@ Imports System.Runtime.InteropServices - + @@ -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: - - + + diff --git a/Controls/DotNetNuke.Events.ScheduleControl/My Project/AssemblyInfo.vb b/Controls/DotNetNuke.Events.ScheduleControl/My Project/AssemblyInfo.vb index 363c4ea..836102b 100644 --- a/Controls/DotNetNuke.Events.ScheduleControl/My Project/AssemblyInfo.vb +++ b/Controls/DotNetNuke.Events.ScheduleControl/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,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: - - + + diff --git a/DotNetNuke.Events.sln b/DotNetNuke.Events.sln index 0017e0a..6d97086 100644 --- a/DotNetNuke.Events.sln +++ b/DotNetNuke.Events.sln @@ -8,21 +8,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DotNetNuke.Events", "DotNet EndProjectSection EndProject Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 2 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs03 - SccProjectUniqueName0 = Controls\\DotNetNuke.Events.ScheduleControl\\DotNetNuke.Events.ScheduleControl.vbproj - SccProjectName0 = Controls/DotNetNuke.Events.ScheduleControl - SccAuxPath0 = https://tfs.codeplex.com/tfs/tfs03 - SccLocalPath0 = Controls\\DotNetNuke.Events.ScheduleControl - SccProvider0 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccProjectUniqueName1 = DotNetNuke.Events.vbproj - SccProjectName1 = . - SccAuxPath1 = https://tfs.codeplex.com/tfs/tfs03 - SccLocalPath1 = . - SccProvider1 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU diff --git a/DotNetNuke.Events.vbproj b/DotNetNuke.Events.vbproj index b6cb44e..2f83385 100644 --- a/DotNetNuke.Events.vbproj +++ b/DotNetNuke.Events.vbproj @@ -367,7 +367,7 @@ - + @@ -566,13 +566,6 @@ - - - web.config - - - web.config - diff --git a/Installation/06.02.01.SqlDataProvider b/Installation/06.02.01.SqlDataProvider new file mode 100644 index 0000000..26c8c99 --- /dev/null +++ b/Installation/06.02.01.SqlDataProvider @@ -0,0 +1,95 @@ +/************************************************************/ +/***** *****/ +/***** SqlDataProvider *****/ +/***** Install/Upgrade for Events module 06.02.01 *****/ +/***** *****/ +/***** 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 diff --git a/Installation/CleanUp/Cleanup.06.02.01.txt b/Installation/CleanUp/Cleanup.06.02.01.txt new file mode 100644 index 0000000..7bfece1 --- /dev/null +++ b/Installation/CleanUp/Cleanup.06.02.01.txt @@ -0,0 +1,3 @@ +'Remove old versions of events +Install\Module\Events_06.02.00_Source.zip +Install\Module\Events_06.02.00_Install.zip diff --git a/Installation/DNN_Events.dnn b/Installation/DNN_Events.dnn index 368ea5d..2baec37 100644 --- a/Installation/DNN_Events.dnn +++ b/Installation/DNN_Events.dnn @@ -1,6 +1,6 @@  - + Events This module renders single and recurring events and includes Master and Sub Calendars with Event Rollup, TimeZone Adjustment, Event Enrollment, and Event Notification. DesktopModules\Events\DNN_Events.png @@ -11,7 +11,7 @@ support@dnnsoftware.com - + true 07.02.00 @@ -200,6 +200,11 @@ 06.02.00.SqlDataProvider 06.02.00 +