sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2.1.0 change model route

Browse Source
This commit is contained in:
SDE
2024-12-05 16:14:07 +03:00
parent b6c56b4890
commit a140ffe523
4 changed files with 100 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
RoutesApp/forms.py
View File

@@ -48,16 +48,17 @@ def routeForm_assign_choices_by_type_transport(form, type_transport):
class RouteForm(forms.ModelForm):
from_address_point_txt = forms.CharField(required=True)
to_address_point_txt = forms.CharField(required=True)
departure_DT = forms.DateTimeField(required=True, input_formats=['%d.%m.%Y %H:%M'])
arrival_DT = forms.DateTimeField(required=True, input_formats=['%d.%m.%Y %H:%M'])
# from_address_point_txt = forms.CharField(required=True)
# to_address_point_txt = forms.CharField(required=True)
departure_DT = forms.DateField(required=True, input_formats=['%d.%m.%Y'])
arrival_DT = forms.DateField(required=True, input_formats=['%d.%m.%Y'])
class Meta:
model = Route
exclude = [
'name', 'name_plural', 'order', 'createDT', 'modifiedDT', 'enable', 'json_data',
'receive_msg_by_sms', 'owner', 'owner_type'
'receive_msg_by_sms', 'owner', 'owner_type',
'extra_phone', 'weight', ''
]
def clean(self):
@@ -72,11 +73,11 @@ class RouteForm(forms.ModelForm):
if error:
self.add_error('phone', error)
if 'extra_phone' in cleaned_data and 'extra_phone' in cleaned_data:
from BaseModels.validators.form_field_validators import get_phone_valid_error
error = get_phone_valid_error(cleaned_data["extra_phone"])
if error:
self.add_error('extra_phone', error)
# if 'extra_phone' in cleaned_data and 'extra_phone' in cleaned_data:
# from BaseModels.validators.form_field_validators import get_phone_valid_error
# error = get_phone_valid_error(cleaned_data["extra_phone"])
# if error:
# self.add_error('extra_phone', error)
if 'departure_DT' in cleaned_data and 'arrival_DT' in cleaned_data and cleaned_data['arrival_DT'] < cleaned_data['departure_DT']:
self.add_error('arrival_DT', _('Указана неверная дата прибытия'))