medvedych/harbour-nextcloudnotes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Worked on C++ implementation of the model.

Browse source
This commit is contained in:
Scharel Clemens 2019-01-06 11:35:28 +01:00
parent 72f3b3f44c
commit 6419b45f52
2 changed files with 59 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/notesmodel.cpp
View file

@ -26,9 +26,20 @@ struct Note {
QString etag;
bool error;
QString errorMessage;
bool operator==(const Note& n) {
bool operator==(const Note& n) const {
return id == n.id;
}
bool equal(const Note& n) const {
return id == n.id &&
modified == n.modified &&
title == n.title &&
category == n.category &&
content == n.content &&
favorite == n.favorite &&
etag == n.etag &&
error == n.error &&
errorMessage == n.errorMessage;
}
enum SearchAttribute {
NoSearchAttribute = 0x0,
SearchInTitle = 0x1,
@ -50,16 +61,16 @@ struct Note {
note.errorMessage = jobj.value(noteRoles[NotesModel::errorMessageRole]).toString();
return note;
}
static bool searchInNote(const QString &query, const Note &note, SearchAttributes criteria = QFlag(SearchAll)) {
static bool searchInNote(const QString &query, const Note &note, SearchAttributes criteria = QFlag(SearchAll), Qt::CaseSensitivity cs = Qt::CaseInsensitive) {
bool queryFound = false;
if (criteria.testFlag(SearchInTitle)) {
queryFound |= note.title.contains(query, Qt::CaseInsensitive);
queryFound |= note.title.contains(query, cs);
}
if (criteria.testFlag(SearchInContent)) {
queryFound |= note.content.contains(query, Qt::CaseInsensitive);
queryFound |= note.content.contains(query, cs);
}
if (criteria.testFlag(SearchInCategory)) {
queryFound |= note.category.contains(query, Qt::CaseInsensitive);
queryFound |= note.category.contains(query, cs);
}
return queryFound;
}
@ -68,8 +79,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Note::SearchAttributes)
NotesModel::NotesModel(QObject *parent) : QAbstractListModel(parent)
{
m_sortBy = sortByDate;
m_favoritesOnTop = true;
m_sortBy = noSorting;
m_favoritesOnTop = false;
}
NotesModel::~NotesModel() {
@ -77,7 +88,7 @@ NotesModel::~NotesModel() {
}
void NotesModel::setSortBy(int sortBy) {
if (sortBy != m_sortBy) {
if (sortBy != m_sortBy && sortBy > 0 && sortBy <= noSorting) {
m_sortBy = sortBy;
sort();
emit sortByChanged(m_sortBy);
@ -109,7 +120,7 @@ bool NotesModel::applyJSON(QString json, bool replaceIfArray) {
if (!jobj.isEmpty() && !jobj.value(noteRoles[errorRole]).toBool(true)) {
Note note = Note::fromjson(jobj);
int position = indexOf(note.id);
if (position >= 0) {
if (position >= 0 && replaceIfArray) {
m_notes[position].note = note;
emit dataChanged(index(position), index(position));
notesToRemove.removeAt(position);
@ -147,7 +158,7 @@ bool NotesModel::applyJSON(QString json, bool replaceIfArray) {
Note note;
note.fromjson(jobj);
int position = indexOf(note.id);
if (position >= 0) {
if (position >= 0 && replaceIfArray) {
m_notes[position].note = note;
}
else {
@ -169,12 +180,28 @@ bool NotesModel::applyJSON(QString json, bool replaceIfArray) {
}
bool NotesModel::removeNote(int id) {
// TODO
return false;
bool noteRemoved = false;
int index = indexOf(id);
while (index >= 0) {
beginRemoveRows(QModelIndex(), index, index);
m_notes.removeAt(index);
endRemoveRows();
noteRemoved = true;
index = indexOf(id);
}
return noteRemoved;
}
void NotesModel::search(QString query) {
m_searchQuery = query;
for (int i = 0; i < m_notes.size(); i++) {
if (m_searchQuery.isEmpty()) {
m_notes[i].param = true;
}
else {
m_notes[i].param = Note::searchInNote(m_searchQuery, m_notes[i].note);
}
}
}
void NotesModel::clearSearch() {
@ -212,15 +239,26 @@ QHash<int, QByteArray> NotesModel::sortingNames() const {
criteria[sortByDate] = "date";
criteria[sortByCategory] = "category";
criteria[sortByTitle] = "title";
criteria[noSorting] = "none";
return criteria;
}
Qt::ItemFlags NotesModel::flags(const QModelIndex &index) const {
return Qt::ItemIsEnabled | Qt::ItemIsEditable; // | Qt::ItemIsSelectable
if (index.isValid()) {
return Qt::ItemIsEnabled | Qt::ItemIsEditable; // | Qt::ItemIsSelectable
}
else {
return Qt::NoItemFlags;
}
}
int NotesModel::rowCount(const QModelIndex &parent) const {
return m_notes.size();
if (parent.isValid()) {
return 0;
}
else {
return m_notes.size();
}
}
QVariant NotesModel::data(const QModelIndex &index, int role) const {

13
src/notesmodel.h
View file

@ -52,12 +52,13 @@ public:
enum SortingCriteria {
sortByDate,
sortByCategory,
sortByTitle
sortByTitle,
noSorting
};
QHash<int, QByteArray> sortingNames() const;
Qt::ItemFlags flags(const QModelIndex &index) const;
virtual int rowCount(const QModelIndex &parent) const;
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
virtual QVariant data(const QModelIndex &index, int role) const;
//virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const;
virtual bool setData(const QModelIndex &index, const QVariant &value, int role);
@ -68,10 +69,6 @@ public:
//bool removeRows(int row, int count, const QModelIndex &parent);
protected:
bool noteLessThan(const Note &n1, const Note &n2) const;
/*static bool noteLessThanByDate(const Note &n1, const Note &n2);
static bool noteLessThanByCategory(const Note &n1, const Note &n2);
static bool noteLessThanByTitle(const Note &n1, const Note &n2);*/
signals:
void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int> ());
@ -87,6 +84,10 @@ private:
void sort();
void update();
int insertPosition(const Note &n) const;
bool noteLessThan(const Note &n1, const Note &n2) const;
/*static bool noteLessThanByDate(const Note &n1, const Note &n2);
static bool noteLessThanByCategory(const Note &n1, const Note &n2);
static bool noteLessThanByTitle(const Note &n1, const Note &n2);*/
};
#endif // NOTESMODEL_H