Merge pull request #53 from psteiwer/dev-nodata

Dev nodata

Author: psteiwer

PivotSubscriptions/Task.cls

@@ -132,15 +132,17 @@ ClassMethod SendEmail(pID, pPivot As %String, pEmails As %String, pFormat As %St
 				}
 			} Else {
 				Do ##class(PivotSubscriptions.Utils).WriteEmailHeader(msg)
-				Do msg.TextData.WriteLine("No data for requested pivot.")
+				Do msg.TextData.WriteLine($G(^PivotSubscriptions.Settings("NoDataMessage"),"No data for requested pivot."))
 				Do ##class(PivotSubscriptions.Utils).WriteEmailFooter(msg)
 			}
 		}
 
 		Do msg.To.SetAt(tEmail,1)
 
 		// Send email
-		Set tSC=server.Send(msg)
+		If $G(^PivotSubscriptions.Settings("SendNoData"),1) {
+			Set tSC=server.Send(msg)
+		}
 		// TODO: Log individual send status?
 
 		If tHasResults {

PivotSubscriptions/UI/ConfigurationPage.cls

@@ -19,6 +19,9 @@ XData contentPane [ XMLNamespace = "http://www.intersystems.com/zen" ]
 			<radioSet id="HTTPButton" label="HTTP or HTTPS?" displayList="HTTP, HTTPs" valueList="http://,https://" />
 			<text id="ServerText" label="Server" size="25" />
 			<text id="PortText" label="Port Number" size="25" />
+			<label label="No Data Settings" labelClass="sectionCaption" containerStyle="padding-top:5px;padding-bottom:5px;" />
+			<radioSet id="NoDataEmail" label="Send No Data Email" displayList="Yes,No" valueList="1,0" value="1"/>
+			<textarea id="NoDataMessage" label="No Data Message" cols="50" rows="3" value="No data for requested pivot."/>
 	</vgroup>
 </hgroup>
 <hgroup>
@@ -61,6 +64,12 @@ Method %OnAfterCreatePage() As %Status
 	If $G(^PivotSubscriptions.Settings("Port"))'="" {
 		Set ..%GetComponentById("PortText").value=^PivotSubscriptions.Settings("Port")
 	}
+	If $G(^PivotSubscriptions.Settings("SendNoData"))'="" {
+		Set ..%GetComponentById("NoDataEmail").value=^PivotSubscriptions.Settings("SendNoData")
+	}
+	If $G(^PivotSubscriptions.Settings("NoDataMessage"))'="" {
+		Set ..%GetComponentById("NoDataMessage").value=^PivotSubscriptions.Settings("NoDataMessage")
+	}
 
 	Quit $$$OK
 }
@@ -72,19 +81,21 @@ ClientMethod ButtonClick() [ Language = javascript ]
 		var http=zen('HTTPButton').getValue();
 		var server=zen('ServerText').getValue();
 		var port=zen('PortText').getValue();
+		var nodataemail=zen('NoDataEmail').getValue();
+		var nodatamessage=zen('NoDataMessage').getValue();
 
-		var status=zenPage.SaveConfiguration(adminemail,http,server,port);
+		var status=zenPage.SaveConfiguration(adminemail,http,server,port,nodataemail,nodatamessage);
 	}
 	catch(ex) {
 		zenExceptionHandler(ex,arguments);
 	}
 }
 
-Method SaveConfiguration(pAdminEmail, pHttp, pServer, pPort) As %Status [ ZenMethod ]
+Method SaveConfiguration(pAdminEmail, pHttp, pServer, pPort, pNoDataEmail, pNoDataMessage) As %Status [ ZenMethod ]
 {
 	Set tSC=$$$OK
 
-	Set tSC = ##class(PivotSubscriptions.Utils).ConfigureSettings(pAdminEmail, pHttp, pServer, pPort)
+	Set tSC = ##class(PivotSubscriptions.Utils).ConfigureSettings(pAdminEmail, pHttp, pServer, pPort, pNoDataEmail, pNoDataMessage)
 
 	Quit tSC
 }

PivotSubscriptions/Utils.cls

@@ -7,12 +7,14 @@ ClassMethod GetVersion() As %String
 }
 
 /// Utility method for saving and updating global variables
-ClassMethod ConfigureSettings(pAdminEmail, pHttp, pServer, pPort)
+ClassMethod ConfigureSettings(pAdminEmail, pHttp, pServer, pPort, pNoDataEmail, pNoDataMessage)
 {
 	Set ^PivotSubscriptions.Settings("AdminEmail")=pAdminEmail
 	Set ^PivotSubscriptions.Settings("Http")=pHttp
 	Set ^PivotSubscriptions.Settings("Server")=pServer
 	Set ^PivotSubscriptions.Settings("Port")=pPort
+	Set ^PivotSubscriptions.Settings("SendNoData")=pNoDataEmail
+	Set ^PivotSubscriptions.Settings("NoDataMessage")=pNoDataMessage
 
 	Quit $$$OK
 }