shimatta_kenkyusho/parts/views/distributor_views.py

@@ -1,12 +1,20 @@
-import uuid
+from django.shortcuts import render, redirect
-from django.shortcuts import redirect
+from django.urls import reverse
+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 Distributor
+from ..models import Storage, Stock, Component, Distributor, Manufacturer, Package, ComponentParameter, DistributorNum
 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 django.db.models import Q
+from django.db.models.functions import Lower
+import uuid
 from .generic_views import BaseTemplateMixin
 
 class DistributorView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):

shimatta_kenkyusho/parts/views/manufacturer_views.py

@@ -1,11 +1,20 @@
-from django.shortcuts import redirect
+from django.shortcuts import render, redirect
+from django.urls import reverse
+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 Manufacturer
+from ..models import Storage, Stock, Component, Distributor, Manufacturer, Package, ComponentParameter, DistributorNum
 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 django.db.models import Q
+from django.db.models.functions import Lower
+import uuid
 from .generic_views import BaseTemplateMixin
 
 class ManufacturersView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):

shimatta_kenkyusho/parts/views/package_views.py

@@ -1,11 +1,20 @@
-from django.shortcuts import  redirect
+from django.shortcuts import render, redirect
+from django.urls import reverse
+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 django.core.paginator import Paginator
+from django.core.exceptions import ValidationError
+from django.db import IntegrityError
 from django.db.models import ProtectedError
-from django.db.models import Q
 from ..forms import *
-from ..models import Package
+from django.db.models import Q
+from django.db.models.functions import Lower
+import uuid
 from .generic_views import BaseTemplateMixin
 
 class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):

shimatta_kenkyusho/parts/views/storage_views.py

@@ -1,14 +1,24 @@
-import uuid
+from django.shortcuts import render, redirect
-from django.shortcuts import redirect
 from django.urls import reverse
+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
+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 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 ..models import Storage, Stock
+from django.forms import formset_factory
-from ..forms import *
+from django.http import HttpResponse
+import uuid
 from .generic_views import BaseTemplateMixin
 
 class StockView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
@@ -150,6 +160,7 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
     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')
@@ -177,7 +188,7 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
             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
+        del_error = None
         if 'stock_uuid' in request.POST:
             f = DeleteStockForm(data=request.POST)
             if f.is_valid():
@@ -197,6 +208,7 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
         
     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: