Добавлено поле регистрации - телефон

Author: kip

config/settings.py

@@ -59,6 +59,7 @@
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
+    'phonenumber_field',
 ]
 
 MIDDLEWARE = [
@@ -247,3 +248,5 @@
 EMAIL_USE_TLS = True
 
 INPUT_DATE_FORMATS = ['%m/%d/%Y']
+
+PHONENUMBER_DEFAULT_REGION = 'RU'

events/forms.py

@@ -7,6 +7,7 @@
 
 from events.models import Participant, Event, ACCENT_TYPE, Route, PromoCode, Wallet
 from tinymce.widgets import TinyMCE
+from phonenumber_field.formfields import PhoneNumberField
 
 
 class ParticipantRegistrationForm(forms.ModelForm):
@@ -45,6 +46,10 @@ def __init__(self, *args, **kwargs):
         if Event.FIELD_EMAIL in registration_fields:
             self.fields[Event.FIELD_EMAIL] = forms.EmailField(label='Email',
                                                               required=Event.FIELD_EMAIL in required_fields)
+        if Event.FIELD_PHONE in registration_fields:
+            self.fields[Event.FIELD_PHONE] = PhoneNumberField(label='Телефон',
+                                                              required=Event.FIELD_PHONE in required_fields,
+                                                              region='RU')
 
         if group_list != ['']:
             self.fields['group_index'] = forms.ChoiceField(choices=tuple([(name, name) for name in group_list]),
@@ -368,6 +373,7 @@ class Meta:
             Event.FIELD_TEAM,
             Event.FIELD_GRADE,
             Event.FIELD_EMAIL,
+            Event.FIELD_PHONE,
             'paid',
         ]
         labels = {
@@ -380,6 +386,7 @@ class Meta:
             Event.FIELD_TEAM: 'Команда',
             Event.FIELD_GRADE: 'Спортивный разряд',
             Event.FIELD_EMAIL: 'E-mail',
+            Event.FIELD_PHONE: 'Телефон',
             'paid': 'Оплата произведена',
         }
 

events/migrations/0020_participant_phone_number_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.0.8 on 2023-03-29 07:39
+
+from django.db import migrations
+import multiselectfield.db.fields
+import phonenumber_field.modelfields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0019_event_price_list'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='participant',
+            name='phone_number',
+            field=phonenumber_field.modelfields.PhoneNumberField(blank=True, max_length=128, region=None),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='registration_fields',
+            field=multiselectfield.db.fields.MultiSelectField(blank=True, choices=[('gender', 'Пол'), ('birth_year', 'Год рождения'), ('city', 'Город'), ('team', 'Команда'), ('grade', 'Разряд'), ('email', 'Email'), ('phone_number', 'Телефон')], default='gender,birth_year,city,team', max_length=52, null=True),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='required_fields',
+            field=multiselectfield.db.fields.MultiSelectField(blank=True, choices=[('birth_year', 'Год рождения'), ('city', 'Город'), ('team', 'Команда'), ('email', 'Email'), ('phone_number', 'Телефон')], default=None, max_length=39, null=True),
+        ),
+    ]

events/models.py

@@ -4,6 +4,7 @@
 from django.db import models
 from multiselectfield import MultiSelectField
 from django.contrib.postgres.fields import ArrayField
+from phonenumber_field.modelfields import PhoneNumberField
 
 from config import settings
 
@@ -130,27 +131,31 @@ class Event(models.Model):
     FIELD_GENDER = 'gender'
     FIELD_GRADE = 'grade'
     FIELD_EMAIL = 'email'
