From 6d39b1fef0d60aecec00106f4133462bfdfdacc1 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Sat, 22 Jun 2019 01:58:03 +0300 Subject: [PATCH] refactoring --- abonapp/forms.py | 13 +++----- abonapp/models.py | 6 ++-- .../templates/abonapp/modal_add_phone.html | 21 ++++-------- .../templates/abonapp/modal_addstreet.html | 18 ++--------- accounts_app/views.py | 2 +- msg_app/forms.py | 14 ++++---- msg_app/locale/ru/LC_MESSAGES/django.po | 8 ++++- msg_app/models.py | 10 ++++-- msg_app/templates/msg_app/chat.html | 24 ++++---------- .../msg_app/modal_new_conversation.html | 29 +++++------------ msg_app/views.py | 5 ++- taskapp/forms.py | 3 +- taskapp/templates/taskapp/add_edit_task.html | 32 +++++++------------ 13 files changed, 70 insertions(+), 115 deletions(-) diff --git a/abonapp/forms.py b/abonapp/forms.py index 3751e9a..958075a 100644 --- a/abonapp/forms.py +++ b/abonapp/forms.py @@ -125,7 +125,7 @@ class PassportForm(forms.ModelForm): ), 'distributor': forms.TextInput(attrs={'required': ''}), 'date_of_acceptance': forms.DateInput(attrs={ - 'class': 'form-control', 'required': '' + 'required': '' }, format='%Y-%m-%d') } @@ -136,10 +136,8 @@ class AbonStreetForm(forms.ModelForm): fields = '__all__' widgets = { 'name': forms.TextInput(attrs={ - 'class': 'form-control', 'required': '', 'autofocus': '' - }), - 'group': forms.Select(attrs={'class': 'form-control'}) + }) } @@ -154,11 +152,10 @@ class AdditionalTelephoneForm(forms.ModelForm): settings, 'TELEPHONE_REGEXP', r'^(\+[7,8,9,3]\d{10,11})?$' ), - 'required': '', - 'class': 'form-control' + 'required': '' }), 'owner_name': forms.TextInput(attrs={ - 'class': 'form-control', 'required': '' + 'required': '' }) } @@ -168,7 +165,7 @@ class PeriodicPayForIdForm(forms.ModelForm): model = models.PeriodicPayForId exclude = ('account',) widgets = { - 'next_pay': forms.DateInput(attrs={'class': 'form-control', 'type': 'date'}) + 'next_pay': forms.DateInput(attrs={'type': 'date'}) } diff --git a/abonapp/models.py b/abonapp/models.py index f0ece28..aa8275a 100644 --- a/abonapp/models.py +++ b/abonapp/models.py @@ -68,8 +68,8 @@ class AbonTariff(models.Model): class AbonStreet(models.Model): - name = models.CharField(max_length=64) - group = models.ForeignKey(Group, on_delete=models.CASCADE) + name = models.CharField(_('Street title'), max_length=64) + group = models.ForeignKey(Group, verbose_name=_('User group'), on_delete=models.CASCADE) def __str__(self): return self.name @@ -468,7 +468,7 @@ class AdditionalTelephone(models.Model): getattr(settings, 'TELEPHONE_REGEXP', r'^(\+[7893]\d{10,11})?$') ),) ) - owner_name = models.CharField(max_length=127) + owner_name = models.CharField(_('Telephone owner'), max_length=127) def __str__(self): return "%s - (%s)" % (self.owner_name, self.telephone) diff --git a/abonapp/templates/abonapp/modal_add_phone.html b/abonapp/templates/abonapp/modal_add_phone.html index 32c3edd..cb67f41 100644 --- a/abonapp/templates/abonapp/modal_add_phone.html +++ b/abonapp/templates/abonapp/modal_add_phone.html @@ -1,4 +1,4 @@ -{% load i18n %} +{% load i18n bootstrap3 %}
{% csrf_token %}
@@ -6,21 +6,12 @@
-
- -
- - {{ form.telephone }}{{ form.telephone.errors }} -
-
-
- -
- - {{ form.owner_name }}{{ form.owner_name.errors }} -
-
+ {% bootstrap_icon 'earphone' as ic %} + {% bootstrap_field form.telephone addon_before=ic %} + + {% bootstrap_icon 'user' as ic %} + {% bootstrap_field form.owner_name addon_before=ic %}
@@ -8,22 +8,8 @@ {% include '_messages.html' %}
-
- -
- - {{ form.name }}{{ form.name.errors }} -
-
- -
- -
- - {{ form.group }}{{ form.group.errors }} -
-
+ {% bootstrap_form form %}
- {% csrf_token %} + {% csrf_token %}
-
-
- - -
-
-
- - -
+ {% bootstrap_form msg_form %} + + {% bootstrap_button _('Send') button_type='submit' button_class='btn-default' icon='send' %} Если кто-то будет пользоваться то усовершенствую личные сообщения
diff --git a/msg_app/templates/msg_app/modal_new_conversation.html b/msg_app/templates/msg_app/modal_new_conversation.html index cf65bd7..7a966a9 100644 --- a/msg_app/templates/msg_app/modal_new_conversation.html +++ b/msg_app/templates/msg_app/modal_new_conversation.html @@ -1,4 +1,4 @@ -{% load i18n %} +{% load i18n bootstrap3 %} {% csrf_token %}
@@ -6,28 +6,15 @@
-
- -
- - {{ form.title }}{{ form.title.errors }} -
-
-
- - {% trans 'for select multiple press ctrl and click on field' %} -
- - {{ form.participants }}{{ form.participants.errors }} -
-
+ {% bootstrap_icon 'header' as ic %} + {% bootstrap_field form.title addon_before=ic %} + + {% bootstrap_icon 'user' as ic %} + {% bootstrap_field form.participants addon_before=ic %} + + {% bootstrap_button _('Add') button_type='submit' button_class='btn-primary' icon='plus' %} -
- -
diff --git a/msg_app/views.py b/msg_app/views.py index 80d9573..96e8e1a 100644 --- a/msg_app/views.py +++ b/msg_app/views.py @@ -60,14 +60,17 @@ def to_conversation(request, conv_id): frm = MessageForm(request.POST, request.FILES) if frm.is_valid(): frm.create(conv, request.user) + return redirect(conv.get_absolute_url()) else: messages.error(request, _('fix form errors')) else: conv.make_messages_status_old(request.user) + frm = MessageForm() msg_list = conv.get_messages() return render(request, 'msg_app/chat.html', { 'conv': conv, - 'msg_list': msg_list + 'msg_list': msg_list, + 'msg_form': frm }) except MessageError as e: messages.error(request, e) diff --git a/taskapp/forms.py b/taskapp/forms.py index 9807991..47705e7 100644 --- a/taskapp/forms.py +++ b/taskapp/forms.py @@ -38,8 +38,7 @@ class TaskFrm(forms.ModelForm): 'recipients': forms.SelectMultiple(attrs={ 'size': 10 }), - 'out_date': forms.DateInput(attrs={'class': 'form-control', 'type': 'date'}), - 'abon': forms.Select(attrs={'class': 'form-control'}) + 'out_date': forms.DateInput(attrs={'type': 'date'}) } diff --git a/taskapp/templates/taskapp/add_edit_task.html b/taskapp/templates/taskapp/add_edit_task.html index dbb42b5..1c7a9e0 100644 --- a/taskapp/templates/taskapp/add_edit_task.html +++ b/taskapp/templates/taskapp/add_edit_task.html @@ -62,34 +62,24 @@
    {{ form.abon.errors }}
    -
    - -
    - - {{ form.out_date }}{{ form.out_date.errors }} -
    -
    + {% bootstrap_icon 'calendar' as ic %} + {% bootstrap_field form.out_date addon_before=ic %} {% bootstrap_icon 'picture' as ic %} {% bootstrap_field form.attachment addon_before=ic %}
    - - - {% if task.id %} - - {% trans 'Delete' %} - - {% endif %} + {% bootstrap_button _('Save') button_type='submit' button_class='btn-primary' icon='save' %} + + {% bootstrap_button _('Reset') button_type='reset' icon='remove-circle' %} + {% if task.id %} - - {% trans 'Complete' %} - + {% url 'taskapp:delete' task.id as delurl%} + {% bootstrap_button _('Delete') button_class='btn-danger' href=delurl icon='remove' %} + + {% url 'taskapp:finish' task.id as cmpurl %} + {% bootstrap_button _('Complete') button_class='btn-success' href=cmpurl icon='ok' %} {% endif %}