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

Compare commits

base: mhu:5ce7d99db27ba76b0fc266f01d3b0b5752fd4b2f
Branches Tags
mhu:develop
mhu:issue/23-add-docu
mhu:feature/21-add-package-params
mhu:master
mhu:port-to-django-425
mhu:advanced-formset-search
..
compare: mhu:b3f8041f086fdc7363bda42b3db5d40e78da55ce
Branches Tags
mhu:issue/23-add-docu
mhu:develop
mhu:feature/21-add-package-params
mhu:master
mhu:port-to-django-425
mhu:advanced-formset-search

No commits in common. "5ce7d99db27ba76b0fc266f01d3b0b5752fd4b2f" and "b3f8041f086fdc7363bda42b3db5d40e78da55ce" have entirely different histories.
5ce7d99db2 ... b3f8041f08

4 changed files with 89 additions and 51 deletions
Show Stats Expand all files Collapse all files

32
shimatta_kenkyusho/parts/views/distributor_views.py
View File

@ -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.views.generic import TemplateView, DetailView
from django.contrib.auth.mixins import LoginRequiredMixin 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.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 ProtectedError
from ..forms import * from ..forms import *
from django.db.models import Q from django.db.models import Q
from django.db.models.functions import Lower
import uuid
from .generic_views import BaseTemplateMixin from .generic_views import BaseTemplateMixin
class DistributorView(LoginRequiredMixin, BaseTemplateMixin, TemplateView): class DistributorView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
@ -20,7 +28,7 @@ class DistributorView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
if not search: if not search:
return qs return qs
search_fragments = search.strip().split() search_fragments = search.strip().split()
for search in search_fragments: for search in search_fragments:
@ -31,10 +39,10 @@ class DistributorView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
page_num = self.request.GET.get('page', default=1) page_num = self.request.GET.get('page', default=1)
search_string = self.request.GET.get('search', default=None) search_string = self.request.GET.get('search', default=None)
queryset = self.search_distributors(search_string) queryset = self.search_distributors(search_string)
paginator = Paginator(queryset, self.default_page_size) paginator = Paginator(queryset, self.default_page_size)
context['search_string'] = search_string context['search_string'] = search_string
@ -42,7 +50,7 @@ class DistributorView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
context['new_distri_form'] = DistributorForm() context['new_distri_form'] = DistributorForm()
return context return context
def handle_add_new_distributor(self, request): def handle_add_new_distributor(self, request):
form = DistributorForm(data=request.POST, files=request.FILES) form = DistributorForm(data=request.POST, files=request.FILES)
@ -69,19 +77,19 @@ class DistributorDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
pk_url_kwarg = 'uuid' pk_url_kwarg = 'uuid'
base_title = '' base_title = ''
navbar_selected = 'Distributors' navbar_selected = 'Distributors'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
self.base_title = 'Distributor / '+self.object.name self.base_title = 'Distributor / '+self.object.name
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context['distributor'] = self.object context['distributor'] = self.object
context['edit_form'] = DistributorForm(instance=self.object) context['edit_form'] = DistributorForm(instance=self.object)
return context return context
def handle_delete_distributor(self, request): def handle_delete_distributor(self, request):
delete_error = None delete_error = None
protected_objects = None protected_objects = None
# Try to delete this instance # Try to delete this instance
try: try:
self.object.delete() self.object.delete()
@ -90,7 +98,7 @@ class DistributorDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
protected_objects = pe.protected_objects protected_objects = pe.protected_objects
except: except:
delete_error = 'Cannot delete this distributor. Unknown error' delete_error = 'Cannot delete this distributor. Unknown error'
if delete_error: if delete_error:
context = self.get_context_data() context = self.get_context_data()
context['delete_error'] = delete_error context['delete_error'] = delete_error
@ -117,5 +125,5 @@ class DistributorDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
return self.handle_delete_distributor(request) return self.handle_delete_distributor(request)
elif 'submit-distri-edit' in request.POST: elif 'submit-distri-edit' in request.POST:
return self.edit_distributor(request) return self.edit_distributor(request)
return super().post(request, *args, **kwargs) return super().post(request, *args, **kwargs)

31
shimatta_kenkyusho/parts/views/manufacturer_views.py
View File

