From dfb56c8e4ee8d4ca9257c633ba64855d358bdfad Mon Sep 17 00:00:00 2001 From: agp8x Date: Sun, 10 Sep 2017 22:41:49 +0200 Subject: [PATCH] initial commit --- .gitignore | 5 + docker-compose.yml | 12 ++ partdoc/manage.py | 22 ++++ partdoc/partdoc/__init__.py | 0 partdoc/partdoc/settings.py | 126 ++++++++++++++++++++ partdoc/partdoc/urls.py | 22 ++++ partdoc/partdoc/wsgi.py | 16 +++ partdoc/parts/__init__.py | 0 partdoc/parts/admin.py | 5 + partdoc/parts/apps.py | 5 + partdoc/parts/migrations/__init__.py | 0 partdoc/parts/models.py | 86 +++++++++++++ partdoc/parts/templates/parts/product.html | 15 +++ partdoc/parts/templates/parts/products.html | 6 + partdoc/parts/templates/parts/sketch.html | 9 ++ partdoc/parts/tests.py | 3 + partdoc/parts/urls.py | 9 ++ partdoc/parts/views.py | 19 +++ requirements.txt | 3 + 19 files changed, 363 insertions(+) create mode 100644 .gitignore create mode 100644 docker-compose.yml create mode 100755 partdoc/manage.py create mode 100644 partdoc/partdoc/__init__.py create mode 100644 partdoc/partdoc/settings.py create mode 100644 partdoc/partdoc/urls.py create mode 100644 partdoc/partdoc/wsgi.py create mode 100644 partdoc/parts/__init__.py create mode 100644 partdoc/parts/admin.py create mode 100644 partdoc/parts/apps.py create mode 100644 partdoc/parts/migrations/__init__.py create mode 100644 partdoc/parts/models.py create mode 100644 partdoc/parts/templates/parts/product.html create mode 100644 partdoc/parts/templates/parts/products.html create mode 100644 partdoc/parts/templates/parts/sketch.html create mode 100644 partdoc/parts/tests.py create mode 100644 partdoc/parts/urls.py create mode 100644 partdoc/parts/views.py create mode 100644 requirements.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2060e8c --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/venv +/pgdata +db.sqlite3 +__pycache__/ + diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..26db95d --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +version: "2" + +services: + db: + image: postgres:10-alpine + volumes: + - ./pgdata/:/var/lib/postgresql/data/ + environment: + - POSTGRES_PASSWORD=secret + - POSTGRES_USER=partdoc + ports: + - "127.0.0.1:5432:5432" \ No newline at end of file diff --git a/partdoc/manage.py b/partdoc/manage.py new file mode 100755 index 0000000..cc63fad --- /dev/null +++ b/partdoc/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "partdoc.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) diff --git a/partdoc/partdoc/__init__.py b/partdoc/partdoc/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/partdoc/partdoc/settings.py b/partdoc/partdoc/settings.py new file mode 100644 index 0000000..9704fcf --- /dev/null +++ b/partdoc/partdoc/settings.py @@ -0,0 +1,126 @@ +""" +Django settings for partdoc project. + +Generated by 'django-admin startproject' using Django 1.11.5. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.11/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '5#q$w%zp3y*2e(&a@w09eon7@6a0#^3(ddr3#_(1_@%j*7+fcj' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'parts.apps.PartsConfig', + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'django_extensions', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'partdoc.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'partdoc.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.11/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': 'partdoc', + 'USER': 'partdoc', + 'PASSWORD': 'secret', + 'HOST': '127.0.0.1', + 'PORT': '5432', + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.11/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.11/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/partdoc/partdoc/urls.py b/partdoc/partdoc/urls.py new file mode 100644 index 0000000..699d678 --- /dev/null +++ b/partdoc/partdoc/urls.py @@ -0,0 +1,22 @@ +"""partdoc URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.11/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url, include +from django.contrib import admin + +urlpatterns = [ + url(r'^parts/', include('parts.urls'), name="parts"), + url(r'^admin/', admin.site.urls), +] diff --git a/partdoc/partdoc/wsgi.py b/partdoc/partdoc/wsgi.py new file mode 100644 index 0000000..e3cbb1f --- /dev/null +++ b/partdoc/partdoc/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for partdoc project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "partdoc.settings") + +application = get_wsgi_application() diff --git a/partdoc/parts/__init__.py b/partdoc/parts/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/partdoc/parts/admin.py b/partdoc/parts/admin.py new file mode 100644 index 0000000..c5473ff --- /dev/null +++ b/partdoc/parts/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin + +from .models import Brand, Product, Version, Sketch, Part, Usage, BrandedPart, ProductUsage + +admin.site.register([Brand, Product, Version, Sketch, Part, Usage, BrandedPart, ProductUsage]) diff --git a/partdoc/parts/apps.py b/partdoc/parts/apps.py new file mode 100644 index 0000000..b4f677e --- /dev/null +++ b/partdoc/parts/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class PartsConfig(AppConfig): + name = 'parts' diff --git a/partdoc/parts/migrations/__init__.py b/partdoc/parts/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/partdoc/parts/models.py b/partdoc/parts/models.py new file mode 100644 index 0000000..7fee156 --- /dev/null +++ b/partdoc/parts/models.py @@ -0,0 +1,86 @@ +from django.db import models + +class Brand(models.Model): + name = models.CharField(max_length=256) + + def __str__(self): + return self.name + + +class Product(models.Model): + name = models.CharField(max_length=256) + brand = models.ForeignKey(Brand) + + def __str__(self): + return self.name + " (" + self.brand.name + ")" + + +class Sketch(models.Model): + class Meta: + verbose_name_plural = "sketches" + name = models.CharField(max_length=256) + brand = models.ForeignKey(Brand, blank=True, null=True) + product = models.ForeignKey(Product, blank=True, null=True) + + def __str__(self): + return "Sketch: " + self.name + " (" + str(self.brand) + ")" + + def get_product(self): + if self.product: + return [self.product] + list(self.usage_set.values('productusage__product').distinct()) + return self.usage_set.values('productusage__product').distinct() + def get_brand(self): + if self.brand: + return [self.brand] + list(self.usage_set.values('productusage__product__brand').distinct()) + return self.usage_set.values('productusage__product__brand').distinct() + + +class Version(models.Model): + product = models.ForeignKey(Product) + name = models.CharField(max_length=256) + + def __str__(self): + return "Version: " + self.name + " (" + str(self.product) + ")" + + +class Part(models.Model): + name = models.CharField(max_length=256) + + def __str__(self): + return self.name + +class BrandedPart(models.Model): + part = models.ForeignKey(Part) + brand = models.ForeignKey(Brand) + number = models.CharField(max_length=32, unique=True) + + def __str__(self): + return self.number +": "+ self.part.name + " @ " + self.brand.name + + +class Usage(models.Model): + part = models.ForeignKey(BrandedPart) + sketch = models.ForeignKey(Sketch) + sketch_number = models.CharField(max_length=32) + exact_sketch = models.BooleanField(default=True) + #quantity = models.ManyToManyField(ProductUsage) + + def __str__(self): + return self.sketch_number +"; " + self.part.number +"; "+ self.part.part.name + "; " + str(self.sketch) + + +class ProductUsage(models.Model): + usage = models.ForeignKey(Usage) + product = models.ForeignKey(Product) + quantity = models.IntegerField() + on_demand = models.BooleanField(default=False) + obsolete = models.BooleanField(default=False) + used_until = models.ForeignKey(Version, null=True, blank=True, related_name='introduces') + used_since = models.ForeignKey(Version, null=True, blank=True, related_name='dissmisses') + replaced_by = models.ForeignKey('self', null=True, blank=True, related_name='replaces') + alternative = models.ForeignKey('self', null=True, blank=True, related_name='alternatives') + note = models.CharField(max_length=1024, blank=True) + internal_note = models.CharField(max_length=2, blank=True) + + def __str__(self): + return "ProductUsage: " + self.product.name + " @ " + str(self.quantity) + "; "+ self.usage.part.number \ No newline at end of file diff --git a/partdoc/parts/templates/parts/product.html b/partdoc/parts/templates/parts/product.html new file mode 100644 index 0000000..ea3e8c5 --- /dev/null +++ b/partdoc/parts/templates/parts/product.html @@ -0,0 +1,15 @@ +

