Changeset 9746

Timestamp:

Dec 3, 2011, 10:58:19 AM (13 years ago)

Author:

rick

Message:

• Cannot be placed in init as this will causes the CHOICES to load _before_

the database is created, leading to unknown table errors.

• Added surveyid to upload field to allow selecting which meetrondje to use.

Location:

src/django_gheat/wlheatmap

Files:

• __init__.py (modified) (1 diff)
• forms.py (added)
• urls.py (modified) (2 diffs)

src/django_gheat/wlheatmap/__init__.py

@@ -35 +35 @@
   response.write('</pre>')
   return response
-
-from django import forms
-from django.core.files.base import ContentFile
-
-def get_apperatuur_choices(item):
-  return sorted(set(Apparatuur.objects.values_list(item,item)))
-
-class MeetBestandForm(forms.Form):
-    naam = forms.ChoiceField(choices=Gebruiker.objects.values_list('naam','naam'))
-    kaart = forms.ChoiceField(choices=get_apperatuur_choices('kaart'))
-    antenne = forms.ChoiceField(choices=get_apperatuur_choices('antenne'))
-    bestand = forms.FileField()
-
-#
-# curl  -F naam=huub -F kaart=onbekend -F antenne=onbekend -F bestand=@manage.py http://localhost:8000/wlheatp/add/meetbestand/
-def add_meetbestand(request):
-  if request.method == 'POST':
-    form = MeetBestandForm(request.POST, request.FILES)
-    if form.is_valid():
-      gebruiker = Gebruiker.objects.get(naam=form.cleaned_data['naam'])
-      apparatuur, created = Apparatuur.objects.get_or_create(kaart=form.cleaned_data['kaart'],
-        antenne=form.cleaned_data['antenne'])
-      meetrondje, created = MeetRondje.objects.get_or_create(gebruiker=gebruiker,
-        datum=None,
-        naam=(form.cleaned_data['bestand']),
-        apparatuur=apparatuur)
-
-      meetbestand, created = MeetBestand.objects.get_or_create(meetrondje=meetrondje,is_imported=False)
-      if created:
-        meetbestand.bestand.save(form.cleaned_data['bestand'].name,form.cleaned_data['bestand'])
-        meetbestand.save()
-        return HttpResponse('OK')
-      else:
-        return HttpResponseServerError('ERROR File does already exists')
-    else:
-      return HttpResponseServerError('ERROR No valid input')
-  else:
-    form = MeetBestandForm()
-  return render_to_response('add_file.html', {'form': form})

src/django_gheat/wlheatmap/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
 from django.views.generic.simple import direct_to_template
-#from django.views.generic.base import TemplateView
 from django.conf import settings
 
-#class HomeView(TemplateView):
-#    template_name = 'home.html'
-#
-#urlpatterns = patterns('',
-#    ('^$', HomeView.as_view())
-#)
 
 urlpatterns = patterns('wlheatmap',
@@ -20 +13 @@
     url(r'^filters/$', 'filters.serve_filters'),
     url(r'^process/$', 'process'),
-    url(r'^add/meetbestand/$', 'add_meetbestand'),
+    url(r'^add/meetbestand/$', 'forms.add_meetbestand'),
 )