Changeset 9633

Timestamp:

Aug 30, 2011, 7:38:52 PM (13 years ago)

Author:

rick

Message:

Start building framework for direct import of files.

Location:

src/django_gheat

Files:

• gheat/management/commands/import_datafile.py (modified) (1 diff)
• gheat/models.py (modified) (4 diffs)
• urls.py (modified) (1 diff)

src/django_gheat/gheat/management/commands/import_datafile.py

@@ -167 +167 @@
   if sql_values:
     counters['meting_added'] = bulk_sql('gheat_meting (`meetrondje_id`,\
-      `accespoint_id`, `lat`, `lng`, `signaal`)',sql_values)
+      `accespoint_id`, `latitude`, `longitude`, `signaal`)',sql_values)
   return counters
 

src/django_gheat/gheat/models.py

@@ -127 +127 @@
   def __unicode__(self):
     return "%s - %s" % (self.antenne, self.kaart)
+  class Meta:
+    verbose_name_plural = 'Apparatuur'
 
 class MeetRondje(models.Model):
-  datum = models.DateTimeField(blank=True,null=True)
+  datum = models.DateTimeField(blank=True,null=True,default=datetime.datetime.now)
   naam = models.CharField(max_length=64)
   gebruiker = models.ForeignKey(Gebruiker)
@@ -135 +137 @@
   def __unicode__(self):
     return "%s - %s" % (self.gebruiker.naam, self.naam)
+  class Meta:
+    verbose_name_plural = 'MeetRondjes'
 
 class MeetBestand(models.Model):
   meetrondje = models.ForeignKey(MeetRondje)
-  bestand = models.FileField(upload_to='meet-bestand/%Y/%m/%d')
+  bestand = models.FileField(upload_to='scan-data/%Y/%m/%d')
+  is_imported = models.BooleanField(default=False)
+  class Meta:
+    verbose_name_plural = 'MeetBestanden'
   
 
@@ -144 +151 @@
   meetrondje = models.ForeignKey(MeetRondje)
   accespoint = models.ForeignKey(Accespoint)
-  latitude = models.FloatField(name='Latitude', db_column='lat')
-  longitude = models.FloatField(name='Longitude', db_column='lng')
+  latitude = models.FloatField()
+  longitude = models.FloatField()
   signaal = models.IntegerField(max_length=3)
   objects = managers.MetingManager()
@@ -155 +162 @@
     # this properly hold.
     unique_together = ('meetrondje', 'accespoint', 'latitude', 'longitude'),
+    verbose_name_plural = 'Metingen'
+

src/django_gheat/urls.py

@@ -28 +28 @@
     )
 
+
 if settings.DEBUG:
   urlpatterns += staticfiles_urlpatterns()
-
+  urlpatterns += patterns('',
+    url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+      'document_root': settings.MEDIA_ROOT,
+    }))