work a bit

modules/toWizard.py

@@ -60,17 +60,22 @@ def connect(data, text_mapping, i):
         return None, None
     
     current_id = data['BPMN_id'][i]
+    current_text = text_mapping[current_id]
+
     next_idx = data['links'][target_idx][1]
     next_id = data['BPMN_id'][next_idx]
-    if next_id.split('_')[0] == 'parallelGateway':
+    if next_id.split('_')[0] == 'exclusiveGateway':
+        for idx, link in enumerate(data['links']):
+            if link[0] == next_idx and link[1] is not None:
+                next_text.append(text_mapping[data['BPMN_id'][link[1]]])
+    elif next_id.split('_')[0] == 'parallelGateway':
         for idx, link in enumerate(data['links']):
             if link[0] == next_idx and link[1] is not None:
                 next_text.append(text_mapping[data['BPMN_id'][link[1]]])
     else:
         next_text.append(text_mapping[next_id])
-    current_text = text_mapping[current_id]
 
-    return current_text, next_text
+    return current_text, next_text, next_id
 
 def check_start(val):
     if val[0] is None:
@@ -106,16 +111,6 @@ def find_merge(bpmn_id, links):
     
     return merge_elements
 
-def find_end_states(data):
-    end_states = {}
-    bpmn_id = data['BPMN_id']
-    for idx, link in enumerate(data['links']):
-        if link[0] is None:
-            continue
-        if bpmn_id[link[0]].split('_')[0] == 'exclusiveGateway':
-            end_states[bpmn_id[idx]] = 'state_'+str(idx)
-    return end_states
-
 def create_wizard_file(data, text_mapping):
     root = ET.Element('methodAndStyleWizard')
     
@@ -133,7 +128,6 @@ def create_wizard_file(data, text_mapping):
     
     processDescription = ET.SubElement(root, 'processDescription')
 
-
     for idx, Bpmn_id in enumerate(data['BPMN_id']):
         # Start Event
         element_type = Bpmn_id.split('_')[0]
@@ -144,14 +138,12 @@ def create_wizard_file(data, text_mapping):
         if idx >= len(data['links']):
             continue
         if check_start(data['links'][idx]) and (element_type=='event' or element_type=='messageEvent'):
-            startEvent = ET.SubElement(root, 'startEvent', attrib={'name': text_mapping[Bpmn_id], 'eventType': eventType}) 
+            startEvent = ET.SubElement(root, 'startEvent', attrib={'name': text_mapping[Bpmn_id], 'eventType': eventType, 'isRegular': 'False'}) 
     
     requestMessage = ET.SubElement(root, 'requestMessage')
     requester = ET.SubElement(root, 'requester')
     
     endEvents = ET.SubElement(root, 'endStates')
-
-    print('mapping: ', text_mapping)
     
     # Add end states event to the collaboration element
     for idx, Bpmn_id in enumerate(data['BPMN_id']):
@@ -164,23 +156,23 @@ def create_wizard_file(data, text_mapping):
             ET.SubElement(endEvents, 'endState', attrib={'name': text_mapping[Bpmn_id], 'eventType': 'None', 'isRegular': 'False'})
     
     
-  
+    # Add activities to the collaboration element
     activities = ET.SubElement(root, 'activities')
-    
     for idx, activity_name in enumerate(data['BPMN_id']):
         if activity_name.startswith('task'):
             activity = ET.SubElement(activities, 'activity', attrib={'name': text_mapping.get(activity_name, activity_name), 'performer': ''})
             endStates = ET.SubElement(activity, 'endStates')
-            current_text, next_text = connect(data, text_mapping, idx)
+            current_text, next_text, next_id = connect(data, text_mapping, idx)
             if next_text is not None and len(next_text) == 1:
                 ET.SubElement(endStates, 'endState', attrib={'name': next_text[0], 'isRegular': 'True'})
+            elif next_text is not None and len(next_text) >= 2 and next_id.split('_')[0] == 'exclusiveGateway':
+                ET.SubElement(endStates, 'endState', attrib={'name': next_text[0], 'isRegular': 'True'})
+                for i in range(1, len(next_text)):
+                    ET.SubElement(endStates, 'endState', attrib={'name': next_text[i], 'isRegular': 'False'})
             ET.SubElement(activity, 'subActivities')
             ET.SubElement(activity, 'subActivityFlows')
             ET.SubElement(activity, 'messageFlows')
 
-    endStates_text = find_end_states(data)
-    #print(endStates_text)
-
     merge_object = find_merge(data['BPMN_id'], data['links'])
     
     activityFlows = ET.SubElement(root, 'activityFlows')
@@ -188,16 +180,14 @@ def create_wizard_file(data, text_mapping):
     for i, link in enumerate(data['links']):
         # create flow with start event
         if link[0] is None and link[1] is not None and (data['BPMN_id'][i].split('_')[0] == 'event' or data['BPMN_id'][i].split('_')[0] == 'messageEvent'):
-            current_text, next_text = connect(data, text_mapping, i)
-            print('current_text: ', current_text)
-            print('next_text: ', next_text)
+            current_text, next_text, _ = connect(data, text_mapping, i)
             if current_text is None or next_text is None:
                 continue
             ET.SubElement(activityFlows, 'activityFlow', attrib={'startEvent': current_text, 'endState': '---', 'target': next_text[0], 'isMerging': 'False', 'isPredefined': 'True'})
             i+=1
         # create flow with tasks
         if link[0] is not None and link[1] is not None and data['BPMN_id'][i].split('_')[0] == 'task':
-            current_text, next_text = connect(data, text_mapping, i)
+            current_text, next_text, next_id = connect(data, text_mapping, i)
             if current_text is None or next_text is None:
                 continue
 
@@ -206,20 +196,16 @@ def create_wizard_file(data, text_mapping):
             else:
                 merge = 'False'
   
-            if len(next_text) > 1:
+            if len(next_text) == 2 and next_id.split('_')[0] == 'exclusiveGateway':
+                ET.SubElement(activityFlows, 'activityFlow', attrib={'activity': current_text, 'endState': next_text[0]+'?', 'target': next_text[0], 'isMerging': 'False', 'isPredefined': 'True'})
+                ET.SubElement(activityFlows, 'activityFlow', attrib={'activity': current_text, 'endState': '---', 'target': next_text[1], 'isMerging': 'False', 'isPredefined': 'True'})
+            elif len(next_text) > 1 and next_id.split('_')[0] == 'parallelGateway':
                 for next in next_text:
                     ET.SubElement(activityFlows, 'activityFlow', attrib={'activity': current_text, 'endState': '---', 'target': next, 'isMerging': merge, 'isPredefined': 'True'})
             elif len(next_text) == 1:
                 ET.SubElement(activityFlows, 'activityFlow', attrib={'activity': current_text, 'endState': '---', 'target': next_text[0], 'isMerging': merge, 'isPredefined': 'True'})
             else:
                 ET.SubElement(activityFlows, 'activityFlow', attrib={'activity': current_text, 'endState': '---', 'target': next_text, 'isMerging': merge, 'isPredefined': 'True'})
-            
-                
-
-            """if data['BPMN_id'][i] in endStates_text:
-                endState = endStates_text[data['BPMN_id'][i]]
-            else:
-                endState = '---'"""
 
             i+=1