From cea44f36348dd794dfed01ce7f16899465e48834 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Fri, 17 May 2019 14:12:06 +0300 Subject: [PATCH] move unregistered onu unit list to OLT page --- .../devapp/custom_dev_page/olt_ztec320.html | 39 +++++++++++- .../olt_ztec320_units_uncfg.html | 63 ------------------- devapp/urls.py | 3 - devapp/views.py | 22 +++---- static/css/custom.css | 2 +- templates/all_base.html | 2 +- 6 files changed, 45 insertions(+), 86 deletions(-) delete mode 100644 devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html diff --git a/devapp/templates/devapp/custom_dev_page/olt_ztec320.html b/devapp/templates/devapp/custom_dev_page/olt_ztec320.html index d1e9a02..753d40c 100644 --- a/devapp/templates/devapp/custom_dev_page/olt_ztec320.html +++ b/devapp/templates/devapp/custom_dev_page/olt_ztec320.html @@ -17,13 +17,46 @@ {% for fiber in dev_manager.get_fibers %}
{{ fiber.fb_name }} - - {{ fiber.fb_onu_num }} - + {{ fiber.fb_onu_num }}
{% empty %}

{% trans 'We have not received info, please check options :(' %}

{% endfor %} +
+ +

{% trans 'Unregistered units' %}

+ + + + + + + + + + + + + {% for onu in unregistered %} + + + + + + + + + {% empty %} + + + + {% endfor %} + +
#{% trans 'Mac' %}{% trans 'Firmware version' %}{% trans 'LOID password' %}{% trans 'LOID' %}#
-{{ onu.mac }}{{ onu.firmware_ver }}{{ onu.loid_passw }}{{ onu.loid }} + + + +
{% trans 'ONU not found' %}
diff --git a/devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html b/devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html deleted file mode 100644 index 5f6d054..0000000 --- a/devapp/templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html +++ /dev/null @@ -1,63 +0,0 @@ -{% extends request.is_ajax|yesno:'nullcont.htm,devapp/ext.htm' %} -{% load i18n %} - -{% block breadcrumb %} -
    -
    2. -
  2. {% trans 'Groups' %}
    3. - {% if dev.group %} -
  3. {{ dev.group.title }}
    4. -
  4. {{ dev.comment }}
    5. - {% else %} -
  5. {% trans 'Not assigned' %}
    6. -
  6. {{ dev.comment }}
    7. - {% endif %} -
  7. {% trans 'OLT Scan' %}
    8. -
-{% endblock %} - -{% block page-header %} - {{ dev.comment|default:_('Not assigned') }}. {% trans 'Unregistered units' %} -{% endblock %} - -{% block content %} -
-
-
- - - - - - - - - - - - - - {% for onu in onu_list %} - - - - - - - - - {% empty %} - - - - {% endfor %} - -
#{% trans 'Mac' %}{% trans 'Firmware version' %}{% trans 'LOID password' %}{% trans 'LOID' %}#
-{{ onu.mac }}{{ onu.firmware_ver }}{{ onu.loid_passw }}{{ onu.loid }} - - - -
{% trans 'ONU not found' %}
-
-
-
-{% endblock %} diff --git a/devapp/urls.py b/devapp/urls.py index 8cad054..c64c527 100644 --- a/devapp/urls.py +++ b/devapp/urls.py @@ -25,9 +25,6 @@ urlpatterns = [ path('fix_device_group//', views.fix_device_group, name='fix_device_group'), path('search_dev/', views.search_dev), - # ZTE ports under fibers - path('///', views.zte_port_view_uncfg, name='zte_port_view_uncfg'), - # Monitoring api path('on_device_event/', views.OnDeviceMonitoringEvent.as_view()), diff --git a/devapp/views.py b/devapp/views.py index ab06acf..d5e4cdc 100644 --- a/devapp/views.py +++ b/devapp/views.py @@ -501,11 +501,18 @@ def devview(request, group_id: int, device_id: int): else: messages.warning(request, _('Not Set snmp device password')) + # unregistered units + unregistered = [] + for fiber in manager.get_fibers(): + for onu in manager.get_units_unregistered(int(fiber.get('fb_id'))): + if onu: + unregistered.append(onu) return render(request, 'devapp/custom_dev_page/' + template_name, { 'dev': device, 'ports': ports, 'dev_accs': Abon.objects.filter(device=device), 'dev_manager': manager, + 'unregistered': unregistered, 'ports_db': Port.objects.filter(device=device).annotate( num_abons=Count('abon') ), @@ -520,21 +527,6 @@ def devview(request, group_id: int, device_id: int): }) -@login_required -@only_admins -def zte_port_view_uncfg(request, group_id: str, device_id: str, fiber_id: str): - fiber_id = safe_int(fiber_id) - zte_olt_device = get_object_or_404(Device, id=device_id) - manager = zte_olt_device.get_manager_object() - onu_list = manager.get_units_unregistered(fiber_id) - return render(request, - 'devapp/custom_dev_page/olt_ztec320_units_uncfg.html', { - 'onu_list': onu_list, - 'dev': zte_olt_device, - 'grp': group_id - }) - - class RebootDevice(LoginAdminPermissionMixin, UpdateView): permission_required = 'devapp.change_device' template_name = 'devapp/modal_device_reboot.html' diff --git a/static/css/custom.css b/static/css/custom.css index 5a778ba..c922f0a 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -151,7 +151,7 @@ td.btn-group { position: relative; top: 27px; } -a.port-img{ +.port-img{ display: block; text-decoration: none; } diff --git a/templates/all_base.html b/templates/all_base.html index 13ec93a..8e8351a 100644 --- a/templates/all_base.html +++ b/templates/all_base.html @@ -7,7 +7,7 @@ - + {% block additional_link %}{% endblock %}