summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Reichel <sre@ring0.de>2015-05-10 22:10:33 +0200
committerSebastian Reichel <sre@ring0.de>2015-05-10 22:10:33 +0200
commitfd4fae9185c163800cb75f812b706d686cd5aaaa (patch)
tree4ac2026eccb621cb56536402700b8ed04a85270f
parent6869876fcb193ff2c8bda648c20598542ec3a890 (diff)
parent95b68bea375de1cc5b1a451535259f9b6bf0f86e (diff)
downloadktt-inventory-system-master.tar.bz2
Merge remote-tracking branch 'keroth/master'HEADmaster
-rw-r--r--inventory/views.py30
1 files changed, 19 insertions, 11 deletions
diff --git a/inventory/views.py b/inventory/views.py
index f5b34c9..2b42f0c 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -104,23 +104,28 @@ 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
- else:
- i = get_object_or_404(models.Barcode, pk=code.upper())
- i.item.parent = p.item
- i.item.save()
+ try:
+ b = Barcode.objects.get(code=code.upper())
+ 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()
+ except ObjectDoesNotExist:
+ error += 1
+ data[index] = code + ' existiert nicht!'
else:
parent = ''
+ 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')
@@ -133,8 +138,11 @@ 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, inUse=True)
+ i.save()
+ i.tag.add(tag)
i.save()
barcode = Barcode(code=code, item=i)
barcode.save()