diff options
| author | Philip Sargent <philip.sargent@gmail.com> | 2025-01-15 18:48:23 +0000 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@gmail.com> | 2025-01-15 18:48:23 +0000 |
| commit | f3bd9024cfdc1e4ff6b7a4cabc5fc2ddaea2baad (patch) | |
| tree | d1a27198a3f2ad9a5762d00a0cfc1c3fe854a020 /core | |
| parent | 21d69994e7a0efc402b3b11fd0ede04eabb1a474 (diff) | |
| download | troggle-f3bd9024cfdc1e4ff6b7a4cabc5fc2ddaea2baad.tar.gz troggle-f3bd9024cfdc1e4ff6b7a4cabc5fc2ddaea2baad.tar.bz2 troggle-f3bd9024cfdc1e4ff6b7a4cabc5fc2ddaea2baad.zip | |
formatting and defaults done
Diffstat (limited to 'core')
| -rw-r--r-- | core/utils.py | 9 | ||||
| -rw-r--r-- | core/views/signup.py | 46 |
2 files changed, 33 insertions, 22 deletions
diff --git a/core/utils.py b/core/utils.py index 3dbbd9f..69425ca 100644 --- a/core/utils.py +++ b/core/utils.py @@ -122,12 +122,15 @@ def make_new_expo(year): u.save() def make_new_expo_dir(year): - t = "<a href='index.html'>index</a><br><a href='mission.html'>mission</a><br><a href='logbook.html'>logbook</a><br>" + pages = ["index", "logbook", "mission", "travel"] + t = "<hr />" + for ff in pages: + t += f"<a href='{ff}.html'>{ff}</a><br>\n" year_dir = Path(settings.EXPOWEB, 'years', year) if not year_dir.is_dir(): year_dir.mkdir(parents=True, exist_ok=True) - for ff in ["index","logbook", "mission"]: - content = f"<html><head><title>{ff}</title></head><body><h1>{ff}</h1>{t}</body></html>" + for ff in pages: + content = f"<html><head><title>{year} {ff}</title></head><body><h1>{ff}</h1>Add content here.{t}</body></html>" p = Path(year_dir, ff+".html") if not p.is_file(): write_and_commit( [(p, content, "utf8")], f"Auto new year {ff} file creation", "Auto New Year <make_new_expo_dir@troggle.expo>") diff --git a/core/views/signup.py b/core/views/signup.py index d36b095..f390002 100644 --- a/core/views/signup.py +++ b/core/views/signup.py @@ -30,9 +30,9 @@ def signup(request): pageform = ExpoSignupForm(request.POST) # A form bound to the POST data if pageform.is_valid(): print(f"form OK") - who = pageform.cleaned_data["name"] - who = git_string(editor) - print(f"{who=}") + who = pageform.cleaned_data["name"] + who = git_string(name) + print(f"{who=}") return render( request, "signup.html", @@ -42,7 +42,12 @@ def signup(request): } ) else: - pageform = ExpoSignupForm(initial={"allergies":"None", "medication":"None", "medic_info":"None", }) + pageform = ExpoSignupForm(initial={"allergies":"None", + "medication":"None", + "medic_info":"None", + "veggie": "mostly", + "student": "no", + }) return render( request, "signup.html", @@ -58,40 +63,43 @@ class ExpoSignupForm(forms.Form): email = forms.EmailField(widget=forms.TextInput(attrs={'tabindex': 4, 'placeholder': 'a.device@potatohut.expo'})) kinname = forms.CharField(label='Next of Kin name', max_length=100, widget=forms.TextInput(attrs={'tabindex': 5, 'placeholder': 'Newton Pulsifer'})) - kinaddress = forms.CharField(widget=forms.Textarea(attrs={'rows': 7, 'cols': 20, 'tabindex': 6})) - kinphone = forms.CharField(max_length=15, widget=forms.TextInput(attrs={'tabindex': 7})) - kinemail = forms.EmailField(widget=forms.TextInput(attrs={'tabindex': 8})) + kinaddress = forms.CharField(widget=forms.Textarea(attrs={'rows': 7, 'cols': 20, 'tabindex': 6, 'placeholder': 'c/o The Old Ship Inn,\nLower Tadfield'})) + kinphone = forms.CharField(max_length=15, widget=forms.TextInput(attrs={'tabindex': 7, 'placeholder': '+44.0987654321'})) + kinemail = forms.EmailField(widget=forms.TextInput(attrs={'tabindex': 8, 'placeholder': 'n.pulsifer@basecamp.expo'})) relation = forms.CharField(label='Relation to you', max_length=100, widget=forms.TextInput(attrs={'tabindex': 9, 'placeholder': 'Beau'})) VEGGIE_CHOICES = [ - ('yes', 'Yes'), - ('mostly', 'Mostly'), + ('vegan', 'Vegan'), + ('yes', 'Vegetarian'), + ('mostly', 'Mostly Vegetarian'), ('no', 'No'), ] STUDENT_CHOICES = [ - ('yes', 'Yes'), - ('no', 'No'), + ('yes', 'Yes, I am an impecunious starvelling'), + ('no', 'No, I have pots of dosh'), ] veggie = forms.ChoiceField(choices=VEGGIE_CHOICES, widget=forms.RadioSelect(attrs={'tabindex': 10})) student = forms.ChoiceField(choices=STUDENT_CHOICES, widget=forms.RadioSelect(attrs={'tabindex': 11})) - transport_ok = forms.ChoiceField(choices=[('yes', 'Yes'), ('no', 'No')], - widget=forms.RadioSelect(attrs={'tabindex': 12}), initial='yes') - transport_info = forms.CharField(widget=forms.Textarea(attrs={'rows': 6, 'cols': 80, 'tabindex': 13}), + transport_ok = forms.ChoiceField(choices=[('yes', 'Yes, I have arranged transport'), ('no', 'No, I need transport')], + widget=forms.RadioSelect(attrs={'tabindex': 12}), initial='no') + transport_info = forms.CharField(widget=forms.Textarea(attrs={'rows': 6, 'cols': 80, 'tabindex': 13, "placeholder":"I am a numpty and have no clue how I will get there (or back)."}), required=False) - bivvy = forms.BooleanField(required=False, widget=forms.CheckboxInput(attrs={'tabindex': 14})) + bivvy = forms.BooleanField(required=False, widget=forms.CheckboxInput(attrs={'tabindex': 14, })) tent = forms.BooleanField(required=False, widget=forms.CheckboxInput(attrs={'tabindex': 15})) - top_tent_cap = forms.IntegerField(required=False, widget=forms.NumberInput(attrs={'tabindex': 16})) + top_tent_cap = forms.IntegerField(required=False, widget=forms.TextInput(attrs={'size': 1, 'tabindex': 16, "placeholder":2})) btent = forms.BooleanField(required=False, widget=forms.CheckboxInput(attrs={'tabindex': 17})) - base_tent_cap = forms.IntegerField(required=False, widget=forms.NumberInput(attrs={'tabindex': 18})) + base_tent_cap = forms.IntegerField(required=False, widget=forms.TextInput(attrs={'size': 1, 'tabindex': 18, "size":1, "placeholder":3})) allergies = forms.CharField(widget=forms.Textarea(attrs={'rows': 2, 'cols': 80, 'tabindex': 19}), required=False) medication = forms.CharField(widget=forms.Textarea(attrs={'rows': 2, 'cols': 80, 'tabindex': 20}), required=False) medic_info = forms.CharField(widget=forms.Textarea(attrs={'rows': 5, 'cols': 80, 'tabindex': 21}), required=False) - extra_info = forms.CharField(widget=forms.Textarea(attrs={'rows': 15, 'cols': 80, 'tabindex': 22}), required=False) + extra_info = forms.CharField(widget=forms.Textarea(attrs={'rows': 5, 'cols': 80, 'tabindex': 22, + 'placeholder': 'Estuary english (fluent),\nCan use the potato hut bread machine (level 3 certificate)'}), required=False) - aims = forms.CharField(widget=forms.Textarea(attrs={'rows': 15, 'cols': 80, 'tabindex': 23}), required=False) + aims = forms.CharField(widget=forms.Textarea(attrs={'rows': 5, 'cols': 80, 'tabindex': 23, 'placeholder': 'Strolling over the plateau, sunning myself and taking in the views.'}), required=False) + |