+    FIELD_PHONE = 'phone_number'
     OPTIONAL_FIELDS = [
         FIELD_BIRTH_YEAR,
         FIELD_CITY,
         FIELD_TEAM,
         FIELD_GENDER,
         FIELD_GRADE,
         FIELD_EMAIL,
+        FIELD_PHONE,
     ]
     REQUIRED_FIELDS = [
         (FIELD_BIRTH_YEAR, 'Год рождения'),
         (FIELD_CITY, 'Город'),
         (FIELD_TEAM, 'Команда'),
         (FIELD_EMAIL, 'Email'),
+        (FIELD_PHONE, 'Телефон'),
     ]
     REGISTRATION_FIELDS = [
         (FIELD_GENDER, 'Пол'),
         (FIELD_BIRTH_YEAR, 'Год рождения'),
         (FIELD_CITY, 'Город'),
         (FIELD_TEAM, 'Команда'),
         (FIELD_GRADE, 'Разряд'),
-        (FIELD_EMAIL, 'Email')
+        (FIELD_EMAIL, 'Email'),
+        (FIELD_PHONE, 'Телефон'),
     ]
     registration_fields = MultiSelectField(choices=REGISTRATION_FIELDS,
                                            default=f'{FIELD_GENDER},{FIELD_BIRTH_YEAR},{FIELD_CITY},{FIELD_TEAM}',
@@ -227,6 +232,8 @@ class Participant(models.Model):
     scores = models.JSONField(default=_get_blank_json)
     counted_routes = ArrayField(models.IntegerField(), blank=True, null=True)
 
+    phone_number = PhoneNumberField(blank=True)
+
     def __str__(self):
         return f'<Part-t: Name={self.last_name}, PIN={self.pin}, Score={self.score}, set={self.set_index}>'
 

events/services.py

@@ -247,6 +247,7 @@ def update_participant(event: Event, participant: Participant, cd: dict) -> Part
     participant.paid = cd['paid'] if 'paid' in cd else False
     participant.email = cd['email'] if 'email' in cd else ''
     participant.reg_type_index = cd['reg_type_index'] if 'reg_type_index' in cd else 0
+    participant.phone_number = cd['phone_number'] if 'phone_number' in cd else ''
     participant.save()
 
     if need_update_results:
@@ -270,6 +271,7 @@ def _create_participant(event: Event, first_name: str, last_name: str,
                         set_index: int = 0,
                         email: str = '',
                         reg_type_index: int = 0,
+                        phone_number: str = '',
                         ) -> Participant or None:
     if 0 < event.set_max_participants <= event.participant.filter(set_index=set_index).count():
         return None
@@ -290,6 +292,7 @@ def _create_participant(event: Event, first_name: str, last_name: str,
         set_index=set_index,
         email=email,
         reg_type_index=reg_type_index,
+        phone_number=phone_number,
     )
     return participant
 
@@ -312,6 +315,7 @@ def register_participant(event: Event, cd: dict) -> Participant:
         set_index=get_set_list(event=event).index(cd['set_index']) if 'set_index' in cd else 0,
         email=cd[Event.FIELD_EMAIL] if Event.FIELD_EMAIL in cd else '',
         reg_type_index=cd['reg_type_index'] if 'reg_type_index' in cd else 0,
+        phone_number = cd['phone_number'] if 'phone_number' in cd else '',
     )
     _check_participants_number_to_close_registration(event=event)
     return participant

events/static/events/xl_templates/startlist_template.xlsx

@@ -40,6 +40,9 @@
         {% if user == event.owner or user.is_superuser %}
         <th>Pin</th>
         {% endif %}
+        {% if user == event.owner or user.is_superuser %}
+        <th>Телефон</th>
+        {% endif %}
         {% if 'gender' in fields %}
         <th data-field="gender" data-sortable="true">Пол</th>
         {% endif %}
@@ -86,9 +89,12 @@
           {% endif %}
         </td>
         {% endif %}
-        {% if user.is_superuser %}
+        {% if user == event.owner or user.is_superuser %}
         <td>{{ participant.pin }}</td>
         {% endif %}
+        {% if user == event.owner or user.is_superuser %}
+        <td>{{ participant.phone_number }}</td>
+        {% endif %}
         {% if 'gender' in fields %}
         <td>{{ participant.get_gender_display }}</td>
         {% endif %}

events/templates/events/event/participants.html

@@ -45,8 +45,10 @@ def export_participants_to_start_list(event: Event):
             sheet.cell(row=ROW_OFFSET + index, column=7).value = p.team
             sheet.cell(row=ROW_OFFSET + index, column=8).value = group_list[p.group_index] if group_list != [] else ''
             sheet.cell(row=ROW_OFFSET + index, column=9).value = p.pin
-            sheet.cell(row=ROW_OFFSET + index, column=10).value = "Да" if p.paid else "-"
-            sheet.cell(row=ROW_OFFSET + index, column=11).value = reg_type_list[p.reg_type_index].strip() if reg_type_list != [] else ''
+            sheet.cell(row=ROW_OFFSET + index, column=10).value = str(p.phone_number)
+            sheet.cell(row=ROW_OFFSET + index, column=11).value = p.email
+            sheet.cell(row=ROW_OFFSET + index, column=12).value = "Да" if p.paid else "-"
+            sheet.cell(row=ROW_OFFSET + index, column=13).value = reg_type_list[p.reg_type_index].strip() if reg_type_list != [] else ''
     book.remove(book.worksheets[0])
     book.close()
 

events/xl_tools.py

@@ -23,6 +23,7 @@ django-extensions==3.2.1
 django-heroku==0.3.1
 django-maintenance-mode==0.16.3
 django-multiselectfield==0.1.12
+django-phonenumber-field==7.0.2
 django-queryset-csv==1.1.0
 django-tinymce==3.5.0
 et-xmlfile==1.1.0
@@ -38,6 +39,7 @@ oauthlib==3.2.2
 openpyxl==3.0.10
 packaging==21.3
 pathspec==0.10.1
+phonenumberslite==8.13.8
 Pillow==9.2.0
 pip-review==1.2.0
 platformdirs==2.5.2