Add deletion fuinctionality to storages

shimatta_kenkyusho/parts/models.py

@@ -85,7 +85,10 @@ class Storage(models.Model):
 		if Storage.objects.exclude(id=self.id).filter(name=self.name, parent_storage__isnull=True).exists():
 			if self.parent_storage is None:
 				raise ValidationError('The fields name, parent_storage must make a unique set')
-		super(Storage, self).validate_unique(exclude)
+		try:
+			super(Storage, self).validate_unique(exclude)
+		except:
+			raise
 
 	def get_total_stock_amount(self):
 		stocks = Stock.objects.filter(storage=self)

shimatta_kenkyusho/parts/views.py

@@ -100,6 +100,10 @@ class ComponentView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
     base_title = 'Components'
     navbar_selected = 'Components'
 
+class AddSubStorageForm(forms.Form):
+    storage_name = forms.CharField(label="storage_name", initial='')
+    responsible = forms.CharField(label='responsible_user')
+
 class StockView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
     template_name = 'parts/stocks.html'
     base_title = 'Stocks'
@@ -122,13 +126,45 @@ 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
+        context['add_storage_form'] = add_stor_form
         return context
-    
-class AddSubStorageForm(forms.Form):
-    storage_name = forms.CharField(label="storage_name", initial='')
-    responsible = forms.CharField(label='responsible_user')
 
+    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
+
+        context = self.get_context_data(**kwargs)
+        if return_invalid_form:
+            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
@@ -157,6 +193,7 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
         add_storage_form = AddSubStorageForm()
         add_storage_form.fields['responsible'].initial = self.request.user.username
         context['add_storage_form'] = add_storage_form
+        context['delete_storage_error'] = None
         return context
 
     def handle_add_storage_post(self, request, **kwargs):
@@ -175,10 +212,26 @@ class StockViewDetail(LoginRequiredMixin, BaseTemplateMixin, DetailView):
         context['add_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 post(self, request, *args, **kwargs):
         self.object = self.get_object()
 
         if 'submit-add-storage' in request.POST:
-            return self.handle_add_storage_post(request)
+            return self.handle_add_storage_post(request, **kwargs)
+        elif 'submit-delete-storage' in request.POST:
+            return self.handle_del_storage_post(request, **kwargs)
      
         return super().post(request, *args, **kwargs)