rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-27 07:02:26 +00:00
Code Issues Releases Wiki Activity

Pep8 compliance on logs

Browse source
This commit is contained in:
Maël Kervella 2018-04-13 20:37:04 +00:00
parent 9d7a7fa1f5
commit 0c8bb61574
4 changed files with 127 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
logs/acl.py
View file

@ -26,6 +26,7 @@
Here are defined some functions to check acl on the application. Here are defined some functions to check acl on the application.
""" """
def can_view(user): def can_view(user):
"""Check if an user can view the application. """Check if an user can view the application.

1
logs/templatetags/__init__.py
View file

@ -20,4 +20,3 @@
# You should have received a copy of the GNU General Public License along # You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc., # with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

2
logs/templatetags/logs_extra.py
View file

@ -25,7 +25,7 @@ from django import template
register = template.Library() register = template.Library()
@register.filter @register.filter
def classname(obj): def classname(obj):
return obj.__class__.__name__ return obj.__class__.__name__

124
logs/views.py
View file

@ -227,65 +227,98 @@ def stats_general(request):
_all_baned = all_baned() _all_baned = all_baned()
_all_whitelisted = all_whitelisted() _all_whitelisted = all_whitelisted()
_all_active_interfaces_count = all_active_interfaces_count() _all_active_interfaces_count = all_active_interfaces_count()
_all_active_assigned_interfaces_count = all_active_assigned_interfaces_count() _all_active_assigned_interfaces_count = \
all_active_assigned_interfaces_count()
stats = [ stats = [
[["Categorie", "Nombre d'utilisateurs (total club et adhérents)", "Nombre d'adhérents", "Nombre de clubs"], { [ # First set of data (about users)
[ # Headers
"Categorie",
"Nombre d'utilisateurs (total club et adhérents)",
"Nombre d'adhérents",
"Nombre de clubs"
],
{ # Data
'active_users': [ 'active_users': [
"Users actifs", "Users actifs",
User.objects.filter(state=User.STATE_ACTIVE).count(), User.objects.filter(state=User.STATE_ACTIVE).count(),
Adherent.objects.filter(state=Adherent.STATE_ACTIVE).count(), (Adherent.objects
Club.objects.filter(state=Club.STATE_ACTIVE).count()], .filter(state=Adherent.STATE_ACTIVE)
.count()),
Club.objects.filter(state=Club.STATE_ACTIVE).count()
],
'inactive_users': [ 'inactive_users': [
"Users désactivés", "Users désactivés",
User.objects.filter(state=User.STATE_DISABLED).count(), User.objects.filter(state=User.STATE_DISABLED).count(),
Adherent.objects.filter(state=Adherent.STATE_DISABLED).count(), (Adherent.objects
Club.objects.filter(state=Club.STATE_DISABLED).count()], .filter(state=Adherent.STATE_DISABLED)
.count()),
Club.objects.filter(state=Club.STATE_DISABLED).count()
],
'archive_users': [ 'archive_users': [
"Users archivés", "Users archivés",
User.objects.filter(state=User.STATE_ARCHIVE).count(), User.objects.filter(state=User.STATE_ARCHIVE).count(),
Adherent.objects.filter(state=Adherent.STATE_ARCHIVE).count(), (Adherent.objects
Club.objects.filter(state=Club.STATE_ARCHIVE).count()], .filter(state=Adherent.STATE_ARCHIVE)
.count()),
Club.objects.filter(state=Club.STATE_ARCHIVE).count()
],
'adherent_users': [ 'adherent_users': [
"Cotisant à l'association", "Cotisant à l'association",
_all_adherent.count(), _all_adherent.count(),
_all_adherent.exclude(adherent__isnull=True).count(), _all_adherent.exclude(adherent__isnull=True).count(),
_all_adherent.exclude(club__isnull=True).count()], _all_adherent.exclude(club__isnull=True).count()
],
'connexion_users': [ 'connexion_users': [
"Utilisateurs bénéficiant d'une connexion", "Utilisateurs bénéficiant d'une connexion",
_all_has_access.count(), _all_has_access.count(),
_all_has_access.exclude(adherent__isnull=True).count(), _all_has_access.exclude(adherent__isnull=True).count(),
_all_has_access.exclude(club__isnull=True).count()], _all_has_access.exclude(club__isnull=True).count()
],
'ban_users': [ 'ban_users': [
"Utilisateurs bannis", "Utilisateurs bannis",
_all_baned.count(), _all_baned.count(),
_all_baned.exclude(adherent__isnull=True).count(), _all_baned.exclude(adherent__isnull=True).count(),
_all_baned.exclude(club__isnull=True).count()], _all_baned.exclude(club__isnull=True).count()
],
'whitelisted_user': [ 'whitelisted_user': [
"Utilisateurs bénéficiant d'une connexion gracieuse", "Utilisateurs bénéficiant d'une connexion gracieuse",
_all_whitelisted.count(), _all_whitelisted.count(),
_all_whitelisted.exclude(adherent__isnull=True).count(), _all_whitelisted.exclude(adherent__isnull=True).count(),
_all_whitelisted.exclude(club__isnull=True).count()], _all_whitelisted.exclude(club__isnull=True).count()
],
'actives_interfaces': [ 'actives_interfaces': [
"Interfaces actives (ayant accès au reseau)", "Interfaces actives (ayant accès au reseau)",
_all_active_interfaces_count.count(), _all_active_interfaces_count.count(),
_all_active_interfaces_count.exclude( (_all_active_interfaces_count
machine__user__adherent__isnull=True .exclude(machine__user__adherent__isnull=True)
).count(), .count()),
_all_active_interfaces_count.exclude( (_all_active_interfaces_count
machine__user__club__isnull=True .exclude(machine__user__club__isnull=True)
).count()], .count())
],
'actives_assigned_interfaces': [ 'actives_assigned_interfaces': [
"Interfaces actives et assignées ipv4", "Interfaces actives et assignées ipv4",
_all_active_assigned_interfaces_count.count(), _all_active_assigned_interfaces_count.count(),
_all_active_assigned_interfaces_count.exclude( (_all_active_assigned_interfaces_count
machine__user__adherent__isnull=True .exclude(machine__user__adherent__isnull=True)
).count(), .count()),
_all_active_assigned_interfaces_count.exclude( (_all_active_assigned_interfaces_count
machine__user__club__isnull=True .exclude(machine__user__club__isnull=True)
).count()] .count())
}], ]
[["Range d'ip", "Vlan", "Nombre d'ip totales", "Ip assignées", }
"Ip assignées à une machine active", "Ip non assignées"], ip_dict] ],
[ # Second set of data (about ip adresses)
[ # Headers
"Range d'ip",
"Vlan",
"Nombre d'ip totales",
"Ip assignées",
"Ip assignées à une machine active",
"Ip non assignées"
],
ip_dict # Data already prepared
]
] ]
return render(request, 'logs/stats_general.html', {'stats_list': stats}) return render(request, 'logs/stats_general.html', {'stats_list': stats})
@ -313,11 +346,26 @@ def stats_models(request):
'whitelist': [Whitelist.PRETTY_NAME, Whitelist.objects.count()] 'whitelist': [Whitelist.PRETTY_NAME, Whitelist.objects.count()]
}, },
'Cotisations': { 'Cotisations': {
'factures': [Facture._meta.verbose_name.title(), Facture.objects.count()], 'factures': [
'vente': [Vente._meta.verbose_name.title(), Vente.objects.count()], Facture._meta.verbose_name.title(),
'cotisation': [Cotisation._meta.verbose_name.title(), Cotisation.objects.count()], Facture.objects.count()
'article': [Article._meta.verbose_name.title(), Article.objects.count()], ],
'banque': [Banque._meta.verbose_name.title(), Banque.objects.count()], 'vente': [
Vente._meta.verbose_name.title(),
Vente.objects.count()
],
'cotisation': [
Cotisation._meta.verbose_name.title(),
Cotisation.objects.count()
],
'article': [
Article._meta.verbose_name.title(),
Article.objects.count()
],
'banque': [
Banque._meta.verbose_name.title(),
Banque.objects.count()
],
}, },
'Machines': { 'Machines': {
'machine': [Machine.PRETTY_NAME, Machine.objects.count()], 'machine': [Machine.PRETTY_NAME, Machine.objects.count()],
@ -432,6 +480,7 @@ def stats_actions(request):
} }
return render(request, 'logs/stats_users.html', {'stats_list': stats}) return render(request, 'logs/stats_users.html', {'stats_list': stats})
@login_required @login_required
@can_view_app('users') @can_view_app('users')
def stats_droits(request): def stats_droits(request):
@ -440,6 +489,13 @@ def stats_droits(request):
stats_list = {} stats_list = {}
for droit in ListRight.objects.all().select_related('group_ptr'): for droit in ListRight.objects.all().select_related('group_ptr'):
stats_list[droit]=droit.user_set.all().annotate(num=Count('revision'),last=Max('revision__date_created')) stats_list[droit] = droit.user_set.all().annotate(
num=Count('revision'),
last=Max('revision__date_created')
)
return render(request, 'logs/stats_droits.html', {'stats_list': stats_list}) return render(
request,
'logs/stats_droits.html',
{'stats_list': stats_list}
)