delete old forms, templates. fix logdataissues

1 files changed, 2 insertions, 35 deletions

diff --git a/core/forms.py b/core/forms.py
index 1f0d3e0..ff75872 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -15,8 +15,8 @@ from troggle.core.models.caves import Cave, LogbookEntry, QM, Entrance, CaveAndE
 Some are not used and need renovating or destroying.
 '''
 
-todo = '''Fix UploadFileForm
-delete TripForm once working
+todo = '''Fix UploadFileForm - long list of actions
+
 '''
 
 class CaveForm(ModelForm):
@@ -106,39 +106,6 @@ class EntranceLetterForm(ModelForm):
         model = CaveAndEntrance
         exclude = ('cave', 'entrance')
 
-
-def getTripForm(expedition):
-
-    class TripForm(forms.Form):
-        date = forms.DateField()
-        title = forms.CharField(max_length=200)
-        caves = sorted([cave.reference() for cave in Cave.objects.all()])
-        caves = ["-----"] + caves
-        cave = forms.ChoiceField([(c, c) for c in caves], required=False)
-        location = forms.CharField(max_length=200, required=False) 
-        caveOrLocation = forms.ChoiceField([("cave", "Cave"), ("location", "Location")], widget = forms.widgets.RadioSelect())
-#        html = forms.CharField(widget=TinyMCE(attrs={'cols': 80, 'rows': 30})) 
-        html = forms.CharField(widget=forms.Textarea(attrs={"cols":80, "rows":20}))
-
-        def clean(self):
-            print((dir(self)))
-            if self.cleaned_data.get("caveOrLocation") == "cave" and not self.cleaned_data.get("cave"):
-                self._errors["cave"] = self.error_class(["This field is required"]) 
-            if self.cleaned_data.get("caveOrLocation") == "location" and not self.cleaned_data.get("location"):
-                self._errors["location"] = self.error_class(["This field is required"]) 
-            return self.cleaned_data
-  
-    class PersonTripForm(forms.Form):
-        names = sorted([get_name(pe) for pe in PersonExpedition.objects.filter(expedition = expedition)])
-        names = ["-----"] + names
-        name = forms.ChoiceField([(n, n) for n in names])
-        TU = forms.FloatField(required=False)
-        author = forms.BooleanField(required=False, default=False)
-
-    PersonTripFormSet = formset_factory(PersonTripForm, extra=1)
-
-    return PersonTripFormSet, TripForm
-    
 def get_name(pe):
             if pe.nickname:
                 return pe.nickname