added templating mechanism for storages
This commit is contained in:
@@ -1,13 +1,10 @@
|
||||
from django.shortcuts import render, redirect
|
||||
from django.urls import resolve, reverse
|
||||
from django.urls import reverse
|
||||
from django.contrib.auth import logout, login
|
||||
from django.contrib.auth.models import User
|
||||
from django.http import HttpResponse
|
||||
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
|
||||
from django.views import View
|
||||
import django.forms as forms
|
||||
from django.views.generic import TemplateView, DetailView
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
|
||||
@@ -400,44 +397,31 @@ class StockView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
|
||||
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.username
|
||||
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):
|
||||
return_invalid_form = False
|
||||
|
||||
f = AddSubStorageForm(data=request.POST)
|
||||
if f.is_valid():
|
||||
new_storage_name = f.cleaned_data['storage_name']
|
||||
try:
|
||||
resp_user = User.objects.get(username=f.cleaned_data['responsible'])
|
||||
except Exception as _:
|
||||
resp_user = None
|
||||
f.add_error('responsible', 'Invalid Responsible User')
|
||||
return_invalid_form = True
|
||||
|
||||
if resp_user is not None:
|
||||
try:
|
||||
Storage.objects.create(name=new_storage_name, responsible=resp_user, parent_storage=None)
|
||||
except ValidationError as verr:
|
||||
return_invalid_form = True
|
||||
f.add_error('storage_name', ' .'.join(verr.messages))
|
||||
else:
|
||||
return_invalid_form = True
|
||||
|
||||
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)
|
||||
if return_invalid_form:
|
||||
context['add_storage_form'] = f
|
||||
|
||||
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
|
||||
@@ -496,7 +480,7 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
|
||||
context['stocks'] = stocks
|
||||
context['stock_search'] = stock_search_input
|
||||
add_storage_form = AddSubStorageForm()
|
||||
add_storage_form.fields['responsible'].initial = self.request.user.username
|
||||
add_storage_form.fields['responsible'].initial = self.request.user.id
|
||||
context['add_storage_form'] = add_storage_form
|
||||
context['delete_storage_error'] = None
|
||||
context['add_stock_form'] = AddStockForm()
|
||||
@@ -508,13 +492,13 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
|
||||
if f.is_valid():
|
||||
sub_name = f.cleaned_data['storage_name']
|
||||
try:
|
||||
user = User.objects.get(username=f.cleaned_data['responsible'])
|
||||
try:
|
||||
Storage.objects.create(name=sub_name, parent_storage=self.object, responsible=user)
|
||||
except ValidationError as v_err:
|
||||
f.add_error('storage_name', '. '.join(v_err.messages))
|
||||
except:
|
||||
f.add_error('responsible', 'Invalid user')
|
||||
Storage.objects.create(name=sub_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)
|
||||
@@ -532,6 +516,7 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
|
||||
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:
|
||||
|
Reference in New Issue
Block a user