Continued work on section labelling

master
Hoffelhas 2020-12-07 22:45:12 +01:00
parent c1b14f55ac
commit 6d3439019c
1 changed files with 22 additions and 15 deletions

View File

@ -281,19 +281,24 @@ def main():
if api is not None: if api is not None:
section = api.sections.all(lambda x: x['id'] == item_object['section_id']) section = api.sections.all(lambda x: x['id'] == item_object['section_id'])
current_type = get_type(section[0], 'section_type') if section:
section_type, section_type_changed = get_type(section[0], 'section_type')
# Hier of later inbouwen?
# try:
# first_change = section['first_change']
# except:
# section['first_change'] = 0
else: else:
section_type = None section_type = None
section_type_changed = 0 section_type_changed = 0
if current_type is not None: if section_type is not None:
print(section[0]['name']) print(section[0]['name'])
print(current_type) print(section_type)
else:
try: section_type = None
first_section_change = section['first_change'] section_type_changed = 0
except:
section['first_change'] = 0
return section_type, section_type_changed return section_type, section_type_changed
@ -312,7 +317,7 @@ def main():
# If no type is found in parentless task name, try to find one in the section name. # If no type is found in parentless task name, try to find one in the section name.
if item_type is None: if item_type is None:
section_type, section_type_changed = get_section_type(item, api) #################### TODO: How to note first change for sequential? section_type, section_type_changed = get_section_type(item, api)
else: else:
section_type = None section_type = None
section_type_changed = 0 section_type_changed = 0
@ -514,18 +519,18 @@ def main():
continue continue
# Check item type # Check item type
item_type, item_type_changed, section_type, section_type_changed = get_item_type( item_type, item_type_changed, section_type, section_type_changed = get_item_type(
item, project_type, api) item, project_type, api)
logging.debug('Identified \'%s\' as %s type', logging.debug('Identified \'%s\' as %s type',
item['content'], item_type) item['content'], item_type)
# Check the item_type of the project or parent # If there is no item of section type
if item_type is None: if item_type is None:
# Handle parentless tasks
if item['parent_id'] == 0: if item['parent_id'] == 0:
item_type = project_type item_type = project_type
# Handle other tasks
else: else:
try: try:
if item['parent_type'] is None: if item['parent_type'] is None:
@ -563,6 +568,8 @@ def main():
[remove_label(child_item, label_id) [remove_label(child_item, label_id)
for child_item in child_items] for child_item in child_items]
#TODO: How to add if SECTION is sequential?
# Process sequential tagged items (item_type can overrule project_type) # Process sequential tagged items (item_type can overrule project_type)
if item_type == 'sequential' or item_type == 'p-s': if item_type == 'sequential' or item_type == 'p-s':
for child_item in child_items: for child_item in child_items: