thelilfrog/TaskBoard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

v0.3.0 #1

Merged
mojitaurelie merged 4 commits from dev_0.3 into main 2023-02-21 18:29:54 +01:00
Conversation 0 Commits 4 Files Changed 21 +770 -171
21 changed files with 770 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
TaskBoard.pro
View File

@@ -4,8 +4,8 @@ greaterThan(QT_MAJOR_VERSION, 5): QT += widgets
CONFIG += c++17
win32:VERSION = 0.2.1.0 # major.minor.patch.build
else:VERSION = 0.2.1 # major.minor.patch
win32:VERSION = 0.3.0.0 # major.minor.patch.build
else:VERSION = 0.3.0 # major.minor.patch
DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
DEFINES += APP_NAME=\"\\\"TaskBoard\\\"\"
@@ -68,6 +68,7 @@ linux-* {
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += \
src/frames/boardconfigdialog.cpp \
src/frames/filterdialog.cpp \
src/frames/aboutdialog.cpp \
src/models/board.cpp \
@@ -80,9 +81,11 @@ SOURCES += \
src/models/status.cpp \
src/models/task.cpp \
src/frames/taskdialog.cpp \
src/services/taskstateservice.cpp \
src/tools.cpp
HEADERS += \
src/frames/boardconfigdialog.h \
src/frames/filterdialog.h \
src/frames/aboutdialog.h \
src/models/board.h \
@@ -94,9 +97,11 @@ HEADERS += \
src/models/status.h \
src/models/task.h \
src/frames/taskdialog.h \
src/services/taskstateservice.h \
src/tools.h
FORMS += \
src/frames/boardconfigdialog.ui \
src/frames/filterdialog.ui \
src/frames/aboutdialog.ui \
src/frames/mainwindow.ui \

6
src/frames/aboutdialog.cpp
View File

@@ -1,10 +1,6 @@
#include "aboutdialog.h"
#include "ui_aboutdialog.h"
#ifdef unix
#include <gnu/libc-version.h>
#endif
AboutDialog::AboutDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::AboutDialog)
@@ -33,7 +29,7 @@ QString AboutDialog::getCompilerInfo()
#ifdef __MINGW32__
return QString("MinGW_%1.%2").arg(QString::number(__MINGW32_MAJOR_VERSION), QString::number(__MINGW32_MINOR_VERSION));
#else
return QString("GLIBC_%1").arg(gnu_get_libc_version());
return QString("GLIBC_%1.%2").arg(QString::number(__GLIBC__), QString::number(__GLIBC_MINOR__));
#endif
#elif _MSC_VER
return QString("MSVC_%1").arg(_MSC_VER);

75
src/frames/boardconfigdialog.cpp Normal file
View File

@@ -0,0 +1,75 @@
#include "boardconfigdialog.h"
#include "ui_boardconfigdialog.h"
#include "../services/taskstateservice.h"
#include <QVector>
BoardConfigDialog::BoardConfigDialog(Board *b, QWidget *parent) :
QDialog(parent),
ui(new Ui::BoardConfigDialog)
{
ui->setupUi(this);
ui->nameField->setText(b->getName());
ui->descriptionField->setPlainText(b->getDescription());
if (!b->isAutoStatus())
{
QVector<Status> statuses = TaskStateService::getInstance()->getStatuses();
foreach (Status s, statuses)
{
ui->statusCombobox->addItem(s.getName(), s.getUUID());
}
ui->autoStatusCheckbox->setChecked(false);
ui->statusCombobox->setEnabled(true);
}
connect(ui->autoStatusCheckbox, &QCheckBox::stateChanged, this, &BoardConfigDialog::onAutoStatusCheckboxChange);
}
BoardConfigDialog::~BoardConfigDialog()
{
delete ui;
}
const QString BoardConfigDialog::getName()
{
return ui->nameField->text();
}
const QString BoardConfigDialog::getDescription()
{
return ui->descriptionField->toPlainText();
}
bool BoardConfigDialog::isAutoStatus()
{
return ui->autoStatusCheckbox->isChecked();
}
const QString BoardConfigDialog::getStatus()
{
if (!ui->autoStatusCheckbox->isChecked())
{
if (!ui->statusCombobox->currentData().isNull())
{
return ui->statusCombobox->currentData().toString();
}
}
return "";
}
void BoardConfigDialog::onAutoStatusCheckboxChange(int state)
{
if (state == Qt::CheckState::Unchecked)
{
QVector<Status> statuses = TaskStateService::getInstance()->getStatuses();
foreach (Status s, statuses)
{
ui->statusCombobox->addItem(s.getName(), s.getUUID());
}
ui->statusCombobox->setEnabled(true);
}
else
{
ui->statusCombobox->setEnabled(false);
ui->statusCombobox->clear();
}
}

32
src/frames/boardconfigdialog.h Normal file
View File

