diff --git a/admin/templates/lot_tag_panel.html b/admin/templates/lot_tag_panel.html new file mode 100644 index 0000000..44be7ff --- /dev/null +++ b/admin/templates/lot_tag_panel.html @@ -0,0 +1,173 @@ +{% extends "base.html" %} +{% load i18n django_bootstrap5 %} + +{% block content %} +
+
+

{{ subtitle }}

+
+
+ +
+
+
+
+ {% if lot_tags %} + + + + + + + + + {% for tag in lot_tags %} + + + + + + + {% endfor %} + +
{% trans "Tag" %} + {% trans "Actions" %} +
+ {{ tag.name }} + +
+ + +
+
+ + + {% else %} + + {% endif %} +
+
+ + + + + +{% for tag in lot_tags %} + +{% endfor %} + + + +{% for tag in lot_tags %} + + +{% endfor %} +{% endblock %} diff --git a/admin/urls.py b/admin/urls.py index 8aafced..e7dd195 100644 --- a/admin/urls.py +++ b/admin/urls.py @@ -15,4 +15,8 @@ urlpatterns = [ path("states/delete/", views.DeleteStateDefinitionView.as_view(), name='delete_state_definition'), path("states/update_order/", views.UpdateStateOrderView.as_view(), name='update_state_order'), path("states/edit//", views.UpdateStateDefinitionView.as_view(), name='edit_state_definition'), + path("lot_tag/", views.LotTagPanelView.as_view(), name="tag_panel"), + path("lot_tag/add", views.AddLotTagView.as_view(), name="add_lot_tag"), + path("lot_tag/delete/", views.DeleteLotTagView.as_view(), name='delete_lot_tag'), + path("lot_tag/edit//", views.UpdateLotTagView.as_view(), name='edit_lot_tag'), ] diff --git a/admin/views.py b/admin/views.py index df4cf16..01b9f0e 100644 --- a/admin/views.py +++ b/admin/views.py @@ -18,6 +18,7 @@ from admin.forms import OrderingStateForm from user.models import User, Institution from admin.email import NotifyActivateUserByEmail from action.models import StateDefinition +from lot.models import LotTag class AdminView(DashboardView): @@ -112,6 +113,74 @@ class EditUserView(AdminView, UpdateView): return kwargs +class LotTagPanelView(AdminView, TemplateView): + template_name = "lot_tag_panel.html" + title = _("Lot Tag Panel") + breadcrumb = _("admin / Lot Tag Panel") + + +class AddLotTagView(AdminView, CreateView): + template_name = "lot_tag_panel.html" + title = _("New lot tag Definition") + breadcrumb = "Admin / New lot tag" + success_url = reverse_lazy('admin:tag_panel') + model = LotTag + fields = ('name',) + + def form_valid(self, form): + form.instance.owner = self.request.user.institution + form.instance.user = self.request.user + + response = super().form_valid(form) + messages.success(self.request, _("Lot Tag successfully added.")) + return response + + +class DeleteLotTagView(AdminView, DeleteView): + model = LotTag + success_url = reverse_lazy('admin:tag_panel') + + def post(self, request, *args, **kwargs): + pk = kwargs.get('pk') + self.object = get_object_or_404( + self.model, + owner=self.request.user.institution, + pk=pk + ) + + if self.object.lot_set.first(): + msg = _('This tag have lots. Impossible deleted.') + messages.warning(self.request, msg) + return redirect(reverse_lazy('admin:tag_panel')) + + response = super().delete(request, *args, **kwargs) + msg = _('Lot Tag has been deleted.') + messages.success(self.request, msg) + return response + + +class UpdateLotTagView(AdminView, UpdateView): + model = LotTag + template_name = 'lot_tag_panel.html' + fields = ['name'] + success_url = reverse_lazy('admin:tag_panel') + + def get_form_kwargs(self): + pk = self.kwargs.get('pk') + self.object = get_object_or_404( + self.model, + owner=self.request.user.institution, + pk=pk + ) + return super().get_form_kwargs() + + def form_valid(self, form): + response = super().form_valid(form) + msg = _("Lot Tag updated successfully.") + messages.success(self.request, msg) + return response + + class InstitutionView(AdminView, UpdateView): template_name = "institution.html" title = _("Edit institution") diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html index 57bf0fb..83bfb54 100644 --- a/dashboard/templates/base.html +++ b/dashboard/templates/base.html @@ -82,11 +82,11 @@
    {% if user.is_admin %}
  • - -
      + {% endif %}
    • - -
        -
      • - - {% trans 'Unassigned devices' %} +
      • - -
          +
        • - -
            -
          • - - {% trans 'Upload one' %} - -
            • + - -
          • - - diff --git a/dashboard/urls.py b/dashboard/urls.py index 835e708..cf19b31 100644 --- a/dashboard/urls.py +++ b/dashboard/urls.py @@ -1,10 +1,11 @@ from django.urls import path -from dashboard import views +from dashboard import views app_name = 'dashboard' urlpatterns = [ - path("", views.UnassignedDevicesView.as_view(), name="unassigned_devices"), + path("", views.UnassignedDevicesView.as_view(), name="unassigned"), + path("all", views.AllDevicesView.as_view(), name="all_device"), path("/", views.LotDashboardView.as_view(), name="lot"), path("search", views.SearchView.as_view(), name="search"), ] diff --git a/dashboard/views.py b/dashboard/views.py index 4917bb8..369567b 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -22,6 +22,16 @@ class UnassignedDevicesView(InventaryMixin): return Device.get_unassigned(self.request.user.institution, offset, limit) +class AllDevicesView(InventaryMixin): + template_name = "unassigned_devices.html" + section = "All" + title = _("All Devices") + breadcrumb = "Devices / All Devices" + + def get_devices(self, user, offset, limit): + return Device.get_all(self.request.user.institution, offset, limit) + + class LotDashboardView(InventaryMixin, DetailsMixin): template_name = "unassigned_devices.html" section = "dashboard_lot" diff --git a/device/models.py b/device/models.py index a385895..0bd043c 100644 --- a/device/models.py +++ b/device/models.py @@ -136,6 +136,85 @@ class Device: self.lots = [ x.lot for x in DeviceLot.objects.filter(device_id=self.id)] + @classmethod + def get_all(cls, institution, offset=0, limit=None): + sql = """ + WITH RankedProperties AS ( + SELECT + t1.value, + t1.key, + ROW_NUMBER() OVER ( + PARTITION BY t1.uuid + ORDER BY + CASE + WHEN t1.key = 'CUSTOM_ID' THEN 1 + WHEN t1.key = 'ereuse24' THEN 2 + ELSE 3 + END, + t1.created DESC + ) AS row_num + FROM evidence_systemproperty AS t1 + WHERE t1.owner_id = {institution} + ) + SELECT DISTINCT + value + FROM + RankedProperties + WHERE + row_num = 1 + """.format( + institution=institution.id, + ) + if limit: + sql += " limit {} offset {}".format(int(limit), int(offset)) + + sql += ";" + + annotations = [] + with connection.cursor() as cursor: + cursor.execute(sql) + annotations = cursor.fetchall() + + devices = [cls(id=x[0]) for x in annotations] + count = cls.get_all_count(institution) + return devices, count + + @classmethod + def get_all_count(cls, institution): + + sql = """ + WITH RankedProperties AS ( + SELECT + t1.value, + t1.key, + ROW_NUMBER() OVER ( + PARTITION BY t1.uuid + ORDER BY + CASE + WHEN t1.key = 'CUSTOM_ID' THEN 1 + WHEN t1.key = 'ereuse24' THEN 2 + ELSE 3 + END, + t1.created DESC + ) AS row_num + + FROM evidence_systemproperty AS t1 + WHERE t1.owner_id = {institution} + ) + SELECT + COUNT(DISTINCT value) + FROM + RankedProperties + WHERE + row_num = 1 + """.format( + institution=institution.id + ) + with connection.cursor() as cursor: + cursor.execute(sql) + return cursor.fetchall()[0][0] + + @classmethod def get_unassigned(cls, institution, offset=0, limit=None): diff --git a/device/templates/new_device.html b/device/templates/new_device.html index 320790d..46b4ce6 100644 --- a/device/templates/new_device.html +++ b/device/templates/new_device.html @@ -78,7 +78,7 @@ {% endfor %}
            - {% translate "Cancel" %} + {% translate "Cancel" %}
            diff --git a/device/views.py b/device/views.py index e418c7b..07a9490 100644 --- a/device/views.py +++ b/device/views.py @@ -40,7 +40,7 @@ class NewDeviceView(DashboardView, FormView): template_name = "new_device.html" title = _("New Device") breadcrumb = "Device / New Device" - success_url = reverse_lazy('dashboard:unassigned_devices') + success_url = reverse_lazy('dashboard:unassigned') form_class = DeviceFormSet def form_valid(self, form): diff --git a/evidence/templates/upload.html b/evidence/templates/upload.html index 6337b3e..e2d7aff 100644 --- a/evidence/templates/upload.html +++ b/evidence/templates/upload.html @@ -11,8 +11,8 @@ @@ -22,7 +22,7 @@ {% bootstrap_form form alert_error_type="none" error_css_class="alert alert-danger alert-icon alert-icon-border" %}
            - {% translate "Cancel" %} + {% translate "Cancel" %}
            diff --git a/login/views.py b/login/views.py index beb0368..885cc86 100644 --- a/login/views.py +++ b/login/views.py @@ -17,18 +17,18 @@ class LoginView(auth_views.LoginView): template_name = 'login.html' extra_context = { 'title': _('Login'), - 'success_url': reverse_lazy('dashboard:unassigned_devices'), + 'success_url': reverse_lazy('dashboard:unassigned'), 'commit_id': settings.COMMIT, } def get(self, request, *args, **kwargs): self.extra_context['success_url'] = request.GET.get( 'next', - reverse_lazy('dashboard:unassigned_devices') + reverse_lazy('dashboard:unassigned') ) if not self.request.user.is_anonymous: - return redirect(reverse_lazy('dashboard:unassigned_devices')) - + return redirect(reverse_lazy('dashboard:unassigned')) + return super().get(request, *args, **kwargs) def form_valid(self, form): @@ -72,4 +72,3 @@ class PasswordResetView(auth_views.PasswordResetView): except Exception as err: logger.error(err) return HttpResponseRedirect(self.success_url) - diff --git a/lot/templates/delete_lot.html b/lot/templates/delete_lot.html index 95fe1d6..babdb89 100644 --- a/lot/templates/delete_lot.html +++ b/lot/templates/delete_lot.html @@ -30,7 +30,7 @@ {% endif %} {% bootstrap_form form %}
            - {% translate "Cancel" %} + {% translate "Cancel" %}
            diff --git a/lot/templates/new_lot.html b/lot/templates/new_lot.html index 8f2df37..c4c2cc8 100644 --- a/lot/templates/new_lot.html +++ b/lot/templates/new_lot.html @@ -24,7 +24,7 @@ {% endif %} {% bootstrap_form form %}
            - {% translate "Cancel" %} + {% translate "Cancel" %}
            diff --git a/lot/urls.py b/lot/urls.py index 3456f91..369c063 100644 --- a/lot/urls.py +++ b/lot/urls.py @@ -9,7 +9,7 @@ urlpatterns = [ path("edit//", views.EditLotView.as_view(), name="edit"), path("add/devices/", views.AddToLotView.as_view(), name="add_devices"), path("del/devices/", views.DelToLotView.as_view(), name="del_devices"), - path("tag//", views.LotsTagsView.as_view(), name="tag"), + path("tag//", views.LotsTagsView.as_view(), name="tags"), path("/property", views.LotPropertiesView.as_view(), name="properties"), path("/property/add", views.AddLotPropertyView.as_view(), name="add_property"), path("/property/update", views.UpdateLotPropertyView.as_view(), name="update_property"), diff --git a/lot/views.py b/lot/views.py index 6acc58c..2093668 100644 --- a/lot/views.py +++ b/lot/views.py @@ -18,7 +18,7 @@ class NewLotView(DashboardView, CreateView): template_name = "new_lot.html" title = _("New lot") breadcrumb = "lot / New lot" - success_url = reverse_lazy('dashboard:unassigned_devices') + success_url = reverse_lazy('dashboard:unassigned') model = Lot fields = ( "type", @@ -39,7 +39,7 @@ class DeleteLotView(DashboardView, DeleteView): template_name = "delete_lot.html" title = _("Delete lot") breadcrumb = "lot / Delete lot" - success_url = reverse_lazy('dashboard:unassigned_devices') + success_url = reverse_lazy('dashboard:unassigned') model = Lot fields = ( "type", @@ -58,7 +58,7 @@ class EditLotView(DashboardView, UpdateView): template_name = "new_lot.html" title = _("Edit lot") breadcrumb = "Lot / Edit lot" - success_url = reverse_lazy('dashboard:unassigned_devices') + success_url = reverse_lazy('dashboard:unassigned') model = Lot fields = ( "type", @@ -84,7 +84,7 @@ class AddToLotView(DashboardView, FormView): template_name = "list_lots.html" title = _("Add to lots") breadcrumb = "lot / add to lots" - success_url = reverse_lazy('dashboard:unassigned_devices') + success_url = reverse_lazy('dashboard:unassigned') form_class = LotsForm def get_context_data(self, **kwargs): @@ -125,7 +125,7 @@ class LotsTagsView(DashboardView, TemplateView): template_name = "lots.html" title = _("lots") breadcrumb = _("lots") + " /" - success_url = reverse_lazy('dashboard:unassigned_devices') + success_url = reverse_lazy('dashboard:unassigned') def get_context_data(self, **kwargs): self.pk = kwargs.get('pk')