ereuse/devicehub-django
9
0
Fork 0
Code Issues 6 Pull requests 7 Packages Projects Releases Wiki Activity

WIP: Several UI changes #49

Closed
rskthomas wants to merge 5 commits from ux-changes into main
pull from: ux-changes
merge into: ereuse:main
Conversation 2 Commits 5 Files changed 10 +153 -159
10 changed files with 153 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
admin/templates/admin_users.html
View file

@ -1,15 +1,18 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% block actions %}
<a href="{% url 'admin:new_user' %}" class="btn btn-green-admin">
<i class="bi bi-person-add"></i>
{% translate "New user" %}
</a>
{% endblock %}
{% block content %} {% block content %}
<div class="row"> <h3>{{ subtitle }}</h3>
<div class="col">
<h3>{{ subtitle }}</h3>
</div>
<div class="col-2">
<a href="{% url 'admin:new_user' %}" class="btn btn-green-admin">{% translate "Add new user" %}</a>
</div>
</div>
<div class="row"> <div class="row">
<div class="col"> <div class="col">

12
dashboard/static/css/dashboard.css
View file

@ -174,3 +174,15 @@ h3 {
.btn-orange { .btn-orange {
background-color: #f5b587; background-color: #f5b587;
} }
/* Clase para botones con funcionalidad no implementados */
.btn-todo {
background-color: #6c757d;
color: #fff; /* texto en blanco*/
opacity: 0.65;
cursor: not-allowed;
.btn-todo:disabled {
pointer-events: none;
}
}

35
dashboard/templates/base.html
View file

@ -63,15 +63,23 @@
<div class="navbar-nav navbar-sub-brand"> <div class="navbar-nav navbar-sub-brand">
{{ user.institution.name|upper }} {{ user.institution.name|upper }}
</div> </div>
<div class="navbar-nav">
<div class="nav-item text-nowrap"> <nav class="navbar navbar-expand-sm">
<i id="user-avatar" class="bi bi-person-circle"></i> <div class="container-fluid d-flex justify-content-end">
<a class="navbar-sub-brand px-3" href="{% url 'user:panel' %}">{{ user.email }}</a> <div class="nav-item dropdown">
<a class="logout" href="{% url 'login:logout' %}"> <a class="nav-link dropdown-toggle navbar-sub-brand px-3" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
<i class="fa-solid fa-arrow-right-from-bracket"></i> {{ user.email }}
</a> </a>
<ul class="dropdown-menu dropdown-menu-end">
<li><a class="dropdown-item" href="{% url 'user:panel' %}"><i class="bi bi-person"></i> Profile</a></li>
<li><a class="dropdown-item" href="{% url 'api:tokens' %}"><i class="bi bi-key"></i> Tokens</a></li>
<li><a class="dropdown-item" href="{% url 'user:settings' %}"><i class="bi bi-gear"></i> Settings File</a></li>
<li><hr class="dropdown-divider"></li>
<li><a class="dropdown-item text-danger" href="{% url 'login:logout' %}"><i class="fa-solid fa-arrow-right-from-bracket"></i> Logout</a></li>
</ul>
</div>
</div> </div>
</div> </nav>
</header> </header>
<div class="container-fluid"> <div class="container-fluid">
@ -200,6 +208,10 @@
</div> </div>
</div> </div>
<div class="d-flex flex-wrap gap-2 justify-content-end">
{% block actions %}
{% endblock %}
</div>
{% block content %} {% block content %}
{% endblock content %} {% endblock content %}
@ -218,6 +230,15 @@
<script src="{% static "js/jquery-3.3.1.slim.min.js" %}"></script> <script src="{% static "js/jquery-3.3.1.slim.min.js" %}"></script>
<script src="{% static "js/popper.min.js" %}"></script> <script src="{% static "js/popper.min.js" %}"></script>
<script src="{% static "js/bootstrap.min.js" %}"></script> <script src="{% static "js/bootstrap.min.js" %}"></script>
<script>
// initialize bootstrap tooltips for those objects with data-bs-toggle="tooltip"
var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
return new bootstrap.Tooltip(tooltipTriggerEl);
});
</script>
{% block extrascript %}{% endblock %} {% block extrascript %}{% endblock %}
{% endblock %} {% endblock %}
</body> </body>

21
dashboard/templates/unassigned_devices.html
View file

