diff --git a/SprinklerStudio/db/development.db b/SprinklerStudio/db/development.db
index ace3c0a..8ad8cd2 100644
Binary files a/SprinklerStudio/db/development.db and b/SprinklerStudio/db/development.db differ
diff --git a/SprinklerStudio/settings.py b/SprinklerStudio/settings.py
index cdd6585..c890571 100644
--- a/SprinklerStudio/settings.py
+++ b/SprinklerStudio/settings.py
@@ -137,6 +137,7 @@ INSTALLED_APPS = (
# 'django.contrib.admindocs',
'weather',
'sprinklers',
+ 'setup',
)
# A sample logging configuration. The only tangible logging
diff --git a/SprinklerStudio/settings.pyc b/SprinklerStudio/settings.pyc
index 262b7c9..1512cfc 100644
Binary files a/SprinklerStudio/settings.pyc and b/SprinklerStudio/settings.pyc differ
diff --git a/SprinklerStudio/templates/index.html b/SprinklerStudio/templates/index.html
index 40969bf..55d74f4 100755
--- a/SprinklerStudio/templates/index.html
+++ b/SprinklerStudio/templates/index.html
@@ -10,10 +10,12 @@
{% if sprinkler_list %}
{% for sprinkler in sprinkler_list %}
-
-
- Currently the sprinkler status is: {{sprinkler.status}}
-
+ {% if sprinkler.enabled %}
+
+
+ Currently the sprinkler status is: {{sprinkler.status}}
+
+ {% endif %}
{% endfor %}
{% else %}
No active sprinklers were found.
diff --git a/SprinklerStudio/urls.py b/SprinklerStudio/urls.py
index ae8cf17..3bd244d 100644
--- a/SprinklerStudio/urls.py
+++ b/SprinklerStudio/urls.py
@@ -17,5 +17,6 @@ urlpatterns = patterns('',
url(r'^admin/', include(admin.site.urls)),
url(r'^weather/', include('weather.urls')),
url(r'^sprinklers/', include('sprinklers.urls')),
+ url(r'^setup/', include('setup.urls')),
url(r'^$', views.index, name='index')
)
diff --git a/SprinklerStudio/urls.pyc b/SprinklerStudio/urls.pyc
index 47f2e71..c0a2d37 100644
Binary files a/SprinklerStudio/urls.pyc and b/SprinklerStudio/urls.pyc differ
diff --git a/setup/__init__.pyc b/setup/__init__.pyc
new file mode 100644
index 0000000..cf92d4c
Binary files /dev/null and b/setup/__init__.pyc differ
diff --git a/setup/models.pyc b/setup/models.pyc
new file mode 100644
index 0000000..2d2d5ce
Binary files /dev/null and b/setup/models.pyc differ
diff --git a/setup/templates/setup/index.html b/setup/templates/setup/index.html
index 941f06b..01a7091 100644
--- a/setup/templates/setup/index.html
+++ b/setup/templates/setup/index.html
@@ -1,5 +1,17 @@
{% include "templates/header.html" %}
+
+
+
+
Finding location...
diff --git a/setup/urls.py b/setup/urls.py
new file mode 100644
index 0000000..adb06a3
--- /dev/null
+++ b/setup/urls.py
@@ -0,0 +1,8 @@
+from django.conf.urls import patterns, url
+
+from setup import views
+
+urlpatterns = patterns('',
+ # ex: /setup/
+ url(r'^$', views.index, name='index'),
+)
diff --git a/setup/urls.pyc b/setup/urls.pyc
new file mode 100644
index 0000000..d0b2e6f
Binary files /dev/null and b/setup/urls.pyc differ
diff --git a/setup/views.py b/setup/views.py
index 60f00ef..e575ea5 100644
--- a/setup/views.py
+++ b/setup/views.py
@@ -1 +1,31 @@
# Create your views here.
+import json
+import urllib2
+from django.core.cache import cache
+from django.http import HttpResponse
+from weather.models import Location
+from django.template import Context, loader
+
+from weather import WeatherUtils
+from sprinklers.models import Sprinkler
+
+def index(request):
+ #cache.clear()
+ latitude = Location.objects.all()[0].latitude
+ longitude = Location.objects.all()[0].longitude
+
+ sprinklers = Sprinkler.objects.all()
+
+ template = loader.get_template('setup/index.html')
+ context = Context({
+ 'sprinklers': sprinklers,
+ })
+ return HttpResponse(template.render(context))
+
+def ajax(request):
+
+ latitude = request.GET['lat'] # request.POST.get('lat', False)
+ longitude = request.GET['lon'] # request.POST.get('lat', False)
+
+ temperature = WeatherUtils.currentTempByLatLon(latitude, longitude)
+ return HttpResponse(temperature)
diff --git a/setup/views.pyc b/setup/views.pyc
new file mode 100644
index 0000000..579bddf
Binary files /dev/null and b/setup/views.pyc differ
diff --git a/sprinklers/models.py b/sprinklers/models.py
index 52ed6c8..4b2c190 100644
--- a/sprinklers/models.py
+++ b/sprinklers/models.py
@@ -6,6 +6,7 @@ class Sprinkler(models.Model):
name = models.CharField(max_length=60)
enabled = models.BooleanField()
status = models.BooleanField(default=False)
+ isMaster = models.BooleanField(default=False)
currentLog = models.IntegerField(null=True, blank=True) #If the sprinkler is on, this variable contains the active log entry so it can be ended when it's turned off
class LogEntry(models.Model):
diff --git a/sprinklers/models.pyc b/sprinklers/models.pyc
index 80e18cf..f803721 100644
Binary files a/sprinklers/models.pyc and b/sprinklers/models.pyc differ