diff --git a/abonapp/urls.py b/abonapp/urls.py
index ac1c048..559115f 100644
--- a/abonapp/urls.py
+++ b/abonapp/urls.py
@@ -13,7 +13,6 @@ subscriber_patterns = [
path('addinvoice/', views.add_invoice, name='add_invoice'),
path('pick/', views.pick_tariff, name='pick_tariff'),
path('passport_view/', views.PassportUpdateView.as_view(), name='passport_view'),
- path('dials/', views.DialsListView.as_view(), name='dials'),
# path('reset_ip/', views.reset_ip, name='reset_ip'),
path('unsubscribe_service/
/', views.unsubscribe_service, name='unsubscribe_service'),
path('dev/', views.dev, name='dev'),
diff --git a/abonapp/views.py b/abonapp/views.py
index 2b58da4..55b3b26 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -4,7 +4,6 @@ from typing import Dict, Optional
from abonapp.tasks import customer_nas_command, customer_nas_remove
from agent.commands.dhcp import dhcp_commit, dhcp_expiry, dhcp_release
from devapp.models import Device, Port as DevPort
-from dialing_app.models import AsteriskCDR
from django.conf import settings
from django.contrib import messages
from django.contrib.auth.decorators import login_required
@@ -818,60 +817,6 @@ def vcards(r):
return response
-class DialsListView(LoginRequiredMixin, OnlyAdminsMixin, OrderedFilteredList):
- context_object_name = 'logs'
- template_name = 'abonapp/dial_log.html'
-
- def get_queryset(self):
- abon = get_object_or_404(models.Abon,
- username=self.kwargs.get('uname'))
- if not self.request.user.has_perm('group_app.view_group', abon.group):
- raise PermissionDenied
- self.abon = abon
- if abon.telephone is not None and abon.telephone != '':
- tel = abon.telephone.replace('+', '')
- additional_tels = tuple(
- t.telephone for t in
- models.AdditionalTelephone.objects.filter(
- abon=abon
- ).iterator()
- )
- logs = AsteriskCDR.objects.filter(
- Q(src__contains=tel) | Q(dst__contains=tel) |
- Q(src__in=additional_tels) | Q(dst__in=additional_tels)
- )
- return logs
- else:
- return AsteriskCDR.objects.none()
-
- def get_context_data(self, **kwargs):
- context = super(DialsListView, self).get_context_data(**kwargs)
- context['group'] = get_object_or_404(Group, pk=self.kwargs.get('gid'))
- context['abon'] = self.abon
- return context
-
- def render_to_response(self, context, **response_kwargs):
- if hasattr(self.abon.group, 'pk') and self.abon.group.pk != int(
- self.kwargs.get('gid')):
- return redirect(
- 'abonapp:dials', self.abon.group.pk,
- self.abon.username
- )
- return super(DialsListView, self).render_to_response(
- context,
- **response_kwargs
- )
-
- def get(self, request, *args, **kwargs):
- try:
- return super(DialsListView, self).get(request, *args, **kwargs)
- except ProgrammingError as e:
- messages.error(request, e)
- return redirect('abonapp:abon_home',
- self.kwargs.get('gid'),
- self.kwargs.get('uname'))
-
-
@login_required
@only_admins
@permission_required('abonapp.change_abon')
diff --git a/dialing_app/__init__.py b/dialing_app/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/dialing_app/admin.py b/dialing_app/admin.py
deleted file mode 100644
index 8c38f3f..0000000
--- a/dialing_app/admin.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
diff --git a/dialing_app/apps.py b/dialing_app/apps.py
deleted file mode 100644
index 42a981b..0000000
--- a/dialing_app/apps.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class DialingAppConfig(AppConfig):
- name = 'dialing_app'
diff --git a/dialing_app/forms.py b/dialing_app/forms.py
deleted file mode 100644
index a863bc7..0000000
--- a/dialing_app/forms.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from django import forms
-from .models import SMSOut
-
-
-class SMSOutForm(forms.ModelForm):
- class Meta:
- model = SMSOut
- fields = ('dst', 'text')
diff --git a/dialing_app/locale/ru/LC_MESSAGES/django.po b/dialing_app/locale/ru/LC_MESSAGES/django.po
deleted file mode 100644
index e76d39e..0000000
--- a/dialing_app/locale/ru/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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, 2017.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-09 14:59+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Dmitry Novikov nerosketch@gmail.com\n"
-"Language: \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:9 models.py:44
-msgid "No answer"
-msgstr "Не отвечен"
-
-#: models.py:10 models.py:46 models.py:101
-msgid "Failed"
-msgstr "С ошибкой"
-
-#: models.py:11 models.py:48
-msgid "Busy"
-msgstr "Занято"
-
-#: models.py:12 models.py:50
-msgid "Answered"
-msgstr "Отвечен"
-
-#: models.py:13 models.py:52
-msgid "Unknown"
-msgstr "Не определён"
-
-#: models.py:86 models.py:87
-msgid "SMS"
-msgstr "СМС"
-
-#: models.py:95
-msgid "When"
-msgstr "Когда"
-
-#: models.py:96 templates/index.html:25
-msgid "Telephone"
-msgstr "Телефон"
-
-#: models.py:97
-msgid "Text"
-msgstr "Текст"
-
-#: models.py:99
-msgid "New"
-msgstr "Новое"
-
-#: models.py:100
-msgid "Sent"
-msgstr "Отправленное"
-
-#: models.py:103
-msgid "Status"
-msgstr "Статус"
-
-#: models.py:111 models.py:112
-msgid "Out SMS"
-msgstr "Исходящие СМС"
-
-#: templates/ext.html:8 templates/ext.html:25 views.py:45
-msgid "Last calls"
-msgstr "Последние звонки"
-
-#: templates/ext.html:32 views.py:74
-msgid "Voice mail request"
-msgstr "Заявки на подключение"
-
-#: templates/ext.html:39 views.py:83
-msgid "Voice mail report"
-msgstr "Заявки на поломки"
-
-#: templates/ext.html:46 templates/inbox_sms.html:7
-msgid "Inbox sms"
-msgstr "Входящие смс"
-
-#: templates/inbox_sms.html:23
-msgid "Message history is empty"
-msgstr "История сообщений пуста"
-
-#: templates/inbox_sms.html:31 templates/modal_send_sms.html:5
-msgid "Send sms"
-msgstr "Отправить смс"
-
-#: templates/index.html:9 templates/vmail.html:10
-msgid "Play"
-msgstr "Слушать"
-
-#: templates/index.html:10 templates/index.html:36 templates/vmail.html:11
-msgid "calldate"
-msgstr "дата звонка"
-
-#: templates/index.html:11 templates/vmail.html:12
-msgid "src"
-msgstr "кто"
-
-#: templates/index.html:12
-msgid "dst"
-msgstr "куда"
-
-#: templates/index.html:13 templates/vmail.html:13
-msgid "duration"
-msgstr "продолжительность"
-
-#: templates/index.html:14 templates/vmail.html:14
-msgid "start"
-msgstr "начало"
-
-#: templates/index.html:15 templates/vmail.html:15
-msgid "answer"
-msgstr "ответ"
-
-#: templates/index.html:16 templates/vmail.html:16
-msgid "end"
-msgstr "конец"
-
-#: templates/index.html:17 templates/vmail.html:17
-msgid "disposition"
-msgstr "состояние"
-
-#: templates/index.html:23 views.py:94
-msgid "Find dials"
-msgstr "Найти звонки"
-
-#: templates/index.html:34
-msgid "Find by dates"
-msgstr "Найти по дате"
-
-#: templates/index.html:64
-msgid "Download"
-msgstr "Скачать"
-
-#: templates/index.html:80 templates/vmail.html:42
-msgid "Calls was not found"
-msgstr "Звонки не найдены"
-
-#: templates/modal_send_sms.html:19
-msgid "Send"
-msgstr "Отправить"
-
-#: views.py:55
-msgid "Multiple users with the telephone number"
-msgstr "Несколько абонентов с указанным номером телефона"
-
-#: views.py:57
-msgid "User with the telephone number not found"
-msgstr "Абонент с таким номером телефона не найден"
-
-#: views.py:114
-msgid "Make sure that your date format is correct"
-msgstr "Убедитесь что формат времени корректен"
-
-#: views.py:138
-msgid "Message was enqueued for sending"
-msgstr "Сообщение было поставлено в очередь для отправки"
-
-#: views.py:151
-msgid "fix form errors"
-msgstr "Некоторые поля заполнены не правильно, проверте ещё раз"
diff --git a/dialing_app/migrations/0001_initial.py b/dialing_app/migrations/0001_initial.py
deleted file mode 100644
index a5c814a..0000000
--- a/dialing_app/migrations/0001_initial.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2018-02-26 00:20
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- initial = True
-
- dependencies = [
- ]
-
- operations = [
- migrations.CreateModel(
- name='AsteriskCDR',
- fields=[
- ('calldate', models.DateTimeField(default='0000-00-00 00:00:00', primary_key=True, serialize=False)),
- ('clid', models.CharField(default='', max_length=80)),
- ('src', models.CharField(default='', max_length=80)),
- ('dst', models.CharField(default='', max_length=80)),
- ('dcontext', models.CharField(default='', max_length=80)),
- ('channel', models.CharField(default='', max_length=80)),
- ('dstchannel', models.CharField(default='', max_length=80)),
- ('lastapp', models.CharField(default='', max_length=80)),
- ('lastdata', models.CharField(default='', max_length=80)),
- ('duration', models.IntegerField(default=0)),
- ('billsec', models.IntegerField(default=0)),
- ('start', models.DateTimeField(blank=True, default=None, null=True)),
- ('answer', models.DateTimeField(blank=True, default=None, null=True)),
- ('end', models.DateTimeField(blank=True, default=None, null=True)),
- ('disposition', models.CharField(
- choices=[('NO ANSWER', 'No answer'), ('FAILED', 'Failed'), ('BUSY', 'Busy'),
- ('ANSWERED', 'Answered'), ('UNKNOWN', 'Unknown')], default='', max_length=45)),
- ('amaflags', models.IntegerField(default=0)),
- ('accountcode', models.CharField(default='', max_length=20)),
- ('userfield', models.CharField(default='', max_length=255)),
- ('uniqueid', models.CharField(default='', max_length=32)),
- ],
- options={
- 'db_table': 'cdr',
- 'ordering': ['-calldate'],
- 'managed': False,
- },
- ),
- migrations.CreateModel(
- name='SMSModel',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('when', models.DateTimeField(auto_now_add=True)),
- ('who', models.CharField(max_length=32)),
- ('dev', models.CharField(max_length=20)),
- ('text', models.CharField(max_length=255)),
- ],
- options={
- 'verbose_name': 'SMS',
- 'verbose_name_plural': 'SMS',
- 'db_table': 'sms',
- 'ordering': ['-when'],
- 'permissions': (('can_view_sms', 'Can view sms'),),
- },
- ),
- migrations.CreateModel(
- name='SMSOut',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('when', models.DateTimeField(auto_now_add=True, verbose_name='When')),
- ('dst', models.CharField(max_length=16, verbose_name='Telephone')),
- ('text', models.CharField(max_length=255, verbose_name='Text')),
- ('status',
- models.CharField(choices=[('nw', 'New'), ('st', 'Sent'), ('fd', 'Failed')], default='nw', max_length=2,
- verbose_name='Status')),
- ],
- options={
- 'verbose_name': 'Out SMS',
- 'verbose_name_plural': 'Out SMS',
- 'db_table': 'out_sms',
- 'permissions': (('can_view_sms', 'Can view sms'), ('can_send_sms', 'Can send sms')),
- },
- ),
- ]
diff --git a/dialing_app/migrations/0002_auto_20180808_1236.py b/dialing_app/migrations/0002_auto_20180808_1236.py
deleted file mode 100644
index 3de30c6..0000000
--- a/dialing_app/migrations/0002_auto_20180808_1236.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2018-08-08 12:36
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('dialing_app', '0001_initial'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='asteriskcdr',
- options={'managed': False, 'ordering': ('-calldate',)},
- ),
- migrations.AlterModelOptions(
- name='smsmodel',
- options={'ordering': ('-when',), 'permissions': (('can_view_sms', 'Can view sms'),), 'verbose_name': 'SMS', 'verbose_name_plural': 'SMS'},
- ),
- migrations.AlterModelOptions(
- name='smsout',
- options={'ordering': ('-when',), 'permissions': (('can_view_sms', 'Can view sms'), ('can_send_sms', 'Can send sms')), 'verbose_name': 'Out SMS', 'verbose_name_plural': 'Out SMS'},
- ),
- ]
diff --git a/dialing_app/migrations/__init__.py b/dialing_app/migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/dialing_app/models.py b/dialing_app/models.py
deleted file mode 100644
index 2ece5e5..0000000
--- a/dialing_app/models.py
+++ /dev/null
@@ -1,109 +0,0 @@
-from django.db import models
-from datetime import datetime
-from django.utils.translation import gettext_lazy as _
-from django.conf import settings
-
-
-class AsteriskCDR(models.Model):
- DISPOSITION_CHOICES = (
- ('NO ANSWER', _('No answer')),
- ('FAILED', _('Failed')),
- ('BUSY', _('Busy')),
- ('ANSWERED', _('Answered')),
- ('UNKNOWN', _('Unknown'))
- )
- calldate = models.DateTimeField(default='0000-00-00 00:00:00', primary_key=True)
- clid = models.CharField(max_length=80, default='')
- src = models.CharField(max_length=80, default='')
- dst = models.CharField(max_length=80, default='')
- dcontext = models.CharField(max_length=80, default='')
- channel = models.CharField(max_length=80, default='')
- dstchannel = models.CharField(max_length=80, default='')
- lastapp = models.CharField(max_length=80, default='')
- lastdata = models.CharField(max_length=80, default='')
- duration = models.IntegerField(default=0)
- billsec = models.IntegerField(default=0)
- start = models.DateTimeField(null=True, blank=True, default=None)
- answer = models.DateTimeField(null=True, blank=True, default=None)
- end = models.DateTimeField(null=True, blank=True, default=None)
- disposition = models.CharField(max_length=45, choices=DISPOSITION_CHOICES, default='')
- amaflags = models.IntegerField(default=0)
- accountcode = models.CharField(max_length=20, default='')
- userfield = models.CharField(max_length=255, default='')
- uniqueid = models.CharField(max_length=32, default='')
-
- def save(self, *args, **kwargs):
- return
-
- def delete(self, *args, **kwargs):
- return
-
- def locate_disposition(self):
- dsp = self.disposition
- if dsp == 'NO ANSWER':
- return _('No answer')
- elif dsp == 'FAILED':
- return _('Failed')
- elif dsp == 'BUSY':
- return _('Busy')
- elif dsp == 'ANSWERED':
- return _('Answered')
- elif dsp == 'UNKNOWN':
- return _('Unknown')
- return ''
-
- def path_to_media(self):
- path = getattr(settings, 'DIALING_MEDIA', '/media')
- if self.userfield == 'request':
- return "%s/recording/request" % path
- elif self.userfield == 'report':
- return "%s/recording/bug" % path
- return "%s/monitor" % path
-
- def url(self):
- if type(self.calldate) is datetime:
- return "%s/%s-%s-%s.wav" % (
- self.path_to_media(), self.calldate.strftime('%Y/%m/%d/%H_%M'), self.src, self.dst
- )
-
- class Meta:
- db_table = 'cdr'
- managed = False
- ordering = ('-calldate',)
-
-
-class SMSModel(models.Model):
- when = models.DateTimeField(auto_now_add=True)
- who = models.CharField(max_length=32)
- dev = models.CharField(max_length=20)
- text = models.CharField(max_length=255)
-
- class Meta:
- db_table = 'sms'
- verbose_name = _('SMS')
- verbose_name_plural = _('SMS')
- ordering = ('-when',)
-
- def __str__(self):
- return self.text
-
-
-class SMSOut(models.Model):
- when = models.DateTimeField(_('When'), auto_now_add=True)
- dst = models.CharField(_('Telephone'), max_length=16)
- text = models.CharField(_('Text'), max_length=255)
- SMS_OUT_STATUS = (
- ('nw', _('New')),
- ('st', _('Sent')),
- ('fd', _('Failed'))
- )
- status = models.CharField(_('Status'), max_length=2, choices=SMS_OUT_STATUS, default='nw')
-
- class Meta:
- db_table = 'out_sms'
- verbose_name = _('Out SMS')
- verbose_name_plural = _('Out SMS')
- ordering = ('-when',)
-
- def __str__(self):
- return self.text
diff --git a/dialing_app/templates/ext.html b/dialing_app/templates/ext.html
deleted file mode 100644
index e635502..0000000
--- a/dialing_app/templates/ext.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-{% load i18n %}
-
-
-{% block breadcrumb %}
-
- - {% trans 'Last calls' %}
-
-{% endblock %}
-
-
-{% block page-header %}
- {{ title }}
-{% endblock %}
-
-
-{% block main %}
-
-
-
-
-
- {% block content %}{% endblock %}
-
-
-
-
{% trans 'Inbox sms' %}
-
-
-
-
-
-
-
- | {% trans 'Play' %} |
- {% trans 'calldate' %} |
- {% trans 'src' %} |
- {% trans 'dst' %} |
- {% trans 'duration' %} |
- {% trans 'start' %} |
- {% trans 'answer' %} |
- {% trans 'end' %} |
- {% trans 'disposition' %} |
-
-
- |
-
- |
-
-
-
- {% for log in logs %}
-
- {% with lurl=log.url %}
- |
-
-
-
-
- |
- {{ log.calldate|date:'d M, H:i:s' }} |
- {{ log.src|abon_if_telephone|safe }} |
- {{ log.dst|abon_if_telephone|safe }} |
- {{ log.duration }} |
- {{ log.start|date:'d M, H:i:s' }} |
- {{ log.answer|date:'d M, H:i:s' }} |
- {{ log.end|date:'d M, H:i:s' }} |
- {{ log.locate_disposition }} |
- {% endwith %}
-
- {% empty %}
-
- | {% trans 'Calls was not found' %} |
-
- {% endfor %}
-
-
-
-
-
-
- | {% trans 'Play' %} |
- {% trans 'calldate' %} |
- {% trans 'src' %} |
- {% trans 'duration' %} |
- {% trans 'start' %} |
- {% trans 'answer' %} |
- {% trans 'end' %} |
- {% trans 'disposition' %} |
-
-
-
- {% for vmail in vmessages %}
-
- |
-
-
-
-
- |
- {{ vmail.calldate|date:'d E Y, H:i:s' }} |
- {{ vmail.src|abon_if_telephone|safe }} |
- {{ vmail.duration }} |
- {{ vmail.start|date:'d E Y, H:i:s' }} |
- {{ vmail.answer|date:'d E Y, H:i:s' }} |
- {{ vmail.end|date:'d E Y, H:i:s' }} |
- {{ vmail.locate_disposition }} |
-
- {% empty %}
-
- | {% trans 'Calls was not found' %} |
-
- {% endfor %}
-
-
-