diff --git a/abonapp/templates/abonapp/addAbon.html b/abonapp/templates/abonapp/addAbon.html index b93ec39..bf53826 100644 --- a/abonapp/templates/abonapp/addAbon.html +++ b/abonapp/templates/abonapp/addAbon.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n bootstrap3 %} +{% block title %}{% trans 'Add abon' %}{% endblock %} + {% block breadcrumb %}
    2. diff --git a/abonapp/templates/abonapp/addInvoice.html b/abonapp/templates/abonapp/addInvoice.html index 84650d2..7b6e125 100644 --- a/abonapp/templates/abonapp/addInvoice.html +++ b/abonapp/templates/abonapp/addInvoice.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} +{% block title %}{% trans 'Add debt' %}{% endblock %} + {% block breadcrumb %}
      2. diff --git a/abonapp/templates/abonapp/buy_tariff.html b/abonapp/templates/abonapp/buy_tariff.html index 8fc0d05..a9f8daa 100644 --- a/abonapp/templates/abonapp/buy_tariff.html +++ b/abonapp/templates/abonapp/buy_tariff.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} +{% block title %}{% trans 'Pick a service' %}{% endblock %} + {% block breadcrumb %}
        2. diff --git a/abonapp/templates/abonapp/debtors.html b/abonapp/templates/abonapp/debtors.html index dda83d5..3fa8611 100644 --- a/abonapp/templates/abonapp/debtors.html +++ b/abonapp/templates/abonapp/debtors.html @@ -1,6 +1,8 @@ {% extends 'base.html' %} {% load i18n %} +{% block title %}{% trans 'People with debts' %}{% endblock %} + {% block breadcrumb %}
          2. @@ -55,4 +57,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/abonapp/templates/abonapp/ext.htm b/abonapp/templates/abonapp/ext.htm index b3cfdae..1e262aa 100644 --- a/abonapp/templates/abonapp/ext.htm +++ b/abonapp/templates/abonapp/ext.htm @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} +{% block title %}{{ abon.get_full_name }}{% endblock %} + {% block breadcrumb %}
            2. diff --git a/abonapp/templates/abonapp/group_list.html b/abonapp/templates/abonapp/group_list.html index e8f6fe9..90975ec 100644 --- a/abonapp/templates/abonapp/group_list.html +++ b/abonapp/templates/abonapp/group_list.html @@ -1,6 +1,8 @@ {% extends 'base.html' %} {% load dpagination i18n %} +{% block title %}{% trans 'User groups' %}{% endblock %} + {% block breadcrumb %}
              2. diff --git a/abonapp/templates/abonapp/group_tariffs.html b/abonapp/templates/abonapp/group_tariffs.html index ca079ba..0818bc4 100644 --- a/abonapp/templates/abonapp/group_tariffs.html +++ b/abonapp/templates/abonapp/group_tariffs.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} +{% block title %}{% trans 'Belonging services for groups' %}{% endblock %} + {% block breadcrumb %}
                2. diff --git a/abonapp/templates/abonapp/invoiceForPayment.html b/abonapp/templates/abonapp/invoiceForPayment.html index 320cd12..b7f8f22 100644 --- a/abonapp/templates/abonapp/invoiceForPayment.html +++ b/abonapp/templates/abonapp/invoiceForPayment.html @@ -1,6 +1,8 @@ {% extends 'base.html' %} {% load i18n %} +{% block title %}{% trans 'Debts' %}{% endblock %} + {% block breadcrumb %}
                  2. diff --git a/abonapp/templates/abonapp/log.html b/abonapp/templates/abonapp/log.html index 32d9730..92e5777 100644 --- a/abonapp/templates/abonapp/log.html +++ b/abonapp/templates/abonapp/log.html @@ -1,6 +1,8 @@ {% extends 'base.html' %} {% load i18n %} +{% block title %}{% trans 'History of subscriber' %}{% endblock %} + {% block breadcrumb %}
                    2. @@ -58,4 +60,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html index 605d336..b79c8ca 100644 --- a/abonapp/templates/abonapp/peoples.html +++ b/abonapp/templates/abonapp/peoples.html @@ -1,6 +1,8 @@ {% extends 'base.html' %} {% load i18n dpagination %} +{% block title %}{{ group.title }}{% endblock %} + {% block breadcrumb %}
                      2. diff --git a/devapp/templates/devapp/add_dev.html b/devapp/templates/devapp/add_dev.html index af23896..fd9c618 100644 --- a/devapp/templates/devapp/add_dev.html +++ b/devapp/templates/devapp/add_dev.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n bootstrap3 %} +{% block title %}{% trans 'Add new device' %}{% endblock %} + {% block breadcrumb %}
                        2. diff --git a/devapp/templates/devapp/dev.html b/devapp/templates/devapp/dev.html index 2108fcf..9f300a4 100644 --- a/devapp/templates/devapp/dev.html +++ b/devapp/templates/devapp/dev.html @@ -1,5 +1,8 @@ {% extends request.is_ajax|yesno:'nullcont.htm,devapp/ext.htm' %} {% load i18n bootstrap3 %} + +{% block title %}{{ form.comment.value }}{% endblock %} + {% block content %}
                        diff --git a/devapp/templates/devapp/devices.html b/devapp/templates/devapp/devices.html index 59c020d..e2d95a0 100644 --- a/devapp/templates/devapp/devices.html +++ b/devapp/templates/devapp/devices.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n dpagination %} +{% block title %}{% trans 'Devices' %} - {{ group.title }}{% endblock %} + {% block breadcrumb %}
                          2. diff --git a/devapp/templates/devapp/devices_null_group.html b/devapp/templates/devapp/devices_null_group.html index f8e4c73..476175b 100644 --- a/devapp/templates/devapp/devices_null_group.html +++ b/devapp/templates/devapp/devices_null_group.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n dpagination %} +{% block title %}{% trans 'Devices without group' %}{% endblock %} + {% block breadcrumb %}
                            2. @@ -80,4 +82,4 @@
                        -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/devapp/templates/devapp/ext.htm b/devapp/templates/devapp/ext.htm index 454a1af..174e378 100644 --- a/devapp/templates/devapp/ext.htm +++ b/devapp/templates/devapp/ext.htm @@ -1,6 +1,7 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} +{% block title %}{{ dev.comment }}{% endblock %} {% block breadcrumb %}
                          diff --git a/devapp/templates/devapp/fix_dev_group.html b/devapp/templates/devapp/fix_dev_group.html index 3c8d613..e1bbbc1 100644 --- a/devapp/templates/devapp/fix_dev_group.html +++ b/devapp/templates/devapp/fix_dev_group.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n bootstrap3 %} +{% block title %}{% trans 'Fix device group' %}{% endblock %} + {% block breadcrumb %}
                            2. diff --git a/devapp/templates/devapp/group_list.html b/devapp/templates/devapp/group_list.html index a3f2c9d..10c7d6e 100644 --- a/devapp/templates/devapp/group_list.html +++ b/devapp/templates/devapp/group_list.html @@ -1,6 +1,8 @@ {% extends 'base.html' %} {% load i18n %} +{% block title %}{% trans 'Devices' %}{% endblock %} + {% block breadcrumb %}
                              2. diff --git a/devapp/views.py b/devapp/views.py index 3687918..3cc2014 100644 --- a/devapp/views.py +++ b/devapp/views.py @@ -599,9 +599,8 @@ class GroupsListView(LoginAdminMixin, global_base_views.OrderedFilteredList): model = Group def get_queryset(self): - groups = super(GroupsListView, self).get_queryset() groups = get_objects_for_user(self.request.user, - 'group_app.view_group', klass=groups, + 'group_app.view_group', klass=Group, accept_global_perms=False) return groups diff --git a/djing/settings.py b/djing/settings.py index 3b354db..1089d52 100644 --- a/djing/settings.py +++ b/djing/settings.py @@ -58,6 +58,7 @@ INSTALLED_APPS = [ 'messenger', 'msg_app', 'group_app', + 'new_customers', 'guardian', 'pinax_theme_bootstrap', 'bootstrapform', diff --git a/djing/urls.py b/djing/urls.py index fb8a3f7..a1dab3a 100644 --- a/djing/urls.py +++ b/djing/urls.py @@ -19,6 +19,7 @@ urlpatterns = [ path('ip_pool/', include('ip_pool.urls', namespace='ip_pool')), path('messenger/', include('messenger.urls', namespace='messenger')), path('gw/', include('gw_app.urls', namespace='gw_app')), + path('new_customers/', include('new_customers.urls', namespace='new_customers')), path('fin/', include('finapp.urls', namespace='finapp')) # Switch language diff --git a/finapp/templates/finapp/fin_report.html b/finapp/templates/finapp/fin_report.html index e02b64a..ba98a30 100644 --- a/finapp/templates/finapp/fin_report.html +++ b/finapp/templates/finapp/fin_report.html @@ -1,6 +1,8 @@ {% extends 'base.html' %} {% load i18n %} +{% block title %}{% trans 'Money by days' %}{% endblock %} + {% block breadcrumb %}
                                2. @@ -46,4 +48,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/finapp/templates/finapp/payHistory.html b/finapp/templates/finapp/payHistory.html index c35e720..ba52e13 100644 --- a/finapp/templates/finapp/payHistory.html +++ b/finapp/templates/finapp/payHistory.html @@ -1,6 +1,7 @@ {% extends 'base.html' %} {% load i18n %} +{% block title %}{{ pay_gw.title }}{% endblock %} {% block breadcrumb %}
                                  diff --git a/finapp/templates/finapp/payalltimegateway_form.html b/finapp/templates/finapp/payalltimegateway_form.html index 4b404b6..cdda444 100644 --- a/finapp/templates/finapp/payalltimegateway_form.html +++ b/finapp/templates/finapp/payalltimegateway_form.html @@ -1,6 +1,14 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n bootstrap3 %} +{% block title %} + {% if object %} + {% trans 'Change payment gateway' %} + {% else %} + {% trans 'Add payment gateway' %} + {% endif %} +{% endblock %} + {% block breadcrumb %}
                                    2. @@ -17,7 +25,11 @@ {% block page-header %} - {% trans 'Make new payment gateway' %} + {% if object %} + {% trans 'Change payment gateway' %} + {% else %} + {% trans 'Add payment gateway' %} + {% endif %} {% endblock %} diff --git a/finapp/templates/finapp/payalltimegateway_list.html b/finapp/templates/finapp/payalltimegateway_list.html index f099c43..95d0a09 100644 --- a/finapp/templates/finapp/payalltimegateway_list.html +++ b/finapp/templates/finapp/payalltimegateway_list.html @@ -1,6 +1,7 @@ {% extends 'base.html' %} {% load i18n %} +{% block title %}{% trans 'List of payment gateways' %}{% endblock %} {% block breadcrumb %}
                                      diff --git a/group_app/templates/group_app/ext.html b/group_app/templates/group_app/ext.html index 48956ea..81e9574 100644 --- a/group_app/templates/group_app/ext.html +++ b/group_app/templates/group_app/ext.html @@ -1,6 +1,7 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} +{% block title %}{% trans 'Groups' %}{% endblock %} {% block breadcrumb %}
                                        @@ -22,4 +23,4 @@ {% block content %}{% endblock %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/group_app/templates/group_app/group_list.html b/group_app/templates/group_app/group_list.html index 81c2b71..30e3e43 100644 --- a/group_app/templates/group_app/group_list.html +++ b/group_app/templates/group_app/group_list.html @@ -1,6 +1,8 @@ {% extends 'base.html' %} {% load i18n dpagination%} +{% block title %}{% trans 'Groups' %}{% endblock %} + {% block breadcrumb %}
                                          2. diff --git a/gw_app/templates/gw_app/nasmodel_add.html b/gw_app/templates/gw_app/nasmodel_add.html index 08396d1..20430b1 100644 --- a/gw_app/templates/gw_app/nasmodel_add.html +++ b/gw_app/templates/gw_app/nasmodel_add.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n bootstrap3 %} +{% block title %}{% trans 'Add new gateway' %}{% endblock %} + {% block breadcrumb %}
                                            2. diff --git a/gw_app/templates/gw_app/nasmodel_list.html b/gw_app/templates/gw_app/nasmodel_list.html index c641673..f40eff2 100644 --- a/gw_app/templates/gw_app/nasmodel_list.html +++ b/gw_app/templates/gw_app/nasmodel_list.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} +{% block title %}{% trans 'Gateways' %}{% endblock %} + {% block breadcrumb %}
                                              2. diff --git a/gw_app/templates/gw_app/nasmodel_update.html b/gw_app/templates/gw_app/nasmodel_update.html index b2dccd0..997916e 100644 --- a/gw_app/templates/gw_app/nasmodel_update.html +++ b/gw_app/templates/gw_app/nasmodel_update.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n bootstrap3 %} +{% block title %}{% trans 'Edit gateway' %}{% endblock %} + {% block breadcrumb %}
                                                2. diff --git a/ip_pool/templates/ip_pool/net_add.html b/ip_pool/templates/ip_pool/net_add.html index 2218585..ff12d87 100644 --- a/ip_pool/templates/ip_pool/net_add.html +++ b/ip_pool/templates/ip_pool/net_add.html @@ -5,6 +5,8 @@ {# #} {#{% endblock %}#} +{% block title %}{% trans 'Add network' %}{% endblock %} + {% block breadcrumb %}
                                                  2. diff --git a/ip_pool/templates/ip_pool/net_edit.html b/ip_pool/templates/ip_pool/net_edit.html index c878db1..0200465 100644 --- a/ip_pool/templates/ip_pool/net_edit.html +++ b/ip_pool/templates/ip_pool/net_edit.html @@ -5,6 +5,8 @@ {# #} {#{% endblock %}#} +{% block title %}{{ object }}{% endblock %} + {% block breadcrumb %}
                                                    2. diff --git a/ip_pool/templates/ip_pool/network_list.html b/ip_pool/templates/ip_pool/network_list.html index fab9e46..f4bf8ca 100644 --- a/ip_pool/templates/ip_pool/network_list.html +++ b/ip_pool/templates/ip_pool/network_list.html @@ -1,6 +1,8 @@ {% extends 'ip_pool/ext.html' %} {% load i18n %} +{% block title %}{% trans 'Networks' %}{% endblock %} + {% block breadcrumb %}
                                                      2. diff --git a/new_customers/__init__.py b/new_customers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/new_customers/admin.py b/new_customers/admin.py new file mode 100644 index 0000000..a2528b5 --- /dev/null +++ b/new_customers/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from new_customers.models import PotentialSubscriber + + +admin.site.register(PotentialSubscriber) diff --git a/new_customers/apps.py b/new_customers/apps.py new file mode 100644 index 0000000..5360d9c --- /dev/null +++ b/new_customers/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class NewCustomersConfig(AppConfig): + name = 'new_customers' diff --git a/new_customers/forms.py b/new_customers/forms.py new file mode 100644 index 0000000..59b66b9 --- /dev/null +++ b/new_customers/forms.py @@ -0,0 +1,11 @@ +from django import forms +from new_customers.models import PotentialSubscriber + + +class CustomerModelForm(forms.ModelForm): + class Meta: + model = PotentialSubscriber + exclude = ('make_data',) + widgets = { + 'deadline': forms.DateInput(attrs={'type': 'date'}) + } diff --git a/new_customers/locale/ru/LC_MESSAGES/django.po b/new_customers/locale/ru/LC_MESSAGES/django.po new file mode 100644 index 0000000..a473243 --- /dev/null +++ b/new_customers/locale/ru/LC_MESSAGES/django.po @@ -0,0 +1,98 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Dmitry Novikov nerosketch@gmail.com, 2019. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-06-17 00:43+0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" +"%100>=11 && n%100<=14)? 2 : 3);\n" + +#: models.py:11 +msgid "fio" +msgstr "ФИО" + +#: models.py:14 +msgid "Telephone" +msgstr "Номер телефона" + +#: models.py:24 +msgid "User group" +msgstr "Группа нового абонента" + +#: models.py:27 +msgid "Town" +msgstr "Посёлок" + +#: models.py:28 +msgid "Town, if group does not already exist" +msgstr "Населённый пункт, если группа ещё не существует" + +#: models.py:31 +msgid "Street" +msgstr "Улица" + +#: models.py:33 +msgid "House" +msgstr "Дом" + +#: models.py:39 +msgid "Comment" +msgstr "Комментарий" + +#: models.py:43 +msgid "Create date" +msgstr "Дата создания" + +#: models.py:45 +msgid "Deadline connection" +msgstr "Планируемая дата подключения" + +#: models.py:46 +msgid "Date when connection must be finished" +msgstr "Дата, до которой подключение должно быть завершено" + +#: models.py:55 +msgid "Potential customer" +msgstr "Новый абонент" + +#: models.py:56 +msgid "Potential customers" +msgstr "Новые абоненты" + +#: templates/new_customers/potentialsubscriber_form.html:5 +msgid "Create potential client" +msgstr "Создать заявку на подключение" + +#: templates/new_customers/potentialsubscriber_form.html:13 +#: templates/new_customers/potentialsubscriber_list.html:45 +msgid "Add" +msgstr "Добавить" + +#: templates/new_customers/potentialsubscriber_list.html:8 +#: templates/new_customers/potentialsubscriber_list.html:14 +msgid "Potential subscribers" +msgstr "Заявки на подключение" + +#: templates/new_customers/potentialsubscriber_list.html:21 +msgid "New subscribers" +msgstr "Новые абоненты" + +#: templates/new_customers/potentialsubscriber_list.html:22 +msgid "People that may be clients" +msgstr "Подключки. Клиенты, которые должны стать абонентами" + +#: templates/new_customers/potentialsubscriber_list.html:38 +msgid "Not have new subscribers" +msgstr "Нет новых подключек" diff --git a/new_customers/migrations/__init__.py b/new_customers/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/new_customers/models.py b/new_customers/models.py new file mode 100644 index 0000000..d0c97e7 --- /dev/null +++ b/new_customers/models.py @@ -0,0 +1,58 @@ +from django.shortcuts import resolve_url +from django.utils.translation import gettext_lazy as _ +from django.db import models +from django.conf import settings +from django.core.validators import RegexValidator + +from group_app.models import Group + + +class PotentialSubscriber(models.Model): + fio = models.CharField(_('fio'), max_length=256) + telephone = models.CharField( + max_length=16, + verbose_name=_('Telephone'), + blank=True, + null=True, + validators=(RegexValidator( + getattr(settings, 'TELEPHONE_REGEXP', r'^(\+[7893]\d{10,11})?$') + ),) + ) + group = models.ForeignKey( + Group, + on_delete=models.SET_NULL, + blank=True, null=True, + verbose_name=_('User group') + ) + town = models.CharField( + _('Town'), + help_text=_('Town, if group does not already exist'), + max_length=127, blank=True, null=True + ) + street = models.CharField(_('Street'), max_length=127, blank=True, null=True) + house = models.CharField( + _('House'), + max_length=12, + null=True, + blank=True + ) + description = models.TextField( + _('Comment'), + null=True, + blank=True + ) + make_data = models.DateTimeField(_('Create date'), auto_now_add=True) + deadline = models.DateField( + _('Deadline connection'), + help_text=_('Date when connection must be finished'), + blank=True, null=True + ) + + def get_absolute_url(self): + return resolve_url('new_customers:user', uid=self.pk) + + class Meta: + db_table = 'new_customers' + verbose_name = _('Potential customer') + verbose_name_plural = _('Potential customers') + ordering = '-id', diff --git a/new_customers/templates/new_customers/potentialsubscriber_detail.html b/new_customers/templates/new_customers/potentialsubscriber_detail.html new file mode 100644 index 0000000..cdbb4e5 --- /dev/null +++ b/new_customers/templates/new_customers/potentialsubscriber_detail.html @@ -0,0 +1,58 @@ +{% extends request.is_ajax|yesno:'bajax.html,base.html' %} +{% load i18n bootstrap3 %} + +{% block title %} + {{ object.fio|default:_('Not assigned') }} +{% endblock %} + +{% block breadcrumb %} +
                                                        +
                                                        2. +
                                                      2. {% trans 'Potential subscribers' %}
                                                        3. +
                                                      3. {{ object.fio }}
                                                        4. +
                                                      +{% endblock %} + +{% block page-header %} + {{ object.fio|default:_('Not assigned') }} +{% endblock %} + +{% block main %} + +
                                                      +
                                                      +

                                                      {% trans 'Potential subscriber' %}

                                                      +
                                                      +
                                                      + +
                                                      + + {% for model_field in model_fields %} +
                                                      {{ model_field.verbose_name }}
                                                      +
                                                      {{ model_field.value }}
                                                      + {% endfor %} + +
                                                      + +
                                                      {% csrf_token %} + {% bootstrap_form form %} + +
                                                      + + {% trans 'Save' %} + + + + {% trans 'Make client' %} + + + + {% trans 'Cancel' %} + +
                                                      +
                                                      + +
                                                      +
                                                      + +{% endblock %} diff --git a/new_customers/templates/new_customers/potentialsubscriber_form.html b/new_customers/templates/new_customers/potentialsubscriber_form.html new file mode 100644 index 0000000..fe14db4 --- /dev/null +++ b/new_customers/templates/new_customers/potentialsubscriber_form.html @@ -0,0 +1,17 @@ +{% load i18n bootstrap3 %} +
                                                      {% csrf_token %} +
                                                      + +

                                                      {% trans 'Create potential client' %}

                                                      +
                                                      + +
                                                      + {% bootstrap_form form %} + +
                                                      + +
                                                      +
                                                      +
                                                      diff --git a/new_customers/templates/new_customers/potentialsubscriber_list.html b/new_customers/templates/new_customers/potentialsubscriber_list.html new file mode 100644 index 0000000..bab929f --- /dev/null +++ b/new_customers/templates/new_customers/potentialsubscriber_list.html @@ -0,0 +1,70 @@ +{% extends request.is_ajax|yesno:'bajax.html,base.html' %} +{% load i18n %} + +{% block title %}{% trans 'Potential subscribers' %}{% endblock %} + +{% block breadcrumb %} +
                                                        +
                                                        2. +
                                                      2. {% trans 'Potential subscribers' %}
                                                        3. +
                                                      +{% endblock %} + + +{% block page_header %} +

                                                      {% trans 'Potential subscribers' %}

                                                      +{% endblock %} + +{% block main %} + +
                                                      +
                                                      +

                                                      {% trans 'New subscribers' %}

                                                      + {% trans 'People that may be clients' %} +
                                                      +
                                                      + {% for new_user in object_list %} + + {% with user_group=new_user.group %} + + +
                                                      + {{ new_user.make_data|date:'d M, H:i:s' }} + {% if user_group.deadline %} + {{ new_user.deadline|date:'d M, H:i:s' }} + {% endif %} +
                                                      + +

                                                      {{ new_user.fio }} {{ new_user.telephone }}

                                                      + + {% if user_group %} + {{ user_group.title }} + {% else %} + {{ town|default_if_none:'' }} + {% endif %} + + {{ new_user.street }}, {{ new_user.house }} + + {% if new_user.description %} +

                                                      {{ new_user.description }}

                                                      + {% endif %} + +                                                       + {% endwith %} + + {% empty %} + +

                                                      {% trans 'Not have new subscribers' %}

                                                      +                                                       + {% endfor %} +
                                                      +
                                                      +
                                                      + + {% trans 'Add' %} + +
                                                      +
                                                      +
                                                      + +{% endblock %} diff --git a/new_customers/urls.py b/new_customers/urls.py new file mode 100644 index 0000000..ae746b4 --- /dev/null +++ b/new_customers/urls.py @@ -0,0 +1,12 @@ +from django.urls import path +from new_customers import views + + +app_name = 'new_customers' + + +urlpatterns = [ + path('', views.CustomersList.as_view(), name='customers_list'), + path('new/', views.CustomerNew.as_view(), name='new_user'), + path('/', views.CustomerDetail.as_view(), name='user'), +] diff --git a/new_customers/views.py b/new_customers/views.py new file mode 100644 index 0000000..9d68f91 --- /dev/null +++ b/new_customers/views.py @@ -0,0 +1,37 @@ +from django.contrib.auth.mixins import PermissionRequiredMixin +from django.views.generic import ListView, DetailView, CreateView + +from djing.global_base_views import OrderingMixin +from djing.lib.mixins import LoginAdminMixin, LoginAdminPermissionMixin +from new_customers.forms import CustomerModelForm +from new_customers.models import PotentialSubscriber + + +class CustomersList(LoginAdminMixin, OrderingMixin, ListView): + model = PotentialSubscriber + + +class CustomerDetail(LoginAdminPermissionMixin, DetailView): + model = PotentialSubscriber + pk_url_kwarg = 'uid' + permission_required = 'new_customers.view_potentialsubscriber' + + def get_context_data(self, **kwargs): + model_fields = filter(lambda x: hasattr(self.object, x.name), self.object._meta.fields) + model_fields = filter(lambda x: getattr(self.object, x.name), model_fields) + model_fields = filter(lambda x: x.name != 'id', model_fields) + context = { + 'form': CustomerModelForm(instance=self.object), + 'model_fields': map(lambda f: { + 'verbose_name': f.verbose_name, + 'value': getattr(self.object, f.name) + }, model_fields) + } + context.update(kwargs) + return super().get_context_data(**context) + + +class CustomerNew(LoginAdminMixin, PermissionRequiredMixin, CreateView): + model = PotentialSubscriber + form_class = CustomerModelForm + permission_required = 'new_customers.add_potentialsubscriber' diff --git a/searchapp/templates/searchapp/index.html b/searchapp/templates/searchapp/index.html index 999debf..60174ae 100644 --- a/searchapp/templates/searchapp/index.html +++ b/searchapp/templates/searchapp/index.html @@ -1,6 +1,8 @@ {% extends 'base.html' %} {% load i18n %} +{% block title %}{% trans 'Search' %}{% endblock %} + {% block breadcrumb %}
                                                        2. diff --git a/tariff_app/templates/tariff_app/editTarif.html b/tariff_app/templates/tariff_app/editTarif.html index d701828..3618c13 100644 --- a/tariff_app/templates/tariff_app/editTarif.html +++ b/tariff_app/templates/tariff_app/editTarif.html @@ -1,6 +1,14 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n bootstrap3 %} +{% block title %} + {% if tarif_id == 0 %} + {% trans 'Add' %} + {% else %} + {{ form.title.value }} + {% endif %} +{% endblock %} + {% block breadcrumb %}
                                                          2. diff --git a/tariff_app/templates/tariff_app/ext.html b/tariff_app/templates/tariff_app/ext.html index 8124fd7..586ef24 100644 --- a/tariff_app/templates/tariff_app/ext.html +++ b/tariff_app/templates/tariff_app/ext.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} +{% block title %}{% trans 'Services' %}{% endblock %} + {% block breadcrumb %}
                                                            2. diff --git a/tariff_app/templates/tariff_app/periodic_pays/add_edit.html b/tariff_app/templates/tariff_app/periodic_pays/add_edit.html index b80049e..7d8ecd5 100644 --- a/tariff_app/templates/tariff_app/periodic_pays/add_edit.html +++ b/tariff_app/templates/tariff_app/periodic_pays/add_edit.html @@ -1,6 +1,14 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n bootstrap3 %} +{% block title %} + {% if pay_instance %} + {% trans 'Change periodic pay' %} + {% else %} + {% trans 'Add new periodic pay' %} + {% endif %} +{% endblock %} + {% block breadcrumb %}
                                                              2. diff --git a/tariff_app/templates/tariff_app/service_users.html b/tariff_app/templates/tariff_app/service_users.html index 8d5d9c1..31255d8 100644 --- a/tariff_app/templates/tariff_app/service_users.html +++ b/tariff_app/templates/tariff_app/service_users.html @@ -1,6 +1,8 @@ {% extends 'base.html' %} {% load i18n dpagination %} +{% block title %}{% trans 'Service users' %}{% endblock %} + {% block breadcrumb %}
                                                                2. diff --git a/taskapp/templates/taskapp/add_edit_task.html b/taskapp/templates/taskapp/add_edit_task.html index 1c7a9e0..0b9fcef 100644 --- a/taskapp/templates/taskapp/add_edit_task.html +++ b/taskapp/templates/taskapp/add_edit_task.html @@ -1,6 +1,13 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n bootstrap3 globaltags %} +{% block title %} + {% if task.id %} + {% trans 'Edit' %} + {% else %} + {% trans 'Create' %} + {% endif %} +{% endblock %} {% block breadcrumb %}
                                                                  diff --git a/taskapp/templates/taskapp/ext.htm b/taskapp/templates/taskapp/ext.htm index 218cd72..2058d42 100644 --- a/taskapp/templates/taskapp/ext.htm +++ b/taskapp/templates/taskapp/ext.htm @@ -1,6 +1,7 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} +{% block title %}{% trans 'Tasks' %}{% endblock %} {% block breadcrumb %}
                                                                    diff --git a/taskapp/templates/taskapp/tasklist_all.html b/taskapp/templates/taskapp/tasklist_all.html index 570db01..f99b8c5 100644 --- a/taskapp/templates/taskapp/tasklist_all.html +++ b/taskapp/templates/taskapp/tasklist_all.html @@ -1,6 +1,7 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n tasktags %} +{% block title %}{% trans 'All tasks' %}{% endblock %} {% block breadcrumb %}
                                                                      diff --git a/taskapp/templates/taskapp/tasklist_empty.html b/taskapp/templates/taskapp/tasklist_empty.html index 6d1da12..3e29e73 100644 --- a/taskapp/templates/taskapp/tasklist_empty.html +++ b/taskapp/templates/taskapp/tasklist_empty.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'nullcont.htm,taskapp/ext.htm' %} {% load i18n %} +{% block title %}{% trans 'Tasks in which no recipients' %}{% endblock %} + {% block page-header %} {% trans 'Tasks in which no recipients' %} {% endblock %} diff --git a/taskapp/templates/taskapp/tasklist_failed.html b/taskapp/templates/taskapp/tasklist_failed.html index 4243e1e..61b2f8a 100644 --- a/taskapp/templates/taskapp/tasklist_failed.html +++ b/taskapp/templates/taskapp/tasklist_failed.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:'nullcont.htm,taskapp/ext.htm' %} {% load i18n %} +{% block title %}{% trans 'Failed tasks' %}{% endblock %} + {% block page-header %} {% trans 'Tasks in which was trouble while at runtime' %} {% endblock %} diff --git a/taskapp/templates/taskapp/tasklist_finish.html b/taskapp/templates/taskapp/tasklist_finish.html index 23ff87b..9016a31 100644 --- a/taskapp/templates/taskapp/tasklist_finish.html +++ b/taskapp/templates/taskapp/tasklist_finish.html @@ -1,7 +1,9 @@ {% extends request.is_ajax|yesno:'nullcont.htm,taskapp/ext.htm' %} {% load i18n %} -{% block content %} +{% block title %}{% trans 'Completed tasks' %}{% endblock %} + +{% block content %}
                                                                      diff --git a/taskapp/templates/taskapp/tasklist_own.html b/taskapp/templates/taskapp/tasklist_own.html index 73675c9..5168aae 100644 --- a/taskapp/templates/taskapp/tasklist_own.html +++ b/taskapp/templates/taskapp/tasklist_own.html @@ -1,7 +1,9 @@ {% extends request.is_ajax|yesno:'nullcont.htm,taskapp/ext.htm' %} {% load i18n %} -{% block content %} +{% block title %}{% trans 'Scheduled tasks me' %}{% endblock %} + +{% block content %}
                                                                      diff --git a/templates/all_base.html b/templates/all_base.html index 8e8351a..b800f4c 100644 --- a/templates/all_base.html +++ b/templates/all_base.html @@ -1,7 +1,7 @@ {% load i18n globaltags static %} - {% global_var 'COMPANY_NAME' %} - {% trans 'Admin side' %} + {% block title %}{% global_var 'COMPANY_NAME' %} - {% trans 'Admin side' %}{% endblock %} diff --git a/templates/base.html b/templates/base.html index c215bdf..4cb2ae0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -122,6 +122,13 @@ {% endif %} + {% url 'new_customers:customers_list' as newclist %} + + + {% trans 'Potential subscribers' %} + + +