@@ -0,0 +1,32 @@
#ifndef BOARDCONFIGDIALOG_H
#define BOARDCONFIGDIALOG_H
#include <QDialog>
#include "../models/board.h"
namespace Ui {
class BoardConfigDialog;
}
class BoardConfigDialog : public QDialog
{
Q_OBJECT
public:
explicit BoardConfigDialog(Board *b, QWidget *parent = nullptr);
~BoardConfigDialog();
const QString getName();
const QString getDescription();
bool isAutoStatus();
const QString getStatus();
private slots:
void onAutoStatusCheckboxChange(int);
private:
Ui::BoardConfigDialog *ui;
};
#endif // BOARDCONFIGDIALOG_H

119
src/frames/boardconfigdialog.ui Normal file
View File

@@ -0,0 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>BoardConfigDialog</class>
<widget class="QDialog" name="BoardConfigDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>379</height>
</rect>
</property>
<property name="windowTitle">
<string>Board Configuration</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Name</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="nameField"/>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Description</string>
</property>
</widget>
</item>
<item>
<widget class="QPlainTextEdit" name="descriptionField"/>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="autoStatusCheckbox">
<property name="text">
<string>Auto determine status</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Status</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="statusCombobox">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>BoardConfigDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>BoardConfigDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

16
src/frames/filterdialog.cpp
View File

