Commit 61c5384b authored by Rafael Monnerat's avatar Rafael Monnerat

The blocks at secondary layer should be frozen by default and

also store if it is a part of secondary layer.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20126 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 35aeadf4
...@@ -2305,7 +2305,8 @@ class PlanningStructure: ...@@ -2305,7 +2305,8 @@ class PlanningStructure:
lane_axis_range = axis_range, lane_axis_range = axis_range,
planning=self, warning=warning, planning=self, warning=warning,
error_block_list=error_block_list, error_block_list=error_block_list,
error_info_dict=error_info_dict) error_info_dict=error_info_dict,
sec_layer_uid_list=basic_structure.sec_layer_uid_list)
if axis_group_object.property_dict['stat'] == 1: if axis_group_object.property_dict['stat'] == 1:
# case stat group_object, need to update block size to display # case stat group_object, need to update block size to display
...@@ -2380,7 +2381,8 @@ class Activity: ...@@ -2380,7 +2381,8 @@ class Activity:
def addBlocs(self, report_axis_start=None, report_axis_stop=None, def addBlocs(self, report_axis_start=None, report_axis_stop=None,
lane_axis_start=None, lane_axis_stop=None, lane_axis_start=None, lane_axis_stop=None,
lane_axis_range=None, planning=None, warning=0, lane_axis_range=None, planning=None, warning=0,
error_block_list=[], height=0, error_info_dict={}): error_block_list=[], height=0, error_info_dict={},
sec_layer_uid_list=[]):
""" """
define list of (begin & stop) values for blocs representing the actual define list of (begin & stop) values for blocs representing the actual
activity (can have several blocs if necessary). activity (can have several blocs if necessary).
...@@ -2420,12 +2422,19 @@ class Activity: ...@@ -2420,12 +2422,19 @@ class Activity:
# passive # passive
block_color = '#D1E8FF' block_color = '#D1E8FF'
block_link = '' block_link = ''
property_dict = self.property_dict
if self.object.getUid() in sec_layer_uid_list:
property_dict['sec_layer'] = 1
else:
property_dict['sec_layer'] = 0
new_block = Bloc(name= block_name,color=block_color,link=block_link, new_block = Bloc(name= block_name,color=block_color,link=block_link,
number = block_number, number = block_number,
vertical_view=self.vertical_view, parent_activity=self, vertical_view=self.vertical_view, parent_activity=self,
warning=warning, error=error, warning=warning, error=error,
error_text=error_text,zone=zone, error_text=error_text,zone=zone,
property_dict=self.property_dict) property_dict=property_dict)
new_block.buildInfoDict(info_dict = self.info) new_block.buildInfoDict(info_dict = self.info)
......
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