Commit 4dc71ff7 authored by Yusei Tahara's avatar Yusei Tahara

Sort category list. XMLMatrix.keyToId will not fail.

parent 516ab724
...@@ -532,6 +532,18 @@ def updateCellList(portal, line, cell_type, cell_range_method, cell_dict_list): ...@@ -532,6 +532,18 @@ def updateCellList(portal, line, cell_type, cell_range_method, cell_dict_list):
else: else:
return range_list return range_list
def getSortedCategoryList(line, base_id, category_list):
category_dict = {}
for category in category_list:
category_dict[category.split('/')[0]] = category
result = []
index_list = line.index[base_id].keys()
index_list.sort()
for index in index_list:
base_category = line.index[base_id][index].keys()[0].split('/')[0]
result.append(category_dict[base_category])
return result
for cell_dict in cell_dict_list: for cell_dict in cell_dict_list:
base_id = cell_dict['base_id'] base_id = cell_dict['base_id']
if callable(cell_range_method): if callable(cell_range_method):
...@@ -589,6 +601,7 @@ def updateCellList(portal, line, cell_type, cell_range_method, cell_dict_list): ...@@ -589,6 +601,7 @@ def updateCellList(portal, line, cell_type, cell_range_method, cell_dict_list):
data_list.append(([row, column[index]] + tab_list, getMappedValueDict(item))) data_list.append(([row, column[index]] + tab_list, getMappedValueDict(item)))
for category_list, mapped_value_dict in data_list: for category_list, mapped_value_dict in data_list:
category_list = getSortedCategoryList(line, base_id, category_list)
cell = line.newCell(portal_type=cell_type, cell = line.newCell(portal_type=cell_type,
base_id=base_id, base_id=base_id,
*category_list) *category_list)
......
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