-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from DNNCommunity/Release_06.02.01
Correction of SProc for enrollments & new version
- Loading branch information
Showing
10 changed files
with
120 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.0"> | ||
| <package name="DNN_Events" type="Module" version="6.2.1"> | ||
| <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> | ||
|
|
@@ -11,7 +11,7 @@ | |
| <email>[email protected]</email> | ||
| </owner> | ||
| <license src="License.txt"></license> | ||
| <releaseNotes src="Release.06.02.00.txt"></releaseNotes> | ||
| <releaseNotes src="Release.06.02.01.txt"></releaseNotes> | ||
| <azureCompatible>true</azureCompatible> | ||
| <dependencies> | ||
| <dependency type="CoreVersion">07.02.00</dependency> | ||
|
|
@@ -200,6 +200,11 @@ | |
| <name>06.02.00.SqlDataProvider</name> | ||
| <version>06.02.00</version> | ||
| </script> | ||
| <script type="Install"> | ||
| <path>Installation</path> | ||
| <name>06.02.01.SqlDataProvider</name> | ||
| <version>06.02.01</version> | ||
| </script> | ||
| <script type="Install"> | ||
| <path>Installation</path> | ||
| <name>Install.05.02.04.SqlDataProvider</name> | ||
|
|
@@ -399,6 +404,7 @@ | |
| <component type="Cleanup" version="06.01.03" fileName="Installation\CleanUp\Cleanup.06.01.03.txt" /> | ||
| <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="Config"> | ||
| <config> | ||
| <configFile>web.config</configFile> | ||
|
|
||
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <h2>Release notes DNN Events 06.02.01</h2> | ||
| <p>Events 06.02.01 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>An error has occurred. Error: Calendar is currently unavailable when clicking My Enrollments. Fixed.</li> | ||
| </ul> |