@ -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.views.generic import TemplateView, DetailView
from django.contrib.auth.mixins import LoginRequiredMixin 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.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 ProtectedError
from ..forms import * from ..forms import *
from django.db.models import Q from django.db.models import Q
from django.db.models.functions import Lower
import uuid
from .generic_views import BaseTemplateMixin from .generic_views import BaseTemplateMixin
class ManufacturersView(LoginRequiredMixin, BaseTemplateMixin, TemplateView): class ManufacturersView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
@ -19,7 +28,7 @@ class ManufacturersView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
if not search: if not search:
return qs return qs
search_fragements = search.strip().split() search_fragements = search.strip().split()
for search in search_fragements: for search in search_fragements:
@ -31,10 +40,10 @@ class ManufacturersView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
page_num = self.request.GET.get('page', default=1) page_num = self.request.GET.get('page', default=1)
search_string = self.request.GET.get('search', default=None) search_string = self.request.GET.get('search', default=None)
queryset = self.search_manufacturers(search_string) queryset = self.search_manufacturers(search_string)
paginator = Paginator(queryset, self.default_page_size) paginator = Paginator(queryset, self.default_page_size)
context['search_string'] = search_string context['search_string'] = search_string
@ -42,7 +51,7 @@ class ManufacturersView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
context['new_manufacturer_form'] = ManufacturerForm() context['new_manufacturer_form'] = ManufacturerForm()
return context return context
def handle_add_new_manufacturer(self, request): def handle_add_new_manufacturer(self, request):
form = ManufacturerForm(data=request.POST, files=request.FILES) form = ManufacturerForm(data=request.POST, files=request.FILES)
@ -69,19 +78,19 @@ class ManufacturerDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
pk_url_kwarg = 'uuid' pk_url_kwarg = 'uuid'
base_title = '' base_title = ''
navbar_selected = 'Manufacturers' navbar_selected = 'Manufacturers'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
self.base_title = 'Manufacturer / '+self.object.name self.base_title = 'Manufacturer / '+self.object.name
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context['manufacturer'] = self.object context['manufacturer'] = self.object
context['edit_form'] = ManufacturerForm(instance=self.object) context['edit_form'] = ManufacturerForm(instance=self.object)
return context return context
def handle_delete_manufacturer(self, request): def handle_delete_manufacturer(self, request):
delete_error = None delete_error = None
protected_objects = None protected_objects = None
# Try to delete this instance # Try to delete this instance
try: try:
self.object.delete() self.object.delete()
@ -90,7 +99,7 @@ class ManufacturerDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
protected_objects = pe.protected_objects protected_objects = pe.protected_objects
except: except:
delete_error = 'Cannot delete this distributor. Unknown error' delete_error = 'Cannot delete this distributor. Unknown error'
if delete_error: if delete_error:
context = self.get_context_data() context = self.get_context_data()
context['delete_error'] = delete_error context['delete_error'] = delete_error
@ -117,5 +126,5 @@ class ManufacturerDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
return self.handle_delete_manufacturer(request) return self.handle_delete_manufacturer(request)
elif 'submit-manufacturer-edit' in request.POST: elif 'submit-manufacturer-edit' in request.POST:
return self.edit_manufacturer(request) return self.edit_manufacturer(request)
return super().post(request, *args, **kwargs) return super().post(request, *args, **kwargs)

35
shimatta_kenkyusho/parts/views/package_views.py
View File

@ -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.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.db import IntegrityError
from django.db.models import ProtectedError from django.db.models import ProtectedError
from django.db.models import Q
from ..forms import * 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 from .generic_views import BaseTemplateMixin
class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView): class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
@ -19,7 +28,7 @@ class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
if not search: if not search:
return qs return qs
search_fragments = search.strip().split() search_fragments = search.strip().split()
for search in search_fragments: for search in search_fragments:
if search.lower() == 'smd': if search.lower() == 'smd':
@ -38,10 +47,10 @@ class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
page_num = self.request.GET.get('page', default=1) page_num = self.request.GET.get('page', default=1)
search_string = self.request.GET.get('search', default=None) search_string = self.request.GET.get('search', default=None)
package_queryset = self.search_packages(search_string) package_queryset = self.search_packages(search_string)
paginator = Paginator(package_queryset, self.default_page_size) paginator = Paginator(package_queryset, self.default_page_size)
context['search_string'] = search_string context['search_string'] = search_string
@ -49,7 +58,7 @@ class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
context['new_pkg_form'] = PackageForm() context['new_pkg_form'] = PackageForm()
return context return context
def handle_add_new_package(self, request): def handle_add_new_package(self, request):
form = PackageForm(data=request.POST, files=request.FILES) form = PackageForm(data=request.POST, files=request.FILES)
@ -68,7 +77,7 @@ class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
return self.handle_add_new_package(request) return self.handle_add_new_package(request)
return super().post(request, *args, **kwargs) return super().post(request, *args, **kwargs)
class PackageDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView): class PackageDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
template_name = 'parts/packages-detail.html' template_name = 'parts/packages-detail.html'
@ -76,19 +85,19 @@ class PackageDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
pk_url_kwarg = 'uuid' pk_url_kwarg = 'uuid'
base_title = '' base_title = ''
navbar_selected = 'Packages' navbar_selected = 'Packages'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
self.base_title = 'Package / '+self.object.name self.base_title = 'Package / '+self.object.name
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context['package'] = self.object context['package'] = self.object
context['edit_form'] = PackageForm(instance=self.object) context['edit_form'] = PackageForm(instance=self.object)
return context return context
def handle_delete_package(self, request): def handle_delete_package(self, request):
delete_error = None delete_error = None
protected_objects = None protected_objects = None
# Try to delete this instance # Try to delete this instance
try: try:
self.object.delete() self.object.delete()
@ -97,7 +106,7 @@ class PackageDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
protected_objects = pe.protected_objects protected_objects = pe.protected_objects
except: except:
delete_error = 'Cannot delete this package. Unknown error' delete_error = 'Cannot delete this package. Unknown error'
if delete_error: if delete_error:
context = self.get_context_data() context = self.get_context_data()
context['delete_error'] = delete_error context['delete_error'] = delete_error
@ -124,5 +133,5 @@ class PackageDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
return self.handle_delete_package(request) return self.handle_delete_package(request)
elif 'submit-pkg-edit' in request.POST: elif 'submit-pkg-edit' in request.POST:
return self.edit_package(request) return self.edit_package(request)
return super().post(request, *args, **kwargs) return super().post(request, *args, **kwargs)

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

@ -1,14 +1,24 @@
import uuid from django.shortcuts import render, redirect
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 ..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 from .generic_views import BaseTemplateMixin
class StockView(LoginRequiredMixin, BaseTemplateMixin, TemplateView): class StockView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
@ -75,7 +85,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
@ -96,7 +106,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):
@ -109,7 +119,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)
@ -150,6 +160,7 @@ 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')
@ -164,20 +175,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 # TODO: Check error handling. This is clearly not working as intended :P del_error = None
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():
@ -188,15 +199,16 @@ 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:
@ -204,7 +216,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():
@ -247,7 +259,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)