@ -2,31 +2,28 @@
{% load i18n %} {% load i18n %}
{% load paginacion %} {% load paginacion %}
{% block actions %}
{% block content %}
<div class="row">
<div class="col">
<h3>{{ subtitle }}</h3>
</div>
<div class="col text-center">
{% if lot %} {% if lot %}
<a href="{% url 'lot:documents' object.id %}" type="button" class="btn btn-green-admin"> <a href="{% url 'lot:documents' object.id %}" type="button" class="btn btn-green-admin">
<i class="bi bi-folder2"></i> <i class="bi bi-folder2"></i>
{% trans 'Documents' %} {% trans 'Documents' %}
</a> </a>
{% endif %} {% endif %}
<a href="{# url 'dashboard:exports' object.id #}" type="button" class="btn btn-green-admin"> <a href="{# url 'dashboard:exports' object.id #}" type="button" class="btn btn-todo" data-bs-toggle="tooltip" title="NOT IMPLEMENTED. This action tries to emulate what devicehub-teal did, which was related to opening a dialog where you can select different options for export the devices as csv for all selected devices" >
<i class="bi bi-reply"></i> <i class="bi bi-reply"></i>
{% trans 'Exports' %} {% trans 'Exports' %}
</a> </a>
{% if lot %} {% if lot %}
<a href="{% url 'lot:annotations' object.id %}" type="button" class="btn btn-green-admin"> <a href="{% url 'lot:annotations' object.id %}" type="button" class="btn btn-green-admin" >
<i class="bi bi-tag"></i> <i class="bi bi-tag"></i>
{% trans 'Annotations' %} {% trans 'Annotations' %}
</a> </a>
{% endif %} {% endif %}
</div>
</div> {% endblock%}
{% block content %}
<h3>{{ subtitle }}</h3>
<div class="dataTable-container"> <div class="dataTable-container">
<form method="post"> <form method="post">
@ -79,7 +76,7 @@
</tbody> </tbody>
{% endfor %} {% endfor %}
</table> </table>
<button class="btn btn-green-admin" type="submit" value="{% url 'lot:del_devices' %}" name="url">Remove</button> <button class="btn btn-green-admin" type="submit" name="url" value="{% url 'lot:add_devices' %}">add</button> <button class="btn btn-green-admin" type="submit" value="{% url 'lot:del_devices' %}" name="url">Remove</button> <button class="btn btn-green-admin" type="submit" name="url" value="{% url 'lot:add_devices' %}">add</button>
</form> </form>
</div> </div>
<div class="row mt-3"> <div class="row mt-3">

2
device/templates/details.html
View file

@ -241,7 +241,7 @@
{% for snap in object.evidences %} {% for snap in object.evidences %}
<tr> <tr>
<td> <td>
<a href="{% url 'evidence:details' snap.uuid %}">{{ snap.uuid }}</a> <a href="{% url 'evidence:details' snap.uuid %}">{{ snap.uuid|truncatechars:7|upper }}</a>
</td> </td>
<td> <td>
{% if snap.did_document %} {% if snap.did_document %}

77
evidence/templates/ev_details.html
View file

