2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 12:06:44 +00:00
Fixing python style errors
This commit is contained in:
Oliver 2018-04-16 01:02:17 +10:00
parent 1027e812bc
commit a91ff58d84
24 changed files with 74 additions and 97 deletions

View File

@ -7,6 +7,7 @@ from rest_framework.exceptions import ValidationError
from django.db.models.signals import pre_delete
from django.dispatch import receiver
class Company(models.Model):
""" Abstract model representing an external company
"""
@ -185,7 +186,7 @@ class InvenTreeTree(models.Model):
@receiver(pre_delete, sender=InvenTreeTree, dispatch_uid='tree_pre_delete_log')
def before_delete_tree_item(sender, intance, using, **kwargs):
def before_delete_tree_item(sender, instance, using, **kwargs):
# Update each tree item below this one
for child in instance.children.all():

View File

@ -1,13 +1,10 @@
from django.conf.urls import url, include
from django.contrib import admin
from rest_framework.documentation import include_docs_urls
from part.urls import part_api_urls, part_cat_api_urls
from part.urls import bom_api_urls
from part.urls import part_urls
from stock.urls import stock_api_urls, stock_api_loc_urls
from stock.urls import stock_urls

View File

@ -5,7 +5,7 @@ from .models import PartCategory, Part
from .models import BomItem
from .models import PartAttachment
#class PartAdmin(admin.ModelAdmin):
class PartAdmin(ImportExportModelAdmin):
list_display = ('name', 'IPN', 'description', 'stock', 'category')
@ -15,13 +15,15 @@ class PartCategoryAdmin(admin.ModelAdmin):
list_display = ('name', 'pathstring', 'description')
#class BomItemAdmin(admin.ModelAdmin):
class BomItemAdmin(ImportExportModelAdmin):
list_display = ('part', 'sub_part', 'quantity')
class PartAttachmentAdmin(admin.ModelAdmin):
list_display = ('part', 'attachment')
"""
class ParameterTemplateAdmin(admin.ModelAdmin):
list_display = ('name', 'units', 'format')

View File

@ -8,6 +8,9 @@ from django_filters.rest_framework import FilterSet, DjangoFilterBackend
from .models import PartCategory, Part, BomItem
from InvenTree.models import FilterChildren
class PartDetail(generics.RetrieveUpdateDestroyAPIView):
"""
@ -69,6 +72,7 @@ class PartParamDetail(generics.RetrieveUpdateDestroyAPIView):
permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
"""
class PartFilter(FilterSet):
class Meta:
@ -174,6 +178,7 @@ class PartTemplateList(generics.ListCreateAPIView):
"""
class BomItemDetail(generics.RetrieveUpdateDestroyAPIView):
queryset = BomItem.objects.all()
@ -190,9 +195,6 @@ class BomItemFilter(FilterSet):
class BomItemList(generics.ListCreateAPIView):
#def get_queryset(self):
# params = self.request.
queryset = BomItem.objects.all()
serializer_class = BomItemSerializer
permission_classes = (permissions.IsAuthenticatedOrReadOnly,)

View File

@ -12,9 +12,7 @@ class EditPartForm(forms.ModelForm):
self.helper = FormHelper()
self.helper.form_id = 'id-edit-part-form'
#self.helper.form_class = 'blueForms'
self.helper.form_method = 'post'
#self.helper.form_action = 'submit'
self.helper.add_input(Submit('submit', 'Submit'))
@ -39,9 +37,7 @@ class EditCategoryForm(forms.ModelForm):
self.helper = FormHelper()
self.helper.form_id = 'id-edit-part-form'
#self.helper.form_class = 'blueForms'
self.helper.form_method = 'post'
#self.helper.form_action = 'submit'
self.helper.add_input(Submit('submit', 'Submit'))
@ -61,9 +57,7 @@ class EditBomItemForm(forms.ModelForm):
self.helper = FormHelper()
self.helper.form_id = 'id-edit-part-form'
#self.helper.form_class = 'blueForms'
self.helper.form_method = 'post'
#self.helper.form_action = 'submit'
self.helper.add_input(Submit('submit', 'Submit'))

View File

@ -1,5 +1,4 @@
from __future__ import unicode_literals
from django.utils.translation import ugettext as _
from django.db import models
from django.db.models import Sum
from django.core.validators import MinValueValidator
@ -42,6 +41,7 @@ class PartCategory(InvenTreeTree):
return self.part_set.all()
"""
@receiver(pre_delete, sender=PartCategory, dispatch_uid='partcategory_delete_log')
def before_delete_part_category(sender, instance, using, **kwargs):
@ -129,7 +129,6 @@ class Part(models.Model):
class Meta:
verbose_name = "Part"
verbose_name_plural = "Parts"
#unique_together = (("name", "category"),)
@property
def tracked_parts(self):
@ -152,7 +151,6 @@ class Part(models.Model):
def bomItemCount(self):
return self.bom_items.all().count()
@property
def usedInCount(self):
return self.used_in.all().count()
@ -177,6 +175,7 @@ class Part(models.Model):
return projects
"""
def attach_file(instance, filename):
base = 'part_files'
@ -188,19 +187,18 @@ def attach_file(instance, filename):
return os.path.join(base, fn)
class PartAttachment(models.Model):
""" A PartAttachment links a file to a part
Parts can have multiple files such as datasheets, etc
"""
part = models.ForeignKey(Part, on_delete=models.CASCADE,
related_name='attachments')
attachment = models.FileField(upload_to=attach_file, null=True, blank=True)
class BomItem(models.Model):
""" A BomItem links a part to its component items.
A part can have a BOM (bill of materials) which defines
@ -221,7 +219,6 @@ class BomItem(models.Model):
# Quantity required
quantity = models.PositiveIntegerField(default=1, validators=[MinValueValidator(0)])
class Meta:
verbose_name = "BOM Item"

View File

@ -3,6 +3,7 @@ from rest_framework import serializers
from .models import Part, PartCategory
from .models import BomItem
class BomItemSerializer(serializers.ModelSerializer):
class Meta:
@ -12,6 +13,7 @@ class BomItemSerializer(serializers.ModelSerializer):
'sub_part',
'quantity')
"""
class PartParameterSerializer(serializers.HyperlinkedModelSerializer):
" Serializer for a PartParameter
@ -27,7 +29,7 @@ class PartParameterSerializer(serializers.HyperlinkedModelSerializer):
'units')
"""
#class PartSerializer(serializers.HyperlinkedModelSerializer):
class PartSerializer(serializers.ModelSerializer):
""" Serializer for complete detail information of a part.
Used when displaying all details of a single component.
@ -56,6 +58,7 @@ class PartCategorySerializer(serializers.HyperlinkedModelSerializer):
'parent',
'pathstring')
"""
class PartTemplateSerializer(serializers.HyperlinkedModelSerializer):

View File

@ -46,7 +46,6 @@ part_detail_urls = [
url(r'^suppliers/?', views.PartDetail.as_view(template_name='part/supplier.html'), name='part-suppliers'),
# Any other URLs go to the part detail page
#url(r'^.*$', views.detail, name='part-detail'),
url(r'^.*$', views.PartDetail.as_view(), name='part-detail'),
]
@ -90,8 +89,6 @@ part_urls = [
url(r'^.*$', RedirectView.as_view(url='', permanent=False), name='part-index'),
]
"""
part_param_urls = [
# Detail of a single part parameter
@ -111,5 +108,3 @@ part_param_template_urls = [
url(r'^$', views.PartTemplateList.as_view())
]
"""

View File

@ -1,15 +1,13 @@
from InvenTree.models import FilterChildren
from .models import PartCategory, Part, BomItem
from django.shortcuts import get_object_or_404, render
from django.shortcuts import get_object_or_404
from django.http import HttpResponseRedirect
from django.urls import reverse
from django.views.generic import DetailView, ListView
from django.views.generic.edit import UpdateView, DeleteView, CreateView
from .forms import EditPartForm, EditCategoryForm, EditBomItemForm
from .models import PartCategory, Part, BomItem
class PartIndex(ListView):
model = Part

View File

@ -3,9 +3,6 @@ from django_filters import NumberFilter
from rest_framework import generics, permissions, response
# from InvenTree.models import FilterChildren
from .models import StockLocation, StockItem
from .serializers import StockItemSerializer, StockQuantitySerializer

View File

@ -14,7 +14,6 @@ class EditStockLocationForm(forms.ModelForm):
self.helper.form_id = 'id-edit-part-form'
self.helper.form_class = 'blueForms'
self.helper.form_method = 'post'
#self.helper.form_action = 'submit'
self.helper.add_input(Submit('submit', 'Submit'))
@ -36,11 +35,9 @@ class EditStockItemForm(forms.ModelForm):
self.helper.form_id = 'id-edit-part-form'
self.helper.form_class = 'blueForms'
self.helper.form_method = 'post'
#self.helper.form_action = 'submit'
self.helper.add_input(Submit('submit', 'Submit'))
class Meta:
model = StockItem
fields = [

View File

@ -14,6 +14,7 @@ from datetime import datetime
from django.db.models.signals import pre_delete
from django.dispatch import receiver
class StockLocation(InvenTreeTree):
""" Organization tree for StockItem objects
A "StockLocation" can be considered a warehouse, or storage location
@ -47,6 +48,7 @@ def before_delete_stock_location(sender, instance, using, **kwargs):
child.parent = instance.parent
child.save()
class StockItem(models.Model):
def get_absolute_url(self):

View File

@ -1,5 +1,4 @@
from django.conf.urls import url, include
from django.views.generic.base import RedirectView
from . import views
from . import api

View File

@ -1,6 +1,5 @@
from django.shortcuts import get_object_or_404, render
from django.shortcuts import get_object_or_404
from django.http import HttpResponseRedirect
from django.urls import reverse
from django.views.generic import DetailView, ListView
from django.views.generic.edit import UpdateView, DeleteView, CreateView
@ -11,6 +10,7 @@ from .models import StockItem, StockLocation
from .forms import EditStockLocationForm
from .forms import EditStockItemForm
class StockIndex(ListView):
model = StockItem
template_name = 'stock/index.html'
@ -29,6 +29,7 @@ class StockIndex(ListView):
return context
class StockLocationDetail(DetailView):
context_object_name = 'location'
template_name = 'stock/location.html'

View File

@ -14,7 +14,6 @@ class EditSupplierForm(forms.ModelForm):
self.helper.form_id = 'id-edit-part-form'
self.helper.form_class = 'blueForms'
self.helper.form_method = 'post'
#self.helper.form_action = 'submit'
self.helper.add_input(Submit('submit', 'Submit'))
@ -40,7 +39,6 @@ class EditSupplierPartForm(forms.ModelForm):
self.helper.form_id = 'id-edit-part-form'
self.helper.form_class = 'blueForms'
self.helper.form_method = 'post'
#self.helper.form_action = 'submit'
self.helper.add_input(Submit('submit', 'Submit'))

View File

@ -48,7 +48,6 @@ class SupplierPart(models.Model):
supplier = models.ForeignKey(Supplier, on_delete=models.CASCADE,
related_name='parts')
SKU = models.CharField(max_length=100)
manufacturer = models.ForeignKey(Manufacturer, blank=True, null=True, on_delete=models.SET_NULL)

View File

@ -2,7 +2,6 @@ from django.conf.urls import url, include
from django.views.generic.base import RedirectView
from . import views
from . import api
"""
cust_urls = [

View File

@ -1,6 +1,5 @@
from django.shortcuts import get_object_or_404, render
from django.shortcuts import get_object_or_404
from django.http import HttpResponseRedirect
from django.urls import reverse
from django.views.generic import DetailView, ListView
from django.views.generic.edit import UpdateView, DeleteView, CreateView
@ -11,6 +10,7 @@ from .models import Supplier, SupplierPart
from .forms import EditSupplierForm
from .forms import EditSupplierPartForm
class SupplierIndex(ListView):
model = Supplier
template_name = 'supplier/index.html'

View File

@ -7,7 +7,6 @@ class UniquePartAdmin(admin.ModelAdmin):
list_display = ('part', 'serial', 'status', 'creation_date')
class PartTrackingAdmin(admin.ModelAdmin):
list_display = ('part', 'date', 'title')

View File

@ -14,7 +14,6 @@ class EditTrackedPartForm(forms.ModelForm):
self.helper.form_id = 'id-edit-part-form'
self.helper.form_class = 'blueForms'
self.helper.form_method = 'post'
#self.helper.form_action = 'submit'
self.helper.add_input(Submit('submit', 'Submit'))

View File

@ -1,5 +1,4 @@
from __future__ import unicode_literals
from rest_framework.exceptions import ValidationError
from django.utils.translation import ugettext as _
from django.db import models

View File

@ -1,5 +1,4 @@
from django.conf.urls import url, include
from django.views.generic.base import RedirectView
from . import views

View File

@ -1,15 +1,15 @@
from django.shortcuts import get_object_or_404, render
from django.shortcuts import get_object_or_404
from django.http import HttpResponseRedirect
from django.urls import reverse
from django.views.generic import DetailView, ListView
from django.views.generic.edit import UpdateView, DeleteView, CreateView
from part.models import Part
from .models import UniquePart, PartTrackingInfo
from .models import UniquePart
from .forms import EditTrackedPartForm
class TrackIndex(ListView):
model = UniquePart
template_name = 'track/index.html'