From 9a42485c0adfa66373f23fcf97652e8874a556f5 Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Sun, 18 Oct 2020 13:28:32 +0200 Subject: [PATCH 1/5] Create profil template and corresponding view --- machines/templates/machines/profil.html | 271 ++++++++++++++++++++++++ machines/views.py | 34 +++ 2 files changed, 305 insertions(+) create mode 100644 machines/templates/machines/profil.html diff --git a/machines/templates/machines/profil.html b/machines/templates/machines/profil.html new file mode 100644 index 00000000..4b2650ed --- /dev/null +++ b/machines/templates/machines/profil.html @@ -0,0 +1,271 @@ +{% comment %} +Re2o est un logiciel d'administration développé initiallement au rezometz. Il +se veut agnostique au réseau considéré, de manière à être installable en +quelques clics. + +Copyright © 2017 Gabriel Détraz +Copyright © 2017 Lara Kermarec +Copyright © 2017 Augustin Lemesle + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +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., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +{% endcomment %} + +{% load acl %} +{% load logs_extra %} +{% load i18n %} + +
+
+

+ + {% trans "Machines" %} + {{ nb_machines }} +

+
+
+
+ + + {% trans "Add a machine" %} + +
+
+ {% if machines_list %} +
+ {% if machines_list.paginator %} + {% include 'pagination.html' with list=machines_list go_to_id="machines" %} + {% endif %} + + + + + + + + + + + {% trans "DNS name" as tr_dns_name %} + + + + + + + {% for machine in machines_list %} + + + + + {% for interface in machine.interface_set.all %} + + + + + + + + + + + {% if ipv6_enabled and interface.ipv6 != 'None' %} + + + + {% endif %} + {% if interface.domain.related_domain.all %} + + + + {% endif %} + {% endfor %} + + + + {% endfor %} + +
{% include 'buttons/sort.html' with prefix='machine' col='name' text=tr_dns_name %}{% trans "Type" %}{% trans "MAC address" %}{% trans "IP address" %}{% trans "Actions" %}
+ {% trans "No name" as tr_no_name %} + {% trans "View the profile" as tr_view_the_profile %} + {% if machine.active %} + + {% else %} + {% trans "Deactivated" %}: + {% endif %} + {{ machine.get_name|default:tr_no_name }} + + {{ machine.user }} + + + {% can_create Interface machine.id %} + {% trans "Create an interface" as tr_create_an_interface %} + {% include 'buttons/add.html' with href='machines:new-interface' id=machine.id desc=tr_create_an_interface %} + {% acl_end %} + {% history_button machine %} + {% can_delete machine %} + {% include 'buttons/suppr.html' with href='machines:del-machine' id=machine.id %} + {% acl_end %} +
+ {% if interface.domain.related_domain.all %} + {{ interface.domain }} + + {% else %} + {{ interface.domain }} + {% endif %} + + {{ interface.machine_type }} + + {{ interface.mac_address }} + + + IPv4 {{ interface.ipv4 }} +
+ {% if ipv6_enabled and interface.ipv6 != 'None' %} + IPv6 + + {% endif %} + 		+
+
+ + +
+ {% history_button interface %} + {% can_delete interface %} + {% include 'buttons/suppr.html' with href='machines:del-interface' id=interface.id %} + {% acl_end %} +
+
+
+
    +
  • + {{ interface.get_vendor }} +
    • +
+
+
+
+
    + {% for ipv6 in interface.ipv6.all %} +
  • + {{ ipv6 }} +
    • + {% endfor %} +
+
+
+
+
    + {% for al in interface.domain.related_domain.all %} +
  • + + {{ al }} + + +
    • + {% endfor %} +
+
+
+ + + + {% if machines_list.paginator %} + {% include 'pagination.html' with list=machines_list go_to_id="machines" %} + {% endif %} +
+ {% else %} +

{% trans "No machine" %}

