diff --git a/SprinklerStudio/templates/header.html b/SprinklerStudio/templates/header.html index 0da1e89..0623897 100755 --- a/SprinklerStudio/templates/header.html +++ b/SprinklerStudio/templates/header.html @@ -14,9 +14,9 @@ \ No newline at end of file diff --git a/SprinklerStudio/urls.pyc b/SprinklerStudio/urls.pyc index a36caac..47f2e71 100644 Binary files a/SprinklerStudio/urls.pyc and b/SprinklerStudio/urls.pyc differ diff --git a/setup/__init__.py b/setup/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/setup/models.py b/setup/models.py new file mode 100644 index 0000000..10beca1 --- /dev/null +++ b/setup/models.py @@ -0,0 +1,12 @@ +from django.db import models + +class Setup(models.Model): + latitude = models.CharField(max_length=10) + longitude = models.CharField(max_length=10) + cityID = models.IntegerField() + + googleID = models.CharField(max_length=100) + calendarName = models.CharField(max_length=100) + + precipitationLimit = models.IntegerField() + precipitationTime = models.IntegerField() \ No newline at end of file diff --git a/setup/templates/setup/index.html b/setup/templates/setup/index.html new file mode 100644 index 0000000..941f06b --- /dev/null +++ b/setup/templates/setup/index.html @@ -0,0 +1,61 @@ +{% include "templates/header.html" %} + + +
+
+

Sprinklers!

+
+

Blah blah blah watering. Blah blah rain.

+ lime +
+ +
+
+

Finding location...

+
+
+

+
+
+ + + + + + diff --git a/setup/tests.py b/setup/tests.py new file mode 100644 index 0000000..501deb7 --- /dev/null +++ b/setup/tests.py @@ -0,0 +1,16 @@ +""" +This file demonstrates writing tests using the unittest module. These will pass +when you run "manage.py test". + +Replace this with more appropriate tests for your application. +""" + +from django.test import TestCase + + +class SimpleTest(TestCase): + def test_basic_addition(self): + """ + Tests that 1 + 1 always equals 2. + """ + self.assertEqual(1 + 1, 2) diff --git a/setup/views.py b/setup/views.py new file mode 100644 index 0000000..60f00ef --- /dev/null +++ b/setup/views.py @@ -0,0 +1 @@ +# Create your views here. diff --git a/weather/WeatherUtils.py b/weather/WeatherUtils.py index 40792e8..d4973af 100644 --- a/weather/WeatherUtils.py +++ b/weather/WeatherUtils.py @@ -19,7 +19,16 @@ def currentTemp(): response = urllib2.urlopen(queryURL) decoder = json.JSONDecoder() - data = decoder.decode(response.read())["main"]["temp"] + temperature = decoder.decode(response.read())["main"]["temp"] - return (str(data) + " Degrees") + return (str(temperature) + " Degrees") +def currentTempByLatLon(latitude, longitude): + + queryURL = weatherURL + "lat=" + str(latitude) + "&lon=" + str(longitude) + response = urllib2.urlopen(queryURL) + + decoder = json.JSONDecoder() + temperature = decoder.decode(response.read())["main"]["temp"] + + return (str(temperature) + " Degrees") \ No newline at end of file diff --git a/weather/WeatherUtils.pyc b/weather/WeatherUtils.pyc index b5527f5..4c21200 100644 Binary files a/weather/WeatherUtils.pyc and b/weather/WeatherUtils.pyc differ diff --git a/weather/templates/sprinklers/detail.html b/weather/templates/sprinklers/detail.html deleted file mode 100644 index 133a02d..0000000 --- a/weather/templates/sprinklers/detail.html +++ /dev/null @@ -1,17 +0,0 @@ -{% include "templates/header.html" %} - -{% if sprinkler %} - sprinkler ID: {{sprinkler.id}}
- sprinkler Name: {{sprinkler.name}}
- sprinkler On? {{sprinkler.status}}
- {% for entry in sprinkler_log %} - Log ID: {{entry.id}}
- Time Started: {{entry.timeOn}}
- Time Ended: {{entry.timeOff}}
- {% endfor %} -{% else %} -

No sprinklers were found with that ID.

-{% endif %} - - - diff --git a/weather/templates/weather/index.html b/weather/templates/weather/index.html new file mode 100644 index 0000000..941f06b --- /dev/null +++ b/weather/templates/weather/index.html @@ -0,0 +1,61 @@ +{% include "templates/header.html" %} + + +
+
+

Sprinklers!

+
+

Blah blah blah watering. Blah blah rain.

+ lime +
+ +
+
+

Finding location...

+
+
+

+
+
+ + + + + + diff --git a/weather/urls.py b/weather/urls.py index c72ae6d..c74bff2 100644 --- a/weather/urls.py +++ b/weather/urls.py @@ -3,5 +3,6 @@ from django.conf.urls import patterns, url from weather import views urlpatterns = patterns('', - url(r'^$', views.index, name='index') + url(r'^$', views.index, name='index'), + url(r'^ajax$', views.ajax, name='ajax') ) diff --git a/weather/urls.pyc b/weather/urls.pyc index d9a6cce..718272d 100644 Binary files a/weather/urls.pyc and b/weather/urls.pyc differ diff --git a/weather/views.py b/weather/views.py index 2743b3f..1796dbc 100644 --- a/weather/views.py +++ b/weather/views.py @@ -4,6 +4,8 @@ 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 weatherURL = "http://api.openweathermap.org/data/2.5/weather?" @@ -18,5 +20,16 @@ def index(request): decoder = json.JSONDecoder() data = decoder.decode(response.read()) - return HttpResponse("Latitude: " + str(data)) + template = loader.get_template('weather/index.html') + context = Context({ + 'latitude': latitude, + }) + 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/weather/views.pyc b/weather/views.pyc index c0624e1..d32d370 100644 Binary files a/weather/views.pyc and b/weather/views.pyc differ