Changeset 9041 for src

Timestamp:

Apr 13, 2011, 8:05:10 PM (14 years ago)

Author:

dennisw

Message:

manage.py kan nu worden gerunned vanuit project root met './manage.py'
settings, models en schemes aangepast

Location:

src/django_gheat

Files:

• gheat/admin.py (added)
• gheat/base.py (modified) (1 diff)
• gheat/etc/color-schemes/classic.png (modified) ( previous)
• gheat/foo.py (added)
• gheat/models.py (modified) (2 diffs)
• gheat/settings.py (added)
• gheat/views.py (modified) (1 diff)
• manage.py (added)
• samples/persisted/settings.py (modified) (1 diff)
• samples/persisted/urls.py (modified) (2 diffs)
• settings.py (added)

src/django_gheat/gheat/base.py

@@ -1 @@
-import settings
 import datetime
 import os

src/django_gheat/gheat/models.py

@@ -2 +2 @@
 from gheat import managers
 import datetime
-
 
 class Accespoint(models.Model):
@@ -9 +8 @@
         encryptie = models.BooleanField()
         def __unicode__(self):
-                return (self.mac, self.ssid)
-
+                return "%s - %s" % (self.mac, self.ssid)
 
 class Gebruiker(models.Model):
-        gebruiker = models.CharField(max_length=64)
-        apparatuur = models.CharField(max_length=64)
+        naam = models.CharField(max_length=64)
+        email = models.CharField(max_length=64)
         def __unicode__(self):
-                return (self.gebruiker, self.apparatuur)
+                return "%s - %s" % (self.naam, self.email)
 
+class Apparatuur(models.Model):
+        antenne = models.CharField(max_length=64)
+        kaart = models.CharField(max_length=64)
+        def __unicode__(self):
+                return "%s - %s" % (self.antenne, self.kaart)
+
+class MeetRondje(models.Model):
+        datum = models.DateTimeField()
+        naam = models.CharField(max_length=60)
+        gebruiker = models.ForeignKey(Gebruiker)
+        apparatuur = models.ForeignKey(Apparatuur)
+        def __unicode__(self):
+                return "%s - %s" % (self.naam)
 
 class Meting(models.Model):
+        meetrondje = models.ForeignKey(MeetRondje)
         accespoint = models.ForeignKey(Accespoint)
-        gebruiker = models.ForeignKey(Gebruiker)
         latitude = models.FloatField(name='Latitude', db_column='lat')
         longitude = models.FloatField(name='Longitude', db_column='lng')
         signaal = models.IntegerField(max_length=3)
-        datum = models.DateTimeField()
-
         objects = managers.MetingManager()

src/django_gheat/gheat/views.py

@@ -27 +27 @@
         x = int(x)
         y = int(y)
-        assert 0 <= zoom <= 30, "bad zoom: %d" % zoom
+        assert 0 <= zoom <= 17, "bad zoom: %d" % zoom
     except AssertionError, err:
         return HttpResponseBadRequest()

src/django_gheat/samples/persisted/settings.py

@@ -89 +89 @@
     'django_extensions',
     'home',
+    'django.contrib.admin',
 )
 

src/django_gheat/samples/persisted/urls.py

@@ -2 +2 @@
 
 # Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
+from django.contrib import admin
+admin.autodiscover()
 
 urlpatterns = patterns('',
@@ -9 +9 @@
     (r'^home/', include('home.urls')),
     (r'^gheat/', include('gheat.urls')),
-
+    (r'^admin/', include(admin.site.urls)),
 )