improved ssl lexer

Reviewed-on: #37

.dockerignore

@@ -1 +1,2 @@
-start_server.sh
+start_server.sh
+run/*

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "sly"]
+	path = sly
+	url = git@git.shimatta.de:sst/sly.git

.vscode/launch.json

@@ -6,10 +6,9 @@
     "configurations": [
         {
             "name": "Python: Django",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
-            "pythonPath": "${workspaceFolder}/../myenv/bin/python",
-            "program": "${workspaceFolder}/manage.py",
+            "program": "${workspaceFolder}/shimatta_kenkyusho/manage.py",
             "args": [
                 "runserver",
                 "0.0.0.0:8000"

README.md

@@ -0,0 +1,192 @@
+# Shimatta Kenkyusho Parts Database
+
+## Installation
+
+### Prerequisites
+Shimatta Kenkyusho (しまった・研究所) is a Django based web application. It is highly recommended to run it using the supplied docker setup. This removes the need of any special installation on the host system. This guide assumes, that `nginx` is running on the host system and can serve as a reverse proxy and webserver. For easiest download, it is recommended to clone the desired release with `git`.
+
+Install the requirements:
+
+**For Debian / Ubuntu:**
+```
+# apt-get update
+# apt-get install docker docker-compose-plugin nginx git
+```
+
+**For Arch based Systems:**
+```
+# pacman -S nginx docker docker-compose git
+```
+
+### Setup Shimatta Kenkyusho
+
+Clone this repository:
+```
+$ git clone https://git.shimatta.de/mhu/shimatta-kenkyusho.git
+```
+
+> Note: Shimatta Kenkyusho is currently not stable yet and the newest verison is in the `develop` branch. This will change once actual releases are done and merged to the `master` branch. You will be able to get the latest stable version from the `master` branch or a respective tag. For now, the `develop` is recommended.
+
+
+Change directory into the `shimatta-kenkyusho` folder cloned by git.
+
+Copy the `example.env` file to `.env` and edit it according to your needs:
+
+The following settings are required to be adapted:
+- `DJANGO_STATIC_VOL`: The directory the application will extract its static data into, which needs to be served by your webserver. See the example reverse proxy setup for more details.
+- `DJANGO_MEDIA_VOL`: The directory all media files like images uploaded to the application are stored here. This folder must be served by your webserver on the configured media URL.
+- `PGDATA_VOL`: The directory, the postgres database will store its files.
+- `PORT`: The TCP/IP port that the whole setup will listen on. Use a reverse proxy to forward to this port. *Do not directly expose it to the internet!*
+- `DJANGO_SECRET_KEY`: Provide a secret, and randomly generated key. Do not share this with anybody!
+- `DJANGO_ALLOWED_HOST`: Set this to the domain, the application will be reached at. E.g: `lab.example.com`
+- `DJANGO_MEDIA_URL`: Set this to the media URL at which your webserver serves the `DJANGO_MEDIA_VOL` diretory. E.g: `media.lab.example.com/` Note the **slash at the end**. It is important.
+- `DJANGO_USER_ID`: The user ID to run the application inside the docker container. This is the user id, that is used to write the to `DJANGO_STATIC_VOL` and `DJANGO_MEDIA_VOL`. Make sure the user has access.
+- `DJANGO_USER_GID`: The group ID to run the application inside the docker container. This is the group id, that is used to write the to `DJANGO_STATIC_VOL` and `DJANGO_MEDIA_VOL`.
+
+> Note: It is not recommended to run the docker container without a set `DJANGO_USER_ID` and `DJANGO_USER_GID`. It will default to `0 (root)`.
+
+Once the environment is set up, the docker containers can be built and started. Run
+```
+$ docker compose build
+```
+This will generate two container images:
+1. `shimatta-kenkyusho-shimatta-kenkyusho-web`: The django application
+2. `postgres`: A alpine based docker container containing the postgres database.
+
+Start the application as a service with
+```
+$ docker compose up -d
+```
+> Note: The initial startup might need a minute because the whole database etc. needs to be initialized first.
+
+Use 
+```
+$ docker ps
+```
+to check if the `shimatta-kenkyusho-shimatta-kenkyusho-db` and the `shimatta-kenkyusho-shimatta-kenkyusho-web` container are running and report a *healthy  status*.
+
+### Setup Initial Login User
+When started for the first time with a fresh database without any superuser configured, a superuser `admin` with password `admin` will be automatically generated.
+Use this user to login for the first time. In the django admin panel you can then either change the password of the `admin` user or create a new superuser with your own username and delete the `admin` user.
+As long as there is at least one superuser configured, no admin user will be regenerated upon startup.
+
+
+### Example Reverse Proxy Setup Using nginx
+Once the setup is configured the reverse proxy setup is needed. This setup serves three purposes:
+1. Redirect incoming requests to the django application running on the port `PORT` configured in the `.env`
+2. Serve static files at the URL: (e.g. `lab.example.com/static`). See `ALLOWED_HOST` configuration.
+3. Serve the media volume at the media URL (e.g. `media.lab.example.com`). See `DJANGO_MEDIA_URL`
+
+Example nginx configuration for `nginx >v2.25` with SSL and http2 / http3 support:
+> Note: This is by no means a replacement for the documentation of nginx and only serves as an example. Consult the documentation of your nginx version reagrding security and other issues.
+```
+# Force redirection from http to https for application
+server {
+        listen 80;
+        listen [::]:80;
+        server_name lab.example.com; # This must match your ALLOWED_HOST. Adapt domain.
+        allow all;
+
+        return 301 https://lab.example.com$request_uri; # Adapt domain
+}
+
+# Force redirection from http to https for media url
+server {
+        listen 80;
+        listen [::]:80;
+        server_name media.lab.example.com; # Adapt domain name according to DJANGO_MEDIA_URL
+        allow all;
+        return 301 https://media.lab.example.com$request_uri; # Adapt domain name
+}
+
+# Reverse Proxy for application
+server {
+        listen       443 ssl;
+        listen       [::]:443 ssl;
+        http2        on;
+
+
+   # Add this for HTTP3. If your nginx is older than 2.25 this might not be available
+######################################################################################
+        # listen       443 quic reuseport;
+        # listen       [::]:443 quic reuseport;
+        # Enable QUIC and HTTP/3
+        # ssl_early_data on;
+        # add_header Alt-Svc 'h3=":443"; ma=86400';
+#######################################################################################
+
+    server_name  lab.example.com; # Adapt domain
+
+    # Use letsencrypt as SSL certificate provider.  
+    ssl_certificate      /etc/letsencrypt/live/lab.example.com/fullchain.pem;
+    ssl_certificate_key  /etc/letsencrypt/live/lab.example.com/privkey.pem;
+
+    ssl_protocols TLSv1.3;
+    ssl_prefer_server_ciphers on;
+
+    ssl_session_cache    shared:SSL:1m;
+    ssl_session_timeout  5m;
+
+    ssl_ciphers  HIGH:!aNULL:!MD5;
+
+    location / {
+        allow all;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP  $remote_addr;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://127.0.0.1:8000;  # Adapt PORT from .env
+    }
+
+    location /static/ {
+        # Adapt path to static volume here. Note the slash at the end
+        alias /path/to/DJANGO_STATIC_VOL/; 
+        allow all;
+    }
+
+    client_max_body_size 60m;
+
+}
+
+# Serve the media files
+server {
+        listen       443 ssl;
+        listen       [::]:443 ssl;
+        # Add this for HTTP3. If your nginx is older than 2.25 this might not be available
+######################################################################################
+        # listen       443 quic reuseport;
+        # listen       [::]:443 quic reuseport;
+        # Enable QUIC and HTTP/3
+        # ssl_early_data on;
+        # add_header Alt-Svc 'h3=":443"; ma=86400';
+#######################################################################################
+        http2        on;
+
+        server_name  media.lab.example.com; # Adapt according to DJANGO_MEDIA_URL
+
+        # Use letsencrypt as SSL certificate provider. 
+        ssl_certificate      /etc/letsencrypt/live/media.lab.example.com/fullchain.pem;
+        ssl_certificate_key  /etc/letsencrypt/live/media.lab.example.com/privkey.pem;
+
+        ssl_protocols TLSv1.3;
+        ssl_prefer_server_ciphers on;
+
+        ssl_session_cache    shared:SSL:1m;
+        ssl_session_timeout  5m;
+
+        ssl_ciphers  HIGH:!aNULL:!MD5;
+        error_page 502 /lab_down.html;
+
+        allow all;
+        root /path/to /DJANGO_MEDIA_VOL/; # Adapt this to the volume provided.
+}
+```
+Congratulations. Your shimatta kenkyusho installation is now fully setup.
+> Note that, the `compose.yaml` contains a restart-policy. By default the containers will restart automatically, even after a reboot of the host machine, if the docker service is enabled.
+
+
+## Backup and Restore
+> TODO
+
+## Debugging and Development
+> Todo
+

compose.yaml

@@ -1,6 +1,11 @@
+x-op-restart-policy: &restart_policy
+  restart: unless-stopped
+
 services:
   shimatta-kenkyusho-web:
+    <<: *restart_policy
     build: .
+    user: "${DJANGO_USER_ID:-0}:${DJANGO_USER_GID:-0}"
     volumes:
       - "${DJANGO_STATIC_VOL:-./run/static}:/var/static"
       - "${DJANGO_MEDIA_VOL:-./run/media}:/var/media"
@@ -30,6 +35,7 @@ services:
       start_period: 30s
 
   shimatta-kenkyusho-db:
+    <<: *restart_policy
     image: postgres:16.5-alpine
     environment:
       POSTGRES_PASSWORD: "${DJANGO_POSTGRESQL_PW:-p4ssw0rd}"

entrypoint.sh

@@ -3,4 +3,6 @@ source /home/shimatta/kenkyusho/.venv/bin/activate
 cd /home/shimatta/kenkyusho/shimatta_kenkyusho
 python manage.py migrate --settings shimatta_kenkyusho.settings_production
 python manage.py collectstatic --settings shimatta_kenkyusho.settings_production --noinput
+python manage.py create_kenkyusho_admin_user --settings shimatta_kenkyusho.settings_production
+
 gunicorn -w 4 --bind 0.0.0.0:8000 shimatta_kenkyusho.wsgi:application

entrypoint_self_hosted.sh

@@ -2,5 +2,6 @@
 source /home/shimatta/kenkyusho/.venv/bin/activate
 cd /home/shimatta/kenkyusho/shimatta_kenkyusho
 python manage.py migrate --settings shimatta_kenkyusho.settings_production
+python manage.py create_kenkyusho_admin_user --settings shimatta_kenkyusho.settings_production
 
 python manage.py runserver 0.0.0.0:8000 --settings shimatta_kenkyusho.settings_production

example.env

@@ -2,6 +2,12 @@
 # Example configuration. Must be edited and copied to ".env" next to the compose.yaml
 ####################################################################################################
 
+# User id to use for the web application. This determines the user id, the media and static files are written to the volumes.
+# Make sure the user has rw access to these directories.
+DJANGO_USER_ID=1000
+
+# Group id to use for the web application
+DJANGO_USER_GID=1000
 
 # Path to to mount as the directory for static data. Must be served by a webserver on the /static path
 DJANGO_STATIC_VOL=/path/to/static/root
@@ -29,4 +35,4 @@ DJANGO_MEDIA_URL=media.lab.example.com/
 
 # Set this password if you want to use a custom postgres password. The db should be confined inside the docker network.
 # Using the standard PW is therefore not a problem
-# DJANGO_POSTGRESQL_PW=myfancynewpassword123donotsharemewithanyone
+# DJANGO_POSTGRESQL_PW=myfancynewpassword123donotsharemewithanyone

requirements.txt

@@ -1,15 +1,17 @@
-asgiref==3.4.1
-astroid==2.6.5
+annotated-types==0.7.0
+asgiref==3.8.1
+astroid==3.3.5
 certifi==2024.8.30
 charset-normalizer==3.4.0
-crispy-bootstrap5==0.6
-Django==3.2.5
-django-crispy-forms==1.13.0
-django-filter==2.4.0
-django-qr-code==2.2.0
+crispy-bootstrap5==2024.10
+dill==0.3.9
+Django==5.1.3
+django-crispy-forms==2.3
+django-filter==24.3
+django-qr-code==4.1.0
 django-rest-framework==0.1.0
-django-tex==1.1.9.post1
-djangorestframework==3.12.4
+django-tex==1.1.10
+djangorestframework==3.15.2
 gunicorn==21.2.0
 idna==3.10
 isort==5.9.3
@@ -19,15 +21,19 @@ MarkupSafe==2.0.1
 mccabe==0.6.1
 packaging==24.2
 Pillow==8.3.1
+pipdeptree==2.23.4
+platformdirs==4.3.6
 psycopg2-binary==2.9.9
-pylint==2.9.6
-pytz==2021.1
-qrcode==7.2
+pydantic==2.9.2
+pydantic_core==2.23.4
+pylint==3.3.1
 requests==2.32.3
-segno==1.3.3
+segno==1.6.1
 setuptools==75.3.0
-six==1.16.0
 sqlparse==0.4.1
 toml==0.10.2
+tomlkit==0.13.2
+typing_extensions==4.12.2
+tzdata==2024.2
 urllib3==2.2.3
 wrapt==1.12.1

shimatta_kenkyusho/api/serializers.py

@@ -44,6 +44,7 @@ class ComponentSerializer(serializers.HyperlinkedModelSerializer):
     ro_component_type = serializers.ReadOnlyField(source='component_type.class_name')
     ro_parameters = ComponentParameterSerializer(many=True, source='componentparameter_set', read_only=True)
     ro_distributor_numbers = ComponentDistributorNumSerializer(many=True, source='distributornum_set', read_only=True)
+    ro_dynamic_description = serializers.ReadOnlyField(source='dynamic_description')
 
     class Meta:
         model = parts_models.Component
@@ -60,12 +61,14 @@ class ComponentSerializer(serializers.HyperlinkedModelSerializer):
                   'ro_image',
                   'ro_component_type',
                   'ro_parameters',
-                  'ro_distributor_numbers']
+                  'ro_distributor_numbers',
+                  'ro_dynamic_description']
 
 class StockSerializer(serializers.HyperlinkedModelSerializer):
     id = serializers.ReadOnlyField()
     ro_package_name = serializers.ReadOnlyField(source='component.package.name')
     ro_component_name = serializers.ReadOnlyField(source='component.name')
+    ro_component_dynamic_description = serializers.ReadOnlyField(source='component.dynamic_description')
     ro_manufacturer_name = serializers.ReadOnlyField(source='component.manufacturer.name')
     ro_image = serializers.ReadOnlyField(source='component.get_resolved_image')
     class Meta:
@@ -80,7 +83,7 @@ class StorageSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:
         model = parts_models.Storage
-        fields = ['url', 'id', 'name', 'verbose_name', 'parent_storage', 'responsible', 'template', 'full_path']
+        fields = ['url', 'id', 'name', 'verbose_name', 'parent_storage', 'responsible', 'template', 'full_path', 'full_path_verbose']
 
 class StorageSerializerStocksExpanded(StorageSerializer):
     ro_stocks = StockSerializerExpandComponent(many=True, read_only=True, source='stock_set')

shimatta_kenkyusho/api/urls.py

@@ -1,7 +1,6 @@
-from django.urls import include, path
+from django.urls import include, path, re_path
 from rest_framework import routers
 from .views import *
-from django.conf.urls import url
 
 router = routers.DefaultRouter()
 router.register(r'users', UserViewSet)
@@ -20,6 +19,6 @@ router.register(r'parts/component-param-types', PartsComponentParameterTypeViewS
 
 urlpatterns = [
     path('', include(router.urls)),
-    url(r'^token-auth/', ObtainExpiringAuthToken.as_view()),
-	url(r'^token-logout/', TokenLogout.as_view()),
+    re_path(r'^token-auth/', ObtainExpiringAuthToken.as_view()),
+	re_path(r'^token-logout/', TokenLogout.as_view()),
 ]

shimatta_kenkyusho/api/views.py

@@ -43,8 +43,8 @@ class GroupViewSet(viewsets.ReadOnlyModelViewSet):
 class PartsStorageViewSet(viewsets.ModelViewSet):
     queryset = parts_models.Storage.objects.all()
     permission_classes = [permissions.DjangoModelPermissions]
-    filter_backends = [django_filters.rest_framework.DjangoFilterBackend]
-    search_fields = ['id', 'name', 'parent_storage']
+    filter_backends = [django_filters.rest_framework.DjangoFilterBackend, filters.SearchFilter]
+    search_fields = ['id', 'name', 'verbose_name']
     filterset_fields = ['id', 'name', 'parent_storage']
 
     def get_serializer_class(self):

shimatta_kenkyusho/parts/admin.py

@@ -9,6 +9,7 @@ admin.site.register(parts_models.Manufacturer)
 admin.site.register(parts_models.Storage)
 admin.site.register(parts_models.Stock)
 admin.site.register(parts_models.ComponentParameter)
+admin.site.register(parts_models.PackageParameter)
 admin.site.register(parts_models.ComponentParameterType)
 admin.site.register(parts_models.ComponentType)
 admin.site.register(parts_models.Distributor)

shimatta_kenkyusho/parts/forms.py

@@ -6,6 +6,7 @@ from parts import models as parts_models
 from shimatta_modules.EngineeringNumberConverter import EngineeringNumberConverter
 import uuid
 from django.urls import reverse
+from .qr_parser import QrCodeValidator
 
 
 from crispy_forms.helper import FormHelper
@@ -52,7 +53,7 @@ class AutoCompleteWidget(widgets.Input):
             'name_field_name': self.name_field_name,
             'prepend': self.prepend,
             'name': display_name,
-        } 
+        }
         return context
 
 class AutocompleteForeingKeyField(forms.UUIDField):
@@ -71,7 +72,7 @@ class AutocompleteForeingKeyField(forms.UUIDField):
                                          prepend)
         self.foreign_model = foreign_model
 
-    
+
     def clean(self, value):
         try:
             pre_cleaned_uuid = super().clean(value)
@@ -100,7 +101,8 @@ class ChangeStorageForm(forms.Form):
                                               foreign_model=get_user_model(),
                                               prepend='@')
 
-    is_template = forms.BooleanField(label='is_template', required=False)
+    expand_sub_storage_stocks = forms.BooleanField(label='Expand sub storage Stocks', required=False)
+    is_template = forms.BooleanField(label='Is template', required=False)
 
 class AddSubStorageForm(ChangeStorageForm):
     template = AutocompleteForeingKeyField(api_search_url='storage-template-list',
@@ -111,15 +113,13 @@ class AddSubStorageForm(ChangeStorageForm):
 class DeleteStockForm(forms.Form):
     stock_uuid = forms.UUIDField()
 
-class EditWatermarkForm(forms.Form):
+class EditStockBaseForm(forms.Form):
     stock_uuid = forms.UUIDField()
-    watermark_active = forms.BooleanField(required=False) #If it is false, the webbrowser won't send it at all. Therefore we have to set it to required=False
-    watermark = forms.IntegerField(min_value=0)
 
     def clean(self):
         cleaned_data = super().clean()
         id = cleaned_data.get("stock_uuid")
-        
+
         if not id:
             raise ValidationError("No stock UUID given")
 
@@ -132,6 +132,10 @@ class EditWatermarkForm(forms.Form):
 
         return cleaned_data
 
+class EditWatermarkForm(EditStockBaseForm):
+    watermark_active = forms.BooleanField(required=False) #If it is false, the webbrowser won't send it at all. Therefore we have to set it to required=False
+    watermark = forms.IntegerField(min_value=0)
+
     def save(self):
         stock = self.cleaned_data['stock']
         active = self.cleaned_data['watermark_active']
@@ -143,32 +147,36 @@ class EditWatermarkForm(forms.Form):
         stock.watermark = watermark
         stock.save()
 
-class EditStockAmountForm(forms.Form):
-    stock_uuid = forms.UUIDField()
+class EditLotForm(EditStockBaseForm):
+    lot = forms.IntegerField(min_value=0)
+
+    def save(self):
+        stock = self.cleaned_data['stock']
+        lot = self.cleaned_data['lot']
+
+        stock.lot = lot
+        stock.save()
+
+class RelocateStockForm(forms.ModelForm):
+    storage = AutocompleteForeingKeyField(api_search_url='storage-list',
+                                          foreign_model=parts_models.Storage,
+                                          name_field_name='full_path_verbose',
+                                          image_field_name=None,
+                                          required=True)
+
+    class Meta:
+        model = parts_models.Stock
+        fields = ['storage']
+
+class EditStockAmountForm(EditStockBaseForm):
     amount = forms.IntegerField(min_value=0)
 
-    def clean(self):
-        cleaned_data = super().clean()
-        id = cleaned_data.get("stock_uuid")
-
-        if not id:
-            raise ValidationError("No stock UUID given")
-
-        stock = None
-        try:
-            stock = parts_models.Stock.objects.get(id=id)
-        except:
-            raise ValidationError("Stock with uuid %s does not exist" % (id))
-        cleaned_data['stock'] = stock
-
-        return cleaned_data
-
     def save(self, increase: bool):
         stock = self.cleaned_data['stock']
         amount = self.cleaned_data['amount']
 
         if not increase:
-            amount = -amount 
+            amount = -amount
 
         return stock.atomic_increment(amount)
 
@@ -193,7 +201,7 @@ class AddStockForm(forms.Form):
         cleaned_data['component'] = component
 
         return cleaned_data
-    
+
     def save(self, storage):
         component = self.cleaned_data.get('component')
         amount = self.cleaned_data.get('amount')
@@ -251,15 +259,19 @@ class DistributorNumberDeleteForm(forms.Form):
 
 class ComponentParameterDeleteForm(forms.Form):
     param_num = forms.UUIDField(required=True)
-    
+    model = parts_models.ComponentParameter
+
     def clean_param_num(self):
         my_uuid = self.cleaned_data['param_num']
         try:
-            param = parts_models.ComponentParameter.objects.get(id=my_uuid)
+            param = self.model.objects.get(id=my_uuid)
         except:
             raise ValidationError('Parameter Number Invalid')
         return param
 
+class PackageParameterDeleteForm(ComponentParameterDeleteForm):
+    model = parts_models.PackageParameter
+
 class AdvancedComponentSearchForm(forms.Form):
     name = forms.CharField(max_length=255, label='Component Name', required=False)
     package = AutocompleteForeingKeyField(required=False, api_search_url='package-list', foreign_model=parts_models.Package)
@@ -308,6 +320,7 @@ class ComponentParameterSearchForm(forms.Form):
 class ComponentParameterCreateForm(forms.Form):
     parameter_type = AutocompleteForeingKeyField(required=True, foreign_model=parts_models.ComponentParameterType, api_search_url='componentparametertype-list', image_field_name=None, name_field_name='descriptive_name')
     value = forms.CharField(required=True, max_length=256)
+    model = parts_models.ComponentParameter
 
     def clean(self):
         data = super().clean()
@@ -316,7 +329,7 @@ class ComponentParameterCreateForm(forms.Form):
 
         if not ptype:
             raise ValidationError('No valid parameter type selected')
-        
+
         if not value:
             raise ValidationError('No valid parameter value')
 
@@ -328,7 +341,7 @@ class ComponentParameterCreateForm(forms.Form):
             data['number_value'] = number
         else:
             pass
-    
+
     def save(self, component):
         param_type = self.cleaned_data['parameter_type']
         if param_type.parameter_type == 'F':
@@ -337,4 +350,26 @@ class ComponentParameterCreateForm(forms.Form):
         else:
             text_value = ''
             value = self.cleaned_data['number_value']
-        parts_models.ComponentParameter.objects.create(parameter_type=param_type, component=component, value=value, text_value=text_value)
+        self.model.objects.create(parameter_type=param_type, component=component, value=value, text_value=text_value)
+
+class PackageParameterCreateForm(ComponentParameterCreateForm):
+    model = parts_models.PackageParameter
+
+    def save(self, package):
+        param_type = self.cleaned_data['parameter_type']
+        if param_type.parameter_type == 'F':
+            text_value = self.cleaned_data['value']
+            value = 0
+        else:
+            text_value = ''
+            value = self.cleaned_data['number_value']
+        self.model.objects.create(parameter_type=param_type, package=package, value=value, text_value=text_value)
+
+class QrSearchForm(forms.Form):
+    my_qr_validator = QrCodeValidator()
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+
+    qr_search = forms.CharField(label='qr_search', validators=[my_qr_validator])

shimatta_kenkyusho/parts/management/commands/consolidate_component_package_parameters.py

@@ -0,0 +1,43 @@
+from django.core.management.base import BaseCommand, CommandParser
+from django.contrib.auth import get_user_model
+from parts.models import Component, ComponentParameter, ComponentParameterType, PackageParameter, Package
+
+class Command(BaseCommand):
+	help = "Remove component parameters, that are also set on the package with the same value"
+
+	def add_arguments(self, parser: CommandParser):
+		parser.add_argument('--dry-run',
+			help='Do not perform parameter deletion. Print only',
+			action='store_true')
+
+	def handle(self, *args, **options):
+		# Get all components with set packages. Ignore the ones without packages
+		all_comps = Component.objects.exclude(package__isnull=True)
+
+		for component in all_comps:
+			package_parameters = PackageParameter.objects.filter(package=component.package)
+			component_parameters = ComponentParameter.objects.filter(component=component)
+			package_param_ids = package_parameters.values_list('parameter_type_id', flat=True)
+			component_param_ids = component_parameters.values_list('parameter_type_id', flat=True)
+
+            # Skip trivial cases
+			if len(package_param_ids) == 0 or len(component_param_ids) == 0:
+				continue
+			
+			self.stdout.write(f'Comp: {str(component)} Found {len(component_param_ids)} different parameters')
+			self.stdout.write(f'\tPackage: {str(component.package)} Found {len(package_param_ids)} different parameters')
+
+			commontypes = ctypes = ComponentParameterType.objects.filter(id__in=component_param_ids).filter(id__in=package_param_ids)
+			self.stdout.write(f'\tCommon parameter count: {len(commontypes)}')
+			
+			# Check if values are the same when rendered as a string. This avoids float comparison problems
+			for common_type in commontypes:
+				s1 = package_parameters.filter(parameter_type=common_type).first().resolved_value_as_string()
+				comp_param = component_parameters.filter(parameter_type=common_type).first()
+				s2 = comp_param.resolved_value_as_string()
+				if s1 == s2:
+					self.stdout.write(f'\tParameter {common_type.parameter_name} is the same value for component and package: {s1}. Removing from component')
+					if not options['dry_run']:
+						comp_param.delete()
+				else:
+					self.stderr.write(f'\tParameter {common_type.parameter_name} is set on component {str(component)} and its package with different values: "{s1}" vs "{s2}"')

shimatta_kenkyusho/parts/management/commands/create_kenkyusho_admin_user.py

@@ -0,0 +1,23 @@
+from django.core.management.base import BaseCommand, CommandParser
+from django.contrib.auth import get_user_model
+
+class Command(BaseCommand):
+	help = "Create a default superuser if no superuser is already present. This aids automatic deployment inside a container."
+
+	def add_arguments(self, parser: CommandParser):
+		parser.add_argument('--user',
+			help='Username to create if no admin account is present',
+			default='admin')
+		parser.add_argument('--password',
+			help='Password to set for newly created user. Ignored, if any admin user is already present',
+			default='admin')
+
+	def handle(self, *args, **options):
+		User = get_user_model()
+
+		# Query if there is any admin user
+		if not User.objects.filter(is_superuser=True).exists():
+			self.stdout.write(f'No superuser present. Creating {options['user']} with supplied password')
+			User.objects.create_superuser(username=options['user'], password=options['password'])
+		else:
+			self.stdout.write('At least one superuser already exists. Skipping superuser creation')

shimatta_kenkyusho/parts/migrations/0013_packageparameter.py

@@ -0,0 +1,49 @@
+# Generated by Django 5.1.3 on 2024-11-19 20:26
+
+import django.db.models.deletion
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("parts", "0012_storage_verbose_name"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="PackageParameter",
+            fields=[
+                (
+                    "id",
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                        unique=True,
+                    ),
+                ),
+                ("value", models.FloatField(default=0)),
+                ("text_value", models.TextField(blank=True)),
+                (
+                    "package",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="parts.package"
+                    ),
+                ),
+                (
+                    "parameter_type",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="parts.componentparametertype",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["id"],
+                "unique_together": {("package", "parameter_type")},
+            },
+        ),
+    ]

shimatta_kenkyusho/parts/migrations/0014_storage_expand_sub_storage_stocks.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.3 on 2025-01-25 14:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parts', '0013_packageparameter'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='storage',
+            name='expand_sub_storage_stocks',
+            field=models.BooleanField(default=False),
+        ),
+    ]

shimatta_kenkyusho/parts/migrations/0015_componenttype_description_template.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.3 on 2025-01-31 21:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parts', '0014_storage_expand_sub_storage_stocks'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='componenttype',
+            name='description_template',
+            field=models.TextField(blank=True),
+        ),
+    ]

shimatta_kenkyusho/parts/migrations/0016_componentparametertype_interfix.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.3 on 2025-01-31 21:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parts', '0015_componenttype_description_template'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='componentparametertype',
+            name='interfix',
+            field=models.CharField(blank=True, max_length=10),
+        ),
+    ]

shimatta_kenkyusho/parts/migrations/0017_alter_componentparametertype_interfix_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.3 on 2025-02-02 10:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parts', '0016_componentparametertype_interfix'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='componentparametertype',
+            name='interfix',
+            field=models.CharField(blank=True, help_text='char to be used as decimal point in dynamic description eg. 2R2', max_length=10),
+        ),
+        migrations.AlterField(
+            model_name='componenttype',
+            name='description_template',
+            field=models.TextField(blank=True, help_text="Template to assemble the dynamic description. Use template syntax, access the component with 'object', parameters with 'param_*'."),
+        ),
+    ]

shimatta_kenkyusho/parts/models.py

@@ -6,6 +6,7 @@ from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator
 from django.dispatch import receiver
 from django.core.validators import MinValueValidator, MaxValueValidator
+from django.template import engines
 import os
 import uuid
 from shimatta_modules.EngineeringNumberConverter import EngineeringNumberConverter as NumConv
@@ -29,6 +30,7 @@ class ComponentParameterType(models.Model):
 	parameter_name = models.CharField(max_length=50, unique=True)
 	parameter_description = models.TextField(null=False, blank=True)
 	unit = models.CharField(max_length=10, null=False, blank=True)
+	interfix = models.CharField(max_length=10, null=False, blank=True, help_text="char to be used as decimal point in dynamic description eg. 2R2")
 	parameter_type = models.CharField(max_length=1, choices=TYPE_CHOICES, default='N')
 
 	def __str__(self):
@@ -49,6 +51,9 @@ class ComponentType(models.Model):
 	class_name = models.CharField(max_length=50, unique=True)
 	passive = models.BooleanField()
 	possible_parameter = models.ManyToManyField(ComponentParameterType, blank=True)
+	description_template = models.TextField(blank=True,
+										 help_text="Template to assemble the dynamic description. "
+										 "Use template syntax, access the component with 'object', parameters with 'param_*'.")
 
 	def __str__(self):
 		return '[' + self.class_name + ']'
@@ -65,6 +70,7 @@ class Storage(models.Model):
 	verbose_name = models.CharField(max_length=100, null=True, blank=True)
 	parent_storage = models.ForeignKey('self', on_delete=models.CASCADE, blank=True, null=True)
 	responsible = models.ForeignKey(get_user_model(), on_delete=models.SET_NULL, blank=True, null=True)
+	expand_sub_storage_stocks = models.BooleanField(default=False)
 
 	# allow storages to be templates which can be selected when adding new storages
 	is_template = models.BooleanField(default=False)
@@ -74,25 +80,40 @@ class Storage(models.Model):
 								null=True,
 								related_name='template_of')
 
-	def get_path_components(self):
+	# caching variable for subtrees
+	storage_list = None
+
+	def get_path_components(self, top_level=None):
 		chain = []
 		iterator = self
 		chain.append(self)
 		while iterator.parent_storage is not None:
+
+			if top_level and iterator.parent_storage == top_level:
+				break
+
 			chain.append(iterator.parent_storage)
 			iterator = iterator.parent_storage
 
 		return chain
 
-	def get_full_path(self):
+	def get_full_path(self, top_level=None):
 		output = ''
 		
-		chain = self.get_path_components()
+		chain = self.get_path_components(top_level)
 
 		for i in range(len(chain) - 1, -1, -1):
 			output = output + '/' + chain[i].name
 		return output
 
+	@property
+	def full_path_verbose(self):
+		full_path = f'{self.get_full_path()} ({self.id})'
+
+		if self.verbose_name:
+			full_path += f' ({self.verbose_name})'
+		return full_path
+
 	def get_qr_code(self):
 		qrdata = '[stor_uuid]' + str(self.id)
 		return qrdata
@@ -106,6 +127,19 @@ class Storage(models.Model):
 		else:
 			return self.storage_set.all()
 
+	@classmethod
+	def get_substorage_list(cls, sub_storages):
+		sub_sub_storages = cls.objects.filter(parent_storage__in=sub_storages)
+
+		final_sub_storages = sub_storages | sub_sub_storages
+		if sub_sub_storages:
+			final_sub_storages |= cls.get_substorage_list(sub_sub_storages)
+
+		return final_sub_storages
+
+	def get_storage_list(self):
+		return Storage.objects.filter(id=self.id) | self.get_substorage_list(self.storage_set.all())
+
 	def validate_unique(self, exclude=None):
 		if Storage.objects.exclude(id=self.id).filter(name=self.name, parent_storage__isnull=True).exists():
 			if self.parent_storage is None:
@@ -116,12 +150,18 @@ class Storage(models.Model):
 			raise
 
 	def get_total_stock_amount(self):
-		stocks = Stock.objects.filter(storage=self)
+		stocks = Stock.objects.filter(storage__in=self.storage_list or self.get_storage_list())
 		sum = stocks.aggregate(Sum('amount'))['amount__sum']
 		if sum is None:
 			sum = 0
 		return sum
 
+	def get_total_stock_count(self):
+		return Stock.objects.filter(storage__in=self.storage_list or self.get_storage_list()).count()
+
+	def get_total_substorage_amount(self):
+		return len(self.storage_list or self.get_storage_list()) - 1 # -1 as thhe storage list counts the parent storage as well
+
 	@classmethod
 	def from_path(cls, path, root_storage=None):
 		'''
@@ -237,25 +277,42 @@ class Component(models.Model):
 		if sum is None:
 			sum = 0
 		return sum
+	
+	@property
+	def dynamic_description(self):
 
-		
-class ComponentParameter(models.Model):
+		if not self.component_type or not self.component_type.description_template:
+			return ''
+
+		django_engine = engines["django"]
+		template = django_engine.from_string(self.component_type.description_template)
+
+		parameters = list(ComponentParameter.objects.filter(component=self))
+		parameters += list(PackageParameter.objects.filter(package=self.package))
+
+		context = {f'param_{param.parameter_type.parameter_name}': param for param in parameters}
+		context.update({'object': self})
+		return template.render(context)
+
+class AbstractParameter(models.Model):
 	class Meta:
-		unique_together = ('component', 'parameter_type')
-		ordering = ['id']
+		abstract = True
+
 	id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False, unique=True)
-	component = models.ForeignKey(Component, on_delete=models.CASCADE)  # A target component is required!
 	parameter_type = models.ForeignKey(ComponentParameterType, on_delete=models.CASCADE)
 	value = models.FloatField(default=0)
 	text_value = models.TextField(null=False, blank=True)
 
+	def _get_object_of_param(self):
+		return None
+
 	def __str__(self):
 		if self.parameter_type.parameter_type == 'F':
 			value = self.text_value
 		else:
 			value = str(self.value)
 
-		return str(self.component)+ ': '+ str(self.parameter_type) + ': ' + value
+		return str(self._get_object_of_param())+ ': '+ str(self.parameter_type) + ': ' + value
 
 	def resolved_value_as_string(self):
 		my_type = self.parameter_type.parameter_type
@@ -270,6 +327,43 @@ class ComponentParameter(models.Model):
 		elif my_type == 'F':
 			return self.text_value
 
+	def resolved_value_as_short_string(self):
+		my_type = self.parameter_type.parameter_type
+
+		if my_type == 'E' or my_type == 'I':
+			# Engineering float number
+			(num, prefix) = NumConv.number_to_engineering(self.value, it_unit=(True if my_type=='I' else False))
+			result = f'{round(num, 3):g}'
+			interpostfix = (prefix if prefix else self.parameter_type.interfix or '.')
+			if '.' in result:
+				result = result.replace('.', interpostfix)
+			else:
+				result = result + interpostfix
+			return result
+		elif my_type == 'N':
+			# Standard float number
+			return  f'{round(self.value, 3):g}{self.parameter_type.unit}'
+		else:
+			return self.resolved_value_as_string()
+
+class ComponentParameter(AbstractParameter):
+	class Meta:
+		unique_together = ('component', 'parameter_type')
+		ordering = ['id']
+	component = models.ForeignKey(Component, on_delete=models.CASCADE)  # A target component is required!
+
+	def _get_object_of_param(self):
+		return self.component
+
+class PackageParameter(AbstractParameter):
+	class Meta:
+		unique_together = ('package', 'parameter_type')
+		ordering = ['id']
+	package = models.ForeignKey(Package, on_delete=models.CASCADE)
+	
+	def _get_object_of_param(self):
+		return self.package
+
 class Stock(models.Model):
 	class Meta:
 		unique_together = ('component', 'storage')
@@ -289,7 +383,7 @@ class Stock(models.Model):
 		return True
 
 	def get_qr_code(self):
-		qr_data = '[stock]'+str(self.id)
+		qr_data = '[stck_uuid]'+str(self.id)
 		return qr_data
 
 	def __str__(self):
@@ -376,11 +470,18 @@ def auto_apply_template_structure(sender, instance, created, **kwargs):
     If there are nested sub-storages these will be added when the sub-storages
     are created automatically.
     """
+
+    # Skip recursion if the model is saved 'raw' e.g. when imported
+    if 'raw' in kwargs:
+        if kwargs['raw']:
+            return
+
     if created:
         if instance.template:
             for sub_storage in instance.template.storage_set.all():
                 Storage.objects.create(name=sub_storage.name,
                                        parent_storage=instance,
                                        responsible=instance.responsible,
+                                       expand_sub_storage_stocks=instance.expand_sub_storage_stocks,
                                        is_template=False,
                                        template=sub_storage)

shimatta_kenkyusho/parts/qr_parser.py

@@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.urls import reverse as url_reverse
 import re
 
-from .models import Storage, Component
+from .models import Storage, Component, Stock
 
 class QrCode:
     prefix = ''
@@ -19,6 +19,7 @@ class QrCodeValidator:
     qr_patterns = {
         'stor_uuid': QrCode('stor_uuid', 'parts-stocks-detail', Storage),
         'comp_uuid': QrCode('comp_uuid', 'parts-components-detail', Component),
+        'stck_uuid': QrCode('stck_uuid', 'parts-stock-detail', Stock),
     }
 
     def __init__(self):
@@ -32,16 +33,13 @@ class QrCodeValidator:
         
         qr_type = matches.group('prefix')
         qr_uuid = matches.group('uuid')
-        url_name = self.qr_patterns[qr_type].detail_view
 
-        model = None
         try:
+            url_name = self.qr_patterns[qr_type].detail_view
             model = self.qr_patterns[qr_type].model
-        except:
-            model = None
-        if model is None:
-            raise ValidationError('QR Pattern not registered')
-        return (model,qr_uuid, url_name)
+        except KeyError as ex:
+            raise ValidationError('QR Pattern not registered') from ex
+        return (model, qr_uuid, url_name)
     
     def get_redirect_url(self, data):
         model, uuid, url_name = self._get_model_from_qr(data)

shimatta_kenkyusho/parts/templatetags/storage_tags.py

@@ -0,0 +1,9 @@
+import datetime
+from django import template
+
+register = template.Library()
+
+
+@register.filter(name="get_relative_storage_path")
+def get_relative_storage_path(storage, top_level):
+    return f'.{storage.get_full_path(top_level)}'

shimatta_kenkyusho/parts/urls.py

@@ -14,7 +14,7 @@ urlpatterns = [
     path('components/<slug:uuid>/', parts_views.ComponentDetailView.as_view(), name='parts-components-detail'),
     path('packages/<slug:uuid>/', parts_views.PackageDetailView.as_view(), name='parts-packages-detail'),
     path('distributors/<slug:uuid>/', parts_views.DistributorDetailView.as_view(), name='parts-distributors-detail'),
-    path('manufacturers/', parts_views.ManufacturersViewSet.as_view(), name='parts-manufacturers'),
-    path("manufacturers/<slug:uuid>/", parts_views.ManufacturerDetailViewSet.as_view(), name='parts-manufacturers-detail'),
+    path('manufacturers/', parts_views.ManufacturersView.as_view(), name='parts-manufacturers'),
+    path("manufacturers/<slug:uuid>/", parts_views.ManufacturerDetailView.as_view(), name='parts-manufacturers-detail'),
     path("healthcheck/", parts_views.health_check_view, name='parts-health-check'),
 ]

shimatta_kenkyusho/parts/views.py

@@ -1,983 +0,0 @@
-from django.shortcuts import render, redirect
-from django.urls import reverse
-from django.contrib.auth import logout, login
-from .navbar import NavBar
-from django.contrib.auth.forms import AuthenticationForm as AuthForm
-from django.contrib.auth.forms import PasswordChangeForm
-from django.contrib.auth import update_session_auth_hash
-import django.forms as forms
-from django.views.generic import TemplateView, DetailView
-from django.contrib.auth.mixins import LoginRequiredMixin
-from .models import Storage, Stock, Component, Distributor, Manufacturer, Package, ComponentParameter, DistributorNum
-from .qr_parser import QrCodeValidator
-from django.core.paginator import Paginator
-from django.core.exceptions import ValidationError
-from django.db import IntegrityError
-from django.db.models import ProtectedError
-from .forms import *
-from .component_import import import_components_from_csv
-from django.db.models import Q
-from django.db.models.functions import Lower
-from django.forms import formset_factory
-from django.http import HttpResponse
-import uuid
-
-
-ParameterSearchFormSet = formset_factory(ComponentParameterSearchForm, extra=1)
-
-class QrSearchForm(forms.Form):
-    my_qr_validator = QrCodeValidator()
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        
-
-    qr_search = forms.CharField(label='qr_search', validators=[my_qr_validator])
-
-class BaseTemplateMixin(object):
-    navbar_selected = ''
-    base_title = ''
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        base_context = {
-            'navbar': NavBar.get_navbar(self.navbar_selected, self.request.user),
-            'title': NavBar.get_brand()+' / '+ self.base_title,
-            'login_active': False,
-        }
-        context['base'] = base_context 
-        return context
-
-    def post(self, request, *args, **kwargs):
-        data = request.POST
-        if 'qr_search' not in data:
-            super().post(request, *args, **kwargs)
-
-        print('QR',data['qr_search'])
-        f = QrSearchForm(data)
-        if f.is_valid():
-            return redirect(f.my_qr_validator.get_redirect_url(f.cleaned_data['qr_search']))
-
-        return self.get(request)
-
-class ChangePasswordView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
-    template_name = 'parts/change-pw.html'
-    navbar_selected = 'Main'
-    base_title = 'Change Password'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['form'] = PasswordChangeForm(self.request.user)
-        return context
-
-    def post(self, request, *args, **kwargs):
-        if 'submit-change-pw' not in request.POST:
-            return super().post(request, *args, **kwargs)
-
-        form = PasswordChangeForm(request.user, data=request.POST)
-
-        if form.is_valid():
-            user = form.save()
-            update_session_auth_hash(request, user)
-            return redirect('parts-main')
-        else:
-            pass
-
-        context = self.get_context_data(**kwargs)
-        if form.errors:
-            context['form'] = form
-
-        return self.render_to_response(context)
-    
-
-class MainView(BaseTemplateMixin, TemplateView):
-    template_name = 'parts/main.html'
-    navbar_selected = 'Main'
-    base_title = 'Main'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['user'] = self.request.user
-        return context
-    
-    
-def logout_view(request):
-    logout(request)
-    return redirect('parts-main')
-
-def login_view(request):
-    base_context = {
-        'navbar': NavBar.get_navbar('Login', request.user),
-        'title': NavBar.get_brand()+' / '+'Login',
-        'login_active': True,
-    }
-
-    if request.user.is_authenticated:
-        next_param = request.GET.get('next')
-        if next_param is not None:
-            return redirect(next_param)
-        else:
-            return redirect('parts-main')
-
-    if request.method == 'POST':
-        form = AuthForm(data=request.POST)
-        if form.is_valid():
-            valid_user = form.get_user()
-            login(request, valid_user)
-            next_param = request.GET.get('next')
-            if next_param is not None:
-                return redirect(next_param)
-            else:
-                return redirect('parts-main')
-    else:
-        form = AuthForm()
-
-
-    context = {
-        'base': base_context,
-        'form': form,
-    }
-
-    return render(request, 'parts/login.html', context)
-
-# Create your views here.
-
-class ComponentView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
-    template_name = 'parts/components.html'
-    base_title = 'Components'
-    navbar_selected = 'Components'
-    default_page_size = 25
-
-    def get_component_query_set(self, search_string):
-        queryset = Component.objects.all()
-        
-        if not search_string:
-            return queryset
-
-        search_fragments = search_string.strip().split()
-        for search in search_fragments:
-            queryset = queryset.filter(Q(name__icontains = search) | Q(manufacturer__name__icontains = search) | Q(package__name__icontains = search))
-
-        return queryset
-
-    def get_component_queryset_from_advanced_search(self, cleaned_data):
-        queryset = Component.objects.all()
-
-        if cleaned_data['name']:
-            queryset = queryset.filter(Q(name__icontains=cleaned_data['name']))
-        if cleaned_data['package']:
-            queryset = queryset.filter(package=cleaned_data['package'])
-        if cleaned_data['package_pin_count']:
-            queryset = queryset.filter(package__pin_count=cleaned_data['package_pin_count'])
-        if cleaned_data['component_type']:
-            queryset = queryset.filter(component_type=cleaned_data['component_type'])
-        if cleaned_data['distributor_num']:
-            if cleaned_data['distributor']:
-                distri = cleaned_data['distributor']
-                queryset = queryset.filter(Q(distributornum__distributor_part_number__icontains=cleaned_data['distributor_num']) & Q(distributornum__distributor=distri))
-            else:
-                 queryset = queryset.filter(Q(distributornum__distributor_part_number__icontains=cleaned_data['distributor_num']))
-        if cleaned_data['manufacturer']:
-            queryset = queryset.filter(manufacturer=cleaned_data['manufacturer'])
-        return queryset
-
-    def get_context_data_int(self, advanced_search, parameter_formset : ParameterSearchFormSet, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        comp_page_num = self.request.GET.get('comp_page', default=1)
-
-        if advanced_search and parameter_formset:
-            search = None
-            context['advanced_search_shown'] = True
-            context['advanced_search_form'] = advanced_search
-            context['advanced_search_param_formset'] = parameter_formset
-            if advanced_search.is_valid():
-                paginator_queryset = self.get_component_queryset_from_advanced_search(advanced_search.cleaned_data)
-            else:
-                paginator_queryset = Component.objects.all()
-
-            if parameter_formset.is_valid():
-                # Process parameters
-                pass
-            
-        else:
-            search = self.request.GET.get('search', default=None)
-            paginator_queryset = self.get_component_query_set(search)
-
-        comp_paginator = Paginator(paginator_queryset, self.default_page_size)
-
-        context['components'] = comp_paginator.get_page(comp_page_num)
-        context['comp_form'] = ComponentForm()
-        context['import_comp_form'] = ImportComponentForm()
-        context['search_string'] = search
-
-        if not parameter_formset:
-            context['advanced_search_param_formset'] = ParameterSearchFormSet()
-
-
-        if not advanced_search:
-            context['advanced_search_form'] = AdvancedComponentSearchForm(auto_id='adv_search_%s')
-
-        return context
-    
-    def get_context_data(self, **kwargs):
-        return self.get_context_data_int(advanced_search = None, parameter_formset=None, **kwargs)    
-
-    def handle_new_component_post(self, request, open=False, **kwargs):
-        cform = ComponentForm(data=request.POST, files=request.FILES)
-        new_component = None
-        if cform.is_valid():
-            new_component = cform.save()
-
-        context = self.get_context_data(**kwargs)
-        if not cform.is_valid():
-            context['comp_form'] = cform
-
-        if open and new_component:
-            return redirect(reverse('parts-components-detail', kwargs={'uuid':new_component.id}))
-        return self.render_to_response(context)
-
-    def handle_import_components_post(self, request, open=False, **kwargs):
-        cform = ImportComponentForm(data=request.POST, files=request.FILES)
-        context = self.get_context_data(**kwargs)
-        if cform.is_valid():
-            try:
-                import_components_from_csv(cform.files['csv_file'].file)
-            except Exception as ex:
-                cform.add_error('csv_file', str(ex))
-                context['import_comp_form'] = cform
-        else:
-            context['import_comp_form'] = cform
-
-        return self.render_to_response(context)
-
-    def handle_advanced_search_post(self, request, **kwargs):
-        
-        form = AdvancedComponentSearchForm(auto_id='adv_search_%s', data=request.POST)
-        param_formset = ParameterSearchFormSet(data=request.POST)
-
-        if form.is_valid():
-            print('Valid')
-
-        if param_formset.is_valid():
-            print('Formset is valid!')
-
-
-        context = self.get_context_data_int(form, param_formset, **kwargs)
-        return self.render_to_response(context)
-
-    def post(self, request, *args, **kwargs):
-        if 'submit-edit-component' in request.POST:
-            return self.handle_new_component_post(request, open=False, **kwargs)
-        elif 'submit-edit-component-open' in request.POST:
-            return self.handle_new_component_post(request, open=True, **kwargs)
-        elif 'submit-import-components' in request.POST:
-            return self.handle_import_components_post(request, open=True, **kwargs)
-        elif 'submit-advanced-search' in request.POST:
-            return self.handle_advanced_search_post(request, **kwargs)
-        else:
-            return super().post(request, *args, **kwargs)
-    
-class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
-    template_name = 'parts/packages.html'
-    base_title = 'Packages'
-    navbar_selected = 'Packages'
-    default_page_size = 25
-
-    def search_packages(self, search):
-        qs = Package.objects.all()
-
-        if not search:
-            return qs
-        
-        search_fragments = search.strip().split()
-        for search in search_fragments:
-            if search.lower() == 'smd':
-                s_filter = Q(name__icontains = search) | Q(smd = True)
-            else:
-                try:
-                    pin_count = int(search)
-                    s_filter = Q(name__icontains = search) | Q(pin_count=pin_count)
-                except:
-                    s_filter = Q(name__icontains = search)
-
-            qs = qs.filter(s_filter)
-        return qs
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        page_num = self.request.GET.get('page', default=1)
-        search_string = self.request.GET.get('search', default=None)
-        
-        package_queryset = self.search_packages(search_string)
-
-        paginator = Paginator(package_queryset, self.default_page_size)       
-
-
-        context['search_string'] = search_string
-        context['packages'] = paginator.get_page(page_num)
-        context['new_pkg_form'] = PackageForm()
-
-        return context
-    
-    def handle_add_new_package(self, request):
-
-        form = PackageForm(data=request.POST, files=request.FILES)
-        if form.is_valid():
-            form.save()
-
-        context = self.get_context_data()
-
-        if not form.is_valid():
-            context['new_pkg_form'] = form
-
-        return self.render_to_response(context)
-
-    def post(self, request, *args, **kwargs):
-        if 'submit-pkg-add-new' in request.POST:
-            return self.handle_add_new_package(request)
-
-        return super().post(request, *args, **kwargs)
-    
-
-class DistributorView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
-    template_name = 'parts/distributors.html'
-    base_title = 'Distributors'
-    navbar_selected = 'Distributors'
-    default_page_size = 25
-
-    def search_distributors(self, search):
-        qs = Distributor.objects.all()
-
-        if not search:
-            return qs
-        
-        search_fragments = search.strip().split()
-
-        for search in search_fragments:
-            qs = qs.filter(Q(name__icontains = search) | Q(website__icontains = search))
-        return qs
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        page_num = self.request.GET.get('page', default=1)
-        search_string = self.request.GET.get('search', default=None)
-        
-        queryset = self.search_distributors(search_string)
-
-        paginator = Paginator(queryset, self.default_page_size)       
-
-
-        context['search_string'] = search_string
-        context['distributors'] = paginator.get_page(page_num)
-        context['new_distri_form'] = DistributorForm()
-
-        return context
-    
-    def handle_add_new_distributor(self, request):
-
-        form = DistributorForm(data=request.POST, files=request.FILES)
-        if form.is_valid():
-            form.save()
-
-        context = self.get_context_data()
-
-        if not form.is_valid():
-            context['new_distri_form'] = form
-
-        return self.render_to_response(context)
-
-    def post(self, request, *args, **kwargs):
-        if 'submit-distri-add-new' in request.POST:
-            return self.handle_add_new_distributor(request)
-
-        return super().post(request, *args, **kwargs)
-
-class StockView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
-    template_name = 'parts/stocks.html'
-    base_title = 'Stocks'
-    navbar_selected = 'Stocks'
-    default_pagination_size = 25
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        storage_page = self.request.GET.get('storage_page')
-        if storage_page is None:
-            storage_page = 1
-        low_stock_page = self.request.GET.get('low_stock_page')
-        if low_stock_page is None:
-            low_stock_page = 1
-
-        storage_paginator = Paginator(Storage.objects.filter(parent_storage=None), self.default_pagination_size)
-        low_stock_paginator = Paginator(Stock.get_under_watermark(),
-            self.default_pagination_size)
-
-        context['low_stocks'] = low_stock_paginator.get_page(low_stock_page)
-        context['storages'] = storage_paginator.get_page(storage_page)
-        add_stor_form = AddSubStorageForm()
-        add_stor_form.fields['responsible'].initial = self.request.user.id
-        context['add_storage_form'] = add_stor_form
-        return context
-
-    def handle_add_storage(self, request, **kwargs):
-        f = AddSubStorageForm(data=request.POST)
-        if f.is_valid():
-            sub_name = f.cleaned_data['storage_name']
-            try:
-                Storage.objects.create(name=sub_name,
-                                        responsible=f.cleaned_data['responsible'],
-                                        is_template=f.cleaned_data['is_template'],
-                                        template=f.cleaned_data.get('template'))
-            except ValidationError as v_err:
-                f.add_error('storage_name', '. '.join(v_err.messages))
-        context = self.get_context_data(**kwargs)
-        context['add_storage_form'] = f
-        return self.render_to_response(context)
-
-    def post(self, request, **kwargs):
-        if 'submit-add-storage' in request.POST:
-            return self.handle_add_storage(request, **kwargs)
-
-        return super().post(request, **kwargs)
-
-class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
-    template_name = 'parts/stocks-detail.html'
-    model = Storage
-    pk_url_kwarg = 'uuid'
-    base_title = ''
-    navbar_selected = 'Stocks'
-    default_pagination_size = 8
-
-    def get_breadcrumbs(self):
-        crumbs = self.object.get_path_components()
-        # Reverse list and drop the last element of the reversed list
-        crumbs = crumbs[::-1][:-1]
-        return crumbs
-
-    def search_stock_queryset(self, search):
-        stocks_in_storage = Stock.objects.filter(storage=self.object).order_by(Lower('component__name'))
-        
-        if search is None or search == '':
-            return stocks_in_storage
-
-        if search.startswith('[comp_uuid]'):
-            search = search.replace('[comp_uuid]', '')
-
-
-        # Check if the searhc equals a UUID
-        test_uuid = None
-        try:
-            test_uuid = uuid.UUID(search)
-        except:
-            pass
-
-        if test_uuid is not None:
-            stocks_in_storage = stocks_in_storage.filter(Q(component__id = test_uuid) | Q(id= test_uuid))
-        else:
-            stocks_in_storage = stocks_in_storage.filter(Q(component__name__icontains = search) |
-                Q(component__package__name__icontains = search) |
-                Q(component__manufacturer__name__icontains = search))
-        
-        return stocks_in_storage
-
-    def get_context_data(self, **kwargs):
-        self.base_title = 'Stocks / ' + self.object.name
-        context = super().get_context_data(**kwargs)
-        context['breadcrumbs'] = self.get_breadcrumbs()
-
-        storage_page = self.request.GET.get('storage_page', default=1)
-        storage_paginator = Paginator(Storage.objects.filter(parent_storage=self.object), self.default_pagination_size)
-        stock_search_input = self.request.GET.get('search')
-
-        componente_stock_page = self.request.GET.get('stock_page', default=1)
-        
-        stock_paginator = Paginator(self.search_stock_queryset(stock_search_input), self.default_pagination_size)
-
-        context['storages'] = storage_paginator.get_page(storage_page)
-        stocks = stock_paginator.get_page(componente_stock_page)
-        context['stocks'] = stocks
-        context['stock_search'] = stock_search_input
-        add_storage_form = AddSubStorageForm()
-        add_storage_form.fields['responsible'].initial = self.request.user.id
-        context['add_storage_form'] = add_storage_form
-        change_storage_form = ChangeStorageForm()
-        change_storage_form.fields['storage_name'].initial = self.object.name
-        change_storage_form.fields['verbose_name'].initial = self.object.verbose_name
-        change_storage_form.fields['responsible'].initial = self.object.responsible.id
-        change_storage_form.fields['is_template'].initial = self.object.is_template
-        context['change_storage_form'] = change_storage_form
-        context['delete_storage_error'] = None
-        context['add_stock_form'] = AddStockForm()
-
-        return context
-
-    def handle_add_storage_post(self, request, **kwargs):
-        f = AddSubStorageForm(data=request.POST)
-        if f.is_valid():
-            sub_name = f.cleaned_data['storage_name']
-            try:
-                Storage.objects.create(name=sub_name,
-                                        verbose_name=f.cleaned_data.get('verbose_name'),
-                                        parent_storage=self.object,
-                                        responsible=f.cleaned_data['responsible'],
-                                        is_template=f.cleaned_data['is_template'],
-                                        template=f.cleaned_data.get('template'))
-            except ValidationError as v_err:
-                f.add_error('storage_name', '. '.join(v_err.messages))
-        context = self.get_context_data(**kwargs)
-        context['add_storage_form'] = f
-        return self.render_to_response(context)
-
-    def handle_change_storage_post(self, request, **kwargs):
-        f = ChangeStorageForm(data=request.POST)
-        if f.is_valid():
-            sub_name = f.cleaned_data['storage_name']
-            try:
-                self.object.name = f.cleaned_data['storage_name']
-                self.object.verbose_name = f.cleaned_data.get('verbose_name')
-                self.object.responsible = f.cleaned_data['responsible']
-                self.object.is_template = f.cleaned_data['is_template']
-                self.object.save()
-            except ValidationError as v_err:
-                f.add_error('storage_name', '. '.join(v_err.messages))
-        context = self.get_context_data(**kwargs)
-        context['change_storage_form'] = f
-        return self.render_to_response(context)
-
-    def handle_del_storage_post(self, request, **kwargs):
-        parent = self.object.parent_storage
-        try:   
-            self.object.delete()
-        except:
-            context = self.get_context_data(**kwargs)
-            context['delete_storage_errors'] = ['Error deleting Storage '+str(self.object)]
-            return self.render_to_response(context)
-        
-        if parent is None:
-            return redirect('parts-stocks')
-        else:
-            return redirect(reverse('parts-stocks-detail', kwargs={'uuid':parent.id}))
-
-    def handle_del_stock_post(self, request, **kwargs):
-        del_error = None
-        if 'stock_uuid' in request.POST:
-            f = DeleteStockForm(data=request.POST)
-            if f.is_valid():
-                try:
-                    s = Stock.objects.get(id=f.cleaned_data['stock_uuid'])
-                    print(s.storage)
-                    print(self.object)
-                    if s.storage == self.object:
-                       s.delete()
-                    else:
-                        del_error = 'Cannot delete stock from another storage.' 
-                except:
-                    del_error = 'Could not find requested stock in this storage.'
-        
-        context = self.get_context_data(**kwargs)
-        return self.render_to_response(context)
-        
-    def handle_update_watermark(self, request, **kwargs):
-        edit_form = EditWatermarkForm(data=request.POST)
-        update_watermark_error = None
-        if edit_form.is_valid():
-            edit_form.save()
-        else:
-            pass # Todo: Handle error
-
-        context = self.get_context_data(**kwargs)
-        return self.render_to_response(context)
-    
-    def handle_amount_change_post(self, request, increase, **kwargs):
-        edit_form = EditStockAmountForm(data=request.POST)
-        if edit_form.is_valid():
-            edit_form.save(increase)
-
-        context = self.get_context_data(**kwargs)
-        return self.render_to_response(context)
-
-    def handle_add_stock_post(self, request, **kwargs):
-        f = AddStockForm(data=request.POST)
-        error_occured = False
-
-        if f.is_valid():
-            try:
-                f.save(self.object)
-            except Exception as ex:
-                f.add_error('', str(ex))
-                error_occured = True
-        else:
-            error_occured = True
-
-        context = self.get_context_data(**kwargs)
-        if error_occured:
-            context['add_stock_form'] = f
-        return self.render_to_response(context)
-
-    def post(self, request, *args, **kwargs):
-        self.object = self.get_object()
-
-        if 'submit-add-storage' in request.POST:
-            return self.handle_add_storage_post(request, **kwargs)
-        elif 'submit-change-storage' in request.POST:
-            return self.handle_change_storage_post(request, **kwargs)
-        elif 'submit-delete-storage' in request.POST:
-            return self.handle_del_storage_post(request, **kwargs)
-        elif 'submit-delete-stock' in request.POST:
-            return self.handle_del_stock_post(request, **kwargs)
-        elif 'submit-edit-watermark' in request.POST:
-            return self.handle_update_watermark(request, **kwargs)
-        elif 'submit-amount-reduce' in request.POST:
-            return self.handle_amount_change_post(request, False, **kwargs)
-        elif 'submit-amount-increase' in request.POST:
-            return self.handle_amount_change_post(request, True, **kwargs)     
-        elif 'submit-add-stock' in request.POST:
-            return self.handle_add_stock_post(request, **kwargs)
-
-        return super().post(request, *args, **kwargs)
-
-class ComponentDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
-    template_name = 'parts/components-detail.html'
-    model = Component
-    pk_url_kwarg = 'uuid'
-    base_title = ''
-    navbar_selected = 'Components'
-   
-    def get_context_data(self, **kwargs):
-        self.base_title = 'Component / '+self.object.name
-        context = super().get_context_data(**kwargs)
-        context['component'] = self.object
-        context['stocks'] = Stock.objects.filter(component=self.object)
-        context['comp_form'] = ComponentForm(instance=self.object)
-        context['new_distri_num_form'] = DistributorNumberCreateForm()
-        context['new_param_form'] = ComponentParameterCreateForm()
-        context['distri_nums'] = DistributorNum.objects.filter(component=self.object).order_by('distributor__name')
-        context['parameters'] = ComponentParameter.objects.filter(component=self.object).order_by('parameter_type__parameter_name')
-
-        return context
-
-    def handle_submit_edit_component_post(self, request, **kwargs):
-        cform = ComponentForm(instance=self.object, data=request.POST, files=request.FILES)
-        if cform.is_valid():
-            cform.save()
-        
-        context = self.get_context_data(**kwargs)
-        if not cform.is_valid():
-            context['comp_form'] = cform
-
-        return self.render_to_response(context)
-
-    def handle_submit_delete_post(self, request, **kwargs):
-        delete_error = None
-        protected_stuff = None
-
-        try:
-            self.object.delete()
-        except ProtectedError as pe:
-            delete_error = 'Component is protected'
-            protected_stuff = pe.protected_objects
-        except:
-            delete_error = 'Cannot delete component. Unknown error'
-
-        if delete_error is None:
-            return redirect('parts-components')
-        else:
-            context = self.get_context_data(**kwargs)
-            context['delete_error'] = delete_error
-            context['protected_stuff'] = protected_stuff
-            return self.render_to_response(context)
-
-    def handle_submit_new_distri_num_post(self, request, **kwargs):
-        form = DistributorNumberCreateForm(data=request.POST)
-        if form.is_valid():
-            new_number = form.save(commit=False)
-            new_number.component = self.object
-            try:
-                new_number.save()
-            except IntegrityError as ie:
-                form.add_error('__all__', 'Number for given distributor already exists')
-
-        context = self.get_context_data(**kwargs)
-        if not form.is_valid():
-            context['new_distri_num_form'] = form
-        return self.render_to_response(context)
-    
-    def handle_submit_delete_distri_num_post(self, request, **kwargs):
-        form = DistributorNumberDeleteForm(data=request.POST)
-        if form.is_valid():
-            form.cleaned_data['distributor_num'].delete()
-
-        context = self.get_context_data(**kwargs)
-        return self.render_to_response(context)
-    
-    def handle_submit_delete_param_post(self, request, **kwargs):
-        form = ComponentParameterDeleteForm(data=request.POST)
-        if form.is_valid():
-            form.cleaned_data['param_num'].delete()
-        
-        context = self.get_context_data(**kwargs)
-        return self.render_to_response(context)
-    
-    def handle_submit_new_param_post(self, request, **kwargs):
-        form = ComponentParameterCreateForm(data=request.POST)
-        
-        if form.is_valid():
-            try:
-                form.save(self.object)
-            except IntegrityError:
-                form.add_error('__all__', 'This parameter is already set')
-        context = self.get_context_data(**kwargs)
-        if not form.is_valid():
-            context['new_param_form'] = form
-        return self.render_to_response(context)
-
-    def post(self, request, *args, **kwargs):
-        self.object = self.get_object()
-        if 'submit-edit-component' in request.POST:
-            return self.handle_submit_edit_component_post(request, **kwargs)
-        elif 'submit-component-delete' in request.POST:
-            return self.handle_submit_delete_post(request, **kwargs)
-        elif 'submit-create-new-distri-num' in request.POST:
-            return self.handle_submit_new_distri_num_post(request, **kwargs)
-        elif 'submit-delete-distributor-num' in request.POST:
-            return self.handle_submit_delete_distri_num_post(request, **kwargs)
-        elif 'submit-delete-param' in request.POST:
-            return self.handle_submit_delete_param_post(request, **kwargs)
-        elif 'submit-create-new-param' in request.POST:
-            return self.handle_submit_new_param_post(request, **kwargs)
-        else:
-            return super().post(request, *args, **kwargs)
-
-class PackageDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
-    template_name = 'parts/packages-detail.html'
-    model = Package
-    pk_url_kwarg = 'uuid'
-    base_title = ''
-    navbar_selected = 'Packages'
-    
-    def get_context_data(self, **kwargs):
-        self.base_title = 'Package / '+self.object.name
-        context = super().get_context_data(**kwargs)
-        context['package'] = self.object
-        context['edit_form'] = PackageForm(instance=self.object)
- 
-        return context
-
-    def handle_delete_package(self, request):
-        delete_error = None
-        protected_objects = None
-        
-        # Try to delete this instance
-        try:
-            self.object.delete()
-        except ProtectedError as pe:
-            delete_error = 'Cannot delete this package. It is referenced by a component.'
-            protected_objects = pe.protected_objects
-        except:
-            delete_error = 'Cannot delete this package. Unknown error'
-        
-        if delete_error:
-            context = self.get_context_data()
-            context['delete_error'] = delete_error
-            context['protected_components'] = protected_objects
-            return self.render_to_response(context)
-        else:
-            return redirect('parts-packages')
-
-    def edit_package(self, request):
-        edit_form = PackageForm(data=request.POST, files=request.FILES, instance=self.object)
-
-        if edit_form.is_valid():
-            edit_form.save()
-
-        context = self.get_context_data()
-        if not edit_form.is_valid():
-            context['edit_form'] = edit_form
-        return self.render_to_response(context)
-
-    def post(self, request, *args, **kwargs):
-        self.object = self.get_object()
-
-        if 'submit-pkg-delete' in request.POST:
-            return self.handle_delete_package(request)
-        elif 'submit-pkg-edit' in request.POST:
-            return self.edit_package(request)
-        
-        return super().post(request, *args, **kwargs)
-
-class DistributorDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
-    template_name = 'parts/distributors-detail.html'
-    model = Distributor
-    pk_url_kwarg = 'uuid'
-    base_title = ''
-    navbar_selected = 'Distributors'
-    
-    def get_context_data(self, **kwargs):
-        self.base_title = 'Distributor / '+self.object.name
-        context = super().get_context_data(**kwargs)
-        context['distributor'] = self.object
-        context['edit_form'] = DistributorForm(instance=self.object)
- 
-        return context
-
-    def handle_delete_distributor(self, request):
-        delete_error = None
-        protected_objects = None
-        
-        # Try to delete this instance
-        try:
-            self.object.delete()
-        except ProtectedError as pe:
-            delete_error = 'Cannot delete this distributor. It is referenced by a component.'
-            protected_objects = pe.protected_objects
-        except:
-            delete_error = 'Cannot delete this distributor. Unknown error'
-        
-        if delete_error:
-            context = self.get_context_data()
-            context['delete_error'] = delete_error
-            context['protected_components'] = protected_objects
-            return self.render_to_response(context)
-        else:
-            return redirect('parts-distributors')
-
-    def edit_distributor(self, request):
-        edit_form = DistributorForm(data=request.POST, files=request.FILES, instance=self.object)
-
-        if edit_form.is_valid():
-            edit_form.save()
-
-        context = self.get_context_data()
-        if not edit_form.is_valid():
-            context['edit_form'] = edit_form
-        return self.render_to_response(context)
-
-    def post(self, request, *args, **kwargs):
-        self.object = self.get_object()
-
-        if 'submit-distri-delete' in request.POST:
-            return self.handle_delete_distributor(request)
-        elif 'submit-distri-edit' in request.POST:
-            return self.edit_distributor(request)
-        
-        return super().post(request, *args, **kwargs)
-
-class ManufacturersViewSet(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
-    template_name = 'parts/manufacturers.html'
-    base_title = 'Manufacturers'
-    navbar_selected = 'Manufacturers'
-    default_page_size = 25
-
-    def search_manufacturers(self, search):
-        qs = Manufacturer.objects.all()
-
-        if not search:
-            return qs
-        
-        search_fragements = search.strip().split()
-
-        for search in search_fragements:
-            qs = qs.filter(Q(name__icontains = search) | Q(website__icontains = search))
-
-        return qs
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        page_num = self.request.GET.get('page', default=1)
-        search_string = self.request.GET.get('search', default=None)
-        
-        queryset = self.search_manufacturers(search_string)
-
-        paginator = Paginator(queryset, self.default_page_size)       
-
-
-        context['search_string'] = search_string
-        context['manufacturers'] = paginator.get_page(page_num)
-        context['new_manufacturer_form'] = ManufacturerForm()
-
-        return context
-    
-    def handle_add_new_manufacturer(self, request):
-
-        form = ManufacturerForm(data=request.POST, files=request.FILES)
-        if form.is_valid():
-            form.save()
-
-        context = self.get_context_data()
-
-        if not form.is_valid():
-            context['new_manufacturer_form'] = form
-
-        return self.render_to_response(context)
-
-    def post(self, request, *args, **kwargs):
-        if 'submit-manufacturer-add-new' in request.POST:
-            return self.handle_add_new_manufacturer(request)
-
-        return super().post(request, *args, **kwargs)
-
-class ManufacturerDetailViewSet(LoginRequiredMixin, BaseTemplateMixin, DetailView):
-    template_name = 'parts/manufacturers-detail.html'
-    model = Manufacturer
-    pk_url_kwarg = 'uuid'
-    base_title = ''
-    navbar_selected = 'Manufacturers'
-    
-    def get_context_data(self, **kwargs):
-        self.base_title = 'Manufacturer / '+self.object.name
-        context = super().get_context_data(**kwargs)
-        context['manufacturer'] = self.object
-        context['edit_form'] = ManufacturerForm(instance=self.object)
- 
-        return context
-
-    def handle_delete_manufacturer(self, request):
-        delete_error = None
-        protected_objects = None
-        
-        # Try to delete this instance
-        try:
-            self.object.delete()
-        except ProtectedError as pe:
-            delete_error = 'Cannot delete this distributor. It is referenced by a component.'
-            protected_objects = pe.protected_objects
-        except:
-            delete_error = 'Cannot delete this distributor. Unknown error'
-        
-        if delete_error:
-            context = self.get_context_data()
-            context['delete_error'] = delete_error
-            context['protected_components'] = protected_objects
-            return self.render_to_response(context)
-        else:
-            return redirect('parts-manufacturers')
-
-    def edit_manufacturer(self, request):
-        edit_form = ManufacturerForm(data=request.POST, files=request.FILES, instance=self.object)
-
-        if edit_form.is_valid():
-            edit_form.save()
-
-        context = self.get_context_data()
-        if not edit_form.is_valid():
-            context['edit_form'] = edit_form
-        return self.render_to_response(context)
-
-    def post(self, request, *args, **kwargs):
-        self.object = self.get_object()
-
-        if 'submit-manufacturer-delete' in request.POST:
-            return self.handle_delete_manufacturer(request)
-        elif 'submit-manufacturer-edit' in request.POST:
-            return self.edit_manufacturer(request)
-        
-        return super().post(request, *args, **kwargs)
-
-
-def health_check_view(request) -> HttpResponse:
-    """
-    Health checking view. Returns empty http response with HTTP status OK.
-    This will be used to check if the system is actually running correctly
-    """
-    return HttpResponse(status=200)

shimatta_kenkyusho/parts/views/__init__.py

@@ -0,0 +1,6 @@
+from .component_views import *
+from .distributor_views import *
+from .generic_views import *
+from .manufacturer_views import *
+from .package_views import *
+from .storage_views import *

shimatta_kenkyusho/parts/views/component_import.py

@@ -3,7 +3,7 @@ import csv
 import requests
 from django.db import transaction
 from django.core.files.images import ImageFile
-from.models import ComponentParameter, ComponentType, Manufacturer, Component, \
+from ..models import ComponentParameter, ComponentType, Manufacturer, Component, \
                     DistributorNum, Stock, Storage, Distributor, Package, ComponentParameterType
 
 def _stock_component(component, storage_uuid, substorage_path, amount, lot, watermark):
@@ -28,7 +28,7 @@ def _set_additional_parameters(component, type, value):
 
         param = ComponentParameter.objects.create(component=component,
                                                   parameter_type=param_type)
-        if param_type == 'F':
+        if param_type.parameter_type == 'F':
             param.text_value = value
         else:
             param.value = float(value)
@@ -105,6 +105,6 @@ def import_components_from_csv(csv_file):
                                  data.pop('amount'),
                                  data.pop('lot'),
                                  data.pop('watermark'))
-                
+
                 for key, value in data.items():
                     _set_additional_parameters(comp, key, value)

shimatta_kenkyusho/parts/views/component_views.py

@@ -0,0 +1,284 @@
+from django.shortcuts import redirect
+from django.urls import reverse
+from django.views.generic import TemplateView, DetailView
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.core.paginator import Paginator
+from django.db.models import Q
+from django.forms import formset_factory
+from django.db import IntegrityError
+from django.db.models import ProtectedError
+from shimatta_modules.ShimattaSearchLanguage import ShimattaSearchLanguage
+from ..models import Stock, Component, ComponentParameter, DistributorNum, PackageParameter
+from ..forms import *
+from .component_import import import_components_from_csv
+from .generic_views import BaseTemplateMixin
+
+
+ParameterSearchFormSet = formset_factory(ComponentParameterSearchForm, extra=1)
+
+# Create your views here.
+
+class ComponentView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
+    template_name = 'parts/components.html'
+    base_title = 'Components'
+    navbar_selected = 'Components'
+    default_page_size = 25
+
+    def get_component_query_set(self, search_string):
+        queryset = Component.objects.all()
+        error_string = ''
+
+        if not search_string:
+            return queryset, error_string
+        
+        search_parser = ShimattaSearchLanguage()
+        query, errors = search_parser.search_for_components(search_string)
+
+        if query and not errors:
+            try:
+                queryset = queryset.filter(query)
+            except Exception as ex:
+                error_string = str(ex)
+        else:
+            error_string = '<br><br>'.join(errors)
+
+        return queryset, error_string
+
+    def get_component_queryset_from_advanced_search(self, cleaned_data):
+        queryset = Component.objects.all()
+
+        if cleaned_data['name']:
+            queryset = queryset.filter(Q(name__icontains=cleaned_data['name']))
+        if cleaned_data['package']:
+            queryset = queryset.filter(package=cleaned_data['package'])
+        if cleaned_data['package_pin_count']:
+            queryset = queryset.filter(package__pin_count=cleaned_data['package_pin_count'])
+        if cleaned_data['component_type']:
+            queryset = queryset.filter(component_type=cleaned_data['component_type'])
+        if cleaned_data['distributor_num']:
+            if cleaned_data['distributor']:
+                distri = cleaned_data['distributor']
+                queryset = queryset.filter(Q(distributornum__distributor_part_number__icontains=cleaned_data['distributor_num']) & Q(distributornum__distributor=distri))
+            else:
+                 queryset = queryset.filter(Q(distributornum__distributor_part_number__icontains=cleaned_data['distributor_num']))
+        if cleaned_data['manufacturer']:
+            queryset = queryset.filter(manufacturer=cleaned_data['manufacturer'])
+        return queryset
+
+    def get_context_data_int(self, advanced_search, parameter_formset : ParameterSearchFormSet, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        errors = ''
+
+        comp_page_num = self.request.GET.get('comp_page', default=1)
+
+        if advanced_search and parameter_formset:
+            search = None
+            context['advanced_search_shown'] = True
+            context['advanced_search_form'] = advanced_search
+            context['advanced_search_param_formset'] = parameter_formset
+            if advanced_search.is_valid():
+                paginator_queryset = self.get_component_queryset_from_advanced_search(
+			advanced_search.cleaned_data)
+            else:
+                paginator_queryset = Component.objects.all()
+
+            if parameter_formset.is_valid():
+                # Process parameters
+                pass
+
+        else:
+            search = self.request.GET.get('search', default=None)
+            paginator_queryset, errors = self.get_component_query_set(search)
+
+        comp_paginator = Paginator(paginator_queryset, self.default_page_size)
+
+        context['components'] = comp_paginator.get_page(comp_page_num)
+        context['comp_form'] = ComponentForm()
+        context['import_comp_form'] = ImportComponentForm()
+        context['search_string'] = search
+        context['errors'] = errors
+
+        if not parameter_formset:
+            context['advanced_search_param_formset'] = ParameterSearchFormSet()
+
+        if not advanced_search:
+            context['advanced_search_form'] = AdvancedComponentSearchForm(auto_id='adv_search_%s')
+
+        return context
+
+    def get_context_data(self, **kwargs):
+        return self.get_context_data_int(advanced_search = None, parameter_formset=None, **kwargs)
+
+    def handle_new_component_post(self, request, open=False, **kwargs):
+        cform = ComponentForm(data=request.POST, files=request.FILES)
+        new_component = None
+        if cform.is_valid():
+            new_component = cform.save()
+
+        context = self.get_context_data(**kwargs)
+        if not cform.is_valid():
+            context['comp_form'] = cform
+
+        if open and new_component:
+            return redirect(reverse('parts-components-detail', kwargs={'uuid':new_component.id}))
+        return self.render_to_response(context)
+
+    def handle_import_components_post(self, request, open=False, **kwargs):
+        cform = ImportComponentForm(data=request.POST, files=request.FILES)
+        context = self.get_context_data(**kwargs)
+        if cform.is_valid():
+            try:
+                import_components_from_csv(cform.files['csv_file'].file)
+            except Exception as ex:
+                cform.add_error('csv_file', str(ex))
+                context['import_comp_form'] = cform
+        else:
+            context['import_comp_form'] = cform
+
+        return self.render_to_response(context)
+
+    def handle_advanced_search_post(self, request, **kwargs):
+
+        form = AdvancedComponentSearchForm(auto_id='adv_search_%s', data=request.POST)
+        param_formset = ParameterSearchFormSet(data=request.POST)
+
+        if form.is_valid():
+            print('Valid')
+
+        if param_formset.is_valid():
+            print('Formset is valid!')
+
+
+        context = self.get_context_data_int(form, param_formset, **kwargs)
+        return self.render_to_response(context)
+
+    def post(self, request, *args, **kwargs):
+        if 'submit-edit-component' in request.POST:
+            return self.handle_new_component_post(request, open=False, **kwargs)
+        elif 'submit-edit-component-open' in request.POST:
+            return self.handle_new_component_post(request, open=True, **kwargs)
+        elif 'submit-import-components' in request.POST:
+            return self.handle_import_components_post(request, open=True, **kwargs)
+        elif 'submit-advanced-search' in request.POST:
+            return self.handle_advanced_search_post(request, **kwargs)
+        else:
+            return super().post(request, *args, **kwargs)
+
+class ComponentDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
+    template_name = 'parts/components-detail.html'
+    model = Component
+    pk_url_kwarg = 'uuid'
+    base_title = ''
+    navbar_selected = 'Components'
+
+    def get_context_data(self, **kwargs):
+        self.base_title = 'Component / '+self.object.name
+        context = super().get_context_data(**kwargs)
+        context['component'] = self.object
+        context['stocks'] = Stock.objects.filter(component=self.object)
+        context['comp_form'] = ComponentForm(instance=self.object)
+        context['new_distri_num_form'] = DistributorNumberCreateForm()
+        context['new_param_form'] = ComponentParameterCreateForm()
+        context['distri_nums'] = DistributorNum.objects.filter(component=self.object).order_by(
+            'distributor__name')
+        context['parameters'] = ComponentParameter.objects.filter(component=self.object).order_by(
+            'parameter_type__parameter_name')
+        context['package_parameters'] = PackageParameter.objects.filter(package=self.object.package).order_by(
+            'parameter_type__parameter_name')
+
+        return context
+
+    def handle_submit_edit_component_post(self, request, **kwargs):
+        cform = ComponentForm(instance=self.object, data=request.POST, files=request.FILES)
+        if cform.is_valid():
+            cform.save()
+
+        context = self.get_context_data(**kwargs)
+        if not cform.is_valid():
+            context['comp_form'] = cform
+
+        return self.render_to_response(context)
+
+    def handle_submit_delete_post(self, request, **kwargs):
+        delete_error = None
+        protected_stuff = None
+
+        try:
+            self.object.delete()
+        except ProtectedError as pe:
+            delete_error = 'Component is protected'
+            protected_stuff = pe.protected_objects
+        except:
+            delete_error = 'Cannot delete component. Unknown error'
+
+        if delete_error is None:
+            return redirect('parts-components')
+        else:
+            context = self.get_context_data(**kwargs)
+            context['delete_error'] = delete_error
+            context['protected_stuff'] = protected_stuff
+            return self.render_to_response(context)
+
+    def handle_submit_new_distri_num_post(self, request, **kwargs):
+        form = DistributorNumberCreateForm(data=request.POST)
+        if form.is_valid():
+            new_number = form.save(commit=False)
+            new_number.component = self.object
+            try:
+                new_number.save()
+            except IntegrityError as ie:
+                form.add_error('__all__', 'Number for given distributor already exists')
+
+        context = self.get_context_data(**kwargs)
+        if not form.is_valid():
+            context['new_distri_num_form'] = form
+        return self.render_to_response(context)
+
+    def handle_submit_delete_distri_num_post(self, request, **kwargs):
+        form = DistributorNumberDeleteForm(data=request.POST)
+        if form.is_valid():
+            form.cleaned_data['distributor_num'].delete()
+
+        context = self.get_context_data(**kwargs)
+        return self.render_to_response(context)
+
+    def handle_submit_delete_param_post(self, request, **kwargs):
+        form = ComponentParameterDeleteForm(data=request.POST)
+        if form.is_valid():
+            form.cleaned_data['param_num'].delete()
+
+        context = self.get_context_data(**kwargs)
+        return self.render_to_response(context)
+
+    def handle_submit_new_param_post(self, request, **kwargs):
+        form = ComponentParameterCreateForm(data=request.POST)
+
+        if form.is_valid():
+            try:
+                form.save(self.object)
+            except IntegrityError:
+                form.add_error('__all__', 'This parameter is already set')
+        context = self.get_context_data(**kwargs)
+        if not form.is_valid():
+            context['new_param_form'] = form
+        return self.render_to_response(context)
+
+    def post(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        if 'submit-edit-component' in request.POST:
+            return self.handle_submit_edit_component_post(request, **kwargs)
+        elif 'submit-component-delete' in request.POST:
+            return self.handle_submit_delete_post(request, **kwargs)
+        elif 'submit-create-new-distri-num' in request.POST:
+            return self.handle_submit_new_distri_num_post(request, **kwargs)
+        elif 'submit-delete-distributor-num' in request.POST:
+            return self.handle_submit_delete_distri_num_post(request, **kwargs)
+        elif 'submit-delete-param' in request.POST:
+            return self.handle_submit_delete_param_post(request, **kwargs)
+        elif 'submit-create-new-param' in request.POST:
+            return self.handle_submit_new_param_post(request, **kwargs)
+        else:
+            return super().post(request, *args, **kwargs)
+
+

shimatta_kenkyusho/parts/views/distributor_views.py

@@ -0,0 +1,120 @@
+from django.shortcuts import redirect
+from django.views.generic import TemplateView, DetailView
+from django.contrib.auth.mixins import LoginRequiredMixin
+from ..models import Distributor
+from django.core.paginator import Paginator
+from django.db.models import ProtectedError
+from ..forms import *
+from django.db.models import Q
+from .generic_views import BaseTemplateMixin
+
+class DistributorView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
+    template_name = 'parts/distributors.html'
+    base_title = 'Distributors'
+    navbar_selected = 'Distributors'
+    default_page_size = 25
+
+    def search_distributors(self, search):
+        qs = Distributor.objects.all()
+
+        if not search:
+            return qs
+
+        search_fragments = search.strip().split()
+
+        for search in search_fragments:
+            qs = qs.filter(Q(name__icontains = search) | Q(website__icontains = search))
+        return qs
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        page_num = self.request.GET.get('page', default=1)
+        search_string = self.request.GET.get('search', default=None)
+
+        queryset = self.search_distributors(search_string)
+
+        paginator = Paginator(queryset, self.default_page_size)
+
+
+        context['search_string'] = search_string
+        context['distributors'] = paginator.get_page(page_num)
+        context['new_distri_form'] = DistributorForm()
+
+        return context
+
+    def handle_add_new_distributor(self, request):
+
+        form = DistributorForm(data=request.POST, files=request.FILES)
+        if form.is_valid():
+            form.save()
+
+        context = self.get_context_data()
+
+        if not form.is_valid():
+            context['new_distri_form'] = form
+
+        return self.render_to_response(context)
+
+    def post(self, request, *args, **kwargs):
+        if 'submit-distri-add-new' in request.POST:
+            return self.handle_add_new_distributor(request)
+
+        return super().post(request, *args, **kwargs)
+
+
+class DistributorDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
+    template_name = 'parts/distributors-detail.html'
+    model = Distributor
+    pk_url_kwarg = 'uuid'
+    base_title = ''
+    navbar_selected = 'Distributors'
+
+    def get_context_data(self, **kwargs):
+        self.base_title = 'Distributor / '+self.object.name
+        context = super().get_context_data(**kwargs)
+        context['distributor'] = self.object
+        context['edit_form'] = DistributorForm(instance=self.object)
+
+        return context
+
+    def handle_delete_distributor(self, request):
+        delete_error = None
+        protected_objects = None
+
+        # Try to delete this instance
+        try:
+            self.object.delete()
+        except ProtectedError as pe:
+            delete_error = 'Cannot delete this distributor. It is referenced by a component.'
+            protected_objects = pe.protected_objects
+        except:
+            delete_error = 'Cannot delete this distributor. Unknown error'
+
+        if delete_error:
+            context = self.get_context_data()
+            context['delete_error'] = delete_error
+            context['protected_components'] = protected_objects
+            return self.render_to_response(context)
+        else:
+            return redirect('parts-distributors')
+
+    def edit_distributor(self, request):
+        edit_form = DistributorForm(data=request.POST, files=request.FILES, instance=self.object)
+
+        if edit_form.is_valid():
+            edit_form.save()
+
+        context = self.get_context_data()
+        if not edit_form.is_valid():
+            context['edit_form'] = edit_form
+        return self.render_to_response(context)
+
+    def post(self, request, *args, **kwargs):
+        self.object = self.get_object()
+
+        if 'submit-distri-delete' in request.POST:
+            return self.handle_delete_distributor(request)
+        elif 'submit-distri-edit' in request.POST:
+            return self.edit_distributor(request)
+
+        return super().post(request, *args, **kwargs)

shimatta_kenkyusho/parts/views/generic_views.py

@@ -0,0 +1,121 @@
+from django.shortcuts import render, redirect
+from django.contrib.auth import logout, login
+from django.contrib.auth.forms import AuthenticationForm as AuthForm
+from django.contrib.auth.forms import PasswordChangeForm
+from django.contrib.auth import update_session_auth_hash
+from django.views.generic import TemplateView
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.http import HttpResponse
+from ..navbar import NavBar
+from ..forms import QrSearchForm
+
+class BaseTemplateMixin():
+    navbar_selected = ''
+    base_title = ''
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        base_context = {
+            'navbar': NavBar.get_navbar(self.navbar_selected, self.request.user),
+            'title': NavBar.get_brand()+' / '+ self.base_title,
+            'login_active': False,
+        }
+        context['base'] = base_context
+        return context
+
+    def post(self, request, *args, **kwargs):
+        data = request.POST
+        if 'qr_search' not in data:
+            super().post(request, *args, **kwargs)
+
+        print('QR',data['qr_search'])
+        f = QrSearchForm(data)
+        if f.is_valid():
+            return redirect(f.my_qr_validator.get_redirect_url(f.cleaned_data['qr_search']))
+
+        return self.get(request)
+
+class ChangePasswordView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
+    template_name = 'parts/change-pw.html'
+    navbar_selected = 'Main'
+    base_title = 'Change Password'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['form'] = PasswordChangeForm(self.request.user)
+        return context
+
+    def post(self, request, *args, **kwargs):
+        if 'submit-change-pw' not in request.POST:
+            return super().post(request, *args, **kwargs)
+
+        form = PasswordChangeForm(request.user, data=request.POST)
+
+        if form.is_valid():
+            user = form.save()
+            update_session_auth_hash(request, user)
+            return redirect('parts-main')
+
+        context = self.get_context_data(**kwargs)
+        if form.errors:
+            context['form'] = form
+
+        return self.render_to_response(context)
+
+
+class MainView(BaseTemplateMixin, TemplateView):
+    template_name = 'parts/main.html'
+    navbar_selected = 'Main'
+    base_title = 'Main'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['user'] = self.request.user
+        return context
+
+
+def logout_view(request):
+    logout(request)
+    return redirect('parts-main')
+
+def login_view(request):
+    base_context = {
+        'navbar': NavBar.get_navbar('Login', request.user),
+        'title': NavBar.get_brand()+' / '+'Login',
+        'login_active': True,
+    }
+
+    if request.user.is_authenticated:
+        next_param = request.GET.get('next')
+        if next_param is not None:
+            return redirect(next_param)
+        return redirect('parts-main')
+
+    if request.method == 'POST':
+        form = AuthForm(data=request.POST)
+        if form.is_valid():
+            valid_user = form.get_user()
+            login(request, valid_user)
+            next_param = request.GET.get('next')
+            if next_param is not None:
+                return redirect(next_param)
+            return redirect('parts-main')
+    else:
+        form = AuthForm()
+
+
+    context = {
+        'base': base_context,
+        'form': form,
+    }
+
+    return render(request, 'parts/login.html', context)
+
+
+
+def health_check_view(_request) -> HttpResponse:
+    """
+    Health checking view. Returns empty http response with HTTP status OK.
+    This will be used to check if the system is actually running correctly
+    """
+    return HttpResponse(status=200)

shimatta_kenkyusho/parts/views/manufacturer_views.py

@@ -0,0 +1,121 @@
+from django.shortcuts import redirect
+from django.views.generic import TemplateView, DetailView
+from django.contrib.auth.mixins import LoginRequiredMixin
+from ..models import Manufacturer
+from django.core.paginator import Paginator
+from django.db.models import ProtectedError
+from ..forms import *
+from django.db.models import Q
+from .generic_views import BaseTemplateMixin
+
+class ManufacturersView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
+    template_name = 'parts/manufacturers.html'
+    base_title = 'Manufacturers'
+    navbar_selected = 'Manufacturers'
+    default_page_size = 25
+
+    def search_manufacturers(self, search):
+        qs = Manufacturer.objects.all()
+
+        if not search:
+            return qs
+
+        search_fragements = search.strip().split()
+
+        for search in search_fragements:
+            qs = qs.filter(Q(name__icontains = search) | Q(website__icontains = search))
+
+        return qs
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        page_num = self.request.GET.get('page', default=1)
+        search_string = self.request.GET.get('search', default=None)
+
+        queryset = self.search_manufacturers(search_string)
+
+        paginator = Paginator(queryset, self.default_page_size)
+
+
+        context['search_string'] = search_string
+        context['manufacturers'] = paginator.get_page(page_num)
+        context['new_manufacturer_form'] = ManufacturerForm()
+
+        return context
+
+    def handle_add_new_manufacturer(self, request):
+
+        form = ManufacturerForm(data=request.POST, files=request.FILES)
+        if form.is_valid():
+            form.save()
+
+        context = self.get_context_data()
+
+        if not form.is_valid():
+            context['new_manufacturer_form'] = form
+
+        return self.render_to_response(context)
+
+    def post(self, request, *args, **kwargs):
+        if 'submit-manufacturer-add-new' in request.POST:
+            return self.handle_add_new_manufacturer(request)
+
+        return super().post(request, *args, **kwargs)
+
+
+class ManufacturerDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
+    template_name = 'parts/manufacturers-detail.html'
+    model = Manufacturer
+    pk_url_kwarg = 'uuid'
+    base_title = ''
+    navbar_selected = 'Manufacturers'
+
+    def get_context_data(self, **kwargs):
+        self.base_title = 'Manufacturer / '+self.object.name
+        context = super().get_context_data(**kwargs)
+        context['manufacturer'] = self.object
+        context['edit_form'] = ManufacturerForm(instance=self.object)
+
+        return context
+
+    def handle_delete_manufacturer(self, request):
+        delete_error = None
+        protected_objects = None
+
+        # Try to delete this instance
+        try:
+            self.object.delete()
+        except ProtectedError as pe:
+            delete_error = 'Cannot delete this distributor. It is referenced by a component.'
+            protected_objects = pe.protected_objects
+        except:
+            delete_error = 'Cannot delete this distributor. Unknown error'
+
+        if delete_error:
+            context = self.get_context_data()
+            context['delete_error'] = delete_error
+            context['protected_components'] = protected_objects
+            return self.render_to_response(context)
+        else:
+            return redirect('parts-manufacturers')
+
+    def edit_manufacturer(self, request):
+        edit_form = ManufacturerForm(data=request.POST, files=request.FILES, instance=self.object)
+
+        if edit_form.is_valid():
+            edit_form.save()
+
+        context = self.get_context_data()
+        if not edit_form.is_valid():
+            context['edit_form'] = edit_form
+        return self.render_to_response(context)
+
+    def post(self, request, *args, **kwargs):
+        self.object = self.get_object()
+
+        if 'submit-manufacturer-delete' in request.POST:
+            return self.handle_delete_manufacturer(request)
+        elif 'submit-manufacturer-edit' in request.POST:
+            return self.edit_manufacturer(request)
+
+        return super().post(request, *args, **kwargs)

shimatta_kenkyusho/parts/views/package_views.py

@@ -0,0 +1,156 @@
+from django.shortcuts import  redirect
+from django.views.generic import TemplateView, DetailView
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.core.paginator import Paginator
+from django.db.models import ProtectedError
+from django.db.models import Q
+from ..forms import *
+from ..models import Package, PackageParameter
+from .generic_views import BaseTemplateMixin
+
+class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
+    template_name = 'parts/packages.html'
+    base_title = 'Packages'
+    navbar_selected = 'Packages'
+    default_page_size = 25
+
+    def search_packages(self, search):
+        qs = Package.objects.all()
+
+        if not search:
+            return qs
+
+        search_fragments = search.strip().split()
+        for search in search_fragments:
+            if search.lower() == 'smd':
+                s_filter = Q(name__icontains = search) | Q(smd = True)
+            else:
+                try:
+                    pin_count = int(search)
+                    s_filter = Q(name__icontains = search) | Q(pin_count=pin_count)
+                except:
+                    s_filter = Q(name__icontains = search)
+
+            qs = qs.filter(s_filter)
+        return qs
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        page_num = self.request.GET.get('page', default=1)
+        search_string = self.request.GET.get('search', default=None)
+
+        package_queryset = self.search_packages(search_string)
+
+        paginator = Paginator(package_queryset, self.default_page_size)
+
+
+        context['search_string'] = search_string
+        context['packages'] = paginator.get_page(page_num)
+        context['new_pkg_form'] = PackageForm()
+
+        return context
+
+    def handle_add_new_package(self, request):
+
+        form = PackageForm(data=request.POST, files=request.FILES)
+        if form.is_valid():
+            form.save()
+
+        context = self.get_context_data()
+
+        if not form.is_valid():
+            context['new_pkg_form'] = form
+
+        return self.render_to_response(context)
+
+    def post(self, request, *args, **kwargs):
+        if 'submit-pkg-add-new' in request.POST:
+            return self.handle_add_new_package(request)
+
+        return super().post(request, *args, **kwargs)
+
+
+class PackageDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
+    template_name = 'parts/packages-detail.html'
+    model = Package
+    pk_url_kwarg = 'uuid'
+    base_title = ''
+    navbar_selected = 'Packages'
+
+    def get_context_data(self, **kwargs):
+        self.base_title = 'Package / '+self.object.name
+        context = super().get_context_data(**kwargs)
+        context['package'] = self.object
+        context['edit_form'] = PackageForm(instance=self.object)
+        context['new_param_form'] = PackageParameterCreateForm()
+        context['parameters'] = PackageParameter.objects.filter(package=self.object).order_by(
+            'parameter_type__parameter_name')
+
+        return context
+
+    def handle_delete_package(self, request):
+        delete_error = None
+        protected_objects = None
+
+        # Try to delete this instance
+        try:
+            self.object.delete()
+        except ProtectedError as pe:
+            delete_error = 'Cannot delete this package. It is referenced by a component.'
+            protected_objects = pe.protected_objects
+        except:
+            delete_error = 'Cannot delete this package. Unknown error'
+
+        if delete_error:
+            context = self.get_context_data()
+            context['delete_error'] = delete_error
+            context['protected_components'] = protected_objects
+            return self.render_to_response(context)
+        else:
+            return redirect('parts-packages')
+
+    def edit_package(self, request):
+        edit_form = PackageForm(data=request.POST, files=request.FILES, instance=self.object)
+
+        if edit_form.is_valid():
+            edit_form.save()
+
+        context = self.get_context_data()
+        if not edit_form.is_valid():
+            context['edit_form'] = edit_form
+        return self.render_to_response(context)
+    
+    def handle_submit_delete_param_post(self, request, **kwargs):
+        form = PackageParameterDeleteForm(data=request.POST)
+        if form.is_valid():
+            form.cleaned_data['param_num'].delete()
+
+        context = self.get_context_data(**kwargs)
+        return self.render_to_response(context)
+
+    def handle_submit_new_param_post(self, request, **kwargs):
+        form = PackageParameterCreateForm(data=request.POST)
+
+        if form.is_valid():
+            try:
+                form.save(self.object)
+            except IntegrityError:
+                form.add_error('__all__', 'This parameter is already set')
+        context = self.get_context_data(**kwargs)
+        if not form.is_valid():
+            context['new_param_form'] = form
+        return self.render_to_response(context)
+
+    def post(self, request, *args, **kwargs):
+        self.object = self.get_object()
+
+        if 'submit-pkg-delete' in request.POST:
+            return self.handle_delete_package(request)
+        elif 'submit-pkg-edit' in request.POST:
+            return self.edit_package(request)
+        elif 'submit-delete-param' in request.POST:
+            return self.handle_submit_delete_param_post(request, **kwargs)
+        elif 'submit-create-new-param' in request.POST:
+            return self.handle_submit_new_param_post(request, **kwargs)
+
+        return super().post(request, *args, **kwargs)

shimatta_kenkyusho/parts/views/storage_views.py

@@ -0,0 +1,289 @@
+import uuid
+from django.shortcuts import redirect
+from django.urls import reverse
+from django.views.generic import TemplateView, DetailView
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.core.paginator import Paginator
+from django.core.exceptions import ValidationError
+from django.db.models import Q
+from django.db.models.functions import Lower
+from ..models import Storage, Stock
+from ..forms import *
+from .generic_views import BaseTemplateMixin
+
+class StockView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
+    template_name = 'parts/stocks.html'
+    base_title = 'Stocks'
+    navbar_selected = 'Stocks'
+    default_pagination_size = 25
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        storage_page = self.request.GET.get('storage_page')
+        if storage_page is None:
+            storage_page = 1
+        low_stock_page = self.request.GET.get('low_stock_page')
+        if low_stock_page is None:
+            low_stock_page = 1
+
+        storage_paginator = Paginator(Storage.objects.filter(parent_storage=None), self.default_pagination_size)
+        low_stock_paginator = Paginator(Stock.get_under_watermark(),
+            self.default_pagination_size)
+
+        context['low_stocks'] = low_stock_paginator.get_page(low_stock_page)
+        context['storages'] = storage_paginator.get_page(storage_page)
+        add_stor_form = AddSubStorageForm()
+        add_stor_form.fields['responsible'].initial = self.request.user.id
+        context['add_storage_form'] = add_stor_form
+        return context
+
+    def handle_add_storage(self, request, **kwargs):
+        f = AddSubStorageForm(data=request.POST)
+        if f.is_valid():
+            sub_name = f.cleaned_data['storage_name']
+            try:
+                Storage.objects.create(name=sub_name,
+                                        responsible=f.cleaned_data['responsible'],
+                                        is_template=f.cleaned_data['is_template'],
+                                        template=f.cleaned_data.get('template'))
+            except ValidationError as v_err:
+                f.add_error('storage_name', '. '.join(v_err.messages))
+        context = self.get_context_data(**kwargs)
+        context['add_storage_form'] = f
+        return self.render_to_response(context)
+
+    def post(self, request, **kwargs):
+        if 'submit-add-storage' in request.POST:
+            return self.handle_add_storage(request, **kwargs)
+
+        return super().post(request, **kwargs)
+
+class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
+    template_name = 'parts/stocks-detail.html'
+    model = Storage
+    pk_url_kwarg = 'uuid'
+    base_title = ''
+    navbar_selected = 'Stocks'
+    default_pagination_size = 8
+
+    def get_breadcrumbs(self):
+        crumbs = self.object.get_path_components()
+        # Reverse list and drop the last element of the reversed list
+        crumbs = crumbs[::-1][:-1]
+        return crumbs
+
+    def search_stock_queryset(self, search):
+
+        if self.object.expand_sub_storage_stocks:
+            stocks_in_storage = Stock.objects.filter(storage__in=self.object.get_storage_list())
+        else:
+            stocks_in_storage = Stock.objects.filter(storage=self.object)
+
+        stocks_in_storage = stocks_in_storage.order_by(Lower('component__name'))
+
+        if search is None or search == '':
+            return stocks_in_storage
+
+        if search.startswith('[comp_uuid]'):
+            search = search.replace('[comp_uuid]', '')
+
+
+        # Check if the searhc equals a UUID
+        test_uuid = None
+        try:
+            test_uuid = uuid.UUID(search)
+        except:
+            pass
+
+        if test_uuid is not None:
+            stocks_in_storage = stocks_in_storage.filter(Q(component__id = test_uuid) | Q(id= test_uuid))
+        else:
+            stocks_in_storage = stocks_in_storage.filter(Q(component__name__icontains = search) |
+                Q(component__package__name__icontains = search) |
+                Q(component__manufacturer__name__icontains = search))
+
+        return stocks_in_storage
+
+    def get_context_data(self, **kwargs):
+        self.base_title = 'Stocks / ' + self.object.name
+        context = super().get_context_data(**kwargs)
+        context['breadcrumbs'] = self.get_breadcrumbs()
+
+        storage_page = self.request.GET.get('storage_page', default=1)
+        storage_paginator = Paginator(Storage.objects.filter(parent_storage=self.object), self.default_pagination_size)
+        stock_search_input = self.request.GET.get('search')
+
+        componente_stock_page = self.request.GET.get('stock_page', default=1)
+
+        stock_paginator = Paginator(self.search_stock_queryset(stock_search_input), self.default_pagination_size)
+
+        context['storages'] = storage_paginator.get_page(storage_page)
+        stocks = stock_paginator.get_page(componente_stock_page)
+        context['stocks'] = stocks
+        context['stocks_with_forms'] = [{'object': s, 'relocate_form': RelocateStockForm(instance=s, prefix=str(s.id))} for s in stocks]
+        context['stock_search'] = stock_search_input
+        add_storage_form = AddSubStorageForm()
+        add_storage_form.fields['responsible'].initial = self.request.user.id
+        context['add_storage_form'] = add_storage_form
+        change_storage_form = ChangeStorageForm(prefix='change_storage')
+        change_storage_form.fields['storage_name'].initial = self.object.name
+        change_storage_form.fields['verbose_name'].initial = self.object.verbose_name
+        change_storage_form.fields['responsible'].initial = self.object.responsible.id
+        change_storage_form.fields['expand_sub_storage_stocks'].initial = self.object.expand_sub_storage_stocks
+        change_storage_form.fields['is_template'].initial = self.object.is_template
+        context['change_storage_form'] = change_storage_form
+        context['delete_storage_error'] = None
+        context['add_stock_form'] = AddStockForm()
+
+        return context
+
+    def handle_add_storage_post(self, request, **kwargs):
+        f = AddSubStorageForm(data=request.POST)
+        if f.is_valid():
+            sub_name = f.cleaned_data['storage_name']
+            try:
+                Storage.objects.create(name=sub_name,
+                                        verbose_name=f.cleaned_data.get('verbose_name'),
+                                        parent_storage=self.object,
+                                        responsible=f.cleaned_data['responsible'],
+                                        expand_sub_storage_stocks=f.cleaned_data['expand_sub_storage_stocks'],
+                                        is_template=f.cleaned_data['is_template'],
+                                        template=f.cleaned_data.get('template'))
+            except ValidationError as v_err:
+                f.add_error('storage_name', '. '.join(v_err.messages))
+        context = self.get_context_data(**kwargs)
+        context['add_storage_form'] = f
+        return self.render_to_response(context)
+
+    def handle_change_storage_post(self, request, **kwargs):
+        f = ChangeStorageForm(data=request.POST, prefix='change_storage')
+        if f.is_valid():
+            try:
+                self.object.name = f.cleaned_data['storage_name']
+                self.object.verbose_name = f.cleaned_data.get('verbose_name')
+                self.object.responsible = f.cleaned_data['responsible']
+                self.object.expand_sub_storage_stocks = f.cleaned_data['expand_sub_storage_stocks']
+                self.object.is_template = f.cleaned_data['is_template']
+                self.object.save()
+            except ValidationError as v_err:
+                f.add_error('storage_name', '. '.join(v_err.messages))
+        context = self.get_context_data(**kwargs)
+        context['change_storage_form'] = f
+        return self.render_to_response(context)
+
+    def handle_del_storage_post(self, request, **kwargs):
+        parent = self.object.parent_storage
+        try:
+            self.object.delete()
+        except:
+            context = self.get_context_data(**kwargs)
+            context['delete_storage_errors'] = ['Error deleting Storage '+str(self.object)]
+            return self.render_to_response(context)
+
+        if parent is None:
+            return redirect('parts-stocks')
+        else:
+            return redirect(reverse('parts-stocks-detail', kwargs={'uuid':parent.id}))
+
+    def handle_del_stock_post(self, request, **kwargs):
+        del_error = None # TODO: Check error handling. This is clearly not working as intended :P
+        if 'stock_uuid' in request.POST:
+            f = DeleteStockForm(data=request.POST)
+            if f.is_valid():
+                try:
+                    s = Stock.objects.get(id=f.cleaned_data['stock_uuid'])
+                    print(s.storage)
+                    print(self.object)
+                    if s.storage == self.object:
+                       s.delete()
+                    else:
+                        del_error = 'Cannot delete stock from another storage.'
+                except:
+                    del_error = 'Could not find requested stock in this storage.'
+
+        context = self.get_context_data(**kwargs)
+        return self.render_to_response(context)
+
+    def handle_update_watermark(self, request, **kwargs):
+        edit_form = EditWatermarkForm(data=request.POST)
+        if edit_form.is_valid():
+            edit_form.save()
+        else:
+            pass # Todo: Handle error
+
+        context = self.get_context_data(**kwargs)
+        return self.render_to_response(context)
+
+    def handle_update_lot(self, request, **kwargs):
+        edit_form = EditLotForm(data=request.POST)
+        if edit_form.is_valid():
+            edit_form.save()
+        else:
+            pass # Todo: Handle error
+
+        context = self.get_context_data(**kwargs)
+        return self.render_to_response(context)
+
+    def handle_relocate_stock(self, request, **kwargs):
+        instance = Stock.objects.get(id=request.POST['prefix'])
+        edit_form = RelocateStockForm(instance=instance, data=request.POST, prefix=request.POST['prefix'])
+        if edit_form.is_valid():
+            edit_form.save()
+        else:
+            pass # Todo: Handle error
+
+        context = self.get_context_data(**kwargs)
+        return self.render_to_response(context)
+
+    def handle_amount_change_post(self, request, increase, **kwargs):
+        edit_form = EditStockAmountForm(data=request.POST)
+        if edit_form.is_valid():
+            edit_form.save(increase)
+
+        context = self.get_context_data(**kwargs)
+        return self.render_to_response(context)
+
+    def handle_add_stock_post(self, request, **kwargs):
+        f = AddStockForm(data=request.POST)
+        error_occured = False
+
+        if f.is_valid():
+            try:
+                f.save(self.object)
+            except Exception as ex:
+                f.add_error('', str(ex))
+                error_occured = True
+        else:
+            error_occured = True
+
+        context = self.get_context_data(**kwargs)
+        if error_occured:
+            context['add_stock_form'] = f
+        return self.render_to_response(context)
+
+    def post(self, request, *args, **kwargs):
+        self.object = self.get_object()
+
+        if 'submit-add-storage' in request.POST:
+            return self.handle_add_storage_post(request, **kwargs)
+        elif 'submit-change-storage' in request.POST:
+            return self.handle_change_storage_post(request, **kwargs)
+        elif 'submit-delete-storage' in request.POST:
+            return self.handle_del_storage_post(request, **kwargs)
+        elif 'submit-delete-stock' in request.POST:
+            return self.handle_del_stock_post(request, **kwargs)
+        elif 'submit-edit-watermark' in request.POST:
+            return self.handle_update_watermark(request, **kwargs)
+        elif 'submit-edit-lot' in request.POST:
+            return self.handle_update_lot(request, **kwargs)
+        elif 'submit-relocate-stock' in request.POST:
+            return self.handle_relocate_stock(request, **kwargs)
+        elif 'submit-amount-reduce' in request.POST:
+            return self.handle_amount_change_post(request, False, **kwargs)
+        elif 'submit-amount-increase' in request.POST:
+            return self.handle_amount_change_post(request, True, **kwargs)
+        elif 'submit-add-stock' in request.POST:
+            return self.handle_add_stock_post(request, **kwargs)
+
+        return super().post(request, *args, **kwargs)

shimatta_kenkyusho/shimatta_kenkyusho/settings_production.py

@@ -56,7 +56,6 @@ if get_env_value('DJANGO_FORCE_DEV_MODE', default=False) == 'True':
 
 ALLOWED_HOSTS = ['127.0.0.1', 'localhost', get_env_value('DJANGO_ALLOWED_HOST')]
 
-
 # Application definition
 
 INSTALLED_APPS = [
@@ -239,4 +238,7 @@ CSRF_COOKIE_SECURE = True
 
 SECURE_SSL_REDIRECT = False
 
+# allow detection of https behind "old" nginx
+SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
+
 SECURE_HSTS_SECONDS = get_env_value('DJANGO_SECURE_HSTS_SECONDS', default=120)

shimatta_kenkyusho/shimatta_kenkyusho/urls.py

@@ -14,14 +14,13 @@ Including another URLconf
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path, include
-from django.conf.urls import url
+from django.urls import path, include, re_path
 from django.conf.urls.static import static
 from django.conf import settings
 from parts import views as parts_views
 
 urlpatterns = [
-    url(r'^admin/login/', parts_views.login_view),
+    re_path(r'^admin/login/', parts_views.login_view),
     path('admin/', admin.site.urls),
     path('api/v1/', include('api.urls'), name='api-root'),
     path('', include('parts.urls')),

shimatta_kenkyusho/shimatta_modules/ShimattaSearchLanguage.py

@@ -0,0 +1,184 @@
+import re
+from django.db.models import Q
+from sly import Lexer, Parser
+from shimatta_modules.EngineeringNumberConverter import EngineeringNumberConverter
+
+class ShimattaSearchConstants():
+    '''
+    Just a bunch of conversions and regular expression stored here.
+    '''
+
+    # convert the prefixes from the engineering number converter be used in the lexer
+    PREFIX_DICT = {k: v for k, v in EngineeringNumberConverter.prefixes if k}
+    PREFIX_DICT.update({k: v for k, v in EngineeringNumberConverter.it_prefixes if k})
+    PREFIX_RULE = r'(' + r'|'.join([rf'(?:{p})' for p in PREFIX_DICT.keys()]) + r')?'
+
+    TEXTUAL_REGEX = r'(?:([^"><=!&\|\(\)\s]+))|(?:"([^"]*)")'
+    VALUE_REGEX = rf'(\-?\d+(?:\.\d+)?){PREFIX_RULE}'
+
+    TEXTUAL_PATTERN = re.compile(TEXTUAL_REGEX)
+    VALUE_PATTERN = re.compile(VALUE_REGEX)
+
+class ShimattaSearchLexer(Lexer):
+    '''
+    Stupid lexer to tokenize a search string.
+    '''
+
+    tokens = {GT, LT, GTE, LTE, EQ, NEQ, AND, OR, LPAREN, RPAREN, NUMBER, TEXTUAL}
+
+    # ignore whitespace only characters as well as newlines
+    ignore = ' \t\n'
+
+    # Regular expression rules for simple tokens
+    GTE       = r'>='
+    LTE       = r'<='
+    GT        = r'>'
+    LT        = r'<'
+    EQ        = r'=='
+    NEQ       = r'!='
+    AND       = r'(?:&{1,2})|(?:and)|(?:AND)'
+    OR        = r'(?:\|{1,2})|(?:or)|(?:OR)'
+    LPAREN    = r'\('
+    RPAREN    = r'\)'
+
+    def __init__(self):
+        self.errors = []
+        super().__init__()
+
+    @_(ShimattaSearchConstants.VALUE_REGEX)
+    def NUMBER(self, t):
+        '''
+        Parse numbers with engineering unit prefixes
+        '''
+        match = ShimattaSearchConstants.VALUE_PATTERN.match(t.value)
+        t.value = float(match.group(1))
+        prefix = match.group(2)
+        if prefix:
+            t.value *= ShimattaSearchConstants.PREFIX_DICT[prefix]
+        return t
+
+    @_(ShimattaSearchConstants.TEXTUAL_REGEX)
+    def TEXTUAL(self, t):
+        '''
+        Find texts with or without param_ prefix (used to filter for parameters)
+        '''
+        match = ShimattaSearchConstants.TEXTUAL_PATTERN.match(t.value)
+
+        # strip the quotation marks
+        value = match.group(1)
+        if match.group(2):
+            value = match.group(2)
+
+        t.value = value
+        return t
+
+    def error(self, t):
+        self.errors.append(f'Line {self.lineno}: Bad character {t.value}')
+        self.index += 1
+
+class ShimattaSearchParser(Parser):
+    # Get the token list from the lexer (required)
+    tokens = ShimattaSearchLexer.tokens
+
+    def __init__(self):
+        self.errors = []
+        super().__init__()
+
+    @staticmethod
+    def _get_filter(key, value, compare_suffix='', invert=False):
+        '''
+        Assemble a filter to grep data from the relational database structure
+        '''
+
+        # filter for params - stored in two separate tables
+        if key.startswith('param_'):
+            key = key[len('param_'):]
+
+            key_query = Q(Q(**{f'componentparameter__parameter_type__parameter_name': key})| \
+                        Q(**{f'package__packageparameter__parameter_type__parameter_name': key}))
+
+            if isinstance(value, str):
+                query = Q(Q(**{f'componentparameter__text_value{compare_suffix}': value})| \
+                        Q(**{f'package__packageparameter__text_value{compare_suffix}': value}))&key_query
+            else:
+                query = Q(Q(**{f'componentparameter__value{compare_suffix}': value})| \
+                        Q(**{f'package__packageparameter__value{compare_suffix}': value}))&key_query
+        # filter for direct attributes - or whatever the user throws into the search input
+        else:
+            query = Q(**{f'{key}{compare_suffix}': value})
+
+        if invert:
+            query = ~query
+        return Q(query)
+
+    # ruleset
+
+    @_('expression : textual GT number')
+    def expression(self, p):
+        return self._get_filter(p.textual.strip(), p.number, '__gt', False)
+
+    @_('expression : textual LT number')
+    def expression(self, p):
+        return self._get_filter(p.textual.strip(), p.number, '__lt', False)
+
+    @_('expression : textual GTE number')
+    def expression(self, p):
+        return self._get_filter(p.textual.strip(), p.number, '__gte', False)
+
+    @_('expression : textual LTE number')
+    def expression(self, p):
+        return self._get_filter(p.textual.strip(), p.number, '__lte', False)
+
+    @_('expression : textual EQ number')
+    def expression(self, p):
+        return self._get_filter(p.textual.strip(), p.number, '', False)
+
+    @_('expression : textual NEQ number')
+    def expression(self, p):
+        return self._get_filter(p.textual.strip(), p.number, '', True)
+
+    @_('expression : textual EQ textual')
+    def expression(self, p):
+        return self._get_filter(p.textual0.strip(), p.textual1, '', False)
+
+    @_('expression : textual NEQ textual')
+    def expression(self, p):
+        return self._get_filter(p.textual0.strip(), p.textual1, '', True)
+
+    @_('TEXTUAL')
+    def textual(self, p):
+        return p.TEXTUAL
+
+    @_('NUMBER')
+    def number(self, p):
+        return p.NUMBER
+
+    @_('expression : LPAREN expression RPAREN')
+    def expression(self, p):
+        return Q(p.expression)
+
+    @_('expression : expression AND expression')
+    def expression(self, p):
+        return p.expression0&p.expression1
+
+    @_('expression : expression OR expression')
+    def expression(self, p):
+        return p.expression0|p.expression1
+
+    @_('expression')
+    def expression(self, p):
+        return p.expression
+
+    # Error rule for syntax errors
+    def error(self, p):
+        self.errors.append(f'Syntax error in input {p}!')
+
+class ShimattaSearchLanguage():
+
+    def __init__(self):
+        self.lexer = ShimattaSearchLexer()
+        self.parser = ShimattaSearchParser()
+
+    def search_for_components(self, search_string):
+        query = self.parser.parse(self.lexer.tokenize(search_string))
+        return query, self.lexer.errors + self.parser.errors

shimatta_kenkyusho/static/js/autocomplete-foreign-key-field.js

@@ -27,6 +27,17 @@ function initialize_autocompletion_foreign_key_field(search_element) {
         });
     }
 
+    // select first match if any on enter
+    search_element.addEventListener('keydown', (e) => {
+        if (e.key === "Enter") {
+            e.preventDefault();
+            first_search_result = search_element.parentElement.querySelector('li')
+            if (first_search_result) {
+                first_search_result.click()
+            }
+        }
+    });
+
     new AutocompleteCustomUi(
         base_id, base_id+'-ac-ul', function(search_query, autocomplete_obj) {
             api_ajax_request_without_send('GET', search_url+`?search=${encodeURIComponent(search_query)}`, function(method, url, json) {
@@ -47,7 +58,7 @@ function initialize_autocompletion_foreign_key_field(search_element) {
                     }
                 }
 
-                autocomplete_obj.show_results(nodes, function(data) {                    
+                autocomplete_obj.show_results(nodes, function(data) {
                     var name = data['result'][name_field_name];
                     if (image_field_name != '' && image_field_name != null) {
                         var image = data['result'][image_field_name];
@@ -72,7 +83,7 @@ function initialize_autocompletion_foreign_key_field(search_element) {
                     });
                     dflex_container.appendChild(span);
 
-                })   
+                })
             }, function (){});
         }
     )

shimatta_kenkyusho/static/js/autocomplete.js

@@ -38,7 +38,9 @@ class AutocompleteCustomUi {
         this.query_callback = query_function.bind(this);
     
         document.getElementById(text_id).addEventListener("keyup", this.ac_delay(function(event) {
-            this.query_callback(document.getElementById(this.text_id).value, this);
+            if (event.key != 'Enter') {
+                this.query_callback(document.getElementById(this.text_id).value, this);
+            }
         }, autocomplete_query_delay_ms).bind(this));
 
         this.dropdown_data = {};

shimatta_kenkyusho/templates/base.html

@@ -75,7 +75,7 @@
             'component-parameter-type-list': '{% url 'componentparametertype-list' %}',
         };
         </script>
-        <script type="text/javascript" src="{% static 'js/kenyusho-api-v1.js' %}"></script>
+        <script type="text/javascript" src="{% static 'js/kenkyusho-api-v1.js' %}"></script>
         <script type="text/javascript" src="{% static 'js/autocomplete.js' %}"></script>
         <script type="text/javascript" src="{% static 'js/autocomplete-foreign-key-field.js' %}"></script>
         <!-- Initialize bootstrap popovers -->
@@ -83,8 +83,23 @@
             const popoverTriggerList = document.querySelectorAll('[data-bs-toggle="popover"]')
             const popoverList = [...popoverTriggerList].map(popoverTriggerEl => new bootstrap.Popover(popoverTriggerEl))
         </script>
+        <!-- Initialize bootstrap tooltips -->
+        <script type="text/javascript">
+            const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
+            const tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
+                return new bootstrap.Tooltip(tooltipTriggerEl)
+            })
+        </script>
+        <!-- Select search field on start of QR scan if no input is currently selevted([) -->
+        <script type="text/javascript">
+            window.addEventListener("keydown", (event)=>{
+                if (document.activeElement.nodeName != 'INPUT' && event.key == '[') {
+                    document.getElementById("qr_search_field").focus()
+                }
+            })
+        </script>
         {% block custom_scripts %}
         {% endblock custom_scripts %}
 
     </body>
-</html>
+</html>

shimatta_kenkyusho/templates/parts/components-detail.html

@@ -76,6 +76,11 @@
                             No description available
                         </div>
                     {% endif %}
+                    
+                    {% if component.dynamic_description %}
+                    <h2>Dynamic Description</h2>
+                    <pre>{{ component.dynamic_description }}</pre>
+                    {% endif %}
                 </div>
                 <div class="col-4">
                     {% if component.pref_distri %}
@@ -119,6 +124,19 @@
                             <th scope="col"></th>
                         </thead>
                         <tbody>
+                            {% for param in package_parameters %}
+                            <tr>
+                                <td>
+                                    <h6 {% if param.parameter_type.parameter_description %} class="accordion-header" data-bs-toggle="collapse" data-bs-target="#collapse-pkg-parameter-desc-{{forloop.counter}}"{% endif %}>
+                                        {{param.parameter_type.parameter_name}}
+                                    </h6>
+                                </td>
+                                <td>
+                                    {{param.resolved_value_as_string}}
+                                </td>
+                                <td><span class="text-info">from Package</span></td>
+                            </tr>
+                            {% endfor %}
                             {% for param in parameters %}
                             <tr>
                                 <td>
@@ -148,6 +166,13 @@
                         </div>
                         {% endif %}
                         {% endfor %}
+                        {% for param in package_parameters %}
+                        {% if param.parameter_type.parameter_description %}
+                        <div class="collapse accordion-collapse" id="collapse-pkg-parameter-desc-{{forloop.counter}}" data-bs-parent="#accordion-param-desc">
+                            {{param.parameter_type.parameter_description}}
+                        </div>
+                        {% endif %}
+                        {% endfor %}
                     </div>
                 </div>
                 <div class="col">

shimatta_kenkyusho/templates/parts/components.html

@@ -6,16 +6,26 @@
     <div class="row">
         <div class="col-md">
             <h2>Components</h2>
-            <form action="" method="get">
-                <div class="input-group mb-3">
-                    <input class="form-control" name="search" type="search" placeholder="Search Component..." {% if search_string %}value="{{search_string}}"{% endif %}>
-                    <button type="submit" class="btn btn-primary">
-                        <i class="bi bi-search"></i>
-                    </button>
-                    <button class="btn btn-secondary" type="button" data-bs-toggle="collapse" href="#advanced-search-collapse">Advanced <i class="bi bi-search"></i></button>
-                    <button class="btn btn-success" type="button" data-bs-toggle="modal" data-bs-target="#comp-edit-modal"><i class="bi bi-plus-circle"></i> Add Component</button>
-                    <button class="btn btn-success" type="button" data-bs-toggle="modal" data-bs-target="#comp-import-modal"><i class="bi bi-plus-circle"></i> Import CSV</button>
+            <form class="needs-validation" action="" method="get">
+                {% if errors %}
+                <div class="card mb-3">
+                {% endif %}
+                    <div class="input-group mb-3">
+                        <input class="form-control" name="search" type="search" placeholder="Search Component..." {% if search_string %}value="{{search_string}}"{% endif %}>
+                        <button type="submit" class="btn btn-primary">
+                            <i class="bi bi-search"></i>
+                        </button>
+                        <button class="btn btn-secondary" type="button" data-bs-toggle="collapse" href="#advanced-search-collapse">Advanced <i class="bi bi-search"></i></button>
+                        <button class="btn btn-success" type="button" data-bs-toggle="modal" data-bs-target="#comp-edit-modal"><i class="bi bi-plus-circle"></i> Add Component</button>
+                        <button class="btn btn-success" type="button" data-bs-toggle="modal" data-bs-target="#comp-import-modal"><i class="bi bi-plus-circle"></i> Import CSV</button>
+                    </div>
+                {% if errors %}
+                    <div class="card-body text-danger">
+                        <h5>Error in search query:</h5>
+                        {{ errors }}
+                    </div>
                 </div>
+                {% endif %}
             </form>
             <div class="collapse mb-3{% if advanced_search_shown %} show{% endif %}" id="advanced-search-collapse" aria-expanded="{% if advanced_search_shown %}true{% else %}false{% endif %}">
                 <form method="POST">
@@ -54,7 +64,12 @@
                                 Manufacturer: {{comp.manufacturer}}
                             {% endif %}
                         </div>
-                        <span class="badge bg-primary rounded-pill">{{comp.get_total_amount}}</span>
+                        <div class="flex-grow-1 d-block ms-3" style="text-align: right;">
+                            <pre>{{ comp.dynamic_description }}</pre>
+                        </div>
+                        <div style="width: 10%; text-align: right;">
+                            <span class="badge bg-primary rounded-pill me-2">{{comp.get_total_amount}}</span>
+                        </div>
                     </li>
                     </a>
                 {% endfor %}

shimatta_kenkyusho/templates/parts/modals/update-stock-modal.html

@@ -39,7 +39,7 @@ needs following context:
                     <form method="post">
                         {% csrf_token %}
                         <input type="hidden" name="stock_uuid" value="{{stock.id}}">
-                        <div class="input-group mb-3">    
+                        <div class="input-group mb-3">
                             <div class="input-group-text">
                                 <input type="checkbox" class="form-check-input mt-0" name="watermark_active" id="ch-stk-watermark-act-{{stock.id}}" {% if stock.watermark >= 0 %}checked{%endif%}>
                             </div>
@@ -47,7 +47,22 @@ needs following context:
                             <input type="submit" class="btn btn-primary" name="submit-edit-watermark" value="Update Watermark">
                         </div>
                     </form>
+                    <form method="post">
+                        {% csrf_token %}
+                        <input type="hidden" name="stock_uuid" value="{{stock.id}}">
+                        <div class="input-group mb-3">
+                            <input type="text" name="lot" id="ch-stk-lot-{{stock.id}}" class="form-control" value="{{stock.lot}}" required>
+                            <input type="submit" class="btn btn-primary" name="submit-edit-lot" value="Update Lot">
+                        </div>
+                    </form>
+                    <form method="post">
+                        {% csrf_token %}
+                        <input type="hidden" name="prefix" value="{{relocate_form.prefix}}">
+                        {{ relocate_form|crispy }}
+                        <input type="submit" class="btn btn-warning" name="submit-relocate-stock" value="Relocate Stock">
+                    </form>
                 </div>
+            </div>
         </div>
     </div>
 </div>

shimatta_kenkyusho/templates/parts/packages-detail.html

@@ -26,6 +26,46 @@
             <input type="submit" class="btn btn-primary" value="Save" name="submit-pkg-edit">
         </form>
         </div>
+        <div class="col-md-3">
+            <h3>Parameters <button class="btn btn-success" data-bs-toggle="modal" data-bs-target="#new-component-parameter-modal"><i class="bi bi-plus-circle"></i></button></h3>
+            <table class="table align-middle mb-3">
+                <thead>
+                    <th scope="col">Parameter</th>
+                    <th scope="col">Value</th>
+                    <th scope="col"></th>
+                </thead>
+                <tbody>
+                    {% for param in parameters %}
+                    <tr>
+                        <td>
+                            <h6 {% if param.parameter_type.parameter_description %} class="accordion-header" data-bs-toggle="collapse" data-bs-target="#collapse-parameter-desc-{{forloop.counter}}"{% endif %}>
+                                {{param.parameter_type.parameter_name}}
+                            </h6>
+                        </td>
+                        <td>
+                            {{param.resolved_value_as_string}}
+                        </td>
+                        <td>
+                            <form method="post">
+                                {% csrf_token %}
+                                <input type="hidden" value="{{param.id}}" name="param_num">
+                                <button class="btn btn-danger" name="submit-delete-param">X</button>
+                            </form>    
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+            <div class="accordion" id="accordion-param-desc">
+                {% for param in parameters %}
+                {% if param.parameter_type.parameter_description %}
+                <div class="collapse accordion-collapse" id="collapse-parameter-desc-{{forloop.counter}}" data-bs-parent="#accordion-param-desc">
+                    {{param.parameter_type.parameter_description}}
+                </div>
+                {% endif %}
+                {% endfor %}
+            </div>
+        </div>
     </div>
 </div>
 
@@ -80,7 +120,7 @@
         </div>
     </div>
 </div>
-
+{% include 'parts/modals/new-component-parameter-modal.html' with component_name=object.name form=new_param_form %}
 
 {% endblock content %}
 

shimatta_kenkyusho/templates/parts/stocks-detail.html

@@ -2,6 +2,7 @@
 {% load qr_code %}
 {% load static %}
 {% load crispy_forms_tags %}
+{% load storage_tags %}
 
 {% block content %}
 <div class="container">
@@ -21,13 +22,28 @@
                 {% qr_from_text object.get_qr_code size="m" image_format="svg" %}
             </div>
             <div class="row">
-                <h4>{{storage.name}}{% if storage.verbose_name %}<small> ({{storage.verbose_name}})</small>{% endif %}</h4>
+                <h4>{{storage.name}}
+                    {% if storage.verbose_name %}
+                    <small>
+                        ({{storage.verbose_name}})
+                    </small>
+                    {% endif %}
+                    {% if storage.is_template %}
+                    <small>
+                        (template)
+                    </small>
+                    {% endif %}
+                </h4>
             </div>
             <div class="row">
                 {% if object.parent_storage %}
-                <h1>Sub-Storages <a class="btn btn-secondary" href="{% url 'parts-stocks-detail' uuid=object.parent_storage.id %}">Parent Storage</a>            {% else %}
+                <h1>Sub-Storages <a class="btn btn-secondary" href="{% url 'parts-stocks-detail' uuid=object.parent_storage.id %}">Parent Storage</a>
+                {% else %}
                 <h1>Sub-Storages <a class="btn btn-secondary" href="{% url 'parts-stocks'%}">Stock Overview</a>
                 {% endif %}
+                {% if storage.template %}
+                <a class="btn btn-secondary" href="{% url 'parts-stocks-detail' uuid=storage.template.id %}">Template</a>
+                {% endif %}
                 <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#delete-storage-modal">Delete</button>
                 <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#add-sub-modal"><i class="bi bi-plus-circle"></i></button>
                 <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#change-modal"><i class="bi bi-pencil-square"></i></button>
@@ -36,11 +52,13 @@
                 {% for storage in storages %}
                     <a href="{% url 'parts-stocks-detail' uuid=storage.id %}" class="text-decoration-none">
                         <li class="list-group-item list-group-item-action justify-content-between align-items-center d-flex">
-                            <div> 
+                            <div>
                             <h5>{{storage.name}}{% if storage.verbose_name %}<small> ({{storage.verbose_name}})</small>{% endif %}</h5>
                             Responsible: {{ storage.responsible }}
                             </div>
-                            <span class="badge bg-primary rounded-pill">{{storage.get_total_stock_amount}}</span>
+                            <span class="badge ms-1 bg-primary rounded-pill" data-bs-toggle="tooltip" data-bs-placement="top" title="Total number of stored parts">{{storage.get_total_stock_amount}}</span>
+                            <span class="badge ms-1 bg-secondary rounded-pill d-none d-lg-block" data-bs-toggle="tooltip" data-bs-placement="top" title="Number of stored lots">{{storage.get_total_stock_count}}</span>
+                            <span class="badge ms-1 bg-info rounded-pill d-none d-lg-block" data-bs-toggle="tooltip" data-bs-placement="top" title="Number of substorages">{{storage.get_total_substorage_amount}}</span>
                         </li>
                     </a>
                 {% endfor %}
@@ -80,11 +98,20 @@
                             {% if stock.component.manufacturer %}
                                 Manufacturer: {{stock.component.manufacturer}}
                             {% endif %}
+                            {% if stock.storage != storage %}
+                            <span class="text-secondary"><br>{{ stock.storage|get_relative_storage_path:storage }}</span>
+                            {% endif %}
                             {% if stock.lot %}
                                 <span class="text-secondary"><br>Lot: {{stock.lot}}</span>
                             {% endif %}
                         </div>
-                        <div class="ms-3">
+                        <div class="flex-grow-2 ms-3 d-none d-lg-block" style="text-align: right;">
+                            <pre>{{ stock.component.dynamic_description }}</pre>
+                        </div>
+                        <div class="flex-grow-2 ms-5 d-none d-lg-block">
+                            {% qr_from_text stock.get_qr_code size="6" image_format="svg" %}
+                        </div>
+                        <div class="ms-3" style="width: 20%;">
                             Amount: {{stock.amount}}
                             {% if stock.watermark >= 0 %}
                             <br>Watermark: {{stock.watermark}}
@@ -108,14 +135,14 @@
             {% include 'paginator.html' with paginator=stocks get_param='stock_page' aria_label='Stock Page Navigation' %}
         </div>
     </div>
-    {% for stock in stocks  %}
-    {% include 'parts/modals/update-stock-modal.html' with stock=stock form=change_stock_form %}
+    {% for stock in stocks_with_forms  %}
+    {% include 'parts/modals/update-stock-modal.html' with stock=stock.object form=change_stock_form relocate_form=stock.relocate_form %}
     {% endfor %}
     <!-- Modal for adding a substorage-->
     {% with add_storage_form as form %}
     {% include 'parts/modals/add-substorage-modal.html' %}
     {% endwith %}
-    <!-- Modal to change current storag-->
+    <!-- Modal to change current storage-->
     {% with change_storage_form as form %}
     {% include 'parts/modals/change-storage-modal.html' %}
     {% endwith %}

start_docker_compose_interactive.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Startup the db container
-docker-compose start shimatta-kenkyusho-db
+docker compose start shimatta-kenkyusho-db
 
 # Override entrypoint to get interactive shell
-docker-compose run --entrypoint="/bin/sh" -p 8000:8000 shimatta-kenkyusho-web
+docker compose run --entrypoint="/bin/sh" -p 8000:8000 shimatta-kenkyusho-web