leca/checks-parser
leca
/
checks-parser
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 3 Wiki Activity

shitty table WIP

This commit is contained in:
leca 2025-05-22 01:32:39 +03:00
parent ca52ddf33c
commit c21166fc5b
12 changed files with 220 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -166,6 +166,7 @@ else()
${PROJECT_SOURCES}
${SOURCES}
widgets/checkqueuetablemodel.h widgets/checkqueuetablemodel.cpp
# widgets/checkqueuetableview.h widgets/checkqueuetableview.cpp
)
endif()

12
mainwindow.cpp
View File

@ -39,6 +39,8 @@ MainWindow::MainWindow(QWidget *parent)
model = new CheckQueueTableModel(&checks, this);
ui->checkQueueTable->setModel(model);
ui->checkQueueTable->viewport()->setAcceptDrops(true);
ui->checkQueueTable->setDragDropMode(QAbstractItemView::DragDrop);
// ui->
// connect(this, &MainWindow::deleteCheckFromList, this, &MainWindow::deleteCheckFromListHandler);
@ -236,15 +238,17 @@ void MainWindow::on_parse_button_clicked() {
// }
void MainWindow::on_add_new_check_button_clicked() {
Check *new_check = parse_new_check();
Check *new_check = new Check();/* parse_new_check();
if (new_check == nullptr) {
return;
}
}*/
new_check->set_date("123");
new_check->set_total(rand() * 1800);
checks.push_back(*new_check);
// checks.push_back(*new_check);
unsigned int newRowIndex = checks.size();
model->insertRow(newRowIndex, 1);
model->insertRows(newRowIndex, 1);
model->setData(model->index(newRowIndex, 0), QVariant::fromValue(new_check->get_date()));
model->setData(model->index(newRowIndex, 1), QVariant::fromValue(new_check->get_total()));

4
scenes/mainwindow.ui
View File

@ -209,13 +209,13 @@
<enum>QAbstractItemView::DragDropMode::InternalMove</enum>
</property>
<property name="defaultDropAction">
<enum>Qt::DropAction::TargetMoveAction</enum>
<enum>Qt::DropAction::MoveAction</enum>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SelectionMode::SingleSelection</enum>
<enum>QAbstractItemView::SelectionMode::MultiSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>

34
translations/en_US.ts
View File

@ -228,77 +228,77 @@
<translation type="vanished">checks parser</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="103"/>
<location filename="../mainwindow.cpp" line="105"/>
<source>QR code for binaryeye to connect</source>
<translation>QR code for binaryeye to connect</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="104"/>
<location filename="../mainwindow.cpp" line="106"/>
<source>I&apos;ve scanned</source>
<translation>I&apos;ve scanned</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="110"/>
<location filename="../mainwindow.cpp" line="112"/>
<source>Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn&apos;t lucky, please, contact the developer.</source>
<translation>Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn&apos;t lucky, please, contact the developer.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="112"/>
<location filename="../mainwindow.cpp" line="114"/>
<source>Could not start http server.</source>
<translation>Could not start http server.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="156"/>
<location filename="../mainwindow.cpp" line="158"/>
<source>Selected image: </source>
<translation>Selected image: </translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="189"/>
<location filename="../mainwindow.cpp" line="191"/>
<source>This feature is under development. Wait it to appear in next updates.</source>
<translation>This feature is under development. Wait for it to appear in next updates.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="191"/>
<location filename="../mainwindow.cpp" line="193"/>
<source>Under development</source>
<translation>Under development</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="203"/>
<location filename="../mainwindow.cpp" line="205"/>
<source>Please, add check(s) to parse</source>
<translation>Please, add check(s) to parse</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="205"/>
<location filename="../mainwindow.cpp" line="207"/>
<source>No checks to parse</source>
<translation>No checks to parse</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="292"/>
<location filename="../mainwindow.cpp" line="296"/>
<source>Captcha was not solved correctly!</source>
<translation>Captcha was not solved correctly!</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="294"/>
<location filename="../mainwindow.cpp" line="298"/>
<source>Captcha is incorrect</source>
<translation>Captcha is incorrect</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="299"/>
<location filename="../mainwindow.cpp" line="303"/>
<source>Internal server error. Please, try again later.</source>
<translation>Internal server error. Please, try again later.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="301"/>
<location filename="../mainwindow.cpp" line="305"/>
<source>Internal server error</source>
<translation>Internal server error</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="306"/>
<location filename="../mainwindow.cpp" line="310"/>
<source>Check not found. Please, ensure correctness of entered data.</source>
<translation>Check not found. Please, ensure correctness of entered data.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="308"/>
<location filename="../mainwindow.cpp" line="312"/>
<source>Check was not found</source>
<translation>Check was not found</translation>
</message>
@ -311,12 +311,12 @@
<translation type="vanished">Error in parsing</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="149"/>
<location filename="../mainwindow.cpp" line="151"/>
<source>Please, select a picture where QR code that contains info about check is present</source>
<translation>Please, select a picture where QR code that contains info about check is present</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="151"/>
<location filename="../mainwindow.cpp" line="153"/>
<source>Picture was not selected</source>
<translation>Picture was not selected</translation>
</message>

34
translations/ru_RU.ts
View File

@ -224,77 +224,77 @@
<translation type="vanished">Парсер чеков</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="103"/>
<location filename="../mainwindow.cpp" line="105"/>
<source>QR code for binaryeye to connect</source>
<translation>QR код для подключения BinaryEye</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="104"/>
<location filename="../mainwindow.cpp" line="106"/>
<source>I&apos;ve scanned</source>
<translation>Просканировал</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="110"/>
<location filename="../mainwindow.cpp" line="112"/>
<source>Could not start http server. 10 times in a row random port was occupied. Either you should run for a lottery ticket, or the problem is in the program. If the lottery ticket wasn&apos;t lucky, please, contact the developer.</source>
<translation>Не смог поднять HTTP сервер. 10 раз подряд случайно выбранный порт был занят. Либо Вам следует бежать за лоттерейным билетом, или в программе баг. Если лотерейный билет не был выигрышным, пожалуйста, сообщите разработчику.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="112"/>
<location filename="../mainwindow.cpp" line="114"/>
<source>Could not start http server.</source>
<translation>Не получилось запустить HTTP сервер.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="156"/>
<location filename="../mainwindow.cpp" line="158"/>
<source>Selected image: </source>
<translation>Выбранное изображение: </translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="189"/>
<location filename="../mainwindow.cpp" line="191"/>
<source>This feature is under development. Wait it to appear in next updates.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="191"/>
<location filename="../mainwindow.cpp" line="193"/>
<source>Under development</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="203"/>
<location filename="../mainwindow.cpp" line="205"/>
<source>Please, add check(s) to parse</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="205"/>
<location filename="../mainwindow.cpp" line="207"/>
<source>No checks to parse</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="292"/>
<location filename="../mainwindow.cpp" line="296"/>
<source>Captcha was not solved correctly!</source>
<translation>Капча была решена неверно!</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="294"/>
<location filename="../mainwindow.cpp" line="298"/>
<source>Captcha is incorrect</source>
<translation>Капча введена неверно</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="299"/>
<location filename="../mainwindow.cpp" line="303"/>
<source>Internal server error. Please, try again later.</source>
<translation>Внутренняя ошибка сервера. Пожалуйста, попробуйте снова позже.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="301"/>
<location filename="../mainwindow.cpp" line="305"/>
<source>Internal server error</source>
<translation>Внутренняя ошибка сервера</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="306"/>
<location filename="../mainwindow.cpp" line="310"/>
<source>Check not found. Please, ensure correctness of entered data.</source>
<translation>Чек не найден. Пожалуйста, убедитесь в правильности введённых данных.</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="308"/>
<location filename="../mainwindow.cpp" line="312"/>
<source>Check was not found</source>
<translation>Чек не найден</translation>
</message>
@ -307,12 +307,12 @@
<translation type="vanished">Ошибка в парсинге</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="149"/>
<location filename="../mainwindow.cpp" line="151"/>
<source>Please, select a picture where QR code that contains info about check is present</source>
<translation>Пожалуйста, выберете изображение, содержащее QR код с информацией о чеке</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="151"/>
<location filename="../mainwindow.cpp" line="153"/>
<source>Picture was not selected</source>
<translation>Изображение не было выбрано</translation>
</message>

8
utils/utils.cpp
View File

@ -181,9 +181,9 @@ std::vector<std::wstring> find_in_html(std::string& html, std::string regex, std
it != end; it++) {
std::wstring found_entry = from_utf8(it->str());
std::cout << "Found: " << to_utf8(found_entry) << std::endl;
// std::cout << "Found: " << to_utf8(found_entry) << std::endl;
std::wstring extracted = substring_from_to(found_entry, from_utf8(html_start), from_utf8(html_end));
std::cout << "Extracted: " << to_utf8(extracted) << std::endl;
// std::cout << "Extracted: " << to_utf8(extracted) << std::endl;
parsed.push_back(extracted);
}
return parsed;
@ -293,8 +293,8 @@ Check parseOfdRuAnswer(std::string html) {
Check c;
for (int i = 0; i < products.size(); i ++) {
std::cout << "Adding to check: ";
std::cout << to_utf8(products[i]) << " " << to_utf8(prices[i]) << " " << to_utf8(net_weights[i]) << " " << to_utf8(amounts[i]) << std::endl;
// std::cout << "Adding to check: ";
// std::cout << to_utf8(products[i]) << " " << to_utf8(prices[i]) << " " << to_utf8(net_weights[i]) << " " << to_utf8(amounts[i]) << std::endl;
Goods goods(to_utf8(products[i]), std::stod(prices[i]), to_utf8(net_weights[i]), std::stod(amounts[i]));
c.add_goods(goods);
}

114
widgets/checkqueuetablemodel.cpp
View File

@ -1,6 +1,7 @@
#include "checkqueuetablemodel.h"
#include <iostream>
#include <QMimeData>
#include <QIODevice>
CheckQueueTableModel::CheckQueueTableModel(std::vector<Check> *checks, QObject *parent)
: checks(checks), QAbstractTableModel{parent}
@ -10,8 +11,10 @@ int CheckQueueTableModel::rowCount(const QModelIndex &parent) const { return che
int CheckQueueTableModel::columnCount(const QModelIndex &parent) const { return 3; }
QVariant CheckQueueTableModel::data(const QModelIndex &index, int role) const {
if (!index.isValid() || index.row() >= checks->size())
return QVariant();
if (role != Qt::DisplayRole) return QVariant();
Check& c = (*checks).at(index.row());
Check& c = checks->at(index.row());
switch (index.column()) {
case 0:
return QVariant::fromValue(QString::fromStdString(c.get_date()));
@ -33,24 +36,16 @@ bool CheckQueueTableModel::setData(const QModelIndex &index, const QVariant &val
return false;
unsigned int row = index.row();
switch (index.column()) {
case 0:
case 0: {
checks->at(row).set_date(value.value<std::string>());
break;
case 1:
} case 1:
checks->at(row).set_total(value.value<double>());
break;
case 2:
// delete Button
break;
}
//for presentation purposes only: build and emit a joined string
// QString result = "dick";
// for (int row = 0; row < checks->size(); row++) {
// for (int col= 0; col < 3; col++)
// result += m_gridData[row][col] + ' ';
// }
// emit editCompleted(result);
return true;
}
return false;
@ -74,21 +69,100 @@ QVariant CheckQueueTableModel::headerData(int section, Qt::Orientation orientati
}
Qt::ItemFlags CheckQueueTableModel::flags(const QModelIndex &index) const {
Qt::ItemFlags defaultFlags = QAbstractTableModel::flags(index);
auto flags = QAbstractItemModel::flags(index);
if (index.isValid())
return Qt::ItemIsDragEnabled | defaultFlags;
flags |= Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled;
else
return Qt::ItemIsDropEnabled | defaultFlags;
// return Qt::ItemIsSelectable | QAbstractTableModel::flags(index);
flags |= Qt::ItemIsDropEnabled;
return flags;
}
bool CheckQueueTableModel::insertRow(int row, int count, const QModelIndex &parent) {
beginInsertRows(QModelIndex(), row, row+count-1);
Qt::DropActions CheckQueueTableModel::supportedDropActions() const {
return Qt::DropActions() | Qt::MoveAction;
}
for (int i = 0; i < count; ++i)
checks->emplace(checks->begin() + row, Check());
bool CheckQueueTableModel::insertRows(int position, int rows, const QModelIndex &index) {
beginInsertRows(QModelIndex(), position, position+rows-1);
for (int i = 0; i < rows; ++i)
checks->emplace(checks->begin() + position, Check());
endInsertRows();
return true;
}
bool CheckQueueTableModel::removeRows(int position, int rows, const QModelIndex &index) {
beginRemoveRows(QModelIndex(), position, position+rows-1);
for (int row = 0; row < rows; ++row)
checks->erase(std::next(checks->begin(), position));
endRemoveRows();
return true;
}
QStringList CheckQueueTableModel::mimeTypes() const {
QStringList types;
types << CheckQueueTableModel::MimeType;
return types;
}
bool CheckQueueTableModel::canDropMimeData(const QMimeData *data, Qt::DropAction action, int, int, const QModelIndex &) {
if (action != Qt::MoveAction || !data->hasFormat(CheckQueueTableModel::MimeType))
return false;
return true;
}
QMimeData* CheckQueueTableModel::mimeData(const QModelIndexList &indexes) const {
QMimeData* mimeData = new QMimeData;
QByteArray encodedData;
QDataStream stream(&encodedData, QIODevice::WriteOnly);
for (const QModelIndex &i : indexes) {
if (i.isValid() && i.column() == 0) {
QString date = data(i, Qt::DisplayRole).toString();
double total = data(index(i.row(), i.column() + 1), Qt::DisplayRole).toDouble();
stream << date << total;
}
}
mimeData->setData(CheckQueueTableModel::MimeType, encodedData);
return mimeData;
}
bool CheckQueueTableModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) {
if (!canDropMimeData(data, action, row, column, parent))
return false;
if (action == Qt::IgnoreAction)
return true;
else if (action != Qt::MoveAction)
return false;
QByteArray encodedData = data->data(CheckQueueTableModel::MimeType);
QDataStream stream(&encodedData, QIODevice::ReadOnly);
std::vector<Check> newItems;
int rows = 0;
while (!stream.atEnd()) {
QString date;
double total;
stream >> date >> total;
Check c;
c.set_date(date.toStdString());
c.set_total(total);
newItems.push_back(c);
++rows;
}
insertRows(row, rows, QModelIndex());
for (Check &c : newItems) {
QModelIndex date_index = index(row, 0, QModelIndex());
QModelIndex total_index = index(row, 1, QModelIndex());
setData(date_index, QVariant::fromValue(c.get_date()), Qt::EditRole);
setData(total_index, QVariant::fromValue(c.get_total()), Qt::EditRole);
row++;
}
return true;
}

11
widgets/checkqueuetablemodel.h
View File

@ -8,6 +8,7 @@
class CheckQueueTableModel : public QAbstractTableModel
{
Q_OBJECT
static constexpr const char* MimeType = "application/check.queue.model";
public:
explicit CheckQueueTableModel(std::vector<Check> *checks, QObject *parent = nullptr);
@ -19,8 +20,16 @@ public:
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
Qt::DropActions supportedDropActions() const override;
bool insertRow(int row, int count, const QModelIndex &parent = QModelIndex());
// bool insertRow(int row, int count, const QModelIndex &parent = QModelIndex());
bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex()) override;
bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex()) override;
QStringList mimeTypes() const override;
bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int, int, const QModelIndex &);
QMimeData* mimeData(const QModelIndexList &indexes) const override;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
private:
std::vector<Check> *checks;
signals:

47
widgets/checkqueuetableview.cpp Normal file
View File

@ -0,0 +1,47 @@
#include "checkqueuetableview.h"
CheckQueueTableView::CheckQueueTableView(QWidget *parent)
: QTableView(parent), m_dropRow(0) {
setSelectionMode(QAbstractItemView::SingleSelection);
setSelectionBehavior(QAbstractItemView::SelectRows);
setDragEnabled(true);
setAcceptDrops(true);
setDragDropMode(QAbstractItemView::DragDrop);
setDefaultDropAction(Qt::MoveAction);
setDragDropOverwriteMode(false);
setDropIndicatorShown(true);
}
int CheckQueueTableView::selectedRow() const {
QItemSelectionModel *selection = selectionModel();
return selection->hasSelection() ? selection->selectedRows().front().row() : -1;
}
void CheckQueueTableView::reset() {
QTableView::reset();
QObject::connect(model(), &QAbstractTableModel::rowsInserted, this, [this](const QModelIndex &parent, int first, int last) {
Q_UNUSED(parent)
Q_UNUSED(last)
m_dropRow = first;
});
}
void CheckQueueTableView::dropEvent(QDropEvent *e) {
if (e->source() != this || e->dropAction() != Qt::MoveAction)
return;
int dragRow = selectedRow();
QTableView::dropEvent(e); // m_dropRow is set by inserted row
if (m_dropRow > dragRow)
--m_dropRow;
QMetaObject::invokeMethod(this,
std::bind(&CheckQueueTableView::selectRow, this, m_dropRow),
Qt::QueuedConnection); // Postpones selection
}

19
widgets/checkqueuetableview.h Normal file
View File

@ -0,0 +1,19 @@
#ifndef CHECKQUEUETABLEVIEW_H
#define CHECKQUEUETABLEVIEW_H
#include <QTableView>
#include <QDropEvent>
class CheckQueueTableView : public QTableView
{
Q_OBJECT
int m_dropRow;
public:
CheckQueueTableView(QWidget *parent = nullptr);
Q_INVOKABLE int selectedRow() const;
void reset();
void dropEvent(QDropEvent *e);
};
#endif // CHECKQUEUETABLEVIEW_H

6
widgets/outputcolumnmodel.cpp
View File

@ -77,12 +77,6 @@ bool OutputColumnModel::removeRows(int position, int rows, const QModelIndex &pa
return true;
}
QStringList OutputColumnModel::mimeTypes() const {
QStringList types;
types << OutputColumnModel::MimeType;
return types;
}
bool OutputColumnModel::canDropMimeData(const QMimeData *data, Qt::DropAction action, int, int, const QModelIndex &) {
if ( action != Qt::MoveAction || !data->hasFormat(OutputColumnModel::MimeType))
return false;

2
widgets/outputcolumnmodel.h
View File

@ -28,7 +28,7 @@ public:
bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex()) override;
bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex()) override;
QStringList mimeTypes() const override;
// QStringList mimeTypes() const override;
bool canDropMimeData(const QMimeData *, Qt::DropAction, int, int, const QModelIndex&);
QMimeData* mimeData(const QModelIndexList &indexes) const;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);