+ {% endif %} +
+
+
diff --git a/machines/views.py b/machines/views.py index 15f59e00..8a93d0e9 100644 --- a/machines/views.py +++ b/machines/views.py @@ -39,6 +39,7 @@ from django.db import IntegrityError from django.forms import modelformset_factory from django.http import HttpResponse from django.shortcuts import render, redirect +from django.template.loader import render_to_string from django.urls import reverse from django.utils.translation import ugettext as _ from django.views.decorators.csrf import csrf_exempt @@ -1311,6 +1312,39 @@ def index(request): machines_list = re2o_paginator(request, machines_list, pagination_large_number) return render(request, "machines/index.html", {"machines_list": machines_list}) +# Canonic vie for displaying machines in users's profil +def profil(request, user): + """View used to display the machines on a user's profile.""" + machines = ( + Machine.objects.filter(user=users) + .select_related("user") + .prefetch_related("interface_set__domain__extension") + .prefetch_related("interface_set__ipv4__ip_type__extension") + .prefetch_related("interface_set__machine_type") + .prefetch_related("interface_set__domain__related_domain__extension") + ) + machines = SortTable.sort( + machines, + request.GET.get("col"), + request.GET.get("order"), + SortTable.MACHINES_INDEX, + ) + pagination_large_number = GeneralOption.get_cached_value("pagination_large_number") + machines = re2o_paginator(request, machines, pagination_large_number) + nb_machines = machines.count() + + context = { + "machines_list" = machines, + "nb_machines" = nb_machines, + } + + return render_to_string( + "machines/profil.html",context=context,request=request,using=None + ) + + + + @login_required @can_view_all(IpType) From a6d63521fd77d6cdc687405d42d6fc67d6773e43 Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Sun, 18 Oct 2020 14:51:58 +0200 Subject: [PATCH 2/5] Rename profil view in apps and count machines in user profil view --- .../machines/{profil.html => aff_profil.html} | 0 machines/views.py | 17 ++++---- .../tickets/{profil.html => aff_profil.html} | 0 tickets/views.py | 4 +- users/templates/users/profil.html | 27 +----------- users/views.py | 42 ++++++------------- 6 files changed, 25 insertions(+), 65 deletions(-) rename machines/templates/machines/{profil.html => aff_profil.html} (100%) rename tickets/templates/tickets/{profil.html => aff_profil.html} (100%) diff --git a/machines/templates/machines/profil.html b/machines/templates/machines/aff_profil.html similarity index 100% rename from machines/templates/machines/profil.html rename to machines/templates/machines/aff_profil.html diff --git a/machines/views.py b/machines/views.py index 8a93d0e9..76d12eca 100644 --- a/machines/views.py +++ b/machines/views.py @@ -1312,11 +1312,11 @@ def index(request): machines_list = re2o_paginator(request, machines_list, pagination_large_number) return render(request, "machines/index.html", {"machines_list": machines_list}) -# Canonic vie for displaying machines in users's profil -def profil(request, user): +# Canonic view for displaying machines in users's profil +def aff_profil(request, user): """View used to display the machines on a user's profile.""" - machines = ( - Machine.objects.filter(user=users) + machines = ( + Machine.objects.filter(user=user) .select_related("user") .prefetch_related("interface_set__domain__extension") .prefetch_related("interface_set__ipv4__ip_type__extension") @@ -1329,17 +1329,18 @@ def profil(request, user): request.GET.get("order"), SortTable.MACHINES_INDEX, ) + nb_machines = machines.count() pagination_large_number = GeneralOption.get_cached_value("pagination_large_number") machines = re2o_paginator(request, machines, pagination_large_number) - nb_machines = machines.count() context = { - "machines_list" = machines, - "nb_machines" = nb_machines, + "users":user, + "machines_list": machines, + "nb_machines":nb_machines, } return render_to_string( - "machines/profil.html",context=context,request=request,using=None + "machines/aff_profil.html",context=context,request=request,using=None ) diff --git a/tickets/templates/tickets/profil.html b/tickets/templates/tickets/aff_profil.html similarity index 100% rename from tickets/templates/tickets/profil.html rename to tickets/templates/tickets/aff_profil.html diff --git a/tickets/views.py b/tickets/views.py index c1796f8d..a87285ae 100644 --- a/tickets/views.py +++ b/tickets/views.py @@ -193,7 +193,7 @@ def aff_tickets(request): # Canonic views for optional apps -def profil(request, user): +def aff_profil(request, user): """View used to display the tickets on a user's profile.""" tickets_list = Ticket.objects.filter(user=user).all().order_by("-date") nbr_tickets = tickets_list.count() @@ -214,7 +214,7 @@ def profil(request, user): "nbr_tickets_unsolved": nbr_tickets_unsolved, } return render_to_string( - "tickets/profil.html", context=context, request=request, using=None + "tickets/aff_profil.html", context=context, request=request, using=None ) diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index ad0605c7..b9fbc621 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -407,31 +407,6 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endif %} -
-
-

