Skip to content

Clean imports and force address in form to be required as shown in ui #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2024
Merged

Clean imports and force address in form to be required as shown in ui #240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions appointment/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

from django import forms
from django.utils.translation import gettext as _
from phonenumber_field.formfields import PhoneNumberField, SplitPhoneNumberField
from phonenumber_field.widgets import PhoneNumberPrefixWidget
from phonenumber_field.formfields import SplitPhoneNumberField

from .models import (
Appointment, AppointmentRequest, AppointmentRescheduleHistory, DayOff, Service, StaffMember,
Expand All @@ -21,7 +20,8 @@

class SlotForm(forms.Form):
selected_date = forms.DateField(validators=[not_in_the_past])
staff_member = forms.ModelChoiceField(StaffMember.objects.all(), error_messages={'invalid_choice': 'Staff member does not exist'})
staff_member = forms.ModelChoiceField(StaffMember.objects.all(),
error_messages={'invalid_choice': 'Staff member does not exist'})


class AppointmentRequestForm(forms.ModelForm):
Expand Down Expand Up @@ -49,25 +49,26 @@ class Meta:
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields['phone'].widget.attrs.update(
{
'placeholder': '1234567890'
})
{
'placeholder': '1234567890'
})
self.fields['additional_info'].widget.attrs.update(
{
'rows': 2,
'class': 'form-control',
})
{
'rows': 2,
'class': 'form-control',
})
self.fields['address'].widget.attrs.update(
{
'rows': 2,
'class': 'form-control',
'placeholder': '1234 Main St, City, State, Zip Code'
})
{
'rows': 2,
'class': 'form-control',
'placeholder': '1234 Main St, City, State, Zip Code',
'required': 'true'
})
self.fields['additional_info'].widget.attrs.update(
{
'class': 'form-control',
'placeholder': 'I would like to be contacted by phone.'
})
{
'class': 'form-control',
'placeholder': 'I would like to be contacted by phone.'
})


class ClientDataForm(forms.Form):
Expand Down Expand Up @@ -162,9 +163,9 @@ def __init__(self, *args, **kwargs):
existing_staff_user_ids = StaffMember.objects.values_list('user', flat=True)
# Filter queryset for user field to include only superusers or users not already staff members
self.fields['user'].queryset = get_user_model().objects.filter(
is_superuser=True
is_superuser=True
).exclude(id__in=existing_staff_user_ids) | get_user_model().objects.exclude(
id__in=existing_staff_user_ids
id__in=existing_staff_user_ids
)


Expand Down