@@ -3,22 +3,24 @@
#include <QMessageBox>
FilterDialog::FilterDialog(QString dialogTitle, QVector<Board*> boards, QVector<Status> status, QVector<Priority> priorities, QWidget *parent) :
#include "../services/taskstateservice.h"
FilterDialog::FilterDialog(QString dialogTitle, QVector<Board*> boards, QWidget *parent) :
QDialog(parent),
ui(new Ui::FilterDialog)
{
ui->setupUi(this);
this->setWindowTitle(dialogTitle);
init(boards, status, priorities);
init(boards);
}
FilterDialog::FilterDialog(QString dialogTitle, Filter f, QVector<Board*> boards, QVector<Status> status, QVector<Priority> priorities, QWidget *parent) :
FilterDialog::FilterDialog(QString dialogTitle, Filter f, QVector<Board*> boards, QWidget *parent) :
QDialog(parent),
ui(new Ui::FilterDialog)
{
ui->setupUi(this);
this->setWindowTitle(dialogTitle);
init(boards, status, priorities);
init(boards);
ui->nameEdit->setText(f.getName());
ui->descriptionEdit->setPlainText(f.getDescription());
@@ -59,7 +61,7 @@ FilterDialog::FilterDialog(QString dialogTitle, Filter f, QVector<Board*> boards
}
void FilterDialog::init(QVector<Board *> boards, QVector<Status> status, QVector<Priority> priorities)
void FilterDialog::init(QVector<Board *> boards)
{
for (Board *b : boards)
{
@@ -71,7 +73,8 @@ void FilterDialog::init(QVector<Board *> boards, QVector<Status> status, QVector
ui->boardListWidget->addItem(item);
}
for (Status s : status)
QVector<Status> statuses = TaskStateService::getInstance()->getStatuses();
for (Status s : statuses)
{
QListWidgetItem *item = new QListWidgetItem();
item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
@@ -81,6 +84,7 @@ void FilterDialog::init(QVector<Board *> boards, QVector<Status> status, QVector
ui->statusListWidget->addItem(item);
}
QVector<Priority> priorities = TaskStateService::getInstance()->getPriorities();
for (Priority p : priorities)
{
QListWidgetItem *item = new QListWidgetItem();

6
src/frames/filterdialog.h
View File

@@ -17,8 +17,8 @@ class FilterDialog : public QDialog
Q_OBJECT
public:
explicit FilterDialog(QString dialogTitle, QVector<Board*> boards, QVector<Status> status, QVector<Priority> priorities, QWidget *parent = nullptr);
FilterDialog(QString dialogTitle, Filter f, QVector<Board*> boards, QVector<Status> status, QVector<Priority> priorities, QWidget *parent = nullptr);
explicit FilterDialog(QString dialogTitle, QVector<Board*> boards, QWidget *parent = nullptr);
FilterDialog(QString dialogTitle, Filter f, QVector<Board*> boards, QWidget *parent = nullptr);
~FilterDialog();
const Filter getFilter();
@@ -28,7 +28,7 @@ private slots:
private:
Ui::FilterDialog *ui;
void init(QVector<Board*> boards, QVector<Status> status, QVector<Priority> priorities);
void init(QVector<Board*> boards);
};
#endif // FILTERDIALOG_H

202
src/frames/mainwindow.cpp
View File

@@ -17,13 +17,16 @@
#include "namedialog.h"
#include "taskdialog.h"
#include "filterdialog.h"
#include "boardconfigdialog.h"
#include "../tools.h"
#include "../services/taskstateservice.h"
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent)
, ui(new Ui::MainWindow)
{
ui->setupUi(this);
ui->boardStatus->setVisible(false);
this->menuSelectedBoardItem = nullptr;
this->menuSelectedFilterItem = nullptr;
this->menuSelectedTaskItem = nullptr;
@@ -61,11 +64,11 @@ MainWindow::~MainWindow()
void MainWindow::openPreferences()
{
PrefDialog dialog(status, priorities, this);
PrefDialog dialog(this);
if (dialog.exec() == QDialog::DialogCode::Accepted)
{
this->priorities = dialog.getPriorities();
this->status = dialog.getStatus();
TaskStateService::getInstance()->updatePriorities(dialog.getPriorities());
TaskStateService::getInstance()->updateStatuses(dialog.getStatus());
save();
redrawTaskTree();
}
@@ -153,7 +156,7 @@ void MainWindow::onNewTaskClick()
{
if (selectedBoardIndex > -1)
{
TaskDialog dialog(status, priorities, this);
TaskDialog dialog(this);
if (dialog.exec() == QDialog::DialogCode::Accepted)
{
Task t = dialog.getTask();
@@ -169,7 +172,7 @@ void MainWindow::onNewTaskClick()
void MainWindow::onNewFilterClick()
{
FilterDialog dialog("New filter", boards, status, priorities, this);
FilterDialog dialog("New filter", boards, this);
if (dialog.exec() == QDialog::DialogCode::Accepted)
{
Filter f = dialog.getFilter();
@@ -195,7 +198,16 @@ void MainWindow::onBoardSelected(int i)
{
Board *b = boards[selectedBoardIndex];
ui->label->setText(b->getName());
if (b->getDescription().length() > 0)
{
ui->boardDescription->setText(b->getDescription());
ui->boardDescription->setEnabled(true);
}
else
{
ui->boardDescription->setText("No description");
ui->boardDescription->setEnabled(false);
}
ui->actionNew_task->setDisabled(false);
}
else
@@ -222,7 +234,16 @@ void MainWindow::onFilterSelected(int i)
{
Filter f = filters[selectedFilterIndex];
ui->label->setText(f.getName());
if (f.getDescription().length() > 0)
{
ui->boardDescription->setText(f.getDescription());
ui->boardDescription->setEnabled(true);
}
else
{
ui->boardDescription->setText("No description");
ui->boardDescription->setEnabled(false);
}
}
else
{
@@ -237,13 +258,14 @@ void MainWindow::onEditTask(QTreeWidgetItem *item)
Task *t = getSelectedTask();
if (t != nullptr)
{
TaskDialog dialog(t, status, priorities, this);
TaskDialog dialog(t, this);
if (dialog.exec() == QDialog::DialogCode::Accepted)
{
Task editedTask = dialog.getTask();
t->update(editedTask);
updateTaskRow(item, editedTask);
save();
redrawBoardStatus();
if (selectedFilterIndex > -1)
{
redrawTaskTree();
@@ -256,7 +278,11 @@ void MainWindow::onRemoveBoardMenu()
{
if (menuSelectedBoardItem != nullptr)
{
int i = ui->filterListWidget->indexFromItem(menuSelectedFilterItem).row();
int i = ui->boardList->indexFromItem(menuSelectedBoardItem).row();
if (i == -1)
{
return;
}
QMessageBox::StandardButton result = QMessageBox::question(this, "Delete a board", "Do you want to delete this board?");
if (result == QMessageBox::Yes)
{
@@ -293,6 +319,10 @@ void MainWindow::onRemoveFilterMenu()
if (menuSelectedFilterItem != nullptr)
{
int i = ui->filterListWidget->indexFromItem(menuSelectedFilterItem).row();
if (i == -1)
{
return;
}
QMessageBox::StandardButton result = QMessageBox::question(this, "Delete a filter", "Do you want to delete this filter?");
if (result == QMessageBox::Yes)
{
@@ -312,20 +342,50 @@ void MainWindow::onEditNameBoardMenu()
{
if (menuSelectedBoardItem != nullptr)
{
int i = ui->filterListWidget->indexFromItem(menuSelectedFilterItem).row();
int i = ui->boardList->indexFromItem(menuSelectedBoardItem).row();
if (i == -1)
{
return;
}
Board *b = boards.at(i);
NameDialog dialog("Edit board name", b->getName(), b->getDescription(), this);
BoardConfigDialog dialog(b, this);
if (dialog.exec() == QDialog::DialogCode::Accepted)
{
QString newName = dialog.getChoosenName();
QString newName = dialog.getName();
QString newDesc = dialog.getDescription();
b->setName(newName);
b->setDescription(newDesc);
if (!dialog.isAutoStatus())
{
std::optional<Status> status = TaskStateService::getInstance()->getStatusByUUID(dialog.getStatus());
if (status.has_value())
{
b->setDirtyStatus(status.value());
}
else
{
b->removeDirtyStatus();
}
}
else
{
b->removeDirtyStatus();
}
QListWidgetItem *item = ui->boardList->item(i);
item->setText(newName);
item->setToolTip(newDesc);
ui->label->setText(newName);
if (newDesc.length() > 0)
{
ui->boardDescription->setText(newDesc);
ui->boardDescription->setEnabled(true);
}
else
{
ui->boardDescription->setText("No description");
ui->boardDescription->setEnabled(false);
}
redrawBoardStatus();
save();
}
}
@@ -346,7 +406,7 @@ void MainWindow::onEditFilterMenu()
{
int i = ui->filterListWidget->indexFromItem(menuSelectedFilterItem).row();
Filter f = filters[i];
FilterDialog dialog("Edit the filter", f, boards, status, priorities, this);
FilterDialog dialog("Edit the filter", f, boards, this);
if (dialog.exec() == QDialog::DialogCode::Accepted)
{
Filter f = dialog.getFilter();
@@ -355,7 +415,16 @@ void MainWindow::onEditFilterMenu()
item->setText(f.getName());
item->setToolTip(f.getDescription());
ui->label->setText(f.getName());
if (f.getDescription().length() > 0)
{
ui->boardDescription->setText(f.getDescription());
ui->boardDescription->setEnabled(true);
}
else
{
ui->boardDescription->setText("No description");
ui->boardDescription->setEnabled(false);
}
redrawTaskTree();
save();
}
@@ -396,13 +465,15 @@ void MainWindow::init()
QJsonArray jsonStatus = save[STATUS_KEY].toArray();
QJsonArray jsonBoards = save[BOARDS_KEY].toArray();
QJsonArray jsonFilters = save[FILTERS_KEY].toArray();
QVector<Priority> priorities;
QVector<Status> statuses;
for (QJsonValueRef value : jsonPriorities)
{
priorities.append(Priority(value.toObject()));
}
for (QJsonValueRef value : jsonStatus)
{
status.append(Status(value.toObject()));
statuses.append(Status(value.toObject()));
}
for (QJsonValueRef value : jsonBoards)
{
@@ -412,35 +483,16 @@ void MainWindow::init()
{
filters.append(Filter(value.toObject()));
}
TaskStateService::getInstance()->updatePriorities(priorities);
TaskStateService::getInstance()->updateStatuses(statuses);
redrawFilterList();
redrawBoardList();
return;
}
}
this->priorities = defaultPriorities();
this->status = defaultStatus();
save();
}
QVector<Priority> MainWindow::defaultPriorities()
{
QVector<Priority> res;
res.append(Priority(QUuid::createUuid().toString(QUuid::WithoutBraces), "None", QColor(217, 217, 217)));
res.append(Priority(QUuid::createUuid().toString(QUuid::WithoutBraces), "Low", QColor(48, 157, 176)));
res.append(Priority(QUuid::createUuid().toString(QUuid::WithoutBraces), "Medium", QColor(176, 142, 48)));
res.append(Priority(QUuid::createUuid().toString(QUuid::WithoutBraces), "High", QColor(176, 67, 48)));
return res;
}
QVector<Status> MainWindow::defaultStatus()
{
QVector<Status> res;
res.append(Status(QUuid::createUuid().toString(QUuid::WithoutBraces), "To Do", QColor(143, 143, 143)));
res.append(Status(QUuid::createUuid().toString(QUuid::WithoutBraces), "Working on", QColor(95, 48, 176)));
res.append(Status(QUuid::createUuid().toString(QUuid::WithoutBraces), "Completed", QColor(48, 176, 73)));
return res;
}
QVector<Filter> MainWindow::defaultFilters()
{
QVector<Filter> res;
@@ -449,54 +501,42 @@ QVector<Filter> MainWindow::defaultFilters()
const QString MainWindow::getPriorityLabel(QString uuid)
{
QString res = "";
foreach (Priority p, priorities)
std::optional<Priority> p = TaskStateService::getInstance()->getPriorityByUUID(uuid);
if (p.has_value())
{
if (p.getUUID() == uuid)
{
res = p.getName();
return p.value().getName();
}
}
return res;
return "";
}
const QString MainWindow::getStatusLabel(QString uuid)
{
QString res = "";
foreach (Status s, status)
std::optional<Status> s = TaskStateService::getInstance()->getStatusByUUID(uuid);
if (s.has_value())
{
if (s.getUUID() == uuid)
{
res = s.getName();
return s.value().getName();
}
}
return res;
return "";
}
const QColor MainWindow::getPriorityColor(QString uuid, QColor defaultColor)
{
QColor color = defaultColor;
foreach (Priority p, priorities)
std::optional<Priority> p = TaskStateService::getInstance()->getPriorityByUUID(uuid);
if (p.has_value())
{
if (p.getUUID() == uuid)
{
color = p.getColor();
return p.value().getColor();
}
}
return color;
return defaultColor;
}
const QColor MainWindow::getStatusColor(QString uuid, QColor defaultColor)
{
QColor color = defaultColor;
foreach (Status s, status)
std::optional<Status> s = TaskStateService::getInstance()->getStatusByUUID(uuid);
if (s.has_value())
{
if (s.getUUID() == uuid)
{
color = s.getColor();
return s.value().getColor();
}
}
return color;
return defaultColor;
}
const QJsonDocument MainWindow::getJsonSave()
@@ -504,18 +544,24 @@ const QJsonDocument MainWindow::getJsonSave()
QJsonDocument doc;
QJsonObject obj;
QJsonArray jsonPriorities;
foreach (Priority p, this->priorities) {
QJsonArray jsonStatus;
QJsonArray jsonBoards;
QJsonArray jsonFilters;
QVector<Priority> priorities = TaskStateService::getInstance()->getPriorities();
foreach (Priority p, priorities) {
jsonPriorities.append(p.toJson());
}
QJsonArray jsonStatus;
foreach (Status s, this->status) {
QVector<Status> statuses = TaskStateService::getInstance()->getStatuses();
foreach (Status s, statuses) {
jsonStatus.append(s.toJson());
}
QJsonArray jsonBoards;
foreach (Board *b, this->boards) {
jsonBoards.append(b->toJson());
}
QJsonArray jsonFilters;
foreach (Filter f, this->filters)
{
jsonFilters.append(f.toJson());
@@ -651,6 +697,13 @@ void MainWindow::redrawTaskTree()
if (selectedBoardIndex > -1)
{
Board *b = boards[selectedBoardIndex];
std::optional<Status> boardStatus = TaskStateService::getInstance()->getStatusByUUID(b->getStatus());
if (boardStatus.has_value())
{
ui->boardStatus->setStyleSheet(Tools::getStatusLabelStylesheet(boardStatus.value()));
ui->boardStatus->setText(boardStatus.value().getName());
ui->boardStatus->setVisible(true);
}
foreach (Task *t, b->getTasks())
{
QTreeWidgetItem *item = new QTreeWidgetItem();
@@ -669,6 +722,23 @@ void MainWindow::redrawTaskTree()
ui->taskList->addTopLevelItem(item);
}
}
redrawBoardStatus();
}
void MainWindow::redrawBoardStatus()
{
ui->boardStatus->setVisible(false);
if (selectedBoardIndex > -1)
{
Board *b = boards[selectedBoardIndex];
std::optional<Status> boardStatus = TaskStateService::getInstance()->getStatusByUUID(b->getStatus());
if (boardStatus.has_value())
{
ui->boardStatus->setStyleSheet(Tools::getStatusLabelStylesheet(boardStatus.value()));
ui->boardStatus->setText(boardStatus.value().getName());
ui->boardStatus->setVisible(true);
}
}
}
void MainWindow::save()

3
src/frames/mainwindow.h
View File

@@ -57,8 +57,6 @@ private:
QVector<Task*> filterResult;
QVector<Priority> priorities;
QVector<Status> status;
QVector<Board*> boards;
QVector<Filter> filters;
@@ -80,6 +78,7 @@ private:
void redrawBoardList();
void redrawFilterList();
void redrawTaskTree();
void redrawBoardStatus();
void save();
};
#endif // MAINWINDOW_H

42
src/frames/mainwindow.ui
View File

@@ -24,7 +24,7 @@
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<item row="4" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
@@ -52,6 +52,9 @@
<height>250</height>
</size>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@@ -87,6 +90,10 @@
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label">
<property name="font">
@@ -106,6 +113,39 @@
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="boardStatus">
<property name="minimumSize">
<size>
<width>100</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>24</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">border-color: rgb(87, 227, 137);
border: solid;
background-color: rgb(87, 227, 137);
border-radius: 4px;
color: white;</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTreeWidget" name="taskList">
<property name="alternatingRowColors">

57
src/frames/prefdialog.cpp
View File

@@ -5,13 +5,15 @@
#include <QUuid>
#include "../tools.h"
#include "../services/taskstateservice.h"
PrefDialog::PrefDialog(QVector<Status> status, QVector<Priority> priorities, QWidget *parent) :
PrefDialog::PrefDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::PrefDialog)
{
ui->setupUi(this);
QVector<Status> status = TaskStateService::getInstance()->getStatuses();
foreach (Status s, status)
{
QListWidgetItem *item = new QListWidgetItem(s.getName());
@@ -20,6 +22,7 @@ PrefDialog::PrefDialog(QVector<Status> status, QVector<Priority> priorities, QWi
ui->statusListWidget->addItem(item);
}
QVector<Priority> priorities = TaskStateService::getInstance()->getPriorities();
foreach (Priority p, priorities)
{
QListWidgetItem *item = new QListWidgetItem(p.getName());
@@ -38,6 +41,8 @@ PrefDialog::PrefDialog(QVector<Status> status, QVector<Priority> priorities, QWi
connect(ui->namePriorityEdit, &QLineEdit::textEdited, this, &PrefDialog::onNameChange);
connect(ui->removeStatusButton, &QPushButton::clicked, this, &PrefDialog::onRemoveStatusButtonClick);
connect(ui->removePriorityButton, &QPushButton::clicked, this, &PrefDialog::onRemovePriorityButtonClick);
connect(ui->upStatus, &QPushButton::clicked, this, &PrefDialog::onUpStatusButtonClick);
connect(ui->downStatus, &QPushButton::clicked, this, &PrefDialog::onDownStatusButtonClick);
}
PrefDialog::~PrefDialog()
@@ -113,6 +118,16 @@ void PrefDialog::onItemSelectionChange(int index)
colorBtn = ui->colorStatusButton;
nameEdit = ui->nameStatusEdit;
colorEdit = ui->colorStatusEdit;
if (index > -1)
{
ui->downStatus->setEnabled((index > 0));
ui->upStatus->setEnabled((index < statusUUIDRef.size()-1));
}
else
{
ui->downStatus->setEnabled(false);
ui->upStatus->setEnabled(false);
}
}
else
{
@@ -208,6 +223,46 @@ void PrefDialog::onRemovePriorityButtonClick()
priorityUUIDRef.removeAt(index);
}
void PrefDialog::onUpStatusButtonClick()
{
if (ui->statusListWidget->selectedItems().size() != 1)
{
return;
}
int i = ui->statusListWidget->indexFromItem(ui->statusListWidget->selectedItems()[0]).row();
if (i < statusUUIDRef.size())
{
QListWidgetItem *item = ui->statusListWidget->takeItem(i);
i++;
ui->statusListWidget->insertItem(i, item);
statusUUIDRef.move(i-1, i);
ui->downStatus->setEnabled((i > 0));
ui->upStatus->setEnabled((i < statusUUIDRef.size()-1));
ui->statusListWidget->setCurrentRow(i);
}
}
void PrefDialog::onDownStatusButtonClick()
{
if (ui->statusListWidget->selectedItems().size() != 1)
{
return;
}
int i = ui->statusListWidget->indexFromItem(ui->statusListWidget->selectedItems()[0]).row();
if (i > 0)
{
QListWidgetItem *item = ui->statusListWidget->takeItem(i);
i--;
ui->statusListWidget->insertItem(i, item);
statusUUIDRef.move(i+1, i);
ui->downStatus->setEnabled((i > 0));
ui->upStatus->setEnabled((i < statusUUIDRef.size()-1));
ui->statusListWidget->setCurrentRow(i);
}
}
void PrefDialog::setItemColor(QListWidgetItem *item, QColor bgColor)
{
QColor fgColor = Tools::getForegroundColor(bgColor);

5
src/frames/prefdialog.h
View File

@@ -17,7 +17,7 @@ class PrefDialog : public QDialog
Q_OBJECT
public:
explicit PrefDialog(QVector<Status> status, QVector<Priority> priorities, QWidget *parent = nullptr);
explicit PrefDialog(QWidget *parent = nullptr);
~PrefDialog();
QVector<Priority> getPriorities();
@@ -31,7 +31,8 @@ private slots:
void onNameChange();
void onRemoveStatusButtonClick();
void onRemovePriorityButtonClick();
void onUpStatusButtonClick();
void onDownStatusButtonClick();
private:
Ui::PrefDialog *ui;

36
src/frames/prefdialog.ui
View File

@@ -150,7 +150,7 @@
<x>570</x>
<y>310</y>
<width>41</width>
<height>32</height>
<height>21</height>
</rect>
</property>
<property name="text">
@@ -166,13 +166,45 @@
<x>520</x>
<y>310</y>
<width>41</width>
<height>31</height>
<height>21</height>
</rect>
</property>
<property name="text">
<string>-</string>
</property>
</widget>
<widget class="QPushButton" name="downStatus">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>310</y>
<width>41</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Down</string>
</property>
</widget>
<widget class="QPushButton" name="upStatus">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry">
<rect>
<x>70</x>
<y>310</y>
<width>41</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Up</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">

96
src/frames/taskdialog.cpp
View File

@@ -3,48 +3,28 @@
#include <QDate>
TaskDialog::TaskDialog(QVector<Status> status, QVector<Priority> priorities, QWidget *parent) :
#include "../services/taskstateservice.h"
TaskDialog::TaskDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::TaskDialog)
{
ui->setupUi(this);
init();
this->setWindowTitle("New task");
this->status = status;
this->priorities = priorities;
foreach (Status s, this->status)
{
ui->statusCombo->addItem(s.getName());
}
foreach (Priority p, this->priorities)
{
ui->priorityCombo->addItem(p.getName());
}
QDate expectedFor = QDate::currentDate();
expectedFor = expectedFor.addDays(10);
ui->expectedForEdit->setDate(expectedFor);
}
TaskDialog::TaskDialog(Task *t, QVector<Status> status, QVector<Priority> priorities, QWidget *parent) :
TaskDialog::TaskDialog(Task *t, QWidget *parent) :
QDialog(parent),
ui(new Ui::TaskDialog)
{
ui->setupUi(this);
init();
this->setWindowTitle("Edit task");
this->status = status;
this->priorities = priorities;
foreach (Status s, this->status)
{
ui->statusCombo->addItem(s.getName());
}
foreach (Priority p, this->priorities)
{
ui->priorityCombo->addItem(p.getName());
}
// set fields
ui->nameEdit->setText(t->getTitle());
@@ -53,34 +33,12 @@ TaskDialog::TaskDialog(Task *t, QVector<Status> status, QVector<Priority> priori
if (t->getPriorityUUID().length() > 0)
{
int16_t refindex = -1;
for (uint16_t i = 0; i < this->priorities.count(); i++)
{
if (this->priorities[i].getUUID() == t->getPriorityUUID())
{
refindex = i;
}
}
if (refindex > -1)
{
ui->priorityCombo->setCurrentIndex(refindex);
}
initSelectionCombobox(t->getPriorityUUID(), ui->priorityCombo);
}
if (t->getStatusUUID().length() > 0)
{
int16_t refindex = -1;
for (uint16_t i = 0; i < this->status.count(); i++)
{
if (this->status[i].getUUID() == t->getStatusUUID())
{
refindex = i;
}
}
if (refindex > -1)
{
ui->statusCombo->setCurrentIndex(refindex);
}
initSelectionCombobox(t->getStatusUUID(), ui->statusCombo);
}
}
@@ -96,16 +54,42 @@ Task TaskDialog::getTask()
QString description = ui->descriptionEdit->toMarkdown(QTextDocument::MarkdownFeature::MarkdownDialectCommonMark);
QDate expectedFor = ui->expectedForEdit->date();
QString priorityUUID = "";
if (ui->priorityCombo->currentIndex() > -1)
if (!ui->priorityCombo->currentData().isNull())
{
Priority priority = priorities[ui->priorityCombo->currentIndex()];
priorityUUID = priority.getUUID();
priorityUUID = ui->priorityCombo->currentData().toString();
}
QString statusUUID = "";
if (ui->statusCombo->currentIndex() > -1)
if (!ui->statusCombo->currentData().isNull())
{
Status s = status[ui->statusCombo->currentIndex()];
statusUUID = s.getUUID();
statusUUID = ui->statusCombo->currentData().toString();
}
return Task(title, description, expectedFor, priorityUUID, statusUUID);
}
void TaskDialog::init()
{
QVector<Status> statuses = TaskStateService::getInstance()->getStatuses();
QVector<Priority> priorities = TaskStateService::getInstance()->getPriorities();
foreach (Status s, statuses)
{
ui->statusCombo->addItem(s.getName(), s.getUUID());
}
foreach (Priority p, priorities)
{
ui->priorityCombo->addItem(p.getName(), p.getUUID());
}
}
void TaskDialog::initSelectionCombobox(QString uuid, QComboBox *cbx)
{
for (uint16_t i = 0; i < cbx->count(); i++)
{
if (cbx->itemData(i).toString() == uuid)
{
cbx->setCurrentIndex(i);
break;
}
}
}

9
src/frames/taskdialog.h
View File

@@ -3,6 +3,7 @@
#include <QDialog>
#include <QVector>
#include <QComboBox>
#include "../models/status.h"
#include "../models/priority.h"
@@ -17,8 +18,8 @@ class TaskDialog : public QDialog
Q_OBJECT
public:
explicit TaskDialog(QVector<Status>, QVector<Priority>, QWidget *parent = nullptr);
TaskDialog(Task*, QVector<Status>, QVector<Priority>, QWidget *parent = nullptr);
explicit TaskDialog(QWidget *parent = nullptr);
TaskDialog(Task *t, QWidget *parent = nullptr);
~TaskDialog();
Task getTask();
@@ -26,8 +27,8 @@ public:
private:
Ui::TaskDialog *ui;
QVector<Status> status;
QVector<Priority> priorities;
void init();
void initSelectionCombobox(QString uuid, QComboBox *cbx);
};
#endif // TASKDIALOG_H

46
src/models/board.cpp
View File

@@ -4,11 +4,15 @@
#define TASKS_KEY "tasks"
#define UUID_KEY "uuid"
#define DESCRIPTION_KEY "description"
#define AUTOSTATUS_KEY "auto_status"
#define STATUS_KEY "status"
#include <QJsonArray>
#include <QJsonValue>
#include <QUuid>
#include "../services/taskstateservice.h"
Board::Board(QString name, QString description)
{
QUuid uuid = QUuid::createUuid();
@@ -23,6 +27,8 @@ Board::Board(QJsonObject obj)
this->uuid = obj[UUID_KEY].toString(uuid.toString(QUuid::WithoutBraces));
this->name = obj[NAME_KEY].toString("!Missing name!");
this->description = obj[DESCRIPTION_KEY].toString("");
this->autoStatus = obj[AUTOSTATUS_KEY].toBool(true);
this->statusUUID = obj[STATUS_KEY].toString();
QJsonArray jsonTasks = obj[TASKS_KEY].toArray();
foreach (QJsonValue value, jsonTasks) {
Task *t = new Task(value.toObject());
@@ -54,6 +60,32 @@ const QString Board::getDescription()
return description;
}
const QString Board::getStatus()
{
if (autoStatus)
{
TaskStateService *tss = TaskStateService::getInstance();
int16_t h = -1;
QString suuid = "";
for (Task *t : tasks)
{
int16_t w = tss->getStatusWeight(t->getStatusUUID());
if (w > -1 && h < w)
{
h = w;
suuid = t->getStatusUUID();
}
}
return suuid;
}
return statusUUID;
}
bool Board::isAutoStatus()
{
return autoStatus;
}
void Board::setName(const QString name)
{
this->name = name;
@@ -64,6 +96,18 @@ void Board::setDescription(const QString description)
this->description = description;
}
void Board::setDirtyStatus(Status s)
{
this->autoStatus = false;
this->statusUUID = s.getUUID();
}
void Board::removeDirtyStatus()
{
this->autoStatus = true;
this->statusUUID = "";
}
void Board::add(Task t)
{
tasks.append(new Task(t));
@@ -100,6 +144,8 @@ const QJsonObject Board::toJson()
QJsonObject obj;
obj[NAME_KEY] = this->name;
obj[UUID_KEY] = this->uuid;
obj[STATUS_KEY] = this->statusUUID;
obj[AUTOSTATUS_KEY] = this->autoStatus;
obj[TASKS_KEY] = array;
obj[DESCRIPTION_KEY] = description;
return obj;

11
src/models/board.h
View File

@@ -6,6 +6,7 @@
#include <QJsonObject>
#include "task.h"
#include "status.h"
class Board
{
@@ -17,10 +18,17 @@ public:
const QString getUuid();
const QString getName();
const QString getDescription();
const QString getStatus();
bool isAutoStatus();
void setName(const QString name);
void setDescription(const QString description);
void setDirtyStatus(Status s);
void removeDirtyStatus();
void add(Task);
void remove(uint16_t index);
Task *taskAt(uint16_t);
const QVector<Task*> getTasks();
@@ -32,6 +40,9 @@ private:
QString name;
QString description;
QString statusUUID;
bool autoStatus;
};
#endif // BOARD_H

80
src/services/taskstateservice.cpp Normal file
View File

@@ -0,0 +1,80 @@
#include "taskstateservice.h"
TaskStateService *TaskStateService::instance = nullptr;
TaskStateService *TaskStateService::getInstance()
{
if (instance == nullptr)
{
instance = new TaskStateService();
}
return instance;
}
void TaskStateService::updateStatuses(QVector<Status> statuses)
{
this->statuses = statuses;
}
void TaskStateService::updatePriorities(QVector<Priority> priorities)
{
this->priorities = priorities;
}
QVector<Status> TaskStateService::getStatuses()
{
return statuses;
}
QVector<Priority> TaskStateService::getPriorities()
{
return priorities;
}
std::optional<Status> TaskStateService::getStatusByUUID(QString uuid)
{
foreach (Status s, statuses) {
if (s.getUUID() == uuid)
{
return std::optional{s};
}
}
return std::nullopt;
}
std::optional<Priority> TaskStateService::getPriorityByUUID(QString uuid)
{
foreach (Priority p, priorities) {
if (p.getUUID() == uuid)
{
return std::optional{p};
}
}
return std::nullopt;
}
int16_t TaskStateService::getStatusWeight(QString uuid)
{
int16_t weight = -1;
for (uint16_t i = 0; i < statuses.count(); i++)
{
if (statuses[i].getUUID() == uuid)
{
weight = i;
break;
}
}
return weight;
}
TaskStateService::TaskStateService()
{
priorities.append(Priority(QUuid::createUuid().toString(QUuid::WithoutBraces), "None", QColor(217, 217, 217)));
priorities.append(Priority(QUuid::createUuid().toString(QUuid::WithoutBraces), "Low", QColor(48, 157, 176)));
priorities.append(Priority(QUuid::createUuid().toString(QUuid::WithoutBraces), "Medium", QColor(176, 142, 48)));
priorities.append(Priority(QUuid::createUuid().toString(QUuid::WithoutBraces), "High", QColor(176, 67, 48)));
statuses.append(Status(QUuid::createUuid().toString(QUuid::WithoutBraces), "To Do", QColor(143, 143, 143)));
statuses.append(Status(QUuid::createUuid().toString(QUuid::WithoutBraces), "Working on", QColor(95, 48, 176)));
statuses.append(Status(QUuid::createUuid().toString(QUuid::WithoutBraces), "Completed", QColor(48, 176, 73)));
}

33
src/services/taskstateservice.h Normal file
View File

@@ -0,0 +1,33 @@
#ifndef TASKSTATESERVICE_H
#define TASKSTATESERVICE_H
#include <QVector>
#include "../models/priority.h"
#include "../models/status.h"
class TaskStateService
{
public:
static TaskStateService *getInstance();
void updateStatuses(QVector<Status>);
void updatePriorities(QVector<Priority>);
QVector<Status> getStatuses();
QVector<Priority> getPriorities();
std::optional<Status> getStatusByUUID(QString);
std::optional<Priority> getPriorityByUUID(QString);
int16_t getStatusWeight(QString uuid);
private:
TaskStateService();
static TaskStateService *instance;
QVector<Priority> priorities;
QVector<Status> statuses;
};
#endif // TASKSTATESERVICE_H

13
src/tools.cpp
View File

@@ -8,6 +8,8 @@
#include <QStandardPaths>
#include <QDir>
#include "services/taskstateservice.h"
Tools::Tools()
{
@@ -95,3 +97,14 @@ bool Tools::readSaveFile(QJsonDocument &doc) {
doc = QJsonDocument::fromJson(json.toUtf8());
return true;
}
const QString Tools::getStatusLabelStylesheet(Status status)
{
QColor bg = status.getColor();
QColor fg = Tools::getForegroundColor(bg);
return QString("border-color: %1; \
border: solid; \
background-color: %1; \
border-radius: 4px; \
color: %2;").arg(bg.name(QColor::HexRgb), fg.name(QColor::HexRgb));
}

3
src/tools.h
View File

@@ -4,6 +4,8 @@
#include <QColor>
#include <QJsonDocument>
#include "models/status.h"
class Tools
{
public:
@@ -14,6 +16,7 @@ public:
static bool isSaveFileExist();
static bool writeSaveToFile(QJsonDocument doc);
static bool readSaveFile(QJsonDocument &doc);
static const QString getStatusLabelStylesheet(Status);
private:
static const QString getSaveFilePath();