From 9adcee728a3471fcb8b7663eca91480a4f023085 Mon Sep 17 00:00:00 2001 From: Dirk Jahnke Date: Fri, 20 May 2022 20:42:54 +0200 Subject: [PATCH] Added container copy function --- .../templates/container/container_list.html | 1 + container/urls.py | 3 +- container/views.py | 36 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/container/templates/container/container_list.html b/container/templates/container/container_list.html index cc0d397..28c1d3f 100644 --- a/container/templates/container/container_list.html +++ b/container/templates/container/container_list.html @@ -32,6 +32,7 @@ Delete View + Copy Label diff --git a/container/urls.py b/container/urls.py index 0ce9a6e..7b6702e 100644 --- a/container/urls.py +++ b/container/urls.py @@ -1,5 +1,5 @@ from django.urls import include, path -from container.views import ContainerListView, ContainerUpdateView, ContainerCreateView, ContainerDetailView, ContainerDeleteView, ContainerPrintLabelView, ContainerImportView +from container.views import ContainerListView, ContainerUpdateView, ContainerCreateView, ContainerCopyView, ContainerDetailView, ContainerDeleteView, ContainerPrintLabelView, ContainerImportView from container.views import ContainerTypeListView, ContainerTypeDetailView, ContainerTypeCreateView, ContainerTypeUpdateView, ContainerTypeDeleteView, ContainerTypeImportView @@ -8,6 +8,7 @@ urlpatterns = [ path('', ContainerListView.as_view(), name='list'), path('/', ContainerDetailView.as_view(), name='detail'), path('add/', ContainerCreateView.as_view(), name='add'), + path('copy//', ContainerCopyView.as_view(), name='copy'), path('import/', ContainerImportView.as_view(), name='container_import'), path('edit//', ContainerUpdateView.as_view(), name='update'), path('label//', ContainerPrintLabelView.as_view(), name='print_label'), diff --git a/container/views.py b/container/views.py index ee9c7fd..184f6eb 100644 --- a/container/views.py +++ b/container/views.py @@ -36,6 +36,42 @@ class ContainerCreateView(LoginRequiredMixin, generic.CreateView): return super().form_valid(form) +def suggest_named_id(existing_id): + result = re.search(r'\d{0,9}$', existing_id) + number_part = int(result.group()) + 1 + number_digits = result.span()[1] - result.span()[0] + prefix_part = existing_id[0:result.span()[0]] + id_candidate = prefix_part + str(number_part).zfill(number_digits) + while Container.objects.filter(named_id=id_candidate).exists(): + number_part = number_part + 1 + id_candidate = prefix_part + str(number_part).zfill(number_digits) + + return id_candidate + + +class ContainerCopyView(LoginRequiredMixin, generic.CreateView): + model = Container + fields = ['named_id', 'description', 'color', 'container_type'] + success_url = '/container/' + + def form_valid(self, form): + if not form.instance.named_id.startswith('C-'): + form.instance.named_id = 'C-' + form.instance.named_id + form.instance.changed_by = self.request.user + form.instance.created_by = self.request.user + return super().form_valid(form) + + def get_initial(self, *args, **kwargs): + initial = super(ContainerCopyView, self).get_initial(**kwargs) + copy_source = Container.objects.get(pk=self.kwargs['pk']) + initial['container_type'] = copy_source.container_type + initial['color'] = copy_source.color + initial['description'] = copy_source.description + # strategy to find a new named_id by using the numbers at the end and trying to increment + initial['named_id'] = suggest_named_id(existing_id=copy_source.named_id) + return initial + + class ContainerImportView(LoginRequiredMixin, generic.TemplateView): template_name = 'container_import.html'