From 1d95d9ebc225d7c8774082e15bfd029781ad37ce Mon Sep 17 00:00:00 2001 From: keroth Date: Sun, 10 May 2015 03:00:33 +0200 Subject: fixed bug in views.py --- inventory/views.py | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/inventory/views.py b/inventory/views.py index 45313e2..541e300 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -90,27 +90,31 @@ def upload(request): if form.is_valid() and request.user.is_authenticated: codefile = request.FILES['file'] data = codefile.read().splitlines() - + index = 0 + error = 0 if request.POST['type'] == '1': parent = '' for code in data: - if code != 'NEWPARENT': - if parent == '': - p = get_object_or_404(models.Barcode, pk=code.upper()) - parent = code + try: + b = Barcode.objects.get(code=code.upper()) + if code != 'NEWPARENT': + if parent == '': + p = Barcode.objects.get(code=code.upper()) + parent = code + else: + i = Barcode.objects.get(code=code.upper()) + i.item.parent = p.item + i.item.save() else: - i = get_object_or_404(models.Barcode, pk=code.upper()) - i.item.parent = p.item - i.item.save() - else: - parent = '' + parent = '' + except ObjectDoesNotExist: + error += 1 + data[index] = code + ' existiert nicht' + index += 1 elif request.POST['type'] == '2': - index = 0 - error = 0 business_area = models.BusinessArea.objects.get(name='ideell') category = models.Category.objects.get(name='Inventar') parent = models.Barcode.objects.get(code='H0000') - tag = models.Tag.objects.get(name='Regale & Storage') for code in data: if code[0] == 'H' and len(code) == 5: @@ -119,8 +123,9 @@ def upload(request): error += 1 data[index] = code + ' existiert bereits' except ObjectDoesNotExist: + name = 'Regalborte' + code description = 'Borte im Hochregal \nReihe: ' + code[1] + '\nRegal: ' + code[2] - i = models.Item(name='Regalborte', description=description, business_area=business_area, category=category, parent=parent.item) + i = models.Item(name=name, description=description, business_area=business_area, category=category, parent=parent.item) i.save() barcode = Barcode(code=code, item=i) barcode.save() -- cgit v1.2.3 From d2005411cef0d7189d82fee7e0d6c5984f80d2df Mon Sep 17 00:00:00 2001 From: keroth Date: Sun, 10 May 2015 03:44:31 +0200 Subject: fixed bug in views.py --- inventory/views.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/inventory/views.py b/inventory/views.py index 541e300..dcc1115 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -95,9 +95,9 @@ def upload(request): if request.POST['type'] == '1': parent = '' for code in data: - try: - b = Barcode.objects.get(code=code.upper()) - if code != 'NEWPARENT': + if code != 'NEWPARENT': + try: + b = Barcode.objects.get(code=code.upper()) if parent == '': p = Barcode.objects.get(code=code.upper()) parent = code @@ -105,11 +105,11 @@ def upload(request): i = Barcode.objects.get(code=code.upper()) i.item.parent = p.item i.item.save() - else: - parent = '' - except ObjectDoesNotExist: - error += 1 - data[index] = code + ' existiert nicht' + except ObjectDoesNotExist: + error += 1 + data[index] = code + ' existiert nicht' + else: + parent = '' index += 1 elif request.POST['type'] == '2': business_area = models.BusinessArea.objects.get(name='ideell') -- cgit v1.2.3 From befa031363fe2332528c7dd6bf28980802d4f276 Mon Sep 17 00:00:00 2001 From: keroth Date: Sun, 10 May 2015 03:45:25 +0200 Subject: fixed bug in views.py --- inventory/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/views.py b/inventory/views.py index dcc1115..ddc2c78 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -107,7 +107,7 @@ def upload(request): i.item.save() except ObjectDoesNotExist: error += 1 - data[index] = code + ' existiert nicht' + data[index] = code + ' existiert nicht!' else: parent = '' index += 1 -- cgit v1.2.3 From 95b68bea375de1cc5b1a451535259f9b6bf0f86e Mon Sep 17 00:00:00 2001 From: keroth Date: Sun, 10 May 2015 22:11:42 +0200 Subject: fixed bug in views.py --- inventory/views.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/inventory/views.py b/inventory/views.py index ddc2c78..382da5f 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -115,6 +115,7 @@ def upload(request): business_area = models.BusinessArea.objects.get(name='ideell') category = models.Category.objects.get(name='Inventar') parent = models.Barcode.objects.get(code='H0000') + tag = models.Tag.objects.get(name='Regale & Storage') for code in data: if code[0] == 'H' and len(code) == 5: @@ -123,9 +124,11 @@ def upload(request): error += 1 data[index] = code + ' existiert bereits' except ObjectDoesNotExist: - name = 'Regalborte' + code + name = 'Regalborte ' + code description = 'Borte im Hochregal \nReihe: ' + code[1] + '\nRegal: ' + code[2] - i = models.Item(name=name, description=description, business_area=business_area, category=category, parent=parent.item) + i = models.Item(name=name, description=description, business_area=business_area, category=category, parent=parent.item, inUse=True) + i.save() + i.tag.add(tag) i.save() barcode = Barcode(code=code, item=i) barcode.save() -- cgit v1.2.3