From 6fa6e2a502d7f1724ec8c1bd2b26d161a994a057 Mon Sep 17 00:00:00 2001 From: psteiwer Date: Tue, 3 Mar 2020 13:37:18 -0500 Subject: [PATCH 01/13] sendNow event type Fixes #69 --- PivotSubscriptions/EventLog.cls | 2 +- PivotSubscriptions/Task.cls | 12 +++++++----- PivotSubscriptions/UI/SubscriptionManager.cls | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/PivotSubscriptions/EventLog.cls b/PivotSubscriptions/EventLog.cls index 82f0b1a..01f5b3f 100644 --- a/PivotSubscriptions/EventLog.cls +++ b/PivotSubscriptions/EventLog.cls @@ -3,7 +3,7 @@ Class PivotSubscriptions.EventLog Extends %Persistent { /// Event Type covers: create, update, delete, sendSubscription, and tableError -Property EventType As %String(VALUELIST = ",create,update,delete,sendSubscription,tableError,unsubscribe"); +Property EventType As %String(VALUELIST = ",create,update,delete,sendSubscription,sendNow,tableError,unsubscribe"); Property StartTime As %TimeStamp [ InitialExpression = {$zdt($h, 3, 1)} ]; diff --git a/PivotSubscriptions/Task.cls b/PivotSubscriptions/Task.cls index e3e149a..f79cfd5 100644 --- a/PivotSubscriptions/Task.cls +++ b/PivotSubscriptions/Task.cls @@ -32,13 +32,13 @@ Method OnTask() As %Status Set tMinute=tRS.%Get("Minute") Set tName=tRS.%Get("Name") - Set tSC = ##class(PivotSubscriptions.Task).SendSubscription(tID,tPivot,tEmails,tFormat,tDayOfWeek,tHour,tMinute,tName) + Set tSC = ##class(PivotSubscriptions.Task).SendSubscription(tID,0,tPivot,tEmails,tFormat,tDayOfWeek,tHour,tMinute,tName) } Quit tSC } -ClassMethod SendSubscription(pID, pPivot As %String, pEmails As %String, pFormat As %String, pDayOfWeek, pHour, pMinute, pName) As %Status +ClassMethod SendSubscription(pID, pSendNow As %Boolean = 0, pPivot As %String, pEmails As %String, pFormat As %String, pDayOfWeek, pHour, pMinute, pName) As %Status { Set tSC=$$$OK @@ -47,7 +47,7 @@ ClassMethod SendSubscription(pID, pPivot As %String, pEmails As %String, pFormat } Try { - Set tSC=##class(PivotSubscriptions.Task).SendEmail(pID,pPivot,pEmails,pFormat,pName) + Set tSC=##class(PivotSubscriptions.Task).SendEmail(pID,pSendNow,pPivot,pEmails,pFormat,pName) } Catch ex { Set tSC=ex.AsStatus() } @@ -55,10 +55,12 @@ ClassMethod SendSubscription(pID, pPivot As %String, pEmails As %String, pFormat Quit tSC } -ClassMethod SendEmail(pID, pPivot As %String, pEmails As %String, pFormat As %String, pName As %String) As %Status +ClassMethod SendEmail(pID, pSendNow As %Boolean = 0, pPivot As %String, pEmails As %String, pFormat As %String, pName As %String) As %Status { Set tSC=$$$OK Set tFilename="" + + Set tEventType=$Select(pSendNow:"sendNow",1:"sendSubscription") Set mdx=##class(%DeepSee.Utils).%GetMDXFromPivot(pPivot,.tSC,0) Set tSubscription=##class(PivotSubscriptions.Subscription).%OpenId(pID) @@ -67,7 +69,7 @@ ClassMethod SendEmail(pID, pPivot As %String, pEmails As %String, pFormat As %St For tCount=1:1:$l(pEmails,",") { Set tEmail=$p(pEmails,",",tCount) - Set tSC=##class(PivotSubscriptions.EventLog).CreateEvent("sendSubscription",pID,$username,pPivot,tSubscription.DayOfWeek,tSubscription.Hour,tSubscription.Minute,tSubscription.Format,tEmail,pName,.pEvent) + Set tSC=##class(PivotSubscriptions.EventLog).CreateEvent(tEventType,pID,$username,pPivot,tSubscription.DayOfWeek,tSubscription.Hour,tSubscription.Minute,tSubscription.Format,tEmail,pName,.pEvent) If $$$ISERR(tSC) Quit tSC Try { diff --git a/PivotSubscriptions/UI/SubscriptionManager.cls b/PivotSubscriptions/UI/SubscriptionManager.cls index a365e5d..51c48eb 100644 --- a/PivotSubscriptions/UI/SubscriptionManager.cls +++ b/PivotSubscriptions/UI/SubscriptionManager.cls @@ -153,7 +153,7 @@ Method SendNow(pId, pPivot, pEmail As %String) As %String [ ZenMethod ] If pId'=0 { Set tSubscription=##class(PivotSubscriptions.Subscription).%OpenId(pId) - Set tSC=##class(PivotSubscriptions.Task).SendSubscription(pId,pPivot,pEmail,tSubscription.Format,tSubscription.DayOfWeek,tSubscription.Hour,tSubscription.Minute,tSubscription.Name) + Set tSC=##class(PivotSubscriptions.Task).SendSubscription(pId,1,pPivot,pEmail,tSubscription.Format,tSubscription.DayOfWeek,tSubscription.Hour,tSubscription.Minute,tSubscription.Name) If $$$ISERR(tSC) { Set tMsg=$System.Status.GetErrorText(tSC) From 733dc8a9b401fe5c9e0ad074517324b9ac7241cb Mon Sep 17 00:00:00 2001 From: psteiwer Date: Fri, 6 Mar 2020 12:23:51 -0500 Subject: [PATCH 02/13] Add version to book cover Fixes #83 --- PivotSubscriptions/Installer.cls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PivotSubscriptions/Installer.cls b/PivotSubscriptions/Installer.cls index 6a5f55e..b634752 100644 --- a/PivotSubscriptions/Installer.cls +++ b/PivotSubscriptions/Installer.cls @@ -16,7 +16,7 @@ ClassMethod RunInstaller(pRootDir) Set tPage="PivotSubscriptions.UI.SubscriptionManager.zen" Set tItem.href=$system.CSP.GetPortalApp($namespace,tPage)_tPage Set tItem.title="Pivot Subscriptions" - Set tItem.bookCover="{background: {style:'background:white;',src:'covers/PivotSubscriptions_Cover.png'},header: {text:'$type',style:'display: none;'},title: {text:'$title',style:'display: none;'},image: {style:'display: none;',src:'deepsee/ds2_globe_44.png',imageStyle:'width:64px;height:64px;'},subtitle: {style:'display: none;'},footer: {text:'$owner',style:'display: none;'}}" + Set tItem.bookCover="{background: {style:'background:white;',src:'covers/PivotSubscriptions_Cover.png'},header: {text:'$type',style:'display: none;'},title: {text:'$title',style:'display: none;'},image: {style:'display: none;',src:'deepsee/ds2_globe_44.png',imageStyle:'width:64px;height:64px;'},subtitle: {text:'"_##class(PivotSubscriptions.Utils).GetVersion()_"',style:'font-size:9px;top:179px;'},footer: {text:'$owner',style:'display: none;'}}" Set tSC=tItem.%Save() If $$$ISERR(tSC) Quit tSC From b3c031c1973fcd297cbf158574de8146bd2a1c50 Mon Sep 17 00:00:00 2001 From: psteiwer Date: Fri, 6 Mar 2020 12:25:29 -0500 Subject: [PATCH 03/13] Set default pRootDir value This allows Installer to be run again to allow: - Reconfigure Task - Reconfigure Web App - Reconfigure Book Cover --- PivotSubscriptions/Installer.cls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PivotSubscriptions/Installer.cls b/PivotSubscriptions/Installer.cls index b634752..651e336 100644 --- a/PivotSubscriptions/Installer.cls +++ b/PivotSubscriptions/Installer.cls @@ -1,7 +1,7 @@ Class PivotSubscriptions.Installer { -ClassMethod RunInstaller(pRootDir) +ClassMethod RunInstaller(pRootDir = "") { Set tSC=$$$OK From de6f51f683a61d36ac003c4b3bc06a571939e51b Mon Sep 17 00:00:00 2001 From: psteiwer Date: Fri, 6 Mar 2020 12:57:03 -0500 Subject: [PATCH 04/13] Add Preset Schedules option --- .../UI/Dialog/EditSubscription.cls | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/PivotSubscriptions/UI/Dialog/EditSubscription.cls b/PivotSubscriptions/UI/Dialog/EditSubscription.cls index e2b024d..5034ed5 100644 --- a/PivotSubscriptions/UI/Dialog/EditSubscription.cls +++ b/PivotSubscriptions/UI/Dialog/EditSubscription.cls @@ -34,6 +34,7 @@ XData dialogBody [ XMLNamespace = "http://www.intersystems.com/zen" ]