+
@@ -76,7 +77,7 @@
{% trans 'Mac on OLT' %}: {{ onu_details.mac }}
-
+
{% trans 'Fix it' %}
diff --git a/devapp/templates/devapp/custom_dev_page/onu_for_zte.html b/devapp/templates/devapp/custom_dev_page/onu_for_zte.html
new file mode 100644
index 0000000..49317c6
--- /dev/null
+++ b/devapp/templates/devapp/custom_dev_page/onu_for_zte.html
@@ -0,0 +1,91 @@
+{% extends request.is_ajax|yesno:'nullcont.htm,devapp/ext.htm' %}
+{% load i18n %}
+{% block content %}
+
+{% with uptime=dev_manager.uptime onu_details=dev_manager.get_details %}
+
+
+
+
+
{{ dev.get_devtype_display|default:_('Title of the type of switch') }}.
+ {% if uptime %}
+ {% trans 'Uptime' %} {{ uptime }}
+ {% endif %}
+
+
+
+
+ - {% trans 'Ip address' %}: {{ dev.ip_address|default:'-' }}
+ - {% trans 'Mac' %}: {{ dev.mac_addr }}
+ - {% trans 'Description' %}: {{ dev.comment }}
+ {% for da in dev_accs %}
+ - {% trans 'Attached user' %}:
+ {% if da.group %}
+ {{ da.get_full_name }}
+ {% else %}
+ {{ da.get_full_name }}
+ {% endif %}
+
+ {% endfor %}
+ {% if dev.parent_dev %}
+ -
+ {% with pdev=dev.parent_dev pdgrp=dev.parent_dev.group %}
+ {% trans 'Parent device' %}:
+
+ {{ pdev.ip_address|default:'-' }} {{ pdev.comment }}
+
+ {% endwith %}
+
+ {% endif %}
+
+
+
+
+
+
+
+
{% trans 'ONU Status' %}
+
+
+
+ {% if onu_details %}
+ {% if onu_details.err %}
+
+
+ {% trans 'ONU error' %}: {{ onu_details.err }}
+
+ {% else %}
+
+ {% endif %}
+ {% else %}
+
{% trans 'Info does not fetch' %}
+ {% endif %}
+
+
+
+
{% bootstrap_icon 'list-alt' as ic %}
- {% bootstrap_field form.snmp_item_num addon_before=ic %}
+ {% bootstrap_field form.snmp_extra addon_before=ic %}
{% bootstrap_field form.is_noticeable %}
@@ -61,7 +61,7 @@
{% trans 'Save' %}
{% if perms.devapp.delete_device %}
-
+
{% trans 'Delete' %}
{% else %}
diff --git a/devapp/templates/devapp/device_confirm_delete.html b/devapp/templates/devapp/device_confirm_delete.html
new file mode 100644
index 0000000..961d650
--- /dev/null
+++ b/devapp/templates/devapp/device_confirm_delete.html
@@ -0,0 +1,14 @@
+{% extends 'base_delete_modal.html' %}
+{% load i18n %}
+
+{% block modal_form_url %}
+ {% url 'devapp:del' object.group.pk object.pk %}
+{% endblock %}
+
+{% block modal_form_title %}
+ {% trans 'Remove device' %}
+{% endblock %}
+
+{% block modal_form_text %}
+
{% trans 'Are you sure you want to delete device?' %}
+{% endblock %}
diff --git a/devapp/templates/devapp/devices.html b/devapp/templates/devapp/devices.html
index 4636d8b..8e75e2a 100644
--- a/devapp/templates/devapp/devices.html
+++ b/devapp/templates/devapp/devices.html
@@ -30,7 +30,6 @@
{% if order_by == 'comment' %}
{% endif %}
{% trans 'Mac address' %} |
- {#
{% trans 'Plugin output' %} | #}
{% trans 'Device type' %}
@@ -61,11 +60,10 @@
| {{ dev.ip_address }} |
{{ dev.comment }} |
{{ dev.mac_addr|default:_('Not assigned') }} |
- {#
{{ dev.mon.plugin_output|default:'–' }} | #}
{{ dev.get_devtype_display }} |
{% if can_del_dev %}
-
+
{% endif %}
diff --git a/devapp/templates/devapp/devices_null_group.html b/devapp/templates/devapp/devices_null_group.html
index cea6acb..3eeaaf0 100644
--- a/devapp/templates/devapp/devices_null_group.html
+++ b/devapp/templates/devapp/devices_null_group.html
@@ -46,12 +46,12 @@
| {{ dev.get_devtype_display }} |
{% if can_del_dev %}
-
+
{% endif %}
{% if can_change_dev %}
-
+
{% endif %}
diff --git a/devapp/urls.py b/devapp/urls.py
index 9731624..fdbf696 100644
--- a/devapp/urls.py
+++ b/devapp/urls.py
@@ -10,7 +10,7 @@ urlpatterns = [
url(r'^(?P\d+)$', views.DevicesListView.as_view(), name='devs'),
url(r'^(?P\d+)/add$', views.dev, name='add'),
url(r'^(\d+)/(?P\d+)$', views.devview, name='view'),
- url(r'^(\d+)/(?P\d+)/del$', views.devdel, name='del'),
+ url(r'^(\d+)/(?P\d+)/del$', views.DeviceVeleteView.as_view(), name='del'),
url(r'^(?P\d+)/(?P\d+)/add$', views.add_single_port, name='add_port'),
url(r'^(?P\d+)/(?P\d+)/edit$', views.dev, name='edit'),
url(r'^(\d+)/(?P\d+)/ports$', views.manage_ports, name='manage_ports'),
diff --git a/devapp/views.py b/devapp/views.py
index 44afebb..13caf28 100644
--- a/devapp/views.py
+++ b/devapp/views.py
@@ -11,10 +11,11 @@ from django.contrib import messages
from django.utils.decorators import method_decorator
from django.utils.translation import gettext_lazy as _, gettext
from easysnmp import EasySNMPTimeoutError, EasySNMPError
-from django.views.generic import DetailView
+from django.views.generic import DetailView, DeleteView
from devapp.base_intr import DeviceImplementationError
-from mydefs import res_success, res_error, only_admins, safe_int
+from djing.lib.decorators import only_admins
+from djing.lib import safe_int
from abonapp.models import Abon
from group_app.models import Group
from accounts_app.models import UserProfile
@@ -68,19 +69,23 @@ class DevicesWithoutGroupsListView(global_base_views.OrderingMixin, BaseDeviceLi
queryset = Device.objects.filter(group=None).only('comment', 'devtype', 'pk', 'ip_address')
-@login_required
-@permission_required('devapp.delete_device')
-def devdel(request, device_id):
- try:
- device_instance = Device.objects.get(pk=device_id)
- back_url = resolve_url('devapp:devs', group_id=device_instance.group.pk if device_instance.group else 0)
- device_instance.update_dhcp(remove=True)
- device_instance.delete()
- return res_success(request, back_url)
- except Device.DoesNotExist:
- return res_error(request, _('Delete failed'))
- except DeviceDBException as e:
- return res_error(request, e)
+@method_decorator(login_required, name='dispatch')
+@method_decorator(permission_required('devapp.delete_device'), name='dispatch')
+class DeviceVeleteView(DeleteView):
+ model = Device
+ pk_url_kwarg = 'device_id'
+
+ def get_success_url(self):
+ return resolve_url('devapp:devs', group_id=self.object.group.pk if self.object.group else 0)
+
+ def delete(self, request, *args, **kwargs):
+ res = super().delete(request, *args, **kwargs)
+ try:
+ self.object.update_dhcp(remove=True)
+ except DeviceDBException as e:
+ messages.error(request, e)
+ messages.success(request, _('Device successfully deleted'))
+ return res
@login_required
@@ -137,7 +142,7 @@ def dev(request, group_id, device_id=0):
'comment': request.GET.get('c'),
'ip_address': request.GET.get('ip'),
'man_passw': getattr(settings, 'DEFAULT_SNMP_PASSWORD', ''),
- 'snmp_item_num': request.GET.get('n') or 0
+ 'snmp_extra': request.GET.get('n') or ''
})
else:
frm = DeviceForm(instance=devinst)
@@ -505,8 +510,8 @@ def fix_onu(request):
# convert bytes mac address to str presentation mac address
real_mac = ':'.join('%x' % ord(i) for i in srcmac)
if mac == real_mac:
- onu.snmp_item_num = snmpnum
- onu.save(update_fields=('snmp_item_num',))
+ onu.snmp_extra = str(snmpnum)
+ onu.save(update_fields=('snmp_extra',))
status = 0
text = ' %s' % _('Fixed')
break
@@ -619,11 +624,11 @@ class NagiosObjectsConfView(global_base_views.AuthenticatedOrHashAuthView):
if device.devtype == 'On':
if device.parent_dev:
host_addr = device.parent_dev.ip_address
- conf = self.templ_onu(host_name, host_addr, mac=mac_addr, snmp_item=device.snmp_item_num or None)
+ conf = self.templ_onu(host_name, host_addr, mac=mac_addr, snmp_item=device.snmp_extra or None)
else:
if device.ip_address:
host_addr = device.ip_address
- conf = self.templ_onu(host_name, host_addr, mac=mac_addr, snmp_item=device.snmp_item_num or None)
+ conf = self.templ_onu(host_name, host_addr, mac=mac_addr, snmp_item=device.snmp_extra or None)
else:
parent_host_name = norm_name("%d%s" % (
device.parent_dev.pk, translit(device.parent_dev.comment, language_code='ru', reversed=True)
@@ -651,7 +656,7 @@ class NagiosObjectsConfView(global_base_views.AuthenticatedOrHashAuthView):
return '\n'.join(i for i in r if i)
@staticmethod
- def templ_onu(host_name: str, host_addr: str, mac: Optional[str], snmp_item: int):
+ def templ_onu(host_name: str, host_addr: str, mac: Optional[str], snmp_item: str):
if not host_addr:
return
r = (
@@ -659,7 +664,7 @@ class NagiosObjectsConfView(global_base_views.AuthenticatedOrHashAuthView):
"\tuse device-onu",
"\thost_name %s" % host_name,
"\taddress %s" % host_addr,
- "\t_snmp_item %d" % snmp_item if snmp_item is not None else '',
+ "\t_snmp_item %s" % snmp_item if snmp_item is not None else '',
"\t_mac_addr %s" % mac if mac is not None else '',
"}\n"
)
diff --git a/dialing.py b/dialing.py
index ab636f7..e8b5a4c 100755
--- a/dialing.py
+++ b/dialing.py
@@ -9,7 +9,7 @@ from urllib.error import HTTPError
from hashlib import sha256
from pid.decorator import pidfile
-from messaging.sms import SmsSubmit, SmsDeliver
+from djing.lib.messaging.sms import SmsSubmit, SmsDeliver
from asterisk import manager as ast_mngr
diff --git a/dialing_app/views.py b/dialing_app/views.py
index ce5c203..9c221bd 100644
--- a/dialing_app/views.py
+++ b/dialing_app/views.py
@@ -16,7 +16,8 @@ from jsonview.decorators import json_view
from abonapp.models import Abon
from djing.global_base_views import SecureApiView
from djing import JSONType
-from mydefs import only_admins, safe_int
+from djing.lib import safe_int
+from djing.lib.decorators import only_admins
from .models import AsteriskCDR, SMSModel, SMSOut
from .forms import SMSOutForm
diff --git a/mydefs.py b/djing/lib/__init__.py
similarity index 67%
rename from mydefs.py
rename to djing/lib/__init__.py
index d885fa0..d358041 100644
--- a/mydefs.py
+++ b/djing/lib/__init__.py
@@ -1,16 +1,9 @@
-# -*- coding: utf-8 -*-
-from datetime import timedelta
-from json import dumps
import socket
import struct
+from abc import ABCMeta
+from datetime import timedelta
from collections import Iterator
-from functools import wraps
-from django.http import HttpResponse, Http404, HttpResponseRedirect
-from django.shortcuts import redirect
from django.db import models
-from django.conf import settings
-
-DEBUG = getattr(settings, 'DEBUG', False)
def ip2int(addr):
@@ -41,20 +34,6 @@ def safe_int(i):
return 0
-def res_success(request, redirect_to='/'):
- if request.is_ajax():
- return HttpResponse(dumps({'errnum': 0}))
- else:
- return redirect(redirect_to)
-
-
-def res_error(request, text):
- if request.is_ajax():
- return HttpResponse(dumps({'errnum': 1, 'errtext': text}))
- else:
- raise Http404(text)
-
-
class MyGenericIPAddressField(models.GenericIPAddressField):
description = "Int32 notation ip address"
@@ -105,19 +84,7 @@ class MyChoicesAdapter(Iterator):
return res
-# Декоратор проверяет аккаунт, чтоб не пускать клиентов в страницы администрации
-def only_admins(fn):
- @wraps(fn)
- def wrapped(request, *args, **kwargs):
- if request.user.is_admin:
- return fn(request, *args, **kwargs)
- else:
- return redirect('client_side:home')
-
- return wrapped
-
-
-# Русифицированный вывод timedelta
+# Russian localized timedelta
class RuTimedelta(timedelta):
def __new__(cls, tm):
if isinstance(tm, timedelta):
@@ -148,23 +115,6 @@ class RuTimedelta(timedelta):
return text_date
-def require_ssl(view):
- """
- Decorator that requires an SSL connection. If the current connection is not SSL, we redirect to the SSL version of
- the page.
- from: https://gist.github.com/ckinsey/9709984
- """
-
- @wraps(view)
- def wrapper(request, *args, **kwargs):
- if not DEBUG and not request.is_secure():
- target_url = "https://" + request.META['HTTP_HOST'] + request.path_info
- return HttpResponseRedirect(target_url)
- return view(request, *args, **kwargs)
-
- return wrapper
-
-
class MultipleException(Exception):
def __init__(self, err_list):
if not isinstance(err_list, (list, tuple)):
@@ -176,12 +126,10 @@ class LogicError(Exception):
pass
-def singleton(class_):
- instances = {}
-
- def getinstance(*args, **kwargs):
- if class_ not in instances:
- instances[class_] = class_(*args, **kwargs)
- return instances[class_]
+class Singleton(type):
+ _instances = {}
- return getinstance
+ def __call__(cls, *args, **kwargs):
+ if cls not in cls._instances:
+ cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
+ return cls._instances[cls]
diff --git a/djing/auth_backends.py b/djing/lib/auth_backends.py
similarity index 100%
rename from djing/auth_backends.py
rename to djing/lib/auth_backends.py
diff --git a/djing/lib/decorators.py b/djing/lib/decorators.py
new file mode 100644
index 0000000..9be54a5
--- /dev/null
+++ b/djing/lib/decorators.py
@@ -0,0 +1,35 @@
+from functools import wraps
+from django.conf import settings
+from django.http import HttpResponseRedirect
+from django.shortcuts import redirect
+
+
+DEBUG = getattr(settings, 'DEBUG', False)
+
+
+def require_ssl(view):
+ """
+ Decorator that requires an SSL connection. If the current connection is not SSL, we redirect to the SSL version of
+ the page.
+ from: https://gist.github.com/ckinsey/9709984
+ """
+
+ @wraps(view)
+ def wrapper(request, *args, **kwargs):
+ if not DEBUG and not request.is_secure():
+ target_url = "https://" + request.META['HTTP_HOST'] + request.path_info
+ return HttpResponseRedirect(target_url)
+ return view(request, *args, **kwargs)
+
+ return wrapper
+
+
+# Allow to view only admins
+def only_admins(fn):
+ @wraps(fn)
+ def wrapped(request, *args, **kwargs):
+ if request.user.is_admin:
+ return fn(request, *args, **kwargs)
+ else:
+ return redirect('client_side:home')
+ return wrapped
diff --git a/messaging/__init__.py b/djing/lib/messaging/__init__.py
similarity index 100%
rename from messaging/__init__.py
rename to djing/lib/messaging/__init__.py
diff --git a/djing/lib/messaging/sms/__init__.py b/djing/lib/messaging/sms/__init__.py
new file mode 100644
index 0000000..0e78d70
--- /dev/null
+++ b/djing/lib/messaging/sms/__init__.py
@@ -0,0 +1,7 @@
+# See LICENSE
+
+from djing.lib.messaging.sms.deliver import SmsDeliver
+from djing.lib.messaging.sms.submit import SmsSubmit
+from djing.lib.messaging.sms.gsm0338 import is_gsm_text
+
+__all__ = ("SmsSubmit", "SmsDeliver", "is_gsm_text")
diff --git a/messaging/sms/base.py b/djing/lib/messaging/sms/base.py
similarity index 100%
rename from messaging/sms/base.py
rename to djing/lib/messaging/sms/base.py
diff --git a/messaging/sms/consts.py b/djing/lib/messaging/sms/consts.py
similarity index 100%
rename from messaging/sms/consts.py
rename to djing/lib/messaging/sms/consts.py
diff --git a/messaging/sms/deliver.py b/djing/lib/messaging/sms/deliver.py
similarity index 96%
rename from messaging/sms/deliver.py
rename to djing/lib/messaging/sms/deliver.py
index 5036e46..1efa925 100644
--- a/messaging/sms/deliver.py
+++ b/djing/lib/messaging/sms/deliver.py
@@ -3,11 +3,11 @@
from datetime import datetime, timedelta
-from messaging.utils import (swap, swap_number, encode_bytes, debug,
- unpack_msg, unpack_msg2, to_array)
-from messaging.sms import consts
-from messaging.sms.base import SmsBase
-from messaging.sms.udh import UserDataHeader
+from djing.lib.messaging.utils import (swap, swap_number, encode_bytes, debug,
+ unpack_msg, unpack_msg2, to_array)
+from djing.lib.messaging.sms import consts
+from djing.lib.messaging.sms.submit import SmsBase
+from djing.lib.messaging.sms.udh import UserDataHeader
class SmsDeliver(SmsBase):
diff --git a/messaging/sms/gsm0338.py b/djing/lib/messaging/sms/gsm0338.py
similarity index 100%
rename from messaging/sms/gsm0338.py
rename to djing/lib/messaging/sms/gsm0338.py
diff --git a/messaging/sms/pdu.py b/djing/lib/messaging/sms/pdu.py
similarity index 100%
rename from messaging/sms/pdu.py
rename to djing/lib/messaging/sms/pdu.py
diff --git a/messaging/sms/submit.py b/djing/lib/messaging/sms/submit.py
similarity index 94%
rename from messaging/sms/submit.py
rename to djing/lib/messaging/sms/submit.py
index f0e9941..1bdb3cd 100644
--- a/messaging/sms/submit.py
+++ b/djing/lib/messaging/sms/submit.py
@@ -4,15 +4,15 @@
from datetime import datetime, timedelta
import re
-from messaging.sms import consts
-from messaging.utils import (debug, encode_str, clean_number,
- pack_8bits_to_ucs2, pack_8bits_to_7bits,
- pack_8bits_to_8bit,
- timedelta_to_relative_validity,
- datetime_to_absolute_validity)
-from messaging.sms.base import SmsBase
-from messaging.sms.gsm0338 import is_gsm_text
-from messaging.sms.pdu import Pdu
+from djing.lib.messaging.sms import consts
+from djing.lib.messaging.utils import (debug, encode_str, clean_number,
+ pack_8bits_to_ucs2, pack_8bits_to_7bits,
+ pack_8bits_to_8bit,
+ timedelta_to_relative_validity,
+ datetime_to_absolute_validity)
+from djing.lib.messaging.sms.base import SmsBase
+from djing.lib.messaging.sms.gsm0338 import is_gsm_text
+from djing.lib.messaging.sms.pdu import Pdu
VALID_NUMBER = re.compile("^\+?\d{3,20}$")
diff --git a/messaging/sms/udh.py b/djing/lib/messaging/sms/udh.py
similarity index 100%
rename from messaging/sms/udh.py
rename to djing/lib/messaging/sms/udh.py
diff --git a/messaging/sms/wap.py b/djing/lib/messaging/sms/wap.py
similarity index 95%
rename from messaging/sms/wap.py
rename to djing/lib/messaging/sms/wap.py
index 46611ab..859c952 100644
--- a/messaging/sms/wap.py
+++ b/djing/lib/messaging/sms/wap.py
@@ -2,7 +2,7 @@
from array import array
-from messaging.mms.mms_pdu import MMSDecoder
+from djing.lib.messaging import MMSDecoder
def is_a_wap_push_notification(s):
diff --git a/messaging/utils.py b/djing/lib/messaging/utils.py
similarity index 100%
rename from messaging/utils.py
rename to djing/lib/messaging/utils.py
diff --git a/djing/lib/tln/__init__.py b/djing/lib/tln/__init__.py
new file mode 100644
index 0000000..5f19e0c
--- /dev/null
+++ b/djing/lib/tln/__init__.py
@@ -0,0 +1,4 @@
+from .tln import *
+
+__all__ = ('TelnetApi', 'ValidationError', 'ZTEFiberNumberNotFound', 'ZTEFiberIsFull',
+ 'OnuZteRegisterError', 'ZteOltConsoleError', 'register_onu_ZTE_F660')
diff --git a/djing/lib/tln/tln.py b/djing/lib/tln/tln.py
new file mode 100755
index 0000000..fa52217
--- /dev/null
+++ b/djing/lib/tln/tln.py
@@ -0,0 +1,266 @@
+#!/usr/bin/env python3
+import re
+import struct
+from telnetlib import Telnet
+from time import sleep
+from typing import Generator, Dict, Optional, Tuple
+
+
+class ZteOltConsoleError(Exception):
+ pass
+
+
+class OnuZteRegisterError(ZteOltConsoleError):
+ pass
+
+
+class ZTEFiberIsFull(ZteOltConsoleError):
+ pass
+
+
+class ZTEFiberNumberNotFound(ZteOltConsoleError):
+ pass
+
+
+class ValidationError(ValueError):
+ pass
+
+
+MAC_ADDR_REGEX = b'^([0-9A-Fa-f]{1,2}[:-]){5}([0-9A-Fa-f]{1,2})$'
+IP_ADDR_REGEX = '^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' \
+ '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' \
+ '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' \
+ '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$'
+ONU_SN_REGEX = b'^ZTEG[A-F\d]{8}$'
+
+
+class TelnetApi(Telnet):
+ config_level = []
+
+ def __init__(self, *args, **kwargs):
+ timeout = kwargs.get('timeout')
+ if timeout:
+ self._timeout = timeout
+ self._prompt_string = b'ZTE-C320-PKP#'
+ super().__init__(*args, **kwargs)
+
+ def write(self, buffer: bytes) -> None:
+ buffer = buffer + b'\n'
+ print('>>', buffer)
+ super().write(buffer)
+
+ def resize_screen(self, width: int, height: int):
+ naws_cmd = struct.pack('>BBBHHBB',
+ 255, 250, 31, # IAC SB NAWS
+ width, height,
+ 255, 240 # IAC SE
+ )
+ sock = self.get_socket()
+ sock.send(naws_cmd)
+
+ def enter(self, username: bytes, passw: bytes) -> None:
+ self.read_until(b'Username:')
+ self.write(username)
+ self.read_until(b'Password:')
+ self.write(passw)
+
+ def read_lines(self) -> Generator:
+ while True:
+ line = self.read_until(b'\r\n', timeout=self._timeout)
+ line = line.replace(b'\r\n', b'')
+ if self._prompt_string == line:
+ break
+ if line == b'':
+ continue
+ yield line
+
+ def command_to(self, cmd: bytes) -> Generator:
+ self.write(cmd)
+ return self.read_lines()
+
+ def set_prompt_string(self, prompt_string: bytes) -> None:
+ self.config_level.append(prompt_string)
+ self._prompt_string = prompt_string
+
+ def level_exit(self) -> Optional[Tuple]:
+ if len(self.config_level) < 2:
+ print('We are in root')
+ return
+ self.config_level.pop()
+ self.set_prompt_string(self.config_level[-1])
+ return tuple(self.command_to(b'exit'))
+
+ def __del__(self):
+ if self.sock:
+ self.write(b'exit')
+ super().__del__()
+
+
+def parse_onu_name(onu_name: bytes, name_regexp=re.compile(b'[/:_]')) -> Dict[str, bytes]:
+ gpon_onu, stack_num, rack_num, fiber_num, onu_num = name_regexp.split(onu_name)
+ return {
+ 'stack_num': stack_num,
+ 'rack_num': rack_num,
+ 'fiber_num': fiber_num,
+ 'onu_num': onu_num
+ }
+
+
+class OltZTERegister(TelnetApi):
+
+ def __init__(self, screen_size: Tuple[int, int], *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.resize_screen(*screen_size)
+
+ def get_unregistered_onu(self, sn: bytes) -> Optional[Dict]:
+ lines = tuple(self.command_to(b'show gpon onu uncfg'))
+ if len(lines) > 3:
+ # devices available
+ # find onu by sn
+ line = tuple(ln for ln in lines if sn.lower() in ln.lower())
+ if len(line) > 0:
+ line = line[0]
+ onu_name, onu_sn, onu_state = line.split()
+ onu_numbers = parse_onu_name(onu_name)
+ onu_numbers.update({
+ 'onu_name': onu_name,
+ 'onu_sn': onu_sn,
+ 'onu_state': onu_state
+ })
+ return onu_numbers
+
+ def get_last_registered_onu_number(self, stack_num: int, rack_num: int, fiber_num: int) -> int:
+ registered_lines = self.command_to(b'show run int gpon-olt_%d/%d/%d' % (
+ stack_num,
+ rack_num,
+ fiber_num
+ ))
+ onu_type_regexp = re.compile(b'^\s{2}onu \d{1,3} type [-\w\d]{4,64} sn \w{4,64}$')
+ last_onu = 0
+ for rl in registered_lines:
+ if rl == b' --More--':
+ self.write(b' ')
+ if onu_type_regexp.match(rl):
+ _onu, num, _type, onu_type, _sn, onu_sn = rl.split()
+ last_onu = int(num)
+ return last_onu
+
+ def enter_to_config_mode(self) -> bool:
+ prompt = b'ZTE-C320-PKP(config)#'
+ self.set_prompt_string(prompt)
+ res = tuple(self.command_to(b'config terminal'))
+ if res[1].startswith(b'Enter configuration commands'):
+ # ok, we in the config mode
+ return True
+ return False
+
+ def go_to_olt_interface(self, stack_num: int, rack_num: int, fiber_num: int) -> Tuple:
+ self.set_prompt_string(b'ZTE-C320-PKP(config-if)#')
+ return tuple(self.command_to(b'interface gpon-olt_%d/%d/%d' % (
+ stack_num,
+ rack_num,
+ fiber_num
+ )))
+
+ def go_to_onu_interface(self, stack_num: int, rack_num: int, fiber_num: int, onu_port_num: int) -> Tuple:
+ self.set_prompt_string(b'ZTE-C320-PKP(config-if)#')
+ return tuple(self.command_to(b'interface gpon-onu_%d/%d/%d:%d' % (
+ stack_num,
+ rack_num,
+ fiber_num,
+ onu_port_num
+ )))
+
+ def apply_conf_to_onu(self, mac_addr: bytes, vlan_id: int) -> None:
+ tmpl = (
+ b'switchport vlan %d tag vport 1' % vlan_id,
+ b'port-location format flexible-syntax vport 1',
+ b'port-location sub-option remote-id enable vport 1',
+ b'port-location sub-option remote-id name %s vport 1' % mac_addr,
+ b'dhcp-option82 enable vport 1',
+ b'dhcp-option82 trust true replace vport 1',
+ b'ip dhcp snooping enable vport 1'
+ )
+ for conf_line in tmpl:
+ self.write(conf_line)
+
+ def register_onu_on_olt_fiber(self, onu_type: bytes, new_onu_num: int, onu_sn: bytes, line_profile: bytes,
+ remote_profile: bytes) -> Tuple:
+ # ok, we in interface
+ tpl = b'onu %d type %s sn %s' % (new_onu_num, onu_type, onu_sn)
+ r = tuple(self.command_to(tpl))
+ return tuple(self.command_to(b'onu %d profile line %s remote %s' % (
+ new_onu_num,
+ line_profile,
+ remote_profile
+ ))) + r
+
+
+def register_onu_ZTE_F660(olt_ip: str, onu_sn: bytes, login_passwd: Tuple[bytes, bytes], onu_mac: bytes):
+ onu_type = b'ZTE-F660'
+ line_profile = b'ZTE-F660-LINE'
+ remote_profile = b'ZTE-F660-ROUTER'
+ if not re.match(MAC_ADDR_REGEX, onu_mac):
+ raise ValidationError
+ if not re.match(IP_ADDR_REGEX, olt_ip):
+ raise ValidationError
+ if not re.match(ONU_SN_REGEX, onu_sn):
+ raise ValidationError
+
+ tn = OltZTERegister(host=olt_ip, timeout=2, screen_size=(120, 128))
+ tn.enter(*login_passwd)
+
+ unregistered_onu = tn.get_unregistered_onu(onu_sn)
+ if unregistered_onu is None:
+ raise OnuZteRegisterError('unregistered onu not found, sn=%s' % onu_sn.decode('utf-8'))
+
+ stack_num = int(unregistered_onu['stack_num'])
+ rack_num = int(unregistered_onu['rack_num'])
+ fiber_num = int(unregistered_onu['fiber_num'])
+
+ last_onu_number = tn.get_last_registered_onu_number(
+ stack_num, rack_num, fiber_num
+ )
+
+ if last_onu_number < 1:
+ raise ZTEFiberNumberNotFound
+ elif last_onu_number > 126:
+ raise ZTEFiberIsFull('olt fiber %d is full' % fiber_num)
+
+ # enter to config
+ if not tn.enter_to_config_mode():
+ raise ZteOltConsoleError('Failed to enter to config mode')
+
+ # go to olt interface
+ if not tn.go_to_olt_interface(stack_num, rack_num, fiber_num):
+ raise ZteOltConsoleError('Failed to enter in olt fiber port')
+
+ # new onu port number
+ new_onu_port_num = last_onu_number + 1
+
+ # register onu on olt interface
+ r = tn.register_onu_on_olt_fiber(onu_type, new_onu_port_num, onu_sn, line_profile, remote_profile)
+ print(r)
+
+ # exit from olt interface
+ tn.level_exit()
+
+ r = tn.go_to_onu_interface(stack_num, rack_num, fiber_num, new_onu_port_num)
+ print(r)
+
+ tn.apply_conf_to_onu(onu_mac, 145)
+ sleep(1)
+ return
+
+
+if __name__ == '__main__':
+ ip = '10.40.1.10'
+ try:
+ register_onu_ZTE_F660(
+ olt_ip=ip, onu_sn=b'ZTEGC0458DCE', login_passwd=(b'admin', b'2ekc3'),
+ onu_mac=b'cc:7b:35:8b:7:0'
+ )
+ except ZteOltConsoleError as e:
+ print(e)
+ except ConnectionRefusedError:
+ print('ERROR: connection refused', ip)
diff --git a/djing/settings.py b/djing/settings.py
index 4b38677..d73a627 100644
--- a/djing/settings.py
+++ b/djing/settings.py
@@ -25,7 +25,7 @@ ALLOWED_HOSTS = local_settings.ALLOWED_HOSTS
# required for django-guardian
AUTHENTICATION_BACKENDS = (
- 'djing.auth_backends.CustomAuthBackend',
+ 'djing.lib.auth_backends.CustomAuthBackend',
# 'django.contrib.auth.backends.ModelBackend', # default
'guardian.backends.ObjectPermissionBackend'
)
diff --git a/docs/dev.md b/docs/dev.md
index 09d00e4..ce2fff9 100644
--- a/docs/dev.md
+++ b/docs/dev.md
@@ -343,7 +343,7 @@ def check_news(request):
return HttpResponse(dumps(r))
```
-Убедитесь что вашему представлению не будет доступа от абонентов, об этом позаботится декоратор *only_admins* из *mydefs*. *mydefs* лежит в корне проекта.
+Убедитесь что вашему представлению не будет доступа от абонентов, об этом позаботится декоратор *only_admins* из *djing.lib*.
После получения сообщения надо вернуть словарь с параметрами:
diff --git a/group_app/templates/group_app/group_confirm_delete.html b/group_app/templates/group_app/group_confirm_delete.html
index cfa1590..27f9fc9 100644
--- a/group_app/templates/group_app/group_confirm_delete.html
+++ b/group_app/templates/group_app/group_confirm_delete.html
@@ -1,13 +1,14 @@
+{% extends 'base_delete_modal.html' %}
{% load i18n %}
-
+
+{% block modal_form_url %}
+ {% url 'group_app:del' object.pk %}
+{% endblock %}
+
+{% block modal_form_title %}
+ {% trans 'Remove group' %}
+{% endblock %}
+
+{% block modal_form_text %}
+ {% blocktrans %}Are you sure you want to delete group {{ object }}?{% endblocktrans %}
+{% endblock %}
diff --git a/mapapp/views.py b/mapapp/views.py
index f996f42..1b61c28 100644
--- a/mapapp/views.py
+++ b/mapapp/views.py
@@ -14,7 +14,7 @@ from jsonview.decorators import json_view
from group_app.models import Group
from .models import Dot
from .forms import DotForm
-from mydefs import safe_int
+from djing.lib import safe_int
from devapp.models import Device
from guardian.decorators import permission_required
diff --git a/messaging/sms/__init__.py b/messaging/sms/__init__.py
deleted file mode 100644
index f00ad10..0000000
--- a/messaging/sms/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# See LICENSE
-
-from messaging.sms.submit import SmsSubmit
-from messaging.sms.deliver import SmsDeliver
-from messaging.sms.gsm0338 import is_gsm_text
-
-__all__ = ["SmsSubmit", "SmsDeliver", "is_gsm_text"]
diff --git a/migrate_to_0.2.py b/migrate_to_0.2.py
deleted file mode 100755
index a2edee8..0000000
--- a/migrate_to_0.2.py
+++ /dev/null
@@ -1,359 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-import os
-import sys
-import shutil
-from json import dump
-import django
-
-'''
-Some permissions is not migrates, all admins is superuser
-after migrate.
-'''
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djing.settings")
-from django.db.models import fields as django_fields
-
-
-def get_fixture_from_unchanget_model(model_name: str, model_class):
- """
- Создаёт фикстуру если модели между версиями не изменились
- :param model_name: str 'app_label.model_name'
- :param model_class: Model модель для которой надо сделать фикстуру
- :return: список словарей
- """
- print(model_name)
-
- def get_fields(obj):
- fields = dict()
- for field in obj._meta.get_fields():
- if isinstance(field,
- (django_fields.reverse_related.ManyToOneRel, django_fields.reverse_related.ManyToManyRel)):
- continue
- field_val = getattr(obj, field.name)
- if field_val is None:
- continue
- if isinstance(field, django_fields.related.ManyToManyField):
- fields[field.name] = [f.pk for f in field_val.all()]
- elif isinstance(field,
- (django_fields.related.ForeignKey, django.contrib.contenttypes.fields.GenericForeignKey)):
- fields[field.name] = field_val.pk
- elif isinstance(field, django_fields.FloatField):
- fields[field.name] = float(field_val)
- elif isinstance(field, django_fields.DateTimeField):
- fields[field.name] = str(field_val)
- elif isinstance(field, django_fields.AutoField):
- continue
- else:
- fields[field.name] = field_val
- return fields
-
- res = [{
- 'model': model_name,
- 'pk': obj.pk,
- 'fields': get_fields(obj)
- } for obj in model_class.objects.all()]
- return res
-
-
-def dump_groups():
- from abonapp import models
- print('group_app.group')
- res = [{
- 'model': 'group_app.group',
- 'pk': abon_group.pk,
- 'fields': {
- 'title': abon_group.title
- }
- } for abon_group in models.AbonGroup.objects.all()]
- return res
-
-
-def dump_abonapp():
- from abonapp import models
-
- res = get_fixture_from_unchanget_model('abonapp.abontariff', models.AbonTariff)
-
- res += get_fixture_from_unchanget_model('abonapp.abonstreet', models.AbonStreet)
-
- res += get_fixture_from_unchanget_model('abonapp.extrafieldsmodel', models.ExtraFieldsModel)
-
- # res += get_fixture_from_unchanget_model('abonapp.abonlog', models.AbonLog)
-
- print('abonapp.abon')
- res += [{
- 'model': 'abonapp.abon',
- 'pk': abon.pk,
- 'fields': {
- 'current_tariff': abon.current_tariff.pk if abon.current_tariff else None,
- 'group': abon.group.pk if abon.group else None,
- 'ballance': abon.ballance,
- 'ip_address': abon.ip_address,
- 'description': abon.description,
- 'street': abon.street.pk if abon.street else None,
- 'house': abon.house,
- 'extra_fields': [a.pk for a in abon.extra_fields.all()],
- 'device': abon.device.pk if abon.device else None,
- 'dev_port': abon.dev_port if abon.dev_port else None,
- 'is_dynamic_ip': abon.is_dynamic_ip,
- 'markers': abon.markers
- }
- } for abon in models.Abon.objects.filter(is_admin=False)]
-
- res += get_fixture_from_unchanget_model('abonapp.passportinfo', models.PassportInfo)
-
- res += get_fixture_from_unchanget_model('abonapp.invoiceforpayment', models.InvoiceForPayment)
-
- res += get_fixture_from_unchanget_model('abonapp.alltimepaylog', models.AllTimePayLog)
-
- res += get_fixture_from_unchanget_model('abonapp.abonrawpassword', models.AbonRawPassword)
-
- res += get_fixture_from_unchanget_model('abonapp.additionaltelephone', models.AdditionalTelephone)
-
- res += get_fixture_from_unchanget_model('abonapp.periodicpayforid', models.PeriodicPayForId)
-
- return res
-
-
-def dump_tariffs():
- from tariff_app import models
- from abonapp.models import AbonGroup
- print('tariff_app.tariff')
- res = [{
- 'model': 'tariff_app.tariff',
- 'pk': trf.pk,
- 'fields': {
- 'title': trf.title,
- 'descr': trf.descr,
- 'speedIn': trf.speedIn,
- 'speedOut': trf.speedOut,
- 'amount': trf.amount,
- 'calc_type': trf.calc_type,
- 'is_admin': trf.is_admin,
- 'groups': [ag.pk for ag in AbonGroup.objects.filter(tariffs__in=[trf])]
- }
- } for trf in models.Tariff.objects.all()]
-
- res += get_fixture_from_unchanget_model('tariff_app.periodicpay', models.PeriodicPay)
-
- return res
-
-
-def dump_devs():
- from devapp import models
- print('devapp.device')
- res = [{
- 'model': 'devapp.device',
- 'pk': dv.pk,
- 'fields': {
- 'ip_address': dv.ip_address,
- 'mac_addr': str(dv.mac_addr) if dv.mac_addr else None,
- 'comment': dv.comment,
- 'devtype': dv.devtype,
- 'man_passw': dv.man_passw,
- 'group': dv.user_group.pk if dv.user_group else None,
- 'parent_dev': dv.parent_dev.pk if dv.parent_dev else None,
- 'snmp_item_num': dv.snmp_item_num,
- 'status': dv.status,
- 'is_noticeable': dv.is_noticeable
- }
- } for dv in models.Device.objects.all()]
-
- res += get_fixture_from_unchanget_model('devapp.port', models.Port)
- return res
-
-
-def dump_accounts():
- from accounts_app import models
- from abonapp.models import AbonGroup
-
- def get_responsibility_groups(account):
- responsibility_groups = AbonGroup.objects.filter(profiles__in=[account])
- ids = [ag.pk for ag in responsibility_groups]
- return ids
-
- print('accounts_app.baseaccount')
- res = [{
- 'model': 'accounts_app.baseaccount',
- 'pk': up.pk,
- 'fields': {
- 'username': up.username,
- 'fio': up.fio,
- 'birth_day': up.birth_day,
- 'is_active': up.is_active,
- 'is_admin': up.is_admin,
- 'telephone': up.telephone,
- 'password': up.password,
- 'last_login': up.last_login,
- 'is_superuser': up.is_admin
- }
- } for up in models.UserProfile.objects.all()]
-
- print('accounts_app.userprofile')
- res += [{
- 'model': 'accounts_app.userprofile',
- 'pk': up.pk,
- 'fields': {
- 'avatar': up.avatar.pk if up.avatar else None,
- 'email': up.email,
- 'responsibility_groups': get_responsibility_groups(up)
- }
- } for up in models.UserProfile.objects.filter(is_admin=True)]
-
- return res
-
-
-def dump_photos():
- from photo_app.models import Photo
- print('photo_app.photo')
- res = [{
- 'model': 'photo_app.photo',
- 'pk': p.pk,
- 'fields': {
- 'image': "%s" % p.image,
- 'wdth': p.wdth,
- 'heigt': p.heigt
- }
- } for p in Photo.objects.all()]
- return res
-
-
-def dump_chatbot():
- from chatbot import models
- res = get_fixture_from_unchanget_model('chatbot.telegrambot', models.TelegramBot)
- res += get_fixture_from_unchanget_model('chatbot.messagehistory', models.MessageHistory)
- res += get_fixture_from_unchanget_model('chatbot.messagequeue', models.MessageQueue)
- return res
-
-
-def dump_map():
- from mapapp import models
- res = get_fixture_from_unchanget_model('mapapp.dot', models.Dot)
- return res
-
-
-def dump_task_app():
- from taskapp import models
- res = get_fixture_from_unchanget_model('taskapp.changelog', models.ChangeLog)
- res += get_fixture_from_unchanget_model('taskapp.task', models.Task)
- res += get_fixture_from_unchanget_model('taskapp.ExtraComment', models.ExtraComment)
- return res
-
-
-def dump_auth():
- from django.contrib.auth import models
- from django.contrib.contenttypes.models import ContentType
- res = get_fixture_from_unchanget_model('contenttypes.contenttype', ContentType)
- res += get_fixture_from_unchanget_model('auth.group', models.Group)
- res += get_fixture_from_unchanget_model('auth.permission', models.Permission)
- return res
-
-
-def dump_guardian():
- from guardian import models
- print('guardian.groupobjectpermission')
- res = [{
- 'model': 'guardian.groupobjectpermission',
- 'pk': gp.pk,
- 'fields': {
- 'group': gp.group.pk,
- 'permission': gp.permission.pk,
- 'content_type': gp.content_type.pk,
- 'object_pk': str(gp.object_pk),
- 'content_object': gp.content_object.pk
- }
- } for gp in models.GroupObjectPermission.objects.all()]
- print('guardian.userobjectpermission')
- res += [{
- 'model': 'guardian.userobjectpermission',
- 'pk': up.pk,
- 'fields': {
- 'permission': up.permission.pk,
- 'content_type': up.content_type.pk,
- 'object_pk': str(up.object_pk),
- 'user': up.user.pk
- }
- } for up in models.UserObjectPermission.objects.all()]
- return res
-
-
-def make_migration():
- from datetime import datetime, date
-
- def my_date_converter(o):
- if isinstance(o, datetime) or isinstance(o, date):
- return "%s" % o
-
- def appdump(path, func):
- fname = os.path.join(*path)
- path_dir = os.path.join(*path[:-1])
- if not os.path.isdir(path_dir):
- os.mkdir(path_dir)
- with open(fname, 'w') as f:
- dump(func(), f, default=my_date_converter, ensure_ascii=False)
-
- if not os.path.isdir('fixtures'):
- os.mkdir('fixtures')
- appdump(['fixtures', 'group_app', 'groups_fixture.json'], dump_groups)
- appdump(['fixtures', 'tariff_app', 'tariffs_fixture.json'], dump_tariffs)
- appdump(['fixtures', 'photo_app', 'photos_fixture.json'], dump_photos)
- appdump(['fixtures', 'devapp', 'devs_fixture.json'], dump_devs)
- appdump(['fixtures', 'accounts_app', 'accounts_fixture.json'], dump_accounts)
- appdump(['fixtures', 'abonapp', 'abon_fixture.json'], dump_abonapp)
- appdump(['fixtures', 'chatbot', 'chatbot_fixture.json'], dump_chatbot)
- appdump(['fixtures', 'mapapp', 'map_fixture.json'], dump_map)
- appdump(['fixtures', 'taskapp', 'task_fixture.json'], dump_task_app)
- # appdump(['fixtures', 'accounts_app', 'auth_fixture.json'], dump_auth)
- # appdump(['fixtures', 'accounts_app', 'guardian_fixture.json'], dump_guardian)
-
-
-def move_to_fixtures_dirs():
- fixdir = 'fixtures'
- for dr in os.listdir(fixdir):
- fixture_dir = os.path.join(fixdir, dr)
- for fixture_file in os.listdir(fixture_dir):
- from_file = os.path.join(fixture_dir, fixture_file)
- dst_dir = os.path.join(dr, fixdir)
- to_file = os.path.join(dst_dir, fixture_file)
- if not os.path.isdir(dst_dir):
- os.mkdir(dst_dir)
- shutil.copyfile(from_file, to_file)
- print('cp %s -> %s' % (from_file, to_file))
-
-
-def apply_fixtures():
- from django.core.management import execute_from_command_line
- from accounts_app.models import UserProfile
- # from django.contrib.auth import models
-
- UserProfile.objects.filter(username='AnonymousUser').delete()
- # print('clearing auth.group')
- # models.Group.objects.all().delete()
- # print('clearing auth.permission')
- # models.Permission.objects.all().delete()
-
- fixtures_names = [
- 'groups_fixture.json', 'tariffs_fixture.json', 'photos_fixture.json',
- 'devs_fixture.json', 'accounts_fixture.json', 'abon_fixture.json',
- 'chatbot_fixture.json', 'map_fixture.json', 'task_fixture.json'
- ]
- # 'auth_fixture.json', 'guardian_fixture.json'
- print('./manage.py loaddata ' + ', '.join(fixtures_names))
- execute_from_command_line([sys.argv[0], 'loaddata'] + fixtures_names)
-
-
-if __name__ == '__main__':
- if len(sys.argv) < 2:
- print('Usage: ./migrate_to_0.2.py [makedump OR applydump]')
- exit(1)
- choice = sys.argv[1]
- if choice == 'applydump':
- django.setup()
- move_to_fixtures_dirs()
- apply_fixtures()
- shutil.rmtree('fixtures')
- elif choice == 'makedump':
- django.setup()
- make_migration()
- else:
- print('Unexpected choice')
diff --git a/periodic.py b/periodic.py
index 6d7b4cc..0657bb5 100755
--- a/periodic.py
+++ b/periodic.py
@@ -9,7 +9,7 @@ from django.db import transaction
from django.db.models import signals
from abonapp.models import Abon, AbonTariff, abontariff_pre_delete, PeriodicPayForId, AbonLog
from agent import Transmitter, NasNetworkError, NasFailedResult
-from mydefs import LogicError
+from djing.lib import LogicError
def main():
diff --git a/static/css/custom.css b/static/css/custom.css
index 4e12389..3903f00 100644
--- a/static/css/custom.css
+++ b/static/css/custom.css
@@ -110,7 +110,7 @@ td.btn-group {
border-left: 1px solid #ddd;
border-right: 1px solid #ddd;
border-bottom: 1px solid #ddd;
- border-radius: 0px 0px 5px 5px;
+ border-radius: 0 0 5px 5px;
padding: 10px;
}
@@ -209,8 +209,7 @@ a.port-img{
left: 0;
}
- .row-offcanvas-left
- .sidebar-offcanvas {
+ .row-offcanvas-left .sidebar-offcanvas {
left: -50%; /* 6 columns */
}
@@ -299,3 +298,16 @@ pre {
.m-icon_dollar{background-position: 0 -52px;}
.m-icon_service{background-position: -26px -52px;}
.m-icon_mrk{background-position: -52px -52px;}
+
+
+@media (max-width: 991px) and (min-width: 768px){
+ .container {
+ width: 874px;
+ }
+}
+
+
+/* Icon near to device info */
+.font-extra-large{
+ font-size: 75px;
+}
diff --git a/statistics/migrations/0001_initial.py b/statistics/migrations/0001_initial.py
index bd83354..4148c97 100644
--- a/statistics/migrations/0001_initial.py
+++ b/statistics/migrations/0001_initial.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
from django.db import migrations, models
-import mydefs
+from djing.lib import MyGenericIPAddressField
import statistics.fields
@@ -18,8 +18,7 @@ class Migration(migrations.Migration):
name='StatCache',
fields=[
('last_time', statistics.fields.UnixDateTimeField()),
- (
- 'ip', mydefs.MyGenericIPAddressField(max_length=8, primary_key=True, protocol='ipv4', serialize=False)),
+ ('ip', MyGenericIPAddressField(max_length=8, primary_key=True, protocol='ipv4', serialize=False)),
('octets', models.PositiveIntegerField(default=0)),
('packets', models.PositiveIntegerField(default=0)),
],
diff --git a/statistics/models.py b/statistics/models.py
index c5bc191..13ff2b4 100644
--- a/statistics/models.py
+++ b/statistics/models.py
@@ -3,7 +3,7 @@ from datetime import datetime, timedelta, date, time
from django.db import models, connection, ProgrammingError
from django.utils.timezone import now
-from mydefs import MyGenericIPAddressField
+from djing.lib import MyGenericIPAddressField
from .fields import UnixDateTimeField
diff --git a/tariff_app/base_intr.py b/tariff_app/base_intr.py
index cd2f8aa..970dbe9 100644
--- a/tariff_app/base_intr.py
+++ b/tariff_app/base_intr.py
@@ -17,7 +17,7 @@ class TariffBase(metaclass=ABCMeta):
@staticmethod
def description() -> AnyStr:
"""
- Usage in mydefs.MyChoicesAdapter for choices fields.
+ Usage in djing.lib.MyChoicesAdapter for choices fields.
:return: human readable description
"""
raise NotImplementedError
@@ -54,5 +54,5 @@ class PeriodicPayCalcBase(metaclass=ABCMeta):
@staticmethod
def description() -> AnyStr:
"""Return text description.
- Uses in mydefs.MyChoicesAdapter for CHOICES fields"""
+ Uses in djing.lib.MyChoicesAdapter for CHOICES fields"""
raise NotImplementedError
diff --git a/tariff_app/locale/ru/LC_MESSAGES/django.po b/tariff_app/locale/ru/LC_MESSAGES/django.po
index 08b181f..79aa109 100644
--- a/tariff_app/locale/ru/LC_MESSAGES/django.po
+++ b/tariff_app/locale/ru/LC_MESSAGES/django.po
@@ -209,3 +209,6 @@ msgstr "Новый периодический платёж создан"
#: tariff_app/views.py:102
msgid "Periodic pay has been changed"
msgstr "Периодический платёж изменён"
+
+msgid "Are you sure you want to delete tariff?"
+msgstr "Вы уверены что хотите удалить тариф?"
diff --git a/tariff_app/models.py b/tariff_app/models.py
index 3cb82cb..6ca5e04 100644
--- a/tariff_app/models.py
+++ b/tariff_app/models.py
@@ -5,7 +5,7 @@ from django.dispatch import receiver
from .base_intr import TariffBase, PeriodicPayCalcBase
from .custom_tariffs import TARIFF_CHOICES, PERIODIC_PAY_CHOICES
from group_app.models import Group
-from mydefs import MyChoicesAdapter
+from djing.lib import MyChoicesAdapter
from jsonfield import JSONField
diff --git a/tariff_app/templates/tariff_app/modal_del_warning.html b/tariff_app/templates/tariff_app/modal_del_warning.html
deleted file mode 100644
index fbe951d..0000000
--- a/tariff_app/templates/tariff_app/modal_del_warning.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% load i18n %}
-
-
diff --git a/tariff_app/templates/tariff_app/tariff_confirm_delete.html b/tariff_app/templates/tariff_app/tariff_confirm_delete.html
new file mode 100644
index 0000000..60070e6
--- /dev/null
+++ b/tariff_app/templates/tariff_app/tariff_confirm_delete.html
@@ -0,0 +1,15 @@
+{% extends 'base_delete_modal.html' %}
+{% load i18n %}
+
+{% block modal_form_url %}
+ {% url 'tarifs:del' tid %}
+{% endblock %}
+
+{% block modal_form_title %}
+ {% trans 'Delete service' %}
+{% endblock %}
+
+{% block modal_form_text %}
+
+ {% blocktrans %}after delete the tariff, subscribers who use that tariff will be disconnected from it.{% endblocktrans %}
+{% endblock %}
diff --git a/tariff_app/urls.py b/tariff_app/urls.py
index 1548b9e..727996a 100644
--- a/tariff_app/urls.py
+++ b/tariff_app/urls.py
@@ -8,7 +8,7 @@ urlpatterns = [
url(r'^$', views.TariffsListView.as_view(), name='home'),
url(r'^(?P\d+)$', views.edit_tarif, name='edit'),
url(r'^add$', views.edit_tarif, name='add'),
- url(r'^del(?P\d+)$', views.del_tarif, name='del'),
+ url(r'^del(?P\d+)$', views.TariffDeleteView.as_view(), name='del'),
url(r'^periodic_pays$', views.PeriodicPaysListView.as_view(), name='periodic_pays'),
url(r'^periodic_pays/add$', views.periodic_pay, name='periodic_pay_add'),
diff --git a/tariff_app/views.py b/tariff_app/views.py
index 9dbdaaa..13e5aaa 100644
--- a/tariff_app/views.py
+++ b/tariff_app/views.py
@@ -1,18 +1,18 @@
-# -*- coding: utf-8 -*-
from django.contrib.auth.decorators import login_required
from django.contrib.gis.shortcuts import render_to_text
+from django.urls import reverse_lazy
from django.utils.decorators import method_decorator
from django.utils.translation import ugettext as _
from django.shortcuts import render, get_object_or_404, redirect
from django.contrib import messages
from django.core.exceptions import PermissionDenied
-from django.views.generic import ListView
+from django.views.generic import ListView, DeleteView
from django.conf import settings
from guardian.decorators import permission_required_or_403 as permission_required
from djing.global_base_views import OrderingMixin
from .models import Tariff, PeriodicPay
-import mydefs
+from djing import lib
from . import forms
@@ -21,7 +21,7 @@ class BaseServiceListView(ListView):
paginate_by = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10)
-@method_decorator((login_required, mydefs.only_admins), name='dispatch')
+@method_decorator((login_required, lib.decorators.only_admins), name='dispatch')
class TariffsListView(BaseServiceListView, OrderingMixin):
"""
Show Services(Tariffs) list
@@ -33,7 +33,7 @@ class TariffsListView(BaseServiceListView, OrderingMixin):
@login_required
def edit_tarif(request, tarif_id=0):
- tarif_id = mydefs.safe_int(tarif_id)
+ tarif_id = lib.safe_int(tarif_id)
if tarif_id == 0:
if not request.user.has_perm('tariff_app.add_tariff'):
@@ -61,21 +61,25 @@ def edit_tarif(request, tarif_id=0):
})
-@login_required
-@permission_required('tariff_app.delete_tariff')
-def del_tarif(request, tid):
- if request.method == 'POST':
- if request.POST.get('confirm') == 'yes':
- get_object_or_404(Tariff, id=tid).delete()
- messages.success(request, _('Service has been deleted'))
- else:
- messages.error(request, _('Not have a confirmations of delete'))
- return mydefs.res_success(request, 'tarifs:home')
- return render_to_text('tariff_app/modal_del_warning.html', {'tid': tid}, request=request)
+@method_decorator(login_required, name='dispatch')
+@method_decorator(permission_required('tariff_app.delete_tariff'), name='dispatch')
+class TariffDeleteView(DeleteView):
+ model = Tariff
+ pk_url_kwarg = 'tid'
+ success_url = reverse_lazy('tarifs:home')
+
+ def delete(self, request, *args, **kwargs):
+ res = super().delete(request, *args, **kwargs)
+ messages.success(request, _('Service has been deleted'))
+ return res
+
+ def get_context_data(self, **kwargs):
+ kwargs['tid'] = self.kwargs.get('tid')
+ return super().get_context_data(**kwargs)
@method_decorator(login_required, name='dispatch')
-@method_decorator(permission_required('tariff_app.can_view_periodic_pay'), name='dispatch')
+@method_decorator(permission_required('tariff_app.delete_tariff'), name='dispatch')
class PeriodicPaysListView(BaseServiceListView):
context_object_name = 'pays'
model = PeriodicPay
diff --git a/taskapp/handle.py b/taskapp/handle.py
index c973dc3..cabcdfc 100644
--- a/taskapp/handle.py
+++ b/taskapp/handle.py
@@ -2,7 +2,7 @@
from django.utils.translation import gettext as _
from chatbot.telebot import send_notify
from chatbot.models import ChatException
-from mydefs import MultipleException
+from djing.lib import MultipleException
class TaskException(Exception):
diff --git a/taskapp/migrations/0001_initial.py b/taskapp/migrations/0001_initial.py
index 06da89c..fe69535 100644
--- a/taskapp/migrations/0001_initial.py
+++ b/taskapp/migrations/0001_initial.py
@@ -51,7 +51,7 @@ class Migration(migrations.Migration):
('priority',
models.CharField(choices=[('A', 'Higher'), ('C', 'Average'), ('E', 'Low')], default='E', max_length=1,
verbose_name='A priority')),
- ('out_date', models.DateField(blank=True, default=taskapp.models._delta_add_days, null=True,
+ ('out_date', models.DateField(blank=True, default=taskapp.models.delta_add_days, null=True,
verbose_name='Reality')),
('time_of_create', models.DateTimeField(auto_now_add=True, verbose_name='Date of create')),
('state', models.CharField(choices=[('S', 'New'), ('C', 'Confused'), ('F', 'Completed')], default='S',
diff --git a/taskapp/views.py b/taskapp/views.py
index 949e521..2e53022 100644
--- a/taskapp/views.py
+++ b/taskapp/views.py
@@ -1,5 +1,3 @@
-# coding=utf-8
-from json import dumps
from django.contrib.auth.decorators import login_required
from django.core.exceptions import PermissionDenied
from django.http import HttpResponse
@@ -15,12 +13,15 @@ from datetime import datetime
from django.views.generic.edit import FormMixin, DeleteView, UpdateView
from guardian.decorators import permission_required_or_403 as permission_required
+from jsonview.decorators import json_view
+
from chatbot.models import MessageQueue
from abonapp.models import Abon
from djing import httpresponse_to_referrer
+from djing.lib import safe_int, MultipleException, RuTimedelta
+from djing.lib.decorators import only_admins
from .handle import TaskException
from .models import Task, ExtraComment
-from mydefs import only_admins, safe_int, MultipleException, RuTimedelta
from .forms import TaskFrm, ExtraCommentForm
@@ -249,6 +250,7 @@ def remind(request, task_id):
return redirect('taskapp:home')
+@json_view
def check_news(request):
if request.user.is_authenticated and request.user.is_admin:
msg = MessageQueue.objects.pop(user=request.user, tag='taskap')
diff --git a/templates/base_delete_modal.html b/templates/base_delete_modal.html
new file mode 100644
index 0000000..39c9cdd
--- /dev/null
+++ b/templates/base_delete_modal.html
@@ -0,0 +1,19 @@
+{% load i18n %}
+
|