diff options
Diffstat (limited to 'core/forms.py')
| -rw-r--r-- | core/forms.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/core/forms.py b/core/forms.py index 8265178..15e86d8 100644 --- a/core/forms.py +++ b/core/forms.py @@ -16,7 +16,7 @@ class CaveForm(ModelForm): underground_centre_line = forms.CharField(required = False, widget=forms.Textarea()) notes = forms.CharField(required = False, widget=forms.Textarea()) references = forms.CharField(required = False, widget=forms.Textarea()) - url = forms.CharField(required = True) + url = forms.CharField(required = True) class Meta: model = Cave exclude = ("filename",) @@ -24,9 +24,9 @@ class CaveForm(ModelForm): def clean(self): if self.cleaned_data.get("kataster_number") == "" and self.cleaned_data.get("unofficial_number") == "": - self._errors["unofficial_number"] = self.error_class(["Either the kataster or unoffical number is required."]) + self._errors["unofficial_number"] = self.error_class(["Either the kataster or unoffical number is required."]) if self.cleaned_data.get("kataster_number") != "" and self.cleaned_data.get("official_name") == "": - self._errors["official_name"] = self.error_class(["This field is required when there is a kataster number."]) + self._errors["official_name"] = self.error_class(["This field is required when there is a kataster number."]) if self.cleaned_data.get("area") == []: self._errors["area"] = self.error_class(["This field is required."]) if self.cleaned_data.get("url") and self.cleaned_data.get("url").startswith("/"): @@ -82,11 +82,11 @@ class EntranceLetterForm(ModelForm): # This function returns html-formatted paragraphs for each of the # wikilink types that are related to this logbookentry. Each paragraph # contains a list of all of the related wikilinks. -# +# # Perhaps an admin javascript solution would be better. # """ # res = ["Please use the following wikilinks, which are related to this logbook entry:"] -# +# # res.append(r'</p><p style="float: left;"><b>QMs found:</b>') # for QM in LogbookEntry.instance.QMs_found.all(): # res.append(QM.wiki_link()) @@ -94,12 +94,12 @@ class EntranceLetterForm(ModelForm): # res.append(r'</p><p style="float: left;"><b>QMs ticked off:</b>') # for QM in LogbookEntry.instance.QMs_ticked_off.all(): # res.append(QM.wiki_link()) - + # res.append(r'</p><p style="float: left; "><b>People</b>') # for persontrip in LogbookEntry.instance.persontrip_set.all(): # res.append(persontrip.wiki_link()) # res.append(r'</p>') - + # return string.join(res, r'<br />') # def __init__(self, *args, **kwargs): @@ -107,7 +107,7 @@ class EntranceLetterForm(ModelForm): # self.fields['text'].help_text=self.wikiLinkHints()# #class CaveForm(forms.Form): -# html = forms.CharField(widget=TinyMCE(attrs={'cols': 80, 'rows': 30})) +# html = forms.CharField(widget=TinyMCE(attrs={'cols': 80, 'rows': 30})) def getTripForm(expedition): @@ -118,18 +118,18 @@ def getTripForm(expedition): caves.sort() caves = ["-----"] + caves cave = forms.ChoiceField([(c, c) for c in caves], required=False) - location = forms.CharField(max_length=200, 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=TinyMCE(attrs={'cols': 80, 'rows': 30})) 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"]) + 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"]) + self._errors["location"] = self.error_class(["This field is required"]) return self.cleaned_data - + class PersonTripForm(forms.Form): names = [get_name(pe) for pe in PersonExpedition.objects.filter(expedition = expedition)] names.sort() @@ -141,7 +141,7 @@ def getTripForm(expedition): PersonTripFormSet = formset_factory(PersonTripForm, extra=1) return PersonTripFormSet, TripForm - + def get_name(pe): if pe.nickname: return pe.nickname @@ -162,18 +162,18 @@ def get_name(pe): # 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) +# 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) +# expedition = forms.ChoiceField([(e, e) for e in expeditions], required=False) + +# logbookentry = forms.ChoiceField([("-----", "Please select an expedition"), ], required=False) -# logbookentry = forms.ChoiceField([("-----", "Please select an expedition"), ], required=False) +# person = forms.ChoiceField([("-----", "Please select an expedition"), ], required=False) -# person = forms.ChoiceField([("-----", "Please select an expedition"), ], required=False) - # survey_point = forms.CharField() |