mhu/shimatta-kenkyusho
2
0
Fork 0
Code Issues 11 Pull Requests 2 Releases Wiki Activity

Fixup imports in storage/stock views

Browse Source
This commit is contained in:
Mario Hüttel 2024-11-18 21:27:21 +01:00
parent 6d0ec7e448
commit 5109f8d094
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
shimatta_kenkyusho/parts/views/storage_views.py
View File

@ -1,24 +1,14 @@
from django.shortcuts import render, redirect import uuid
from django.shortcuts import redirect
from django.urls import reverse 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.views.generic import TemplateView, DetailView
from django.contrib.auth.mixins import LoginRequiredMixin 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.paginator import Paginator
from django.core.exceptions import ValidationError 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 import Q
from django.db.models.functions import Lower from django.db.models.functions import Lower
from django.forms import formset_factory from ..models import Storage, Stock
from django.http import HttpResponse from ..forms import *
import uuid
from .generic_views import BaseTemplateMixin from .generic_views import BaseTemplateMixin
class StockView(LoginRequiredMixin, BaseTemplateMixin, TemplateView): class StockView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
@ -85,7 +75,7 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
def search_stock_queryset(self, search): def search_stock_queryset(self, search):
stocks_in_storage = Stock.objects.filter(storage=self.object).order_by(Lower('component__name')) stocks_in_storage = Stock.objects.filter(storage=self.object).order_by(Lower('component__name'))
if search is None or search == '': if search is None or search == '':
return stocks_in_storage return stocks_in_storage
@ -106,7 +96,7 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
stocks_in_storage = stocks_in_storage.filter(Q(component__name__icontains = search) | stocks_in_storage = stocks_in_storage.filter(Q(component__name__icontains = search) |
Q(component__package__name__icontains = search) | Q(component__package__name__icontains = search) |
Q(component__manufacturer__name__icontains = search)) Q(component__manufacturer__name__icontains = search))
return stocks_in_storage return stocks_in_storage
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
@ -119,7 +109,7 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
stock_search_input = self.request.GET.get('search') stock_search_input = self.request.GET.get('search')
componente_stock_page = self.request.GET.get('stock_page', default=1) 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) stock_paginator = Paginator(self.search_stock_queryset(stock_search_input), self.default_pagination_size)
context['storages'] = storage_paginator.get_page(storage_page) context['storages'] = storage_paginator.get_page(storage_page)
@ -160,7 +150,6 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
def handle_change_storage_post(self, request, **kwargs): def handle_change_storage_post(self, request, **kwargs):
f = ChangeStorageForm(data=request.POST) f = ChangeStorageForm(data=request.POST)
if f.is_valid(): if f.is_valid():
sub_name = f.cleaned_data['storage_name']
try: try:
self.object.name = f.cleaned_data['storage_name'] self.object.name = f.cleaned_data['storage_name']
self.object.verbose_name = f.cleaned_data.get('verbose_name') self.object.verbose_name = f.cleaned_data.get('verbose_name')
@ -175,20 +164,20 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
def handle_del_storage_post(self, request, **kwargs): def handle_del_storage_post(self, request, **kwargs):
parent = self.object.parent_storage parent = self.object.parent_storage
try: try:
self.object.delete() self.object.delete()
except: except:
context = self.get_context_data(**kwargs) context = self.get_context_data(**kwargs)
context['delete_storage_errors'] = ['Error deleting Storage '+str(self.object)] context['delete_storage_errors'] = ['Error deleting Storage '+str(self.object)]
return self.render_to_response(context) return self.render_to_response(context)
if parent is None: if parent is None:
return redirect('parts-stocks') return redirect('parts-stocks')
else: else:
return redirect(reverse('parts-stocks-detail', kwargs={'uuid':parent.id})) return redirect(reverse('parts-stocks-detail', kwargs={'uuid':parent.id}))
def handle_del_stock_post(self, request, **kwargs): def handle_del_stock_post(self, request, **kwargs):
del_error = None del_error = None # TODO: Check error handling. This is clearly not working as intended :P
if 'stock_uuid' in request.POST: if 'stock_uuid' in request.POST:
f = DeleteStockForm(data=request.POST) f = DeleteStockForm(data=request.POST)
if f.is_valid(): if f.is_valid():
@ -199,16 +188,15 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
if s.storage == self.object: if s.storage == self.object:
s.delete() s.delete()
else: else:
del_error = 'Cannot delete stock from another storage.' del_error = 'Cannot delete stock from another storage.'
except: except:
del_error = 'Could not find requested stock in this storage.' del_error = 'Could not find requested stock in this storage.'
context = self.get_context_data(**kwargs) context = self.get_context_data(**kwargs)
return self.render_to_response(context) return self.render_to_response(context)
def handle_update_watermark(self, request, **kwargs): def handle_update_watermark(self, request, **kwargs):
edit_form = EditWatermarkForm(data=request.POST) edit_form = EditWatermarkForm(data=request.POST)
update_watermark_error = None
if edit_form.is_valid(): if edit_form.is_valid():
edit_form.save() edit_form.save()
else: else:
@ -216,7 +204,7 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
context = self.get_context_data(**kwargs) context = self.get_context_data(**kwargs)
return self.render_to_response(context) return self.render_to_response(context)
def handle_amount_change_post(self, request, increase, **kwargs): def handle_amount_change_post(self, request, increase, **kwargs):
edit_form = EditStockAmountForm(data=request.POST) edit_form = EditStockAmountForm(data=request.POST)
if edit_form.is_valid(): if edit_form.is_valid():
@ -259,7 +247,7 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
elif 'submit-amount-reduce' in request.POST: elif 'submit-amount-reduce' in request.POST:
return self.handle_amount_change_post(request, False, **kwargs) return self.handle_amount_change_post(request, False, **kwargs)
elif 'submit-amount-increase' in request.POST: elif 'submit-amount-increase' in request.POST:
return self.handle_amount_change_post(request, True, **kwargs) return self.handle_amount_change_post(request, True, **kwargs)
elif 'submit-add-stock' in request.POST: elif 'submit-add-stock' in request.POST:
return self.handle_add_stock_post(request, **kwargs) return self.handle_add_stock_post(request, **kwargs)