From 4b5b044de90818f786b7b753b939381aeae27c51 Mon Sep 17 00:00:00 2001 From: fjrodriguez Date: Wed, 22 Feb 2023 10:14:24 -0600 Subject: [PATCH] sistemas por cliente devices --- Sistemas/views.py | 13 +++++- Templates/Clientes/Errores_Timbres_list.html | 37 ----------------- Templates/Sistemas/Xclientes/detail.html | 18 ++++----- Templates/Sistemas/Xclientes/lista.html | 2 +- Templates/paginator.html | 42 ++++++++++++++++++++ 5 files changed, 64 insertions(+), 48 deletions(-) diff --git a/Sistemas/views.py b/Sistemas/views.py index 9abaa6b..82d9919 100644 --- a/Sistemas/views.py +++ b/Sistemas/views.py @@ -148,9 +148,11 @@ class UsersConnectedList(UserPassesTestMixin,LoginRequiredMixin,ListView): return users class SistemasXCliente_ListView(UserPassesTestMixin,LoginRequiredMixin, ListView): + model = sistemas_por_cliente - paginate_by = 5 + paginate_by = 20 template_name = 'Sistemas/Xclientes/lista.html' + def test_func(self): res = self.request.user.groups.filter(name= 'admin_soft') if not res: @@ -165,6 +167,15 @@ class SistemasXCliente_DetailView(UserPassesTestMixin,LoginRequiredMixin, Detail if not res: messages.error(self.request, f'Lo sentimos. La página que buscas no está disponible, no cuentas con los permisos.') return res + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + sistemas_por_cliente = self.object + sistema = sistemas_por_cliente.id_sistema + cliente = sistemas_por_cliente.cliente + print(sistema.id, cliente.id) + context['devices'] = Device.objects.filter(sistema=sistema, client=cliente.id) + return context class SistemasxCliente_CreateView(CreateView): diff --git a/Templates/Clientes/Errores_Timbres_list.html b/Templates/Clientes/Errores_Timbres_list.html index bb37dc4..4418c6a 100644 --- a/Templates/Clientes/Errores_Timbres_list.html +++ b/Templates/Clientes/Errores_Timbres_list.html @@ -26,44 +26,7 @@ -{% if page_obj.has_other_pages %} - -{% endif %} {% endblock content %} \ No newline at end of file diff --git a/Templates/Sistemas/Xclientes/detail.html b/Templates/Sistemas/Xclientes/detail.html index a56c927..53c591c 100644 --- a/Templates/Sistemas/Xclientes/detail.html +++ b/Templates/Sistemas/Xclientes/detail.html @@ -72,16 +72,16 @@ thead { - click me + + {% for device in devices %} + + + Dispositivo: {{ device }} + + - + - - {% for sistema in object.id_sistema.device_set.all %} - - - Dispositivo: {{sistema}} - - - - - - - {% endfor %} + {% endfor %} diff --git a/Templates/Sistemas/Xclientes/lista.html b/Templates/Sistemas/Xclientes/lista.html index 5ef1247..afef1bd 100644 --- a/Templates/Sistemas/Xclientes/lista.html +++ b/Templates/Sistemas/Xclientes/lista.html @@ -31,6 +31,6 @@ {% endfor %} - + {% endblock content %} \ No newline at end of file diff --git a/Templates/paginator.html b/Templates/paginator.html index 28700c5..a166073 100644 --- a/Templates/paginator.html +++ b/Templates/paginator.html @@ -1,4 +1,46 @@ +{% if page_obj.has_other_pages %} + + +{% endif %} + + + + {% if lista.has_other_pages %}