@ -1,5 +1,13 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% block actions %}
<a href="{% url 'evidence:download' object.uuid %}" class="btn btn-green-admin">
<i class="bi bi-file-earmark-arrow-down"></i>
{% trans "Download File" %}
</a>
{% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
@ -8,20 +16,57 @@
</div> </div>
</div> </div>
{% load django_bootstrap5 %}
<form role="form" method="post" class="p-2 mb-4 border rounded shadow-sm d-flex d-inline-flex align-items-center gap-3" style="max-width: 400px; {% if form2.erase_server.value %}background-color: #d5f7de;{% else %}background-color: #f7e7d5;{% endif %}">
{% csrf_token %}
{% if form2.errors %}
<div class="alert alert-danger d-flex align-items-center alert-dismissible fade show w-100" role="alert">
<i class="mdi mdi-alert-circle me-2"></i>
<div>
{% for field, error in form2.errors.items %}
<strong>{{ field|title }}:</strong> {{ error }}<br />
{% endfor %}
</div>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
{% endif %}
<!-- erase server swithc -->
<div class="form-check form-switch m-0">
<input
class="form-check-input"
type="checkbox"
id="{{ form2.erase_server.id_for_label }}"
name="{{ form2.erase_server.name }}"
{% if form2.erase_server.value %}
checked
{% endif %}>
<label class="form-check-label ps-1" for="{{ form2.erase_server.id_for_label }}">
{% if form2.erase_server.value %}
<i class="pe-1 bi bi-eraser"></i>
{% translate "It is an erase server" %}
{% else %}
<i class="pe-1 bi bi-x-circle"></i>
{% translate "It is not an erase server" %}
{% endif %}
</label>
</div>
<!-- submit button -->
<button class="btn btn-sm btn btn-outline-success" d-flex align-items-end gap-1" type="submit" name="submit_form2">
<i class="bi bi-floppy2-fill"></i> {% translate 'Save' %}
</button>
</form>
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<ul class="nav nav-tabs nav-tabs-bordered"> <ul class="nav nav-tabs nav-tabs-bordered">
<li class="nav-items"> <li class="nav-items">
<button class="nav-link active" data-bs-toggle="tab" data-bs-target="#device">{% trans "Devices" %}</button> <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#device">{% trans "Device" %}</button>
</li> </li>
<li class="nav-items"> <li class="nav-items">
<a href="#tag" class="nav-link" data-bs-toggle="tab" data-bs-target="#tag">{% trans "Tag" %}</a> <a href="#tag" class="nav-link" data-bs-toggle="tab" data-bs-target="#tag">{% trans "Tag" %}</a>
</li>
<li class="nav-items">
<a href="{% url 'evidence:erase_server' object.uuid %}" class="nav-link">{% trans "Erase Server" %}</a>
</li>
<li class="nav-items">
<a href="{% url 'evidence:download' object.uuid %}" class="nav-link">{% trans "Download File" %}</a>
</li> </li>
</ul> </ul>
</div> </div>
@ -35,26 +80,28 @@
<thead> <thead>
<tr> <tr>
<th scope="col" data-sortable=""> <th scope="col" data-sortable="">
{% trans "Type" %} {% trans "Algorithm" %}
</th> </th>
<th scope="col" data-sortable=""> <th scope="col" data-sortable="">
{% trans "Identificator" %} {% trans "Device ID" %}
</th> </th>
<th scope="col" data-sortable=""> <th scope="col" data-sortable="">
{% trans "Data" %} {% trans "Date" %}
</th> </th>
</tr> </tr>
</thead> </thead>
{% for snap in object.annotations %} {% for snap in object.annotations %}
<tbody>
{% if snap.type == 0 %} {% if snap.type == 0 %}
<tbody>
<tr> <tr>
<td> <td>
{{ snap.key }} {{ snap.key }}
</td> </td>
<td> <td>
<small class="text-muted"> <small class="text-muted">
<a href="{% url 'device:details' snap.value %}">{{ snap.value }}</a> <a href="{% url 'device:details' snap.value %}">{{ snap.value|truncatechars:7|upper }}</a>
{{ dev.shortid }}
</small> </small>
</td> </td>
<td> <td>
@ -69,6 +116,7 @@
</table> </table>
</div> </div>
</div> </div>
<div class="tab-pane fade" id="tag"> <div class="tab-pane fade" id="tag">
{% load django_bootstrap5 %} {% load django_bootstrap5 %}
<div class="list-group col-6"> <div class="list-group col-6">
@ -90,7 +138,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<a class="btn btn-grey" href="">{% translate "Cancel" %}</a> <a class="btn btn-grey" href="">{% translate "Cancel" %}</a>
<input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" /> <input class="btn btn-green-admin" type="submit" name="submit_form1" value="{% translate 'Save' %}" />
</div> </div>
{% if form.tag.value %} {% if form.tag.value %}
<div class="col-1"> <div class="col-1">
@ -103,6 +151,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block extrascript %} {% block extrascript %}

61
evidence/templates/ev_eraseserver.html
View file

@ -1,61 +0,0 @@
{% extends "base.html" %}
{% load i18n %}
{% block content %}
<div class="row">
<div class="col">
<h3>{{ object.id }}</h3>
</div>
</div>
<div class="row">
<div class="col">
<ul class="nav nav-tabs nav-tabs-bordered">
<li class="nav-items">
<a href="{% url 'evidence:details' object.uuid %}" class="nav-link">{% trans "Devices" %}</a>
</li>
<li class="nav-items">
<a href="{% url 'evidence:details' object.uuid %}#tag" class="nav-link">{% trans "Tag" %}</a>
</li>
<li class="nav-items">
<button class="nav-link active" data-bs-toggle="tab" data-bs-target="#erase_server">{% trans "Erase Server" %}</button>
</li>
<li class="nav-items">
<a href="{% url 'evidence:download' object.uuid %}" class="nav-link">{% trans "Download File" %}</a>
</li>
</ul>
</div>
</div>
<div class="tab-content pt-2">
<div class="tab-pane fade show active" id="erase_server">
{% load django_bootstrap5 %}
<div class="list-group col-6">
<form role="form" method="post">
{% csrf_token %}
{% if form.errors %}
<div class="alert alert-danger alert-icon alert-icon-border alert-dismissible" role="alert">
<div class="icon"><span class="mdi mdi-close-circle-o"></span></div>
<div class="message">
{% for field, error in form.errors.items %}
{{ error }}<br />
{% endfor %}
<button class="btn-close" type="button" data-dismiss="alert" aria-label="Close"></button>
</div>
</div>
{% endif %}
{% bootstrap_form form %}
<div class="container">
<div class="row">
<div class="col">
<a class="btn btn-grey" href="">{% translate "Cancel" %}</a>
<input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
</div>
</div>
</div>
</form>
</div>
</div>
</div>
{% endblock %}

1
evidence/urls.py
View file

