-
-
- {% include 'partials/asset_buttons.html' %}
+
-
-
-
-
- {% include 'partials/asset_buttons.html' %}
+ {% include 'partials/purchasedetails_form.html' %}
+
+ {%endif%}
+
+ {% include 'partials/cable_form.html' %}
+
+
+ {% include 'partials/parent_form.html' %}
+
-
+
+
+ {% include 'partials/asset_buttons.html' %}
+
+
+
{% include 'partials/confirm_delete.html' with object=object %}
{% endblock %}
-{% block js %}
+{% block js%}
+{% if edit %}
-
-{# #}
-
-
-
-
+{% endif %}
{% endblock %}
diff --git a/assets/templates/partials/asset_buttons.html b/assets/templates/partials/asset_buttons.html
index d752e254..bf302351 100644
--- a/assets/templates/partials/asset_buttons.html
+++ b/assets/templates/partials/asset_buttons.html
@@ -1,20 +1,27 @@
+{% if edit and object %}
+
+
+
Duplicate
+
Delete
+{% elif duplicate %}
+
+
+{% elif create %}
+
+
+{% else %}
+
+{% endif %}
+{% if create or edit or duplicate %}
+
+
+{% endif %}
diff --git a/assets/templates/partials/asset_form.html b/assets/templates/partials/asset_form.html
new file mode 100644
index 00000000..86c2c7a4
--- /dev/null
+++ b/assets/templates/partials/asset_form.html
@@ -0,0 +1,75 @@
+{% load widget_tweaks %}
+{% load asset_templatetags %}
+
+
+ Asset Details
+
+
+ {% if create or edit or duplicate %}
+
+
+ {% if duplicate %}
+ {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %}
+ {% elif object.asset_id %}
+ {% render_field form.asset_id|attr:'readonly'|add_class:'disabled_input form-control' value=object.asset_id %}
+ {% else %}
+ {% render_field form.asset_id|add_class:'form-control' %}
+ {% endif %}
+
+
+
+ {% render_field form.description|add_class:'form-control' value=object.description %}
+
+
+
+
+
+ {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %}
+
+
+
+
+
+
+ {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
+
+
+
+
+ {% render_field form.comments|add_class:'form-control' %}
+
+ {% else %}
+
Asset ID
+
{{ object.asset_id }}
+
+
Description
+
{{ object.description }}
+
+
Category
+
{{ object.category }}
+
+
Status
+
{{ object.status }}
+
+
Serial Number
+
{{ object.serial_number|default:'-' }}
+
+
Comments
+
{{ object.comments|default:'-'|linebreaksbr }}
+ {% endif %}
+
+
diff --git a/assets/templates/partials/asset_list_table_body.html b/assets/templates/partials/asset_list_table_body.html
index 4972b993..17012240 100644
--- a/assets/templates/partials/asset_list_table_body.html
+++ b/assets/templates/partials/asset_list_table_body.html
@@ -1,7 +1,6 @@
{% for item in object_list %}
{#
{{ item.asset_id }} - {{ item.description }}#}
-
-
- | {{ item.asset_id }} |
- {{ item.description }} |
- {{ item.category }} |
- {{ item.status }} |
+ {{ item.asset_id }} |
+ {{ item.description }} |
+ {{ item.category }} |
+ {{ item.status }} |
+
|
diff --git a/assets/templates/partials/asset_picker.html b/assets/templates/partials/asset_picker.html
new file mode 100644
index 00000000..444d95cd
--- /dev/null
+++ b/assets/templates/partials/asset_picker.html
@@ -0,0 +1,63 @@
+
+
+{% load static %}
+{% block css %}
+
+
+{% endblock %}
+
+{% block preload_js %}
+
+
+{% endblock %}
+
+{% block js %}
+
+{% endblock js %}
\ No newline at end of file
diff --git a/assets/templates/partials/cable_form.html b/assets/templates/partials/cable_form.html
new file mode 100644
index 00000000..246f4ee9
--- /dev/null
+++ b/assets/templates/partials/cable_form.html
@@ -0,0 +1,75 @@
+{% load widget_tweaks %}
+{% load asset_templatetags %}
+
+
+ Cable Details
+
+
+ {% if create or edit or duplicate %}
+
+
+
+
+
+
+
+
+
+
+
+
+ {% render_field form.circuits|add_class:'form-control' value=object.circuits %}
+
+
+
+ {% render_field form.cores|add_class:'form-control' value=object.cores %}
+
+ {% else %}
+
+ - Socket
+ - {{ object.socket|default_if_none:'-' }}
+
+ - Plug
+ - {{ object.plug|default_if_none:'-' }}
+
+ - Length
+ - {{ object.length|default_if_none:'-' }}m
+
+ - Cross Sectional Area
+ - {{ object.csa|default_if_none:'-' }}m^2
+
+ - Circuits
+ - {{ object.circuits|default_if_none:'-' }}
+
+ - Cores
+ - {{ object.cores|default_if_none:'-' }}
+
+ {% endif %}
+
+
diff --git a/assets/templates/partials/parent_form.html b/assets/templates/partials/parent_form.html
new file mode 100644
index 00000000..10435818
--- /dev/null
+++ b/assets/templates/partials/parent_form.html
@@ -0,0 +1,41 @@
+{% load widget_tweaks %}
+{% load asset_templatetags %}
+
diff --git a/assets/templates/partials/purchasedetails_form.html b/assets/templates/partials/purchasedetails_form.html
new file mode 100644
index 00000000..abfb2b26
--- /dev/null
+++ b/assets/templates/partials/purchasedetails_form.html
@@ -0,0 +1,76 @@
+{% load widget_tweaks %}
+{% load asset_templatetags %}
+
+
+ Purchase Details
+
+
+ {% if create or edit or duplicate %}
+
+
+
+
+
+
+
+
+
+
+
+ {% if object.date_acquired%}
+ {% with date_acq=object.date_acquired|date:"Y-m-d" %}
+ {% render_field form.date_acquired|add_class:'form-control'|attr:'type="date"' value=date_acq %}
+ {% endwith %}
+ {% else %}
+
+ {% endif %}
+
+
+
+
+ {% with date_sol=object.form.date_sold|date:"Y-m-d" %}
+ {% render_field form.date_sold|add_class:'form-control'|attr:'type="date"' value=date_sol %}
+ {% endwith %}
+
+ {% else %}
+
+ - Purchased From
+ - {{ object.purchased_from|default_if_none:'-' }}
+
+ - Purchase Price
+ - £{{ object.purchase_price|default_if_none:'-' }}
+
+ - Salvage Value
+ - £{{ object.salvage_value|default_if_none:'-' }}
+
+ - Date Acquired
+ - {{ object.date_acquired|default_if_none:'-' }}
+ {% if object.date_sold %}
+ - Date Sold
+ - {{ object.date_sold|default_if_none:'-' }}
+ {% endif %}
+
+ {% endif %}
+
+
diff --git a/assets/urls.py b/assets/urls.py
index dcdf5569..c7dcf2fc 100644
--- a/assets/urls.py
+++ b/assets/urls.py
@@ -2,24 +2,26 @@ from django.urls import path, include
from rest_framework import routers
from assets import views, api
+from PyRIGS.decorators import permission_required_with_403
+
router = routers.DefaultRouter()
router.register(r'api/assets', api.AssetViewSet)
urlpatterns = [
- # path('', views.Index.as_view(), name='index'),
path('', views.AssetList.as_view(), name='index'),
path('asset/list/', views.AssetList.as_view(), name='asset_list'),
path('asset/
/', views.AssetDetail.as_view(), name='asset_detail'),
- path('asset/create/', views.AssetEdit.as_view(), name='asset_create'),
- path('asset//edit/', views.AssetEdit.as_view(), name='asset_update'),
- path('asset/delete/', views.asset_delete, name='ajax_asset_delete'),
- path('asset/update/', views.asset_update, name='ajax_asset_update'),
+ path('asset/create/', permission_required_with_403('assets.create_asset')(views.AssetCreate.as_view()), name='asset_create'),
+ path('asset//edit/', permission_required_with_403('assets.change_asset')(views.AssetEdit.as_view()), name='asset_update'),
+ path('asset//duplicate/', permission_required_with_403('assets.create_asset')(views.AssetDuplicate.as_view()), name='asset_duplicate'),
+ path('asset/delete/', permission_required_with_403('assets.delete_asset')(views.asset_delete), name='ajax_asset_delete'),
+
+ path('asset/search/', views.AssetSearch.as_view(), name='asset_search_json'),
path('supplier/list', views.SupplierList.as_view(), name='supplier_list'),
path('supplier/', views.SupplierDetail.as_view(), name='supplier_detail'),
- path('supplier/create', views.SupplierCreate.as_view(), name='supplier_create'),
- path('supplier//edit', views.SupplierUpdate.as_view(), name='supplier_update'),
+ path('supplier/create', permission_required_with_403('assets.create_supplier')(views.SupplierCreate.as_view()), name='supplier_create'),
+ path('supplier//edit', permission_required_with_403('assets.edit_supplier')(views.SupplierUpdate.as_view()), name='supplier_update'),
path('', include(router.urls)),
]
-
diff --git a/assets/views.py b/assets/views.py
index 62402a95..c706f949 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -1,7 +1,7 @@
from django.shortcuts import render, get_object_or_404
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpResponse, QueryDict
+from django.http import HttpResponse, QueryDict, JsonResponse
from django.core import serializers
from django.views import generic
from django.contrib.auth import views as auth_views
@@ -13,103 +13,109 @@ from dateutil import parser
import simplejson as json
from assets import models, forms
+
class AssetList(LoginRequiredMixin, generic.ListView):
model = models.Asset
template_name = 'asset_list.html'
paginate_by = 40
ordering = ['-pk']
-
+
def get_queryset(self):
- #TODO Feedback to user when search fails
+ # TODO Feedback to user when search fails
query = self.request.GET.get('query', "")
- if len(query) >= 3:
- return self.model.objects.filter(Q(asset_id__exact=query) | Q(description__icontains=query))
- elif query != "":
- return self.model.objects.filter(Q(asset_id__exact=query))
+ if len(query) == 0:
+ queryset = self.model.objects.all()
+ elif len(query) >= 3:
+ queryset = self.model.objects.filter(Q(asset_id__exact=query) | Q(description__icontains=query))
else:
- cat = self.request.GET.get('cat', "")
- status = self.request.GET.get('status', "")
- if cat != "None":
- return self.model.objects.filter(category__name__exact=cat)
- elif status != "None":
- return self.model.objects.filter(status__name__exact=status)
- else:
- return self.model.objects.all()
-
+ queryset = self.model.objects.filter(Q(asset_id__exact=query))
+
+ cat = self.request.GET.get('cat', "")
+ status = self.request.GET.get('status', "")
+ if cat != "":
+ queryset = queryset.filter(category__name__exact=cat)
+ if status != "":
+ queryset = queryset.filter(status__name__exact=status)
+
+ return queryset
+
def get_context_data(self, **kwargs):
context = super(AssetList, self).get_context_data(**kwargs)
context["search_name"] = self.request.GET.get('query', "")
+
context["categories"] = models.AssetCategory.objects.all()
+ context["category_select"] = self.request.GET.get('cat', "")
+
context["statuses"] = models.AssetStatus.objects.all()
- return context;
+ context["status_select"] = self.request.GET.get('status', "")
+ return context
+
+
+class AssetSearch(AssetList):
+ def render_to_response(self, context, **response_kwargs):
+ result = []
+
+ for asset in context["object_list"]:
+ result.append({"id": asset.pk, "label": (asset.asset_id + " | " + asset.description)})
+
+ return JsonResponse(result, safe=False)
+
class AssetDetail(LoginRequiredMixin, generic.DetailView):
model = models.Asset
template_name = 'asset_update.html'
-# class AssetCreate(LoginRequiredMixin, generic.TemplateView):
-# fields = '__all__'
-# template_name = 'asset_update.html'
-# # success_url = reverse_lazy('asset_list')
-
-class AssetEdit(LoginRequiredMixin, generic.TemplateView):
+class AssetEdit(LoginRequiredMixin, generic.UpdateView):
template_name = 'asset_update.html'
+ model = models.Asset
+ form_class = forms.AssetForm
def get_context_data(self, **kwargs):
- context = super(AssetEdit, self).get_context_data(**kwargs)
- if self.kwargs:
- context['object'] = get_object_or_404(models.Asset, pk=self.kwargs['pk'])
- context['form'] = forms.AssetForm
- # context['asset_names'] = models.Asset.objects.values_list('asset_id', 'description').order_by('-date_acquired')[]
-
- if self.request.GET.get('duplicate'):
- context['duplicate'] = True
- context['previous_asset_id'] = context['object'].asset_id
- context['previous_asset_pk'] = context['object'].pk
- context['object'].pk = 0
- context['object'].asset_id = ''
- context['object'].serial_number = ''
- else:
- context['edit'] = True
+ context = super().get_context_data(**kwargs)
+ context['edit'] = True
+ context["connectors"] = models.Connector.objects.all()
return context
-@login_required()
-def asset_update(request):
- context = dict()
+ def get_success_url(self):
+ return reverse("asset_detail", kwargs={"pk": self.object.id})
- if request.method == 'POST' and request.is_ajax():
- defaults = QueryDict(request.POST['form'].encode('ASCII')).dict()
- defaults.pop('csrfmiddlewaretoken')
- asset_pk = int(defaults.pop('id'))
+class AssetCreate(LoginRequiredMixin, generic.CreateView):
+ template_name = 'asset_create.html'
+ model = models.Asset
+ form_class = forms.AssetForm
- if defaults['date_acquired']:
- defaults['date_acquired'] = parser.parse(defaults.pop('date_acquired'))
- else:
- defaults['date_acquired'] = None
+ def get_context_data(self, **kwargs):
+ context = super(AssetCreate, self).get_context_data(**kwargs)
- if defaults['date_sold']:
- defaults['date_sold'] = parser.parse(defaults.pop('date_sold'))
- else:
- defaults['date_sold'] = None
+ context["create"] = True
+ context["connectors"] = models.Connector.objects.all()
- # if defaults['parent']:
- # defaults['parent'] = models.Asset.objects.get(asset_id=defaults.pop('parent'))
+ return context
- form = forms.AssetForm(defaults)
- context['valid'] = form.is_valid()
- context['errors'] = form.errors.as_json()
+ def get_success_url(self):
+ return reverse("asset_detail", kwargs={"pk": self.object.id})
- if asset_pk == 0:
- asset = models.Asset.objects.create(**form.cleaned_data)
- else:
- asset, created = models.Asset.objects.update_or_create(pk=asset_pk, defaults=form.cleaned_data)
- context['url'] = reverse('asset_detail', args=[asset.pk])
+class DuplicateMixin:
+ def get(self, request, *args, **kwargs):
+ self.object = self.get_object()
+ self.object.pk = None
+ return self.render_to_response(self.get_context_data())
- return HttpResponse(json.dumps(context), content_type='application/json')
+
+class AssetDuplicate(DuplicateMixin, AssetCreate):
+ model = models.Asset
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context["create"] = None
+ context["duplicate"] = True
+ context['previous_asset_id'] = self.get_object().asset_id
+ context["previous_asset_pk"] = self.kwargs.get(self.pk_url_kwarg)
+ return context
@login_required()
@@ -123,6 +129,7 @@ def asset_delete(request):
return HttpResponse(json.dumps(context), content_type='application/json')
+
class SupplierList(generic.ListView):
model = models.Supplier
template_name = 'supplier_list.html'