- - {% trans "Machines" %} - {{ nb_machines }} -

-
-
-
- - - {% trans "Add a machine" %} - -
-
- {% if machines_list %} - {% include 'machines/aff_machines.html' with machines_list=machines_list %} - {% else %} -

{% trans "No machine" %}

- {% endif %} -
-
-
@@ -569,7 +544,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
- {% for template in optionnal_templates_list %} + {% for template in apps_templates_list %} {{ template }} {% endfor %} diff --git a/users/views.py b/users/views.py index 54f67b77..96d32136 100644 --- a/users/views.py +++ b/users/views.py @@ -77,7 +77,7 @@ from machines.models import Machine from preferences.models import OptionalUser, GeneralOption, AssoOption from importlib import import_module from django.conf import settings -from re2o.settings_local import OPTIONNAL_APPS_RE2O +from re2o.settings import LOCAL_APPS, OPTIONNAL_APPS_RE2O from re2o.views import form from re2o.utils import all_has_access, permission_tree from re2o.base import re2o_paginator, SortTable @@ -1314,8 +1314,8 @@ def index_serviceusers(request): def mon_profil(request): """Shortcuts view to profil view, with correct arguments. Returns the view profil with users argument, users is set to - default request.user. - + default request.user. + Parameters: request (django request): Standard django request. @@ -1346,33 +1346,18 @@ def profil(request, users, **_kwargs): Returns: Django User Profil Form. - """ - machines = ( - Machine.objects.filter(user=users) - .select_related("user") - .prefetch_related("interface_set__domain__extension") - .prefetch_related("interface_set__ipv4__ip_type__extension") - .prefetch_related("interface_set__machine_type") - .prefetch_related("interface_set__domain__related_domain__extension") - ) - machines = SortTable.sort( - machines, - request.GET.get("col"), - request.GET.get("order"), - SortTable.MACHINES_INDEX, - ) - optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS_RE2O] - optionnal_templates_list = [ - app.views.profil(request, users) - for app in optionnal_apps - if hasattr(app.views, "profil") + # Generate the template list for all apps of re2o if relevant + apps = [import_module(app) for app in LOCAL_APPS + OPTIONNAL_APPS_RE2O] + apps_templates_list = [ + app.views.aff_profil(request, users) + for app in apps + if hasattr(app.views, "aff_profil") ] - pagination_large_number = GeneralOption.get_cached_value("pagination_large_number") - nb_machines = machines.count() - machines = re2o_paginator(request, machines, pagination_large_number) + nb_machines = users.user_interfaces().count() + factures = Facture.objects.filter(user=users) factures = SortTable.sort( factures, @@ -1405,9 +1390,8 @@ def profil(request, users, **_kwargs): "users/profil.html", { "users": users, - "machines_list": machines, - "nb_machines": nb_machines, - "optionnal_templates_list": optionnal_templates_list, + "nb_machines":nb_machines, + "apps_templates_list": apps_templates_list, "facture_list": factures, "ban_list": bans, "white_list": whitelists, From ccce9d2de907f2bb293eeb071c39e0613bda0ce4 Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Sun, 18 Oct 2020 15:22:48 +0200 Subject: [PATCH 3/5] Move facture list to cotisation, add paginator --- .../templates/cotisations/aff_profil.html | 131 ++++++++++++++++++ cotisations/views.py | 24 ++++ users/templates/users/profil.html | 41 +----- users/views.py | 10 +- 4 files changed, 162 insertions(+), 44 deletions(-) create mode 100644 cotisations/templates/cotisations/aff_profil.html diff --git a/cotisations/templates/cotisations/aff_profil.html b/cotisations/templates/cotisations/aff_profil.html new file mode 100644 index 00000000..7e01a93a --- /dev/null +++ b/cotisations/templates/cotisations/aff_profil.html @@ -0,0 +1,131 @@ +{% comment %} +Re2o est un logiciel d'administration développé initiallement au rezometz. Il +se veut agnostique au réseau considéré, de manière à être installable en +quelques clics. + +Copyright © 2017 Gabriel Détraz +Copyright © 2017 Lara Kermarec +Copyright © 2017 Augustin Lemesle + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +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., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +{% endcomment %} + +{% load acl %} +{% load i18n %} +{% load logs_extra %} + + +
+
+

+ + {% trans "Subscriptions" %} +

+
+
+
+ {% can_create Facture %} + + + {% trans "Add a subscription" %} + + {% if user_solde %} + + + {% trans "Edit the balance" %} + + {% endif%} + {% acl_end %} +
+
+ {% if facture_list %} +
+ {% if facture_list.paginator %} + {% include 'pagination.html' with list=facture_list %} + {% endif %} + + + + + + + + + + + + + + + {% for facture in facture_list %} + + + + + + + + + + + {% endfor %} +
+ {% trans "User" as tr_user %} + {% include 'buttons/sort.html' with prefix='cotis' col='user' text=tr_user %} + {% trans "Designation" %}{% trans "Total price" %} + {% trans "Payment method" as tr_payment_method %} + {% include 'buttons/sort.html' with prefix='cotis' col='paiement' text=tr_payment_method %} + + {% trans "Date" as tr_date %} + {% include 'buttons/sort.html' with prefix='cotis' col='date' text=tr_date %} + + {% trans "Invoice ID" as tr_invoice_id %} + {% include 'buttons/sort.html' with prefix='cotis' col='id' text=tr_invoice_id %} +
{{ facture.user }}{{ facture.name }}{{ facture.prix_total }}{{ facture.paiement }}{{ facture.date }}{{ facture.id }} + {% can_edit facture %} + {% include 'buttons/edit.html' with href='cotisations:edit-facture' id=facture.id %} + {% acl_else %} + {% trans "Controlled invoice" %} + {% acl_end %} + {% can_delete facture %} + {% include 'buttons/suppr.html' with href='cotisations:del-facture' id=facture.id %} + {% acl_end %} + {% history_button facture %} + + {% if facture.valid %} + + {% trans "PDF" %} + + {% else %} + {% trans "Invalidated invoice" %} + {% endif %} + {% if facture.control and facture.is_subscription %} + + {% trans "Voucher" %} + + {% endif %} +
+ + {% if facture_list.paginator %} + {% include 'pagination.html' with list=facture_list %} + {% endif %} +
+ {% else %} +

{% trans "No invoice" %}

+ {% endif %} +
+
+
diff --git a/cotisations/views.py b/cotisations/views.py index b90b39e4..800c9df8 100644 --- a/cotisations/views.py +++ b/cotisations/views.py @@ -33,6 +33,7 @@ import os from django.urls import reverse from django.shortcuts import render, redirect, get_object_or_404 +from django.template.loader import render_to_string from django.contrib.auth.decorators import login_required from django.contrib import messages from django.db.models import ProtectedError @@ -1060,3 +1061,26 @@ def voucher_pdf(request, invoice, **_kwargs): "date_begin": invoice.date, }, ) + +def aff_profil(request,user): + """View used to display the cotisations on a user's profil.""" + + factures = Facture.objects.filter(user=user) + factures = SortTable.sort( + factures, + request.GET.get("col"), + request.GET.get("order"), + SortTable.COTISATIONS_INDEX, + ) + + pagination_large_number = GeneralOption.get_cached_value("pagination_large_number") + factures = re2o_paginator(request, factures,pagination_large_number) + + context = { + "users":user, + "facture_list": factures, + } + + return render_to_string( + "cotisations/aff_profil.html",context=context,request=request,using=None + ) diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index b9fbc621..a676b416 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -407,38 +407,12 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endif %} -
-
-

