From 2181c82a313b8d9963b674de20fdd8eeb9432720 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 28 Apr 2019 22:29:15 +1000 Subject: [PATCH 1/7] Add 'attachments' tab for Part --- .../part/templates/part/attachments.html | 21 +++++++++++++++++++ InvenTree/part/templates/part/tabs.html | 3 +++ InvenTree/part/urls.py | 1 + 3 files changed, 25 insertions(+) create mode 100644 InvenTree/part/templates/part/attachments.html diff --git a/InvenTree/part/templates/part/attachments.html b/InvenTree/part/templates/part/attachments.html new file mode 100644 index 0000000000..04041dd7b4 --- /dev/null +++ b/InvenTree/part/templates/part/attachments.html @@ -0,0 +1,21 @@ +{% extends "part/part_base.html" %} +{% load static %} + +{% block details %} + +{% include 'part/tabs.html' with tab='attachments' %} + +

Attachments

+ +
+
+ + +
+ +{% endblock %} + +{% block js_ready %} +{{ block.super }} + +{% endblock %} \ No newline at end of file diff --git a/InvenTree/part/templates/part/tabs.html b/InvenTree/part/templates/part/tabs.html index aa9d798bb7..5aee846ebd 100644 --- a/InvenTree/part/templates/part/tabs.html +++ b/InvenTree/part/templates/part/tabs.html @@ -31,4 +31,7 @@ {% endif %} {% endif %} + + Attachments {% if part.attachments.all|length > 0 %}{{ part.attachments.all|length }}{% endif %} + \ No newline at end of file diff --git a/InvenTree/part/urls.py b/InvenTree/part/urls.py index 96c830f556..2218b7b8a1 100644 --- a/InvenTree/part/urls.py +++ b/InvenTree/part/urls.py @@ -24,6 +24,7 @@ part_detail_urls = [ url(r'^delete/?', views.PartDelete.as_view(), name='part-delete'), url(r'^track/?', views.PartDetail.as_view(template_name='part/track.html'), name='part-track'), url(r'^bom-export/?', views.BomDownload.as_view(), name='bom-export'), + url(r'^attachments/?', views.PartDetail.as_view(template_name='part/attachments.html'), name='part-attachments'), url(r'^bom/?', views.PartDetail.as_view(template_name='part/bom.html'), name='part-bom'), url(r'^build/?', views.PartDetail.as_view(template_name='part/build.html'), name='part-build'), url(r'^stock/?', views.PartDetail.as_view(template_name='part/stock.html'), name='part-stock'), From ad6f4e19b123d02a36146bde280f13abdffb05fe Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 28 Apr 2019 22:40:17 +1000 Subject: [PATCH 2/7] Add 'comment' field to part attachment model --- .../migrations/0012_partattachment_comment.py | 18 ++++++++++++++++++ InvenTree/part/models.py | 15 +++------------ 2 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 InvenTree/part/migrations/0012_partattachment_comment.py diff --git a/InvenTree/part/migrations/0012_partattachment_comment.py b/InvenTree/part/migrations/0012_partattachment_comment.py new file mode 100644 index 0000000000..a1a0057d1b --- /dev/null +++ b/InvenTree/part/migrations/0012_partattachment_comment.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2 on 2019-04-28 12:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('part', '0011_auto_20190428_0841'), + ] + + operations = [ + migrations.AddField( + model_name='partattachment', + name='comment', + field=models.CharField(blank=True, help_text='File comment', max_length=100), + ), + ] diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index 19682929cf..ab83b584cd 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -125,7 +125,7 @@ class Part(models.Model): IPN = models.CharField(max_length=100, blank=True, help_text='Internal Part Number') # Provide a URL for an external link - URL = models.URLField(blank=True, help_text='Link to external URL') + URL = models.URLField(blank=True, help_text='Link to extenal URL') # Part category - all parts must be assigned to a category category = models.ForeignKey(PartCategory, related_name='parts', @@ -307,12 +307,6 @@ class Part(models.Model): def used_in_count(self): return self.used_in.count() - def required_parts(self): - parts = [] - for bom in self.bom_items.all(): - parts.append(bom.sub_part) - return parts - @property def supplier_count(self): # Return the number of supplier parts available for this part @@ -366,7 +360,7 @@ class PartAttachment(models.Model): attachment = models.FileField(upload_to=attach_file, null=True, blank=True) - comment = models.CharField(max_length=100, blank=True, help_text="Attachment description") + comment = models.CharField(max_length=100, blank=True, help_text='File comment') @property def basename(self): @@ -407,11 +401,8 @@ class BomItem(models.Model): - A part cannot refer to a part which refers to it """ - if self.part is None or self.sub_part is None: - # Field validation will catch these None values - pass # A part cannot refer to itself in its BOM - elif self.part == self.sub_part: + if self.part == self.sub_part: raise ValidationError({'sub_part': _('Part cannot be added to its own Bill of Materials')}) # Test for simple recursion From 9614ac2958ab9c3a0d044d835ab528b70d9c1093 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 28 Apr 2019 22:40:30 +1000 Subject: [PATCH 3/7] Move attachments list to attachments tab --- InvenTree/part/templates/part/attachments.html | 10 ++++++++++ InvenTree/part/templates/part/part_base.html | 7 ------- InvenTree/part/templates/part/tabs.html | 17 ++++++++++------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/InvenTree/part/templates/part/attachments.html b/InvenTree/part/templates/part/attachments.html index 04041dd7b4..b6339c23c7 100644 --- a/InvenTree/part/templates/part/attachments.html +++ b/InvenTree/part/templates/part/attachments.html @@ -11,6 +11,16 @@ + + + + +{% for attachment in part.attachments.all %} + + + + +{% endfor %}
FileComment
{{ attachment.basename }}{{ attachment.comment }}
{% endblock %} diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html index 79be275307..a1b4ddc2d1 100644 --- a/InvenTree/part/templates/part/part_base.html +++ b/InvenTree/part/templates/part/part_base.html @@ -66,13 +66,6 @@ {% endif %} - -

Attachments

- diff --git a/InvenTree/part/templates/part/tabs.html b/InvenTree/part/templates/part/tabs.html index 5aee846ebd..2bcf894b2a 100644 --- a/InvenTree/part/templates/part/tabs.html +++ b/InvenTree/part/templates/part/tabs.html @@ -1,6 +1,15 @@
    - Details + Details + + + Stock {{ part.total_stock }} + + {% if part.allocation_count > 0 %} + + Allocated {{ part.allocation_count }} + + {% endif %} {% if part.buildable %} BOM{{ part.bom_count }} @@ -11,12 +20,6 @@ Used In{% if part.used_in_count > 0 %}{{ part.used_in_count }}{% endif %} {% endif %} - - Stock {{ part.total_stock }} - {% if part.allocation_count > 0 %} - - Allocated {{ part.allocation_count }} - {% endif %} {% if part.purchaseable %} Suppliers From 505191089f25ee3145de36ba943d467eb670fad9 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 28 Apr 2019 22:50:31 +1000 Subject: [PATCH 4/7] Added buttons to edit and delete attachments --- InvenTree/part/templates/part/attachments.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/InvenTree/part/templates/part/attachments.html b/InvenTree/part/templates/part/attachments.html index b6339c23c7..2188a89528 100644 --- a/InvenTree/part/templates/part/attachments.html +++ b/InvenTree/part/templates/part/attachments.html @@ -14,11 +14,16 @@ File Comment + {% for attachment in part.attachments.all %} {{ attachment.basename }} {{ attachment.comment }} + + + + {% endfor %} From 08b429fdb8c7d5fbba0259dd8cc5129a8a2aa6b0 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 2 May 2019 01:15:26 +1000 Subject: [PATCH 5/7] SupplierPart detail page now splits details into two columns - Price details in right-hand column --- .../company/templates/company/partdetail.html | 91 ++++++++++--------- 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/InvenTree/company/templates/company/partdetail.html b/InvenTree/company/templates/company/partdetail.html index 644dc5760e..a67e0fbf2d 100644 --- a/InvenTree/company/templates/company/partdetail.html +++ b/InvenTree/company/templates/company/partdetail.html @@ -23,59 +23,66 @@
    - - - - - -
    Supplier{{ part.supplier.name }}
    SKU{{ part.SKU }}
    Internal Part - {% if part.part %} - {{ part.part.name }} +
    +
    + + + + + + + + {% if part.URL %} + {% endif %} - - -{% if part.URL %} - -{% endif %} -{% if part.description %} - -{% endif %} -{% if part.manufacturer %} - - -{% endif %} -{% if part.note %} - -{% endif %} + {% if part.description %} + + {% endif %} + {% if part.manufacturer %} + + + {% endif %} + {% if part.note %} + + {% endif %} +
    Supplier{{ part.supplier.name }}
    SKU{{ part.SKU }}
    Internal Part + {% if part.part %} + {{ part.part.name }} + {% endif %} +
    URL{{ part.URL }}
    URL{{ part.URL }}
    Description{{ part.description }}
    Manufacturer{{ part.manufacturer }}
    MPN{{ part.MPN }}
    Note{{ part.note }}
    Description{{ part.description }}
    Manufacturer{{ part.manufacturer }}
    MPN{{ part.MPN }}
    Note{{ part.note }}
    +
    + +
    + -{% if part.multiple > 1 %} + {% if part.multiple > 1 %} -{% endif %} -{% if part.base_cost > 0 %} + {% endif %} + {% if part.base_cost > 0 %} -{% endif %} -{% if part.minimum > 1 %} + {% endif %} + {% if part.minimum > 1 %} -{% endif %} -
    Pricing
    Single Price{{ part.single_price }}
    Order Multiple{{ part.multiple }}
    Base Price (Flat Fee){{ part.base_cost }}
    Minimum Order Quantity{{ part.minimum }}
    - -
    - -

    Price Breaks

    - - + {% endif %} + {% if part.price_breaks.all %} + -{% for pb in part.price_breaks.all %} - - - - -{% endfor %} + {% for pb in part.price_breaks.all %} + + + + + {% endfor %} + {% endif %}
    Price Breaks
    Quantity Price
    {{ pb.quantity }}{{ pb.cost }}
    {{ pb.quantity }}{{ pb.cost }}
    +
    +
    + +
    From 6e8c1bcc840e4454e2b07c5bdf5f2e73a0d69a21 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 2 May 2019 17:29:21 +1000 Subject: [PATCH 6/7] Add views to Create / Edit / Delete a PartAttachment - Buttons to edit or delete existing attachments - Button to add a new attachment - Fixed conflicting migrations --- InvenTree/InvenTree/views.py | 11 ++- InvenTree/part/forms.py | 15 +++- InvenTree/part/migrations/0012_part_active.py | 5 ++ .../migrations/0012_partattachment_comment.py | 18 ----- .../migrations/0014_partattachment_comment.py | 18 ----- .../templates/part/attachment_delete.html | 3 + .../part/templates/part/attachments.html | 32 +++++++- InvenTree/part/urls.py | 18 ++++- InvenTree/part/views.py | 80 ++++++++++++++++++- 9 files changed, 155 insertions(+), 45 deletions(-) delete mode 100644 InvenTree/part/migrations/0012_partattachment_comment.py delete mode 100644 InvenTree/part/migrations/0014_partattachment_comment.py create mode 100644 InvenTree/part/templates/part/attachment_delete.html diff --git a/InvenTree/InvenTree/views.py b/InvenTree/InvenTree/views.py index 04d1978745..18267f33c4 100644 --- a/InvenTree/InvenTree/views.py +++ b/InvenTree/InvenTree/views.py @@ -177,7 +177,10 @@ class AjaxCreateView(AjaxMixin, CreateView): # Return the PK of the newly-created object data['pk'] = obj.pk - data['url'] = obj.get_absolute_url() + try: + data['url'] = obj.get_absolute_url() + except AttributeError: + pass return self.renderJsonResponse(request, form, data) @@ -223,7 +226,11 @@ class AjaxUpdateView(AjaxMixin, UpdateView): # Include context data about the updated object data['pk'] = obj.id - data['url'] = obj.get_absolute_url() + + try: + data['url'] = obj.get_absolute_url() + except AttributeError: + pass return self.renderJsonResponse(request, form, data) diff --git a/InvenTree/part/forms.py b/InvenTree/part/forms.py index bba8c3e973..0363b4ab37 100644 --- a/InvenTree/part/forms.py +++ b/InvenTree/part/forms.py @@ -9,7 +9,8 @@ from InvenTree.forms import HelperForm from django import forms -from .models import Part, PartCategory, BomItem +from .models import Part, PartCategory, PartAttachment +from .models import BomItem from .models import SupplierPart @@ -44,6 +45,18 @@ class BomExportForm(HelperForm): ] +class EditPartAttachmentForm(HelperForm): + """ Form for editing a PartAttachment object """ + + class Meta: + model = PartAttachment + fields = [ + 'part', + 'attachment', + 'comment' + ] + + class EditPartForm(HelperForm): """ Form for editing a Part object """ diff --git a/InvenTree/part/migrations/0012_part_active.py b/InvenTree/part/migrations/0012_part_active.py index c2f3b55f6c..87929e2f85 100644 --- a/InvenTree/part/migrations/0012_part_active.py +++ b/InvenTree/part/migrations/0012_part_active.py @@ -14,5 +14,10 @@ class Migration(migrations.Migration): model_name='part', name='active', field=models.BooleanField(default=True, help_text='Is this part active?'), + ), + migrations.AddField( + model_name='partattachment', + name='comment', + field=models.CharField(blank=True, help_text='File comment', max_length=100), ), ] diff --git a/InvenTree/part/migrations/0012_partattachment_comment.py b/InvenTree/part/migrations/0012_partattachment_comment.py deleted file mode 100644 index a1a0057d1b..0000000000 --- a/InvenTree/part/migrations/0012_partattachment_comment.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2 on 2019-04-28 12:31 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('part', '0011_auto_20190428_0841'), - ] - - operations = [ - migrations.AddField( - model_name='partattachment', - name='comment', - field=models.CharField(blank=True, help_text='File comment', max_length=100), - ), - ] diff --git a/InvenTree/part/migrations/0014_partattachment_comment.py b/InvenTree/part/migrations/0014_partattachment_comment.py deleted file mode 100644 index a51f588a59..0000000000 --- a/InvenTree/part/migrations/0014_partattachment_comment.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2 on 2019-04-30 23:34 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('part', '0013_auto_20190429_2229'), - ] - - operations = [ - migrations.AddField( - model_name='partattachment', - name='comment', - field=models.CharField(blank=True, help_text='Attachment description', max_length=100), - ), - ] diff --git a/InvenTree/part/templates/part/attachment_delete.html b/InvenTree/part/templates/part/attachment_delete.html new file mode 100644 index 0000000000..db98b7f6d6 --- /dev/null +++ b/InvenTree/part/templates/part/attachment_delete.html @@ -0,0 +1,3 @@ +Are you sure you wish to delete this attachment? +
    +This will remove the file '{{ attachment.basename }}'. \ No newline at end of file diff --git a/InvenTree/part/templates/part/attachments.html b/InvenTree/part/templates/part/attachments.html index 2188a89528..24c69f23f7 100644 --- a/InvenTree/part/templates/part/attachments.html +++ b/InvenTree/part/templates/part/attachments.html @@ -7,7 +7,8 @@

    Attachments

    -
    +
    +
    @@ -21,8 +22,10 @@ {% endfor %} @@ -33,4 +36,27 @@ {% block js_ready %} {{ block.super }} + $("#new-attachment").click(function() { + launchModalForm("{% url 'part-attachment-create' %}?part={{ part.id }}"); + }); + + $("#attachment-table").on('click', '.attachment-edit-button', function() { + var button = $(this); + + launchModalForm(button.attr('url'), + { + success: function() { + } + }); + }); + + $("#attachment-table").on('click', '.attachment-delete-button', function() { + var button = $(this); + + launchDeleteForm(button.attr('url'), { + success: function() { + } + }); + }); + {% endblock %} \ No newline at end of file diff --git a/InvenTree/part/urls.py b/InvenTree/part/urls.py index 2218b7b8a1..401a038193 100644 --- a/InvenTree/part/urls.py +++ b/InvenTree/part/urls.py @@ -1,5 +1,11 @@ """ -URL lookup for Part app +URL lookup for Part app. Provides URL endpoints for: + +- Display / Create / Edit / Delete PartCategory +- Display / Create / Edit / Delete Part +- Create / Edit / Delete PartAttachment +- Display / Create / Edit / Delete SupplierPart + """ from django.conf.urls import url, include @@ -19,6 +25,12 @@ supplier_part_urls = [ url(r'^(?P\d+)/', include(supplier_part_detail_urls)), ] +part_attachment_urls = [ + url('^new/?', views.PartAttachmentCreate.as_view(), name='part-attachment-create'), + url(r'^(?P\d+)/edit/?', views.PartAttachmentEdit.as_view(), name='part-attachment-edit'), + url(r'^(?P\d+)/delete/?', views.PartAttachmentDelete.as_view(), name='part-attachment-delete'), +] + part_detail_urls = [ url(r'^edit/?', views.PartEdit.as_view(), name='part-edit'), url(r'^delete/?', views.PartDelete.as_view(), name='part-delete'), @@ -70,6 +82,10 @@ part_urls = [ # Part category url(r'^category/(?P\d+)/', include(part_category_urls)), + # Part attachments + url(r'^attachment/', include(part_attachment_urls)), + + # Bom Items url(r'^bom/(?P\d+)/', include(part_bom_urls)), # Top level part list (display top level parts and categories) diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py index 7ea8e5efbf..bdc3147e9b 100644 --- a/InvenTree/part/views.py +++ b/InvenTree/part/views.py @@ -13,11 +13,13 @@ from django.forms.models import model_to_dict from django.forms import HiddenInput from company.models import Company -from .models import PartCategory, Part, BomItem +from .models import PartCategory, Part, PartAttachment +from .models import BomItem from .models import SupplierPart from .forms import PartImageForm from .forms import EditPartForm +from .forms import EditPartAttachmentForm from .forms import EditCategoryForm from .forms import EditBomItemForm from .forms import BomExportForm @@ -51,6 +53,81 @@ class PartIndex(ListView): return context +class PartAttachmentCreate(AjaxCreateView): + """ View for creating a new PartAttachment object + + - The view only makes sense if a Part object is passed to it + """ + model = PartAttachment + form_class = EditPartAttachmentForm + ajax_form_title = "Add part attachment" + ajax_template_name = "modal_form.html" + + def get_data(self): + return { + 'success': 'Added attachment' + } + + def get_initial(self): + """ Get initial data for new PartAttachment object. + + - Client should have requested this form with a parent part in mind + - e.g. ?part= + """ + + initials = super(AjaxCreateView, self).get_initial() + + # TODO - If the proper part was not sent, return an error message + initials['part'] = Part.objects.get(id=self.request.GET.get('part')) + + return initials + + def get_form(self): + """ Create a form to upload a new PartAttachment + + - Hide the 'part' field + """ + + form = super(AjaxCreateView, self).get_form() + + form.fields['part'].widget = HiddenInput() + + return form + + +class PartAttachmentEdit(AjaxUpdateView): + """ View for editing a PartAttachment object """ + model = PartAttachment + form_class = EditPartAttachmentForm + ajax_template_name = 'modal_form.html' + ajax_form_title = 'Edit attachment' + + def get_data(self): + return { + 'success': 'Part attachment updated' + } + + def get_form(self): + form = super(AjaxUpdateView, self).get_form() + + form.fields['part'].widget = HiddenInput() + + return form + + +class PartAttachmentDelete(AjaxDeleteView): + """ View for deleting a PartAttachment """ + + model = PartAttachment + ajax_template_name = "part/attachment_delete.html" + context_object_name = "attachment" + + def get_data(self): + return { + 'danger': 'Deleted part attachment' + } + + class PartCreate(AjaxCreateView): """ View for creating a new Part object. @@ -102,7 +179,6 @@ class PartCreate(AjaxCreateView): return form - # Pre-fill the category field if a valid category is provided def get_initial(self): """ Get initial data for the new Part object: From 03eb6f7ef11be335a9e26b42707bba37faa11416 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 2 May 2019 17:44:01 +1000 Subject: [PATCH 7/7] Exclude migration files from PEP --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f6f50b0c03..697f6d1f02 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,5 +4,5 @@ ignore = W293, # - E501 - line too long (82 characters) E501 -exclude = .git,__pycache__ +exclude = .git,__pycache__,*/migrations/* max-complexity = 20
    {{ attachment.basename }} {{ attachment.comment }} - - +
    + + +