merge fix from martin's tip.

1 files changed, 31 insertions, 1 deletions

diff --git a/core/forms.py b/core/forms.py
index 01a9cbe..2a54428 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -1,5 +1,5 @@
 from django.forms import ModelForm

-from models import Cave, Person, PersonExpedition, LogbookEntry, QM

+from models import Cave, Person, PersonExpedition, LogbookEntry, QM, Expedition

 import django.forms as forms

 from django.forms.formsets import formset_factory

 from django.contrib.admin.widgets import AdminDateWidget

@@ -86,3 +86,33 @@ def get_name(pe):
                 return pe.nickname

             else:

                 return pe.person.first_name

+

+class UploadFileForm(forms.Form):

+    title = forms.CharField(max_length=50)

+    file  = forms.FileField()

+    html = forms.CharField(widget=TinyMCE(attrs={'cols': 80, 'rows': 30}))

+    lon_utm = forms.FloatField(required=False)

+    lat_utm = forms.FloatField(required=False)

+    slug = forms.CharField(max_length=50)

+    date = forms.DateField(required=False)

+

+    caves = [cave.slug for cave in Cave.objects.all()]

+    caves.sort()

+    caves = ["-----"] + caves

+    cave = forms.ChoiceField([(c, c) for c in caves], required=False)

+

+    entrance = forms.ChoiceField([("-----", "Please select a cave"), ], required=False) 

+    qm = forms.ChoiceField([("-----", "Please select a cave"), ], required=False) 

+

+    expeditions = [e.year for e in Expedition.objects.all()]

+    expeditions.sort()

+    expeditions = ["-----"] + expeditions

+    expedition = forms.ChoiceField([(e, e) for e in expeditions], required=False)  

+

+    logbookentry = forms.ChoiceField([("-----", "Please select an expedition"), ], required=False) 

+

+    person = forms.ChoiceField([("-----", "Please select an expedition"), ], required=False) 

+    

+    survey_point = forms.CharField()

+

+