Commit 026d0d2b authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

accept solver should propagate the change to parent if not frozen.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31867 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent cec96f61
...@@ -66,6 +66,7 @@ class AcceptSolver(SolverMixin, ConfigurableMixin, XMLObject): ...@@ -66,6 +66,7 @@ class AcceptSolver(SolverMixin, ConfigurableMixin, XMLObject):
""" """
solved_property = self._getPortalTypeValue().getTestedProperty() solved_property = self._getPortalTypeValue().getTestedProperty()
for movement in self.getDeliveryValueList(): for movement in self.getDeliveryValueList():
import pdb; pdb.set_trace()
new_value = movement.getProperty(solved_property) new_value = movement.getProperty(solved_property)
simulation_movement_list = movement.getDeliveryRelatedValueList() simulation_movement_list = movement.getDeliveryRelatedValueList()
# if movement here is a delivery, we need to find simulation # if movement here is a delivery, we need to find simulation
...@@ -75,15 +76,30 @@ class AcceptSolver(SolverMixin, ConfigurableMixin, XMLObject): ...@@ -75,15 +76,30 @@ class AcceptSolver(SolverMixin, ConfigurableMixin, XMLObject):
[x.getDeliveryRelatedValueList() \ [x.getDeliveryRelatedValueList() \
for x in self.getDeliveryValue().getMovementList()], []) for x in self.getDeliveryValue().getMovementList()], [])
for simulation_movement in simulation_movement_list: for simulation_movement in simulation_movement_list:
if not simulation_movement.isPropertyRecorded(solved_property):
simulation_movement.recordProperty(solved_property)
# XXX hard coded # XXX hard coded
if solved_property == 'quantity': if solved_property == 'quantity':
simulation_movement.setProperty( new_quantity = new_value * simulation_movement.getDeliveryRatio()
solved_property, value_dict = {'quantity':new_quantity}
new_value * simulation_movement.getDeliveryRatio())
else: else:
simulation_movement.setProperty(solved_property, new_value) value_dict = {solved_property:new_value}
self._solveRecursively(simulation_movement, value_dict)
simulation_movement.expand() simulation_movement.expand()
# Finish solving # Finish solving
self.succeed() self.succeed()
def _solveRecursively(self, simulation_movement, value_dict=None):
"""
Update value of the current simulation movement, and update
his parent movement.
"""
for property_id in value_dict.iterkeys():
if not simulation_movement.isPropertyRecorded(property_id):
simulation_movement.recordProperty(property_id)
simulation_movement.edit(**value_dict)
applied_rule = simulation_movement.getParentValue()
parent_movement = applied_rule.getParentValue()
if parent_movement.getPortalType() == 'Simulation Movement' and \
not parent_movement.isFrozen():
# backtrack to the parent movement while it is not frozen
self._solveRecursively(parent_movement, value_dict=value_dict)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment