From 7ce5a9a7e5daa04c6d2c81bd84f3ba92a7a9ef04 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 28 Mar 2017 23:38:12 +1100 Subject: [PATCH] Papa Pep --- InvenTree/InvenTree/models.py | 7 +++---- InvenTree/part/models.py | 2 +- InvenTree/part/serializers.py | 2 +- InvenTree/part/urls.py | 2 +- InvenTree/part/views.py | 1 + InvenTree/project/admin.py | 9 ++++++--- InvenTree/project/models.py | 7 +++++-- InvenTree/project/urls.py | 2 +- InvenTree/project/views.py | 3 ++- InvenTree/stock/admin.py | 6 ++++-- InvenTree/stock/models.py | 8 ++++---- 11 files changed, 29 insertions(+), 20 deletions(-) diff --git a/InvenTree/InvenTree/models.py b/InvenTree/InvenTree/models.py index 471f1b17d7..81bf2c62db 100644 --- a/InvenTree/InvenTree/models.py +++ b/InvenTree/InvenTree/models.py @@ -43,7 +43,6 @@ class InvenTreeTree(models.Model): on_delete=models.CASCADE, blank=True, null=True) - #limit_choices_to={id: getAcceptableParents}) def getUniqueChildren(self, unique=None): """ Return a flat set of all child items that exist under this node. @@ -76,7 +75,7 @@ class InvenTreeTree(models.Model): available = contents.get_all_objects_for_this_type() - # List of child IDs + # List of child IDs childs = getUniqueChildren() acceptable = [None] @@ -101,7 +100,7 @@ class InvenTreeTree(models.Model): else: return [] - @property + @property def path(self): if self.parent: return "/".join([p.name for p in self.parentpath]) + "/" + self.name @@ -132,7 +131,7 @@ class InvenTreeTree(models.Model): # Null parent is OK elif val is None: pass - # Ensure that the new parent is not already a child + # Ensure that the new parent is not already a child else: kids = self.getUniqueChildren() if val in kids: diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index 01e640febf..6780aad57c 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -88,7 +88,7 @@ class PartRevision(models.Model): name = models.CharField(max_length=100) description = models.CharField(max_length=500) - revision_date = models.DateField(auto_now_add = True) + revision_date = models.DateField(auto_now_add=True) def __str__(self): return self.name diff --git a/InvenTree/part/serializers.py b/InvenTree/part/serializers.py index b87d329e70..b15ea800c6 100644 --- a/InvenTree/part/serializers.py +++ b/InvenTree/part/serializers.py @@ -19,4 +19,4 @@ class PartCategorySerializer(serializers.ModelSerializer): fields = ('pk', 'name', 'description', - 'path') \ No newline at end of file + 'path') diff --git a/InvenTree/part/urls.py b/InvenTree/part/urls.py index d07d35052b..01ebb11cbf 100644 --- a/InvenTree/part/urls.py +++ b/InvenTree/part/urls.py @@ -14,4 +14,4 @@ urlpatterns = [ # Display list of parts url(r'^$', views.PartList.as_view()) -] \ No newline at end of file +] diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py index 49ee7de40f..28d447303e 100644 --- a/InvenTree/part/views.py +++ b/InvenTree/part/views.py @@ -6,6 +6,7 @@ from rest_framework import generics from .models import PartCategory, Part from .serializers import PartSerializer, PartCategorySerializer + def index(request): return HttpResponse("Hello world. This is the parts page") diff --git a/InvenTree/project/admin.py b/InvenTree/project/admin.py index f266fb3612..b37fa8435c 100644 --- a/InvenTree/project/admin.py +++ b/InvenTree/project/admin.py @@ -2,15 +2,18 @@ from django.contrib import admin from .models import ProjectCategory, Project, ProjectPart + class ProjectCategoryAdmin(admin.ModelAdmin): list_display = ('name', 'path', 'description') - + + class ProjectAdmin(admin.ModelAdmin): list_display = ('name', 'description', 'category') - + + class ProjectPartAdmin(admin.ModelAdmin): list_display = ('part', 'project', 'quantity') admin.site.register(ProjectCategory, ProjectCategoryAdmin) admin.site.register(Project, ProjectAdmin) -admin.site.register(ProjectPart, ProjectPartAdmin) \ No newline at end of file +admin.site.register(ProjectPart, ProjectPartAdmin) diff --git a/InvenTree/project/models.py b/InvenTree/project/models.py index b7d0800fc1..a5f6d60bb7 100644 --- a/InvenTree/project/models.py +++ b/InvenTree/project/models.py @@ -5,6 +5,7 @@ from django.db import models from InvenTree.models import InvenTreeTree from part.models import Part + class ProjectCategory(InvenTreeTree): """ ProjectCategory provides hierarchical organization of Project objects. Each ProjectCategory can contain zero-or-more child categories, @@ -15,6 +16,7 @@ class ProjectCategory(InvenTreeTree): verbose_name = "Project Category" verbose_name_plural = "Project Categories" + class Project(models.Model): """ A Project takes multiple Part objects. A project can output zero-or-more Part objects @@ -33,6 +35,7 @@ class Project(models.Model): """ return self.projectpart_set.all() + class ProjectPart(models.Model): """ A project part associates a single part with a project The quantity of parts required for a single-run of that project is stored. @@ -56,5 +59,5 @@ class ProjectPart(models.Model): def __str__(self): return "{quan} x {name}".format( - name = self.part.name, - quan = self.quantity) \ No newline at end of file + name=self.part.name, + quan=self.quantity) diff --git a/InvenTree/project/urls.py b/InvenTree/project/urls.py index 59e5d723c9..9cb3403af4 100644 --- a/InvenTree/project/urls.py +++ b/InvenTree/project/urls.py @@ -4,4 +4,4 @@ from . import views urlpatterns = [ url(r'^$', views.index, name='index') -] \ No newline at end of file +] diff --git a/InvenTree/project/views.py b/InvenTree/project/views.py index 6b351c0479..a9b40c0cc5 100644 --- a/InvenTree/project/views.py +++ b/InvenTree/project/views.py @@ -1,5 +1,6 @@ from django.shortcuts import render, get_object_or_404 from django.http import HttpResponse + def index(request): - return HttpResponse("This is the Projects page") \ No newline at end of file + return HttpResponse("This is the Projects page") diff --git a/InvenTree/stock/admin.py b/InvenTree/stock/admin.py index 9e0dac771b..94de179851 100644 --- a/InvenTree/stock/admin.py +++ b/InvenTree/stock/admin.py @@ -2,11 +2,13 @@ from django.contrib import admin from .models import Warehouse, StockItem + class WarehouseAdmin(admin.ModelAdmin): list_display = ('name', 'path', 'description') - + + class StockItemAdmin(admin.ModelAdmin): list_display = ('part', 'quantity', 'location', 'status', 'updated') admin.site.register(Warehouse, WarehouseAdmin) -admin.site.register(StockItem, StockItemAdmin) \ No newline at end of file +admin.site.register(StockItem, StockItemAdmin) diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py index e400b50306..f72a0f3d3a 100644 --- a/InvenTree/stock/models.py +++ b/InvenTree/stock/models.py @@ -25,10 +25,10 @@ class StockItem(models.Model): status = models.IntegerField(default=ITEM_IN_PROGRESS, choices=[ - (ITEM_IN_PROGRESS, "In progress"), - (ITEM_DAMAGED, "Damaged"), - (ITEM_ATTENTION, "Requires attention"), - (ITEM_COMPLETE, "Complete") + (ITEM_IN_PROGRESS, "In progress"), + (ITEM_DAMAGED, "Damaged"), + (ITEM_ATTENTION, "Requires attention"), + (ITEM_COMPLETE, "Complete") ]) def __str__(self):