Web-näkymä perustettu ja admin saitti kytketty päälle

jussiarpalahti · May 14, 2015 · 0daa303 · 0daa303
1 parent 107c10e
commit 0daa303
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 3 deletions.
diff --git a/app/admin.py b/app/admin.py
@@ -1,3 +1,9 @@
 from django.contrib import admin
+from .models import Observer
 
-# Register your models here.
+
+class ObserverAdmin(admin.ModelAdmin):
+    pass
+
+
+admin.site.register(Observer, ObserverAdmin)
diff --git a/app/models.py b/app/models.py
@@ -12,6 +12,9 @@ class Observer(models.Model):
     halymax = models.IntegerField("variations in the higher region", default=None, null=True,
                                   help_text="not available in all observers")
 
+    def __unicode__(self):
+        return self.location
+
 
 class Observations(models.Model):
     measurement = models.IntegerField()

diff --git a/app/templates/app/base.html b/app/templates/app/base.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+    <meta charset="UTF-8">
+    <title>Vesikorkeusmittauspisteiden tiedot</title>
+</head>
+<body>
+<h1>Vesikorkeusmittauspisteiden tiedot</h1>
+{% block content %}{% endblock content %}
+</body>
+</html>
diff --git a/app/templates/app/index.html b/app/templates/app/index.html
@@ -0,0 +1,9 @@
+
+{% extends "app/base.html" %}
+{% block content %}
+<ul>
+{% for obj in queryset %}
+    <li>{{ obj }}</li>
+{% endfor %}
+</ul>
+{% endblock content %}
diff --git a/app/urls.py b/app/urls.py
@@ -6,3 +6,8 @@
 router = DefaultRouter()
 router.register(r'observers', views.ObserverViewSet)
 
+from django.conf.urls import include, url
+
+urlpatterns = [
+    url(r'^', views.index)
+]
diff --git a/app/views.py b/app/views.py
@@ -19,3 +19,6 @@ class ObserverViewSet(viewsets.ModelViewSet):
     queryset = Observer.objects.all()
     serializer_class = ObserverSerializer
 
+
+def index(request):
+    return render(request, "app/index.html", {'queryset': Observer.objects.all()})
diff --git a/projekti/db.sqlite3 b/projekti/db.sqlite3
diff --git a/projekti/projekti/urls.py b/projekti/projekti/urls.py
@@ -17,9 +17,10 @@
 from django.contrib import admin
 
 from app.urls import router
-
+import app.urls
 
 urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^api/', include(router.urls))
+    url(r'^api/', include(router.urls)),
+    url(r'', include(app.urls))
 ]