Modifying 'Reminder to Close Windows after leaving house (via presence sensor)'

smartapps/nick257/shut-the-windows.src/shut-the-windows.groovy

@@ -0,0 +1,73 @@
+definition(
+    name: "Shut the windows!",
+    namespace: "nick257",
+    author: "Nick Mahon",
+    description: "Notifies when last person leaves without closing doors or windows.",
+    category: "Safety & Security",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/ModeMagic/bon-voyage.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/ModeMagic/bon-voyage%402x.png"
+)
+
+preferences 
+{
+	section("As the last of these persons leaves") {
+		input "people", "capability.presenceSensor", multiple: true
+	}
+	section("Check that these are closed") {
+		input "doors", "capability.contactSensor", multiple: true
+	}
+    section("Send Push Notification?") {
+		input "sendPush", "bool", required: false,
+		title: "Send Push Notification when Opened?"
+	}
+	section("Send a text message to this number (optional)") {
+	input "phone", "phone", required: false
+	}
+}
+
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+	initialize()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+    unsubscribe()
+    initialize()
+}
+
+def initialize() {
+	subscribe(people, "presence", presence)
+}
+
+def presence(evt)
+{
+	log.debug "evt.name: $evt.value, $evt.deviceId"
+	if (evt.value == "not present") {
+    	log.debug "isSomeonePresent()? ${isSomeonePresent()}"
+        log.debug "isDoorsOpen()? ${isDoorsOpen()}"
+    	if (!isSomeonePresent() && isDoorsOpen()) {
+        	def device = people.find { it.id == evt.deviceId }
+            log.debug "${device.displayName} left ${location.name} without closing ${isDoorsOpen().join(", ")}"
+            
+            def message = "${device.displayName} left ${location.name} without closing ${isDoorsOpen().join(", ")}"
+			if (sendPush) {
+				sendPush(message)
+			}
+			if (phone) {
+				sendSms(phone, message)
+			}
+		}
+	}
+}
+
+def isSomeonePresent() {
+	log.debug "presence: $people.currentPresence"
+    people.findAll{it.currentPresence == "present"}
+}
+
+def isDoorsOpen() {
+	log.debug "doorss: $doors.currentContact"
+	doors.findAll{it.currentContact == "open"}
+}

smartapps/nick257b/turn-off-switch.src/turn-off-switch.groovy

@@ -1,79 +0,0 @@
-/**
- *  Turn Off Switch when Windows/Doors closed
- *
- *  Copyright 2017 Nick Mahon
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-definition(
-    name: "Turn Off Switch",
-    namespace: "Nick257b",
-    author: "Nick Mahon",
-    description: "Turn off a switch (e.g. a light), when all specified door/window contact sensors closed",
-    category: "Safety & Security",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
-
-
-preferences {
-    section("Select the switch to turn off") {
-    	input "theSwitch", "capability.switch", title: "Which switch?", required: true, multiple: false
-    }
-	section("when these are ALL closed") {
-		input "contactSensors", "capability.contactSensor", multiple: true
-	}
-    section("Send Push Notification?") {
-		input "sendPush", "bool", required: false,
-		title: "Send Push Notification when ALL closed?"
-	}
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-    unsubscribe()
-    initialize()
-}
-
-def initialize() {
-	subscribe(contactSensors, "contact.closed", contactClosedHandler)
-}
-
-def contactClosedHandler(evt)
-{
-	log.trace "evt.name: $evt.value, $evt.deviceId"
-	if (evt.value == "closed") {
-    	log.debug "isDoorsOpen()? ${isDoorsOpen()}"
-        def device = contactSensors.find { it.id == evt.deviceId }
-        
-    	if (!isDoorsOpen()) {
-        	def message = "${device.displayName} was closed, switching off light as all other selected contacts sensors also in a closed state."
-            log.debug (message)
-            theSwitch.off()
-            
-			if (sendPush) {
-				sendPush(message)
-			}
-			
-		}
-	}
-}
-
-
-def isDoorsOpen() {
-	log.debug "doorss: $contactSensors.currentContact"
-	doors.findAll{it.currentContact == "open"}
-}