diff --git a/action/forms.py b/action/forms.py new file mode 100644 index 0000000..4d391f2 --- /dev/null +++ b/action/forms.py @@ -0,0 +1,22 @@ +from django import forms +from .models import State + + +class AddStateForm(forms.Form): + add_note = forms.BooleanField(required=False) + note = forms.CharField( + required=False, + widget=forms.Textarea(attrs={'rows': 4, 'maxlength': 200, 'placeholder': 'Max 200 characters'}), + ) + state_id = forms.IntegerField(required=True, widget=forms.HiddenInput()) + snapshot_uuid = forms.UUIDField(required=True, widget=forms.HiddenInput()) + + + def clean(self): + cleaned_data = super().clean() + add_note = cleaned_data.get('add_note') + note = cleaned_data.get('note') + + if add_note == True and not note: + self.add_error('note', 'Please enter a note if you checked "Add a note".') + return cleaned_data \ No newline at end of file diff --git a/device/templates/details.html b/device/templates/details.html index 3c0a185..e38e229 100644 --- a/device/templates/details.html +++ b/device/templates/details.html @@ -58,70 +58,91 @@ - -
+
-
{% trans 'Details' %}
-
-
Phid
-
{{ object.id }}
-
- - {% if object.is_eraseserver %} -
-
- {% trans 'Is a erase server' %} -
-
-
- {% endif %} - -
-
Type
-
{{ object.type }}
-
- - {% if object.is_websnapshot and object.last_user_evidence %} - {% for k, v in object.last_user_evidence %} +
+ +
+
{% trans 'Details' %}
+
-
{{ k }}
-
{{ v|default:'' }}
+
{% trans 'Phid' %}
+
{{ object.id }}
- {% endfor %} - {% else %} -
-
- {% trans 'Manufacturer' %} + + {% if object.is_eraseserver %} +
+
{% trans 'Is an erase server' %}
+
{% trans 'Yes' %}
+
+ {% endif %} + +
+
{% trans 'Type' %}
+
{{ object.type }}
+
+ + {% if object.is_websnapshot and object.last_user_evidence %} + {% for k, v in object.last_user_evidence.items %} +
+
{{ k }}
+
{{ v|default:'' }}
+
+ {% endfor %} + {% else %} +
+
{% trans 'Manufacturer' %}
+
{{ object.manufacturer|default:'' }}
+
+ +
+
{% trans 'Model' %}
+
{{ object.model|default:'' }}
+
+ +
+
{% trans 'Serial Number' %}
+
{{ object.serial_number|default:'' }}
+
+ {% endif %} + +
+
{% trans 'Identifiers' %}
+
+ {% for chid in object.hids %} +
{{ chid|default:'' }}
+ {% endfor %} +
-
{{ object.manufacturer|default:'' }}
- -
-
- {% trans 'Model' %} + + + +
+
{% trans 'Current State' %}
+
+
+
{% trans 'State' %}
+
{{ device_states.0.state }}
-
{{ object.model|default:'' }}
-
- -
-
- {% trans 'Serial Number' %} +
+
{% trans 'Date' %}
+
{{ device_states.0.date|date:"SHORT_DATETIME_FORMAT" }}
-
{{ object.serial_number|default:'' }}
-
- {% endif %} -
-
- {% trans 'Identifiers' %} + + {% if last_note %} +
+
{% trans 'Note' %}
+
{{ object.last_state.note }}
+
+ {% endif %}
- {% for chid in object.hids %} -
-
{{ chid|default:'' }}
-
- {% endfor %}
+
+ +
@@ -169,7 +190,7 @@
- + {% for a in object.get_user_properties %}
diff --git a/device/views.py b/device/views.py index 4ea0f0b..7f9c380 100644 --- a/device/views.py +++ b/device/views.py @@ -14,7 +14,7 @@ from django.views.generic.edit import ( DeleteView, ) from django.views.generic.base import TemplateView -from action.models import StateDefinition +from action.models import StateDefinition, State from dashboard.mixins import DashboardView, Http403 from evidence.models import UserProperty, SystemProperty, Property from lot.models import LotTag @@ -109,11 +109,14 @@ class DetailsView(DashboardView, TemplateView): context = super().get_context_data(**kwargs) self.object.initial() lot_tags = LotTag.objects.filter(owner=self.request.user.institution) + last_evidence= self.object.get_last_evidence(), + uuid=self.object.last_uuid() context.update({ 'object': self.object, - 'snapshot': self.object.get_last_evidence(), + 'snapshot': last_evidence, 'lot_tags': lot_tags, "state_definitions": StateDefinition.objects.filter(institution=self.request.user.institution).order_by('order'), + "device_states": State.objects.filter(snapshot_uuid=uuid).order_by('date'), }) return context