vyn/mirai
1
Fork 0
mirror of https://codeberg.org/vyn/mirai.git synced 2025-07-03 18:23:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show tasks with deadline first, in order

Browse source
This commit is contained in:
Vyn 2024-04-17 15:07:33 +02:00
parent 3030e15d5e
commit d1a4858504
4 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Backend.cpp
View file

@ -122,6 +122,7 @@ void Backend::updateTodoFromRawFormat(int todoIndex, QString text, QString date)
*(taskItem.taskItem) = *(taskItem.taskItem) =
mirai::TodoMdFormat::StringToTask(text.toStdString(), date.toStdString()); mirai::TodoMdFormat::StringToTask(text.toStdString(), date.toStdString());
mirai.save(); mirai.save();
view.lock()->update();
rebuildQMLTasksList(); rebuildQMLTasksList();
emit tasksChanged(); emit tasksChanged();
} }
@ -137,6 +138,7 @@ void Backend::updateTodo(int todoIndex, QString state, QString text, QString dat
taskItem.taskItem->setText(text.toStdString()); taskItem.taskItem->setText(text.toStdString());
taskItem.taskItem->setDate(date.toStdString()); taskItem.taskItem->setDate(date.toStdString());
mirai.save(); mirai.save();
view.lock()->update();
rebuildQMLTasksList(); rebuildQMLTasksList();
emit tasksChanged(); emit tasksChanged();
} }

5
src/core/TaskItem.cpp
View file

@ -75,6 +75,11 @@ bool TaskItem::hasDate() const
return isDate(data.date); return isDate(data.date);
} }
bool TaskItem::hasTime() const
{
return getStartTime() != "" && getEndTime() != "";
}
bool TaskItem::hasTag(const std::string &tag) const bool TaskItem::hasTag(const std::string &tag) const
{ {
return vectorUtils::contains(data.tags, tag); return vectorUtils::contains(data.tags, tag);

1
src/core/TaskItem.h
View file

@ -57,6 +57,7 @@ class TaskItem
const Tags &getTags() const; const Tags &getTags() const;
bool hasTag(const std::string &tag) const; bool hasTag(const std::string &tag) const;
bool hasDate() const; bool hasDate() const;
bool hasTime() const;
private: private:
void onChange(); void onChange();

12
src/core/TasksView.cpp
View file

@ -52,7 +52,17 @@ void TasksView::update()
} else if (!t1->hasDate() && t2->hasDate()) { } else if (!t1->hasDate() && t2->hasDate()) {
return false; return false;
} }
return t1->getDate() < t2->getDate(); if (t1->getDate() < t2->getDate()) {
return true;
} else if (t1->getDate() > t2->getDate()) {
return false;
}
if (t1->hasTime() && !t2->hasTime()) {
return true;
} else if (!t1->hasTime() && t2->hasTime()) {
return false;
}
return t1->getStartTime() < t2->getStartTime();
}); });
} }