From: Seyed Amir Hossein Aqajari <amiraj.95@uci.edu>
Date: Mon, 5 Aug 2019 22:43:35 +0000 (-0700)
Subject: Update gentle-wake-up.groovy
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartapps.git;a=commitdiff_plain;h=6940192fbf5241257289f9303dc3d32dde10a625

Update gentle-wake-up.groovy
---

diff --git a/official/gentle-wake-up.groovy b/official/gentle-wake-up.groovy
index 84936dc..d8c346f 100755
--- a/official/gentle-wake-up.groovy
+++ b/official/gentle-wake-up.groovy
@@ -35,9 +35,9 @@ definition(
 
 preferences {
 	page(name: "rootPage")
+	page(name: "numbersPage")
 	page(name: "schedulingPage")
 	page(name: "completionPage")
-	page(name: "numbersPage")
 	page(name: "controllerExplanationPage")
 	//page(name: "unsupportedDevicesPage")
 }
@@ -51,7 +51,7 @@ def rootPage() {
 				/*if (dimmersContainUnsupportedDevices()) {
 					href(name: "toUnsupportedDevicesPage", page: "unsupportedDevicesPage", title: "Some of your selected dimmers don't seem to be supported", description: "Tap here to fix it", required: true)
 				}*/
-				href(name: "toNumbersPage", page: "numbersPage", title: "Duration & Direction", description: numbersPageHrefDescription(), state: "complete")
+				href(name: "toNumbersPage", page: "numbersPage", title: "Duration & Direction", state: "complete")
 			}
 		}
 
@@ -62,9 +62,9 @@ def rootPage() {
 			}
 
 			section("Rules For Dimming") {
-				href(name: "toSchedulingPage", page: "schedulingPage", title: "Automation", description: schedulingHrefDescription() ?: "Set rules for when to start", state: schedulingHrefDescription() ? "complete" : "")
+				href(name: "toSchedulingPage", page: "schedulingPage", title: "Automation")
 				input(name: "manualOverride", type: "enum", options: ["Cancel dimming","Jump to the end"], title: "When one of the dimmers is manually turned off…", description: "dimming will continue", required: false, multiple: false)
-				href(name: "toCompletionPage", title: "Completion Actions", page: "completionPage", state: completionHrefDescription() ? "complete" : "", description: completionHrefDescription() ?: "Set rules for what to do when dimming completes")
+				href(name: "toCompletionPage", title: "Completion Actions", page: "completionPage")
 			}
 
 			section {
@@ -148,8 +148,8 @@ def numbersPage() {
 		}
 
 		section {
-			input(name: "startLevel", type: "number", range: "0..99", title: "From this level", defaultValue: defaultStart(), description: "Current Level", required: false, multiple: false)
-			input(name: "endLevel", type: "number", range: "0..99", title: "To this level", defaultValue: defaultEnd(), description: "Between 0 and 99", required: true, multiple: false)
+			input(name: "startLevel", type: "number", range: "0..99", title: "From this level", description: "Current Level", required: false, multiple: false)
+			input(name: "endLevel", type: "number", range: "0..99", title: "To this level", , description: "Between 0 and 99", required: true, multiple: false)
 		}
 
 		def colorDimmers = dimmersWithSetColorCommand()
@@ -872,9 +872,9 @@ private hasCommand(device, String command) {
 private dimmersWithSetColorCommand() {
 	def colorDimmers = []
 	dimmers.each { dimmer ->
-		if (hasSetColorCommand(dimmer)) {
+		//if (hasSetColorCommand(dimmer)) {
 			colorDimmers << dimmer
-		}
+		//}
 	}
 	return colorDimmers
 }