Changeset 9750 for src/django_gheat/wlheatmap

Timestamp:

Dec 3, 2011, 12:31:32 PM (13 years ago)

Author:

rick

Message:

Give a hint of which values are available..

Location:

src/django_gheat/wlheatmap

Files:

• forms.py (modified) (3 diffs)
• templates/add_file.html (modified) (1 diff)

src/django_gheat/wlheatmap/forms.py

@@ -13 +13 @@
 
 class MeetBestandForm(forms.Form):
-    username = forms.CharField()
-    password = forms.CharField()
-    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'))
-    surveyid = forms.CharField()
-    bestand = forms.FileField()
+  def get_help_text(model, item):
+    return "Reeds bekend: %s" % ','.join(model.objects.values_list(item,flat=True).distinct())
+  username = forms.CharField()
+  password = forms.CharField()
+  naam = forms.CharField(help_text=get_help_text(Gebruiker, 'naam'))
+  kaart = forms.CharField(help_text=get_help_text(Apparatuur, 'kaart'))
+  antenne = forms.CharField(help_text=get_help_text(Apparatuur, 'antenne'))
+  surveyid = forms.CharField(help_text=get_help_text(MeetRondje, 'naam'))
+  bestand = forms.FileField()
 
 #
@@ -35 +37 @@
       login(request, user)
 
-      gebruiker = Gebruiker.objects.get(naam=form.cleaned_data['naam'])
+      gebruiker, created = Gebruiker.objects.get_or_create(naam=form.cleaned_data['naam'])
       apparatuur, created = Apparatuur.objects.get_or_create(kaart=form.cleaned_data['kaart'],
         antenne=form.cleaned_data['antenne'])
@@ -49 +51 @@
         return HttpResponse('OK: Attached to meetrondje %s' % meetrondje)
       else:
-        return HttpResponseServerError('ERROR: File does already exists')
+        return HttpResponseServerError('ERROR: File %s does already exists' % meetbestand)
     else:
       return HttpResponseServerError('ERROR: No valid input')

src/django_gheat/wlheatmap/templates/add_file.html

@@ -2 +2 @@
 {% block content %}
 <form enctype="multipart/form-data" action="" method="post">
-{{ form.as_p }}
+<table>
+{{ form.as_table }}
+</table>
 <input type="submit" value="Submit" />
 </form>