Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some minor enhancements #31

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Some minor enhancements #31

Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
97ccf72
Update todoist-card.js
sw-carlos-cristobal Jan 18, 2023
4541720
Add option to reverse due date ordering
sw-carlos-cristobal Jan 18, 2023
62bf448
Rewording
sw-carlos-cristobal Jan 18, 2023
ecedde3
Adding due dates to completed items
sw-carlos-cristobal Jan 18, 2023
a4fc31e
Update todoist-card.js
sw-carlos-cristobal Jan 22, 2023
0ee9376
Update todoist-card.js
sw-carlos-cristobal Jan 22, 2023
6adbb73
Update todoist-card.js
sw-carlos-cristobal Jan 22, 2023
bdacb02
Update todoist-card.js
sw-carlos-cristobal Jan 22, 2023
5a7e8a8
Update todoist-card.js
sw-carlos-cristobal Jan 22, 2023
bbdb838
Merge conflicts
sw-carlos-cristobal Jan 22, 2023
7ed8b6f
Merge branch 'grinstantin:main' into main
sw-carlos-cristobal Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 105 additions & 9 deletions todoist-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,30 @@ class TodoistCardEditor extends LitElement {

return false;
}

get _sort_by_due_date() {
if (this.config) {
return this.config.sort_by_due_date || false;
}

return false;
}

get _ascending_order() {
if (this.config) {
return this.config.ascending_order || false;
}

return false;
}

get _custom_days_filter() {
if (this.config) {
return this.config.custom_days_filter || -1;
}

return -1;
}

setConfig(config) {
this.config = config;
Expand Down Expand Up @@ -131,6 +155,7 @@ class TodoistCardEditor extends LitElement {

const entities = this.getEntitiesByType('sensor');
const completedCount = [...Array(16).keys()];
const daysOut = [-1, ...Array(90).keys()];

return html`<div class="card-config">
<div class="option">
Expand Down Expand Up @@ -231,6 +256,44 @@ class TodoistCardEditor extends LitElement {
</ha-switch>
<span>Only show today or overdue</span>
</div>

<div class="option">
<ha-switch
.checked=${(this.config.sort_by_due_date !== undefined) && (this.config.sort_by_due_date !== false)}
.configValue=${'sort_by_due_date'}
@change=${this.valueChanged}
>
</ha-switch>
<span>Sort by due date</span>
</div>

${this.config.sort_by_due_date === true ? html`
<div class="option">
<ha-switch
.checked=${(this.config.ascending_order !== undefined) && (this.config.ascending_order !== false)}
.configValue=${'ascending_order'}
@change=${this.valueChanged}
>
</ha-switch>
<span>Sort by due date in ascending order, otherwise descending</span>
</div>` : null }
<div class="option">
<ha-select
naturalMenuWidth
fixedMenuPosition
label="Only show tasks due within the next X days (-1 to disable, 0 for today, 1 for tomorrow, etc)"
@selected=${this.valueChanged}
@closed=${(event) => event.stopPropagation()}
.configValue=${'custom_days_filter'}
.value=${this._custom_days_filter}
>

${daysOut.map(days => {
return html`<mwc-list-item .value="${days}">${days}</mwc-list-item>`;
})}
</ha-select>
</div>

</div>`;
}

Expand Down Expand Up @@ -453,6 +516,34 @@ class TodoistCard extends LitElement {
return false;
});
}

if (this.config.sort_by_due_date) {
items.sort((a, b) => {
if (a.due && b.due) {
if (this.config.ascending_order){
return (new Date(a.due.date)).getTime() - (new Date(b.due.date)).getTime();
}
return (new Date(b.due.date)).getTime() - (new Date(a.due.date)).getTime();
}

return 0;
});
}

if (this.config.custom_days_filter !== -1) {
const days_out = this.config.custom_days_filter;
items = items.filter(item => {
if (item.due) {
if (/^\d{4}-\d{2}-\d{2}$/.test(item.due.date)) {
item.due.date += 'T00:00:00';
}

return (new Date()).setHours(23, 59, 59, 999) + (days_out * 24 * 60 * 60 * 1000) >= (new Date(item.due.date)).getTime();
}

return false;
});
}

return html`<ha-card>
${(this.config.show_header === undefined) || (this.config.show_header !== false)
Expand All @@ -475,10 +566,9 @@ class TodoistCard extends LitElement {
icon="mdi:circle-medium"
></ha-icon>`}
<div class="todoist-item-text">
${item.description
? html`<span class="todoist-item-content">${item.content}</span>
<span class="todoist-item-description">${item.description}</span>`
: item.content}
${item.content ? html`<span class="todoist-item-content">${item.content}</span>` : null}
${item.description ? html`<span class="todoist-item-description">${item.description}</span>` : null}
${item.due ? html`<span class="todoist-item-due">${item.due.date}</span>` : null}
</div>
${(this.config.show_item_delete === undefined) || (this.config.show_item_delete !== false)
? html`<ha-icon-button
Expand All @@ -490,7 +580,7 @@ class TodoistCard extends LitElement {
: html``}
</div>`;
})
: html`<div class="todoist-list-empty">No uncompleted tasks!</div>`}
: html`<div class="todoist-list-empty">List empty!</div>`}
${this.config.show_completed && this.itemsCompleted
? this.itemsCompleted.map(item => {
return html`<div class="todoist-item todoist-item-completed">
Expand All @@ -505,10 +595,9 @@ class TodoistCard extends LitElement {
icon="mdi:circle-medium"
></ha-icon>`}
<div class="todoist-item-text">
${item.description
? html`<span class="todoist-item-content">${item.content}</span>
<span class="todoist-item-description">${item.description}</span>`
: item.content}
${item.content ? html`<span class="todoist-item-content">${item.content}</span>` : null}
${item.description ? html`<span class="todoist-item-description">${item.description}</span>` : null}
${item.due ? html`<span class="todoist-item-due">${item.due.date}</span>` : null}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't there be a problem with margins if item's description and due are empty?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using ? as a ternary operator is safe to use to check if those are null and to render null html if so, otherwise render the corresponding data with it. This allows the card to have all 3 of these properties as optionals.

The css could probably use a little work as I'm very amateur with front-end code so it's a little rough:

image

Copy link
Owner

@grinstantin grinstantin Jan 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I'm trying to say is that if description and due fields are empty, content will be rendered in a <span> with todoist-item-content class, which has top and bottom margins.

Copy link
Owner

@grinstantin grinstantin Jan 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is the worst option:

${item.description || item.due
    ? html`<span class="todoist-item-content">${item.content}</span>
        <span class="todoist-item-description">${[item.description, item.due?.date].filter().join(' | ')}</span>`
    : item.content}

I would be very grateful if you could test it. I'm in the process of moving and my home server with Home Assistant installed has not yet moved to a new home.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I can give it a shot sometime this week - I should have more time this weekend

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like it's behaving about the same as the other code I think.

Your code:
image

My previous code:
image

Copy link
Owner

@grinstantin grinstantin Jan 31, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's just cache. In my code, description and due.date are separated by a vertical bar.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yeah I see that now, I'll try again soon(ish)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sw-carlos-cristobal did you have some time to take a look at this?

</div>
${(this.config.show_item_delete === undefined) || (this.config.show_item_delete !== false)
? html`<ha-icon-button
Expand Down Expand Up @@ -581,6 +670,13 @@ class TodoistCard extends LitElement {
font-size: 12px !important;
margin: -15px 0;
}

.todoist-item-due {
display: block;
opacity: 0.5;
font-size: 12px !important;
margin: -15px 0;
}

.todoist-item-close {
color: #008000;
Expand Down