{{product.name}}

+

{{product.brand}}

+

explicit sketches

+ + +

implicit sketches

+ \ No newline at end of file diff --git a/partdoc/parts/templates/parts/products.html b/partdoc/parts/templates/parts/products.html new file mode 100644 index 0000000..3cf1fee --- /dev/null +++ b/partdoc/parts/templates/parts/products.html @@ -0,0 +1,6 @@ +

Available products:

+ \ No newline at end of file diff --git a/partdoc/parts/templates/parts/sketch.html b/partdoc/parts/templates/parts/sketch.html new file mode 100644 index 0000000..4676218 --- /dev/null +++ b/partdoc/parts/templates/parts/sketch.html @@ -0,0 +1,9 @@ +

{{sketch.name}}

+

{% for brand in sketch.get_brand %}{{brand.name}},{% endfor%} - {% for product in sketch.get_product %}{{product.name}},{% endfor%}

+ +

{{sketch.get_brand}}

+

{{sketch.get_brand.name.foo}}

\ No newline at end of file diff --git a/partdoc/parts/tests.py b/partdoc/parts/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/partdoc/parts/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/partdoc/parts/urls.py b/partdoc/parts/urls.py new file mode 100644 index 0000000..b6b6e0c --- /dev/null +++ b/partdoc/parts/urls.py @@ -0,0 +1,9 @@ +from django.conf.urls import url + +from . import views + +urlpatterns = [ + url(r'^$', views.index, name="index"), + url(r'^product/(?P[0-9]+)/$', views.product, name="detail"), + url(r'^sketch/(?P[0-9]+)/$', views.sketch, name="sketch"), +] \ No newline at end of file diff --git a/partdoc/parts/views.py b/partdoc/parts/views.py new file mode 100644 index 0000000..69e9d1e --- /dev/null +++ b/partdoc/parts/views.py @@ -0,0 +1,19 @@ +from django.shortcuts import render + +from .models import * + +def index(request): + product_list = Product.objects.all() + context = {'product_list': product_list} + return render(request, 'parts/products.html', context) + +def product(request, product_id): + product = Product.objects.get(id=product_id) + sketches = Sketch.objects.filter(usage__productusage__product=product) + context = {'product': product, 'sketches': sketches} + return render(request, 'parts/product.html', context) + +def sketch(request, sketch_id): + sketch = Sketch.objects.get(id=sketch_id) + context = {'sketch': sketch} + return render(request, 'parts/sketch.html', context) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..2796b7c --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +django +psycopg2 +django-extensions