bugs

reqtool/reqman/api/reqman/apps/reqtool/models/requirements.py

@@ -274,10 +274,10 @@ class BoilerplateData(models.Model):
     owner_data = models.ForeignKey(User, related_name='boilerplate_data', on_delete=models.CASCADE)
     group_of_boilerplate_data = models.ForeignKey(BoilerplateGroup, related_name='group_of_boilerplate_data', on_delete=models.CASCADE)    
     boilerplate_data_id = models.ForeignKey(Boilerplate, related_name='boilerplate_data_id', on_delete=models.CASCADE)
-    title_data = models.CharField(default="", max_length=30, unique=True)
-    prefix_data = models.CharField(default="", max_length=100, blank=True)
-    main_data = models.CharField(default="", max_length=100, blank=True)
-    suffix_data =  models.CharField(max_length=100, blank=True)
+    title_data = models.CharField(default="", max_length=300, unique=True)
+    prefix_data = models.CharField(default="", max_length=1000, blank=True)
+    main_data = models.CharField(default="", max_length=1000, blank=True)
+    suffix_data =  models.CharField(max_length=1000, blank=True)
 
     class Meta:
         ordering = ['boilerplate_data_id']

reqtool/reqman/api/reqman/apps/reqtool/rest_api/views/requirements_views.py

@@ -487,7 +487,7 @@ def getExtractedProperty(group_pk):
                         elif(prefixdata[0]['logic_connective']=='AND'):
                             prefix_predicate = '('+prefix1_predicate+' & @'+prefix2_predicate+')'
                     if (prefixdata[0]['simple_prefix'] == 'P1'):
-                        p1main= '( '+main_predicate+' | ! @('+main_predicate+' S '+prefix_predicate+')'+')'
+                        p1main= '( '+main_predicate+' | ! @(!'+main_predicate+' S '+prefix_predicate+')'+')'
                         return p1main
                     elif (prefixdata[0]['simple_prefix'] == 'P2'):
                         p2main= '('+main_predicate+' | (! @('+prefix_predicate+' & @(∃ temp, !('+prefix1_predicate+' S ('+ prefixverbsub +'temp) & !(temp='+ prefixdata[0]['item_function_flow_statevalue'].split(':')[-1].strip() +')' '))'+')))'