diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/forms.py | 25 | ||||
| -rw-r--r-- | core/models/caves.py | 16 | ||||
| -rw-r--r-- | core/models/wallets.py | 11 | ||||
| -rw-r--r-- | core/views/caves.py | 8 |
4 files changed, 32 insertions, 28 deletions
diff --git a/core/forms.py b/core/forms.py index 0bcd6ef..ccdd307 100644 --- a/core/forms.py +++ b/core/forms.py @@ -103,7 +103,7 @@ class CaveForm(ModelForm): length = forms.CharField(required=False, label="Length (m)", widget=forms.TextInput(attrs={"placeholder": "usually blank"})) depth = forms.CharField(required=False, label="Depth (m)", widget=forms.TextInput(attrs={"placeholder": "usually blank"})) extent = forms.CharField(required=False, label="Extent (m)", widget=forms.TextInput(attrs={"placeholder": "usually blank"})) - areacode = forms.CharField(required=False, label="Area code", widget=forms.TextInput(attrs={"placeholder": "e.g. 1623"})) + areacode = forms.CharField(required=False, label="Area code", widget=forms.TextInput(attrs={"placeholder": "e.g. 1623"})) # should be required=True? subarea = forms.CharField(required=False, label="Subarea (do not use for new caves)", widget=forms.TextInput(attrs={"placeholder": "usually blank, archaic"})) #cave_slug = forms.CharField() @@ -143,12 +143,11 @@ class CaveForm(ModelForm): 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."]) - # if cleaned_data.get("url") == []: - # self._errors["url"] = self.error_class(["This field is required."]) - # if cleaned_data.get("url") and cleaned_data.get("url").startswith("/"): - # self._errors["url"] = self.error_class(["This field cannot start with a /."]) + if self.data.get("areacode") not in ["1623", "1626", "1627", "1624"]: + self._errors["areacode"] = self.error_class( + ["An Austrian kataster areacode, i.e. 1623, 1626, 1627, or 1624 is required."] + ) + return cleaned_data @@ -257,10 +256,14 @@ class EntranceForm(ModelForm): ) def clean(self): - # if self.cleaned_data.get("url"): # can remove this as the form does not have a url field any more, which was never used anyway - # if self.cleaned_data.get("url").startswith("/"): - # self._errors["url"] = self.error_class(["This field cannot start with a /."]) - return self.cleaned_data + cleaned_data = super(EntranceForm, self).clean() # where is this code hidden? How does this work?? + for station in ["tag_station", "other_station"]: + print(f"{station} -- {self.data.get(station)[:4]}") + if self.data.get(station)[:5] not in ["1623.", "1626.", "1627.", "1624.", ""]: + self._errors[station] = self.error_class( + ["An Austrian kataster areacode, i.e. 1623, 1626, 1627, or 1624 prefix is required."] + ) + return self.cleaned_data # # This next line is sufficient to create an entire entry for for the cave fields automatically diff --git a/core/models/caves.py b/core/models/caves.py index 45a7b5e..2914e1e 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -53,18 +53,10 @@ class CaveAndEntrance(models.Model): def get_cave_leniently(caveid): - try: - c = getCave(caveid) - if c: - return c - except: - # print(f"get_cave_leniently FAIL {caveid}") - try: - c = getCave("1623-"+caveid) - if c: - return c - except: - return None + Gcavelookup = GetCaveLookup() + if caveid in Gcavelookup: + return Gcavelookup[caveid] + class Cave(TroggleModel): # (far) too much here perhaps, diff --git a/core/models/wallets.py b/core/models/wallets.py index 288608a..d9a140d 100644 --- a/core/models/wallets.py +++ b/core/models/wallets.py @@ -245,13 +245,20 @@ class Wallet(models.Model): return None #cavelist = jsondata["cave"] cavelist = Wallet.input_to_list(jsondata["cave"]) + from troggle.core.models.troggle import DataIssue for i in cavelist: + if not i: + continue try: - caveobject = get_cave_leniently(i) + caveobject = get_cave_leniently(i.strip()) + # print(f"Attempting adding cave '{caveobject}' to wallet {self} ") if caveobject: self.caves.add(caveobject) except: - print(f"FAIL adding cave to wallet.caves '{i}'") + message = f"FAIL adding cave {caveobject} to wallet.caves '{i}'" + + DataIssue.objects.update_or_create(parser="wallets", message=message, url=wurl) + print(message) pass def year(self): diff --git a/core/views/caves.py b/core/views/caves.py index 856c2cd..2498fb4 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -657,6 +657,8 @@ def edit_entrance(request, path="", caveslug=None, entslug=None): nextletter = chr(ord(letter)+1) return check_new_slugname_ok(slug, nextletter) + entletter = "" # default to stop crashes + entletterform = None if not (cave:= get_cave_from_slug(caveslug)): # walrus operator return render(request, "errors/badslug.html", {"badslug": f"for cave {caveslug} - from edit_entrance()"}) @@ -720,10 +722,10 @@ def edit_entrance(request, path="", caveslug=None, entslug=None): entranceletter="" if not entform.is_valid(): - message = f"- POST INVALID {caveslug=} {entslug=} {path=} entform valid:{entform.is_valid()} entletterform valid:{entletterform.is_valid()}" - entrance = entform.save(commit=False) + message = f"- POST INVALID {caveslug=} {entslug=} {path=} entform valid:{entform.is_valid()} " + # entrance = entform.save(commit=False) print(message) - return render(request, "errors/generic.html", {"message": message}) + # return render(request, "errors/generic.html", {"message": message}) else: print(f"'edit_entrance(): POST is valid {caveslug=} Editing {entslug=} {entranceletter=} {path=}") |