- - {% trans "Subscriptions" %} -

-
-
-
- {% can_create Facture %} - - - {% trans "Add a subscription" %} - - {% if user_solde %} - - - {% trans "Edit the balance" %} - - {% endif%} - {% acl_end %} -
-
- {% if facture_list %} - {% include 'cotisations/aff_cotisations.html' with facture_list=facture_list %} - {% else %} -

{% trans "No invoice" %}

- {% endif %} -
-
-
+ + + {% for template in apps_templates_list %} + {{ template }} + {% endfor %} +

@@ -544,9 +518,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,

- {% for template in apps_templates_list %} - {{ template }} - {% endfor %} {% endblock %} diff --git a/users/views.py b/users/views.py index 96d32136..ffa1344e 100644 --- a/users/views.py +++ b/users/views.py @@ -1357,14 +1357,7 @@ def profil(request, users, **_kwargs): ] nb_machines = users.user_interfaces().count() - - factures = Facture.objects.filter(user=users) - factures = SortTable.sort( - factures, - request.GET.get("col"), - request.GET.get("order"), - SortTable.COTISATIONS_INDEX, - ) + bans = Ban.objects.filter(user=users) bans = SortTable.sort( bans, @@ -1392,7 +1385,6 @@ def profil(request, users, **_kwargs): "users": users, "nb_machines":nb_machines, "apps_templates_list": apps_templates_list, - "facture_list": factures, "ban_list": bans, "white_list": whitelists, "user_solde": user_solde, From c931ec9fa01565aa4002129c33f611e8ef8e7a4b Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Sun, 18 Oct 2020 17:36:10 +0200 Subject: [PATCH 4/5] Add number of article in the display of cotisation --- cotisations/models.py | 10 ++++++++++ cotisations/templates/cotisations/aff_profil.html | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/cotisations/models.py b/cotisations/models.py index 2e71d418..ac75760b 100644 --- a/cotisations/models.py +++ b/cotisations/models.py @@ -96,6 +96,16 @@ class BaseInvoice(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model): ) return name + def name_detailed(self): + """ + Return: + - a list of strings with the name of all article in the invoice + and their quantity. + """ + ventes = self.vente_set.all() + strings = ["{} x {}".format(v.number, v.name) for v in ventes] + return strings + # TODO : change facture to invoice class Facture(BaseInvoice): diff --git a/cotisations/templates/cotisations/aff_profil.html b/cotisations/templates/cotisations/aff_profil.html index 7e01a93a..a6e21624 100644 --- a/cotisations/templates/cotisations/aff_profil.html +++ b/cotisations/templates/cotisations/aff_profil.html @@ -85,7 +85,17 @@ with this program; if not, write to the Free Software Foundation, Inc., {% for facture in facture_list %} {{ facture.user }} - {{ facture.name }} + + + {% for article in facture.name_detailed %} + + + + {% endfor %} +
+ {{ article }} +
+ {{ facture.prix_total }} {{ facture.paiement }} {{ facture.date }} @@ -115,7 +125,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endif %} - + {% endfor %} From e2c2ce6b1895c3726213aa33d49f88ab52b47fe6 Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Tue, 20 Oct 2020 12:32:50 +0200 Subject: [PATCH 5/5] Check to avoid multiple messages --- re2o/context_processors.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/re2o/context_processors.py b/re2o/context_processors.py index b6c54e22..6b61e2a0 100644 --- a/re2o/context_processors.py +++ b/re2o/context_processors.py @@ -26,6 +26,7 @@ from __future__ import unicode_literals import datetime from django.contrib import messages +from django.contrib.messages import get_messages from django.http import HttpRequest from preferences.models import GeneralOption, OptionalMachine from django.utils.translation import get_language @@ -47,9 +48,11 @@ def context_user(request): global_message = GeneralOption.get_cached_value("general_message_en") if global_message: if isinstance(request, HttpRequest): - messages.warning(request, global_message) + if global_message not in [msg.message for msg in get_messages(request)]: + messages.warning(request, global_message) else: - messages.warning(request._request, global_message) + if global_message not in [msg.message for msg in get_messages(request._request)]: + messages.warning(request._request, global_message) if user.is_authenticated(): interfaces = user.user_interfaces() else: