iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix problem when due was defined in todo

Browse Source
This commit is contained in:
aceisace
2022-10-04 23:31:33 +02:00
parent f3d951a93c
commit 4753dbc4a6
1 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
inkycal/modules/inkycal_todoist.py
View File

@@ -4,6 +4,7 @@
Inkycal Todoist Module Inkycal Todoist Module
Copyright by aceisace Copyright by aceisace
""" """
import arrow
from inkycal.modules.template import inkycal_module from inkycal.modules.template import inkycal_module
from inkycal.custom import * from inkycal.custom import *
@@ -125,7 +126,7 @@ class Todoist(inkycal_module):
simplified = [ simplified = [
{ {
'name': task.content, 'name': task.content,
'due': task.due, 'due': arrow.get(task.due.date, "YYYY-MM-DD").format("D-MMM-YY") if task.due else "",
'priority': task.priority, 'priority': task.priority,
'project': filtered_project_ids_and_names[task.project_id] 'project': filtered_project_ids_and_names[task.project_id]
} }
@@ -134,27 +135,33 @@ class Todoist(inkycal_module):
logger.debug(f'simplified: {simplified}') logger.debug(f'simplified: {simplified}')
# Get maximum width of project names for selected font project_lengths = []
project_width = int(max( due_lengths = []
[self.font.getsize(task['project']) for task in simplified]
) * 1.1)
# Get maximum width of project dues for selected font
due_width = int(max([
self.font.getsize(task['due']) for task in simplified]) * 1.1)
# Group tasks by project name
grouped = {name: [] for id_, name in all_projects.items()}
for task in simplified: for task in simplified:
if task['project'] in grouped: if task["project"]:
grouped[task['project']].append(task) project_lengths.append(int(self.font.getlength(task['project']) * 1.1))
if task["due"]:
due_lengths.append(int(self.font.getlength(task['due']) * 1.1))
logger.debug(f"grouped: {grouped}") # Get maximum width of project names for selected font
project_offset = int(max(project_lengths)) if project_lengths else 0
# Get maximum width of project dues for selected font
due_offset = int(max(due_lengths)) if due_lengths else 0
# create a dict with names of filtered groups
groups = {group_name:[] for group_name in filtered_project_ids_and_names.values()}
for task in simplified:
group_of_current_task = task["project"]
if group_of_current_task in groups:
groups[group_of_current_task].append(task)
logger.debug(f"grouped: {groups}")
# Add the parsed todos on the image # Add the parsed todos on the image
cursor = 0 cursor = 0
for name, todos in grouped.items(): for name, todos in groups.items():
if todos: if todos:
for todo in todos: for todo in todos:
if cursor < len(line_positions): if cursor < len(line_positions):
@@ -164,23 +171,23 @@ class Todoist(inkycal_module):
# Add todos project name # Add todos project name
write( write(
im_colour, line_positions[cursor], im_colour, line_positions[cursor],
(project_width, line_height), (project_offset, line_height),
todo['project'], font=self.font, alignment='left') todo['project'], font=self.font, alignment='left')
# Add todos due if not empty # Add todos due if not empty
if todo['due']: if todo['due']:
write( write(
im_black, im_black,
(line_x + project_width, line_y), (line_x + project_offset, line_y),
(due_width, line_height), (due_offset, line_height),
todo['due'], font=self.font, alignment='left') todo['due'], font=self.font, alignment='left')
if todo['name']: if todo['name']:
# Add todos name # Add todos name
write( write(
im_black, im_black,
(line_x + project_width + due_width, line_y), (line_x + project_offset + due_offset, line_y),
(im_width - project_width - due_width, line_height), (im_width - project_offset - due_offset, line_height),
todo['name'], font=self.font, alignment='left') todo['name'], font=self.font, alignment='left')
cursor += 1 cursor += 1