Fixed a few bugs in the model edition

signetsim/views/edit/ModelEventsForm.py

@@ -70,7 +70,7 @@ def load(self, event_id):
 
 			t_pos = assignment.getVariable()
 			t_var_pos = self.parent.listOfVariables.index(t_pos)
-			self.assignments.append((t_var_pos, assignment.getAssignment()))
+			self.assignments.append((t_var_pos, assignment.getDefinition().getPrettyPrintMathFormula()))
 		self.isEditing = True
 
 	def save(self, event):

signetsim/views/edit/ModelEventsView.py

@@ -90,7 +90,7 @@ def load(self, request, *args, **kwargs):
 		if self.isModelLoaded():
 			self.listOfEvents = self.getModel().listOfEvents.values()
 			self.getModel().listOfVariables.classifyVariables()
-			self.listOfVariables = [var for var in self.getModel().listOfVariables.values() if var.isConstant() or var.isAssignment()]
+			self.listOfVariables = [var for var in self.getModel().listOfVariables.values()]# if var.isConstant() or var.isAssignment()]
 
 	def delete(self, request):
 

signetsim/views/json/GetReaction.py

@@ -50,6 +50,15 @@ def post(self, request, *args, **kwargs):
 		for parameter in reaction.listOfLocalParameters.values():
 			list_of_parameters.append(parameter)
 
+		t_reaction_type = reaction.getReactionType()
+		t_reaction_parameters = reaction.getReactionParameters()
+		t_reaction_parameters_index = []
+		if t_reaction_parameters is not None:
+			for t_param in t_reaction_parameters:
+				t_reaction_parameters_index.append(list_of_parameters.index(t_param))
+		else:
+			t_reaction_type = KineticLaw.UNDEFINED
+
 		self.data.update({
 			'id': self.getModel().listOfReactions.values().index(reaction),
 			'name': "" if reaction.getName() is None else reaction.getName(),
@@ -76,12 +85,11 @@ def post(self, request, *args, **kwargs):
 				for product in reaction.listOfProducts.values()
 			],
 			'kinetic_law': reaction.kineticLaw.getPrettyPrintMathFormula(),
-			'reaction_type': reaction.getReactionType(),
-			'reaction_type_name': KineticLaw.reactionTypes[reaction.getReactionType()],
+			'reaction_type': t_reaction_type,
+			'reaction_type_name': KineticLaw.reactionTypes[t_reaction_type],
 			'reversible': 1 if reaction.reversible else 0,
-			'list_of_parameters': [
-				list_of_parameters.index(t_param) for t_param in reaction.getReactionParameters()
-			],
+			'list_of_parameters': [] if t_reaction_parameters is None else t_reaction_parameters_index
+			,
 			'list_of_local_parameters': [
 				[param.getNameOrSbmlId(), "" if param.getValue() is None else param.getValue()] for param in reaction.listOfLocalParameters.values()
 			]

signetsim/views/json/GetSpecies.py

@@ -46,16 +46,21 @@ def post(self, request, *args, **kwargs):
 			'id': self.getModel().listOfSpecies.values().index(species),
 			'name': "" if species.getName() is None else species.getName(),
 			'sbml_id': species.getSbmlId(),
-			'compartment_name': "" if species.getCompartment().getName() is None else species.getCompartment().getName(),
+			'compartment_name': species.getCompartment().getNameOrSbmlId(),
 			'compartment_id': self.getModel().listOfCompartments.values().index(species.getCompartment()),
 			'value': species.getValue(),
 			'isConcentration': 1 if not species.hasOnlySubstanceUnits else 0,
 			'constant': (1 if species.constant else 0),
 			'boundaryCondition': (1 if species.boundaryCondition else 0),
-			'unit_name': "" if species.getUnits().getName() is None else species.getUnits().getName(),
-			'unit_id': self.getModel().listOfUnitDefinitions.values().index(species.getUnits()),
 			'notes': "" if species.getNotes() is None else species.getNotes(),
 		})
+
+		if species.getUnits() is not None:
+			self.data.update({
+				'unit_name': "" if species.getUnits().getName() is None else species.getUnits().getName(),
+				'unit_id': self.getModel().listOfUnitDefinitions.values().index(species.getUnits()),
+			})
+
 		return JsonView.post(self, request, *args, **kwargs)