diff --git a/abonapp/views.py b/abonapp/views.py index 8d0b6ab..ec65647 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -22,6 +22,7 @@ from devapp.models import Device, Port as DevPort from datetime import datetime, date from taskapp.models import Task from dialing_app.models import AsteriskCDR +from statistics.models import getModel, get_dates @login_required @@ -678,7 +679,6 @@ def clear_dev(request, gid, uid): @login_required @mydefs.only_admins def charts(request, gid, uid): - from statistics.models import getModel high = 100 wandate = request.GET.get('wantdate') @@ -725,7 +725,7 @@ def charts(request, gid, uid): 'abon': abon, 'charts_data': ',\n'.join(charts_data) if charts_data is not None else None, 'high': high, - 'dates': StatElem.objects.get_dates() + 'dates': get_dates() }) diff --git a/devapp/dev_types.py b/devapp/dev_types.py index 74099df..c759242 100644 --- a/devapp/dev_types.py +++ b/devapp/dev_types.py @@ -62,9 +62,10 @@ class DLinkDevice(DevBase, SNMPBaseWorker): macs = self.get_list(oids['get_ports']['macs']) speeds = self.get_list(oids['get_ports']['speeds']) res = [] - ln = len(macs) + ln = len(speeds) for n in range(ln): status = True if int(stats[n]) == 1 else False + print(len(nams), len(speeds), len(macs)) res.append(DLinkPort( n+1, nams[n] if len(nams) > 0 else _('does not fetch the name'), diff --git a/devapp/forms.py b/devapp/forms.py index 09a823d..826c714 100644 --- a/devapp/forms.py +++ b/devapp/forms.py @@ -27,7 +27,7 @@ class DeviceForm(forms.ModelForm): 'placeholder': '192.168.0.100', 'class': 'form-control' }), - 'comment': forms.Textarea(attrs={ + 'comment': forms.TextInput(attrs={ 'required': True, 'class': 'form-control' }), diff --git a/mapapp/templates/maps/map_tooltip.html b/mapapp/templates/maps/map_tooltip.html index b7488b1..a628124 100644 --- a/mapapp/templates/maps/map_tooltip.html +++ b/mapapp/templates/maps/map_tooltip.html @@ -1,7 +1,7 @@