common

- fixed: preparing tender data

@@ -198,9 +198,9 @@ def generate_dictionary_from_field_path_and_value(path, value):
     return data
 
 
-#Percentage conversion
+# Percentage conversion
 def multiply_hundred(number):
-    return number*100
+    return number * 100
 
 
 # prepares data for filling form in easiest way
@@ -211,42 +211,58 @@ def prepare_tender_data(data):
 
     # moves features to its related items
     if 'features' in data:
-        for i, feature in enumerate(data['features']):
-            if feature['featureOf'] == 'lot':
+        i = 0
+        l = len(data['features'])
+        while i < l:
+            if data['features'][i]['featureOf'] == 'lot':
                 for lot in data['lots']:
-                    if lot['id'] == feature['relatedItem']:
+                    if lot['id'] == data['features'][i]['relatedItem']:
                         if 'features' not in lot:
                             lot['features'] = []
                         lot['features'].append(data['features'].pop(i))
-            if feature['featureOf'] == 'item':
+                        l = l - 1
+                        i = i - 1
+            if data['features'][i]['featureOf'] == 'item':
                 for item in data['items']:
-                    if item['id'] == feature['relatedItem']:
+                    if item['id'] == data['features'][i]['relatedItem']:
                         if 'features' not in item:
                             item['features'] = []
                         item['features'].append(data['features'].pop(i))
+                        l = l - 1
+                        i = i - 1
+            i = i + 1
 
     if len(data['features']) == 0:
         del data['features']
 
     # moves items to its related lots
-    for i, item in enumerate(data['items']):
+    i = 0
+    l = len(data['items'])
+    while i < l:
         for lot in data['lots']:
-            if lot['id'] == item['relatedLot']:
+            if lot['id'] == data['items'][i]['relatedLot']:
                 if 'items' not in lot:
                     lot['items'] = []
                 lot['items'].append(data['items'].pop(i))
+                l = l - 1
+                i = i - 1
+        i = i + 1
 
     del data['items']
 
     # moves milestones to its related lots
-    for i, milestone in enumerate(data['milestones']):
+    i = 0
+    l = len(data['milestones'])
+    while i < l:
         for lot in data['lots']:
-            if lot['id'] == milestone['relatedLot']:
+            if lot['id'] == data['milestones'][i]['relatedLot']:
                 if 'milestones' not in lot:
                     lot['milestones'] = []
                 lot['milestones'].append(data['milestones'].pop(i))
+                l = l - 1
+                i = i - 1
+        i = i + 1
 
     del data['milestones']
 
     return data
-