@ -18,7 +18,6 @@ urlpatterns = [
path("upload", views.UploadView.as_view(), name="upload"), path("upload", views.UploadView.as_view(), name="upload"),
path("import", views.ImportView.as_view(), name="import"), path("import", views.ImportView.as_view(), name="import"),
path("<uuid:pk>", views.EvidenceView.as_view(), name="details"), path("<uuid:pk>", views.EvidenceView.as_view(), name="details"),
path("<uuid:pk>/eraseserver", views.EraseServerView.as_view(), name="erase_server"),
path("<uuid:pk>/download", views.DownloadEvidenceView.as_view(), name="download"), path("<uuid:pk>/download", views.DownloadEvidenceView.as_view(), name="download"),
path('annotation/<int:pk>/del', views.AnnotationDeleteView.as_view(), name='delete_annotation'), path('annotation/<int:pk>/del', views.AnnotationDeleteView.as_view(), name='delete_annotation'),
] ]

63
evidence/views.py
View file

@ -102,6 +102,7 @@ class EvidenceView(DashboardView, FormView):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context.update({ context.update({
'object': self.object, 'object': self.object,
'form2': EraseServerForm(**self.get_form_kwargs(), data=self.request.POST or None),
}) })
return context return context
@ -112,6 +113,23 @@ class EvidenceView(DashboardView, FormView):
kwargs['user'] = self.request.user kwargs['user'] = self.request.user
return kwargs return kwargs
def post(self, request, *args, **kwargs):
form1 = self.get_form()
#Empty param @initial makes it work, but i doubt it is the correct logic
form2 = EraseServerForm(request.POST, user=self.request.user, initial={}, uuid=self.kwargs.get('pk'))
if "submit_form1" in request.POST and form1.is_valid():
return self.form_valid(form1)
elif "submit_form2" in request.POST and form2.is_valid():
return self.form2_valid(form2)
return self.form_invalid(form1, form2)
def form2_valid(self, form):
form.save(self.request.user)
response = super().form_valid(form)
return response
def form_valid(self, form): def form_valid(self, form):
form.save(self.request.user) form.save(self.request.user)
response = super().form_valid(form) response = super().form_valid(form)
@ -166,48 +184,3 @@ class AnnotationDeleteView(DashboardView, DeleteView):
return redirect(url_name, **kwargs_view) return redirect(url_name, **kwargs_view)
class EraseServerView(DashboardView, FormView):
template_name = "ev_eraseserver.html"
section = "evidences"
title = _("Evidences")
breadcrumb = "Evidences / Details"
success_url = reverse_lazy('evidence:list')
form_class = EraseServerForm
def get(self, request, *args, **kwargs):
self.pk = kwargs['pk']
self.object = Evidence(self.pk)
if self.object.owner != self.request.user.institution:
raise Http403
self.object.get_annotations()
return super().get(request, *args, **kwargs)
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context.update({
'object': self.object,
})
return context
def get_form_kwargs(self):
self.pk = self.kwargs.get('pk')
kwargs = super().get_form_kwargs()
kwargs['uuid'] = self.pk
kwargs['user'] = self.request.user
return kwargs
def form_valid(self, form):
form.save(self.request.user)
response = super().form_valid(form)
return response
def form_invalid(self, form):
response = super().form_invalid(form)
return response
def get_success_url(self):
success_url = reverse_lazy('evidence:details', args=[self.pk])
return success_url

21
lot/templates/lots.html
View file

@ -1,28 +1,29 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% block content %} {% block actions %}
<div class="row mb-3">
<div class="col">
<h3>{{ subtitle }}</h3>
</div>
<div class="col text-center">
{% if show_closed %} {% if show_closed %}
<a href="?show_closed=false" class="btn btn-green-admin"> <a href="?show_closed=false" class="btn btn-green-admin">
{% trans 'Hide closed lots' %} {% trans 'Hide closed lots' %}
<i class="ps-2 bi bi-x-octagon-fill"></i>
</a> </a>
{% else %} {% else %}
<a href="?show_closed=true" class="btn btn-green-admin"> <a href="?show_closed=true" class="btn btn-green-admin">
{% trans 'Show closed lots' %} {% trans 'Show closed lots' %}
<i class="ps-2 bi bi-x-octagon"></i>
</a> </a>
{% endif %} {% endif %}
<a href="{% url 'lot:add' %}" type="button" class="btn btn-green-admin"> <a href="{% url 'lot:add' %}" type="button" class="btn btn-green-admin">
<i class="bi bi-plus"></i> <i class="bi bi-folder-plus"></i>
{% trans 'Add new lot' %} {% trans 'New lot' %}
</a> </a>
</div> {% endblock %}
</div>
{% block content %}
<div class="row"> <div class="row">
<table class= "table table-striped table-sm"> <table class= "table table-striped table-sm">