implement new pagination

apinprastya · Oct 13, 2019 · 47862cc · 47862cc
1 parent 525af1e
commit 47862cc
Show file tree

Hide file tree

Showing 114 changed files with 655 additions and 324 deletions.
diff --git a/libdb/db.cpp b/libdb/db.cpp
@@ -449,6 +449,7 @@ bool Db::truncateTable(const QString &table)
  } else {
  this->exec(QString("TRUNCATE TABLE %1").arg(table));
  }
+ return true;
 }
 
 QSqlDatabase Db::getDatabase()

diff --git a/libgui/about/aboutdialog.h b/libgui/about/aboutdialog.h
@@ -33,7 +33,7 @@ class AboutDialog : public QDialog
  Q_OBJECT
 
 public:
- AboutDialog(QWidget *parent = 0);
+ AboutDialog(QWidget *parent = nullptr);
  ~AboutDialog();
 
 private:

diff --git a/libgui/about/autoupdatedialog.h b/libgui/about/autoupdatedialog.h
@@ -36,7 +36,7 @@ class AutoUpdateDialog : public QDialog
  Q_OBJECT
 
 public:
- AutoUpdateDialog(QWidget *parent = 0);
+ AutoUpdateDialog(QWidget *parent = nullptr);
  ~AutoUpdateDialog();
 
 protected:

diff --git a/libgui/admin/browserdialog.h b/libgui/admin/browserdialog.h
@@ -43,7 +43,7 @@ class BrowserDialog : public QDialog
  Q_OBJECT
 
 public:
- BrowserDialog(QWidget *parent = 0);
+ BrowserDialog(QWidget *parent = nullptr);
  ~BrowserDialog();
  void setUrl(const QUrl &url);
 

diff --git a/libgui/admin/importexportdatabasedialog.h b/libgui/admin/importexportdatabasedialog.h
@@ -40,7 +40,7 @@ class ImportExportDatabaseDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- ImportExportDatabaseDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ ImportExportDatabaseDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~ImportExportDatabaseDialog();
 
 protected:

diff --git a/libgui/admin/listdialog.h b/libgui/admin/listdialog.h
@@ -33,7 +33,7 @@ class ListDialog : public QDialog
  Q_OBJECT
 
 public:
- ListDialog(QWidget *parent = 0);
+ ListDialog(QWidget *parent = nullptr);
  ~ListDialog();
  void fill(const QJsonArray &arr);
  inline QString getSelectedId() { return mSelectedId; }

diff --git a/libgui/bank/bankadddialog.h b/libgui/bank/bankadddialog.h
@@ -34,7 +34,7 @@ class BankAddDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- BankAddDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ BankAddDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~BankAddDialog();
  void reset();
  void fill(const QVariantMap &data);

diff --git a/libgui/bank/bankwidget.cpp b/libgui/bank/bankwidget.cpp
@@ -59,7 +59,7 @@ BankWidget::BankWidget(LibG::MessageBus *bus, QWidget *parent) :
  model->refresh();
  connect(mTableWidget, SIGNAL(addClicked()), SLOT(addClicked()));
  connect(mTableWidget, SIGNAL(updateClicked(QModelIndex)), SLOT(updateClicked(QModelIndex)));
- connect(mTableWidget, SIGNAL(deleteClicked(QModelIndex)), SLOT(deleteClicked(QModelIndex)));
+ connect(mTableWidget, SIGNAL(deleteClicked(QModelIndexList)), SLOT(deleteClicked(QModelIndexList)));
 }
 
 void BankWidget::messageReceived(LibG::Message *msg)
@@ -91,14 +91,17 @@ void BankWidget::updateClicked(const QModelIndex &index)
  mTableWidget->getModel()->refresh();
 }
 
-void BankWidget::deleteClicked(const QModelIndex &index)
+void BankWidget::deleteClicked(const QModelIndexList &index)
 {
- if(!index.isValid()) return;
- auto item = static_cast<TableItem*>(index.internalPointer());
- int ret = QMessageBox::question(this, tr("Delete Confirmation"), tr("Are you sure to delete the bank?"));
+ int ret = QMessageBox::question(this, tr("Delete Confirmation"), tr("Are you sure to delete selected the bank?"));
  if(ret == QMessageBox::Yes) {
+ QList<QVariant> ids;
+ for(int i = 0; i < index.length(); i++) {
+ auto item = static_cast<TableItem*>(index[i].internalPointer());
+ ids.push_back(item->id);
+ }
  Message msg(MSG_TYPE::BANK, MSG_COMMAND::DEL);
- msg.addData("id", item->id);
+ msg.addData("id", ids);
  sendMessage(&msg);
  }
 }
diff --git a/libgui/bank/bankwidget.h b/libgui/bank/bankwidget.h
@@ -22,6 +22,7 @@
 
 #include "messagehandler.h"
 #include <QWidget>
+#include <QModelIndexList>
 
 namespace Ui {
 class NormalWidget;
@@ -35,7 +36,7 @@ class BankWidget : public QWidget, public LibG::MessageHandler
 {
  Q_OBJECT
 public:
- BankWidget(LibG::MessageBus *bus, QWidget *parent = 0);
+ BankWidget(LibG::MessageBus *bus, QWidget *parent = nullptr);
 
 protected:
  void messageReceived(LibG::Message *msg) override;
@@ -47,7 +48,7 @@ class BankWidget : public QWidget, public LibG::MessageHandler
 private slots:
  void addClicked();
  void updateClicked(const QModelIndex &index);
- void deleteClicked(const QModelIndex &index);
+ void deleteClicked(const QModelIndexList &index);
 };
 
 }

diff --git a/libgui/cashier/additemunavailabledialog.h b/libgui/cashier/additemunavailabledialog.h
@@ -35,7 +35,7 @@ class AddItemUnavailableDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- AddItemUnavailableDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ AddItemUnavailableDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~AddItemUnavailableDialog();
  void openBarcode(const QString &barcode);
  void openAutoBarcode();

diff --git a/libgui/cashier/advancepaymentdialog.h b/libgui/cashier/advancepaymentdialog.h
@@ -36,7 +36,7 @@ class AdvancePaymentDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- AdvancePaymentDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ AdvancePaymentDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~AdvancePaymentDialog();
  void setup(double total, Customer *cust);
 

diff --git a/libgui/cashier/cashierhelpdialog.h b/libgui/cashier/cashierhelpdialog.h
@@ -33,7 +33,7 @@ class CashierHelpDialog : public QDialog
  Q_OBJECT
 
 public:
- CashierHelpDialog(QWidget *parent = 0);
+ CashierHelpDialog(QWidget *parent = nullptr);
  ~CashierHelpDialog();
 
 private:

diff --git a/libgui/cashier/cashierreportdialog.h b/libgui/cashier/cashierreportdialog.h
@@ -34,7 +34,7 @@ class CashierReportDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- CashierReportDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ CashierReportDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~CashierReportDialog();
 
 protected:

diff --git a/libgui/cashier/cashierwidget.h b/libgui/cashier/cashierwidget.h
@@ -44,7 +44,7 @@ class CashierWidget : public QWidget, public LibG::MessageHandler, public TabClo
  Q_OBJECT
 
 public:
- CashierWidget(LibG::MessageBus *bus, QWidget *parent = 0);
+ CashierWidget(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~CashierWidget();
  void showEvent(QShowEvent *event) override;
  bool requestClose() override;

diff --git a/libgui/cashier/checkpricedialog.h b/libgui/cashier/checkpricedialog.h
@@ -37,7 +37,7 @@ class CheckPriceDialog : public QDialog
  Q_OBJECT
 
 public:
- CheckPriceDialog(LibG::MessageBus *bus, const QString &barcode, QWidget *parent = 0);
+ CheckPriceDialog(LibG::MessageBus *bus, const QString &barcode, QWidget *parent = nullptr);
  ~CheckPriceDialog();
 
 private:

diff --git a/libgui/cashier/customercreditpaymentdialog.h b/libgui/cashier/customercreditpaymentdialog.h
@@ -34,7 +34,7 @@ class CustomerCreditPaymentDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- CustomerCreditPaymentDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ CustomerCreditPaymentDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~CustomerCreditPaymentDialog();
 
 protected:

diff --git a/libgui/cashier/editpricecountdialog.h b/libgui/cashier/editpricecountdialog.h
@@ -34,7 +34,7 @@ class EditPriceCountDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- EditPriceCountDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ EditPriceCountDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~EditPriceCountDialog();
  void setup(const QString &barcode, float count, double price, const QString disc, const QString &note, int flag);
  inline bool isOk() { return mIsOk; }

diff --git a/libgui/cashier/paycashdialog.h b/libgui/cashier/paycashdialog.h
@@ -34,7 +34,7 @@ class PayCashDialog : public QDialog
  Q_OBJECT
 
 public:
- PayCashDialog(QWidget *parent = 0);
+ PayCashDialog(QWidget *parent = nullptr);
  ~PayCashDialog();
  void fill(double total);
 

diff --git a/libgui/cashier/paycashlessdialog.h b/libgui/cashier/paycashlessdialog.h
@@ -35,7 +35,7 @@ class PayCashlessDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- PayCashlessDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ PayCashlessDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~PayCashlessDialog();
  void showDialog(const double &total);
  int getBank();

diff --git a/libgui/cashier/paymentcashsuccessdialog.h b/libgui/cashier/paymentcashsuccessdialog.h
@@ -33,7 +33,7 @@ class PaymentCashSuccessDialog : public QDialog
  Q_OBJECT
 
 public:
- PaymentCashSuccessDialog(const QVariantMap &data, QWidget *parent = 0);
+ PaymentCashSuccessDialog(const QVariantMap &data, QWidget *parent = nullptr);
  ~PaymentCashSuccessDialog();
 
 private:

diff --git a/libgui/cashier/returnitemadddialog.h b/libgui/cashier/returnitemadddialog.h
@@ -33,7 +33,7 @@ class ReturnItemAddDialog : public QDialog
  Q_OBJECT
 
 public:
- ReturnItemAddDialog(QWidget *parent = 0);
+ ReturnItemAddDialog(QWidget *parent = nullptr);
  ~ReturnItemAddDialog();
  void fill(const QVariantMap &d);
 

diff --git a/libgui/cashier/saveloadslotdialog.h b/libgui/cashier/saveloadslotdialog.h
@@ -33,7 +33,7 @@ class SaveLoadSlotDialog : public QDialog
  Q_OBJECT
 
 public:
- SaveLoadSlotDialog(bool isSave = true, QWidget *parent = 0);
+ SaveLoadSlotDialog(bool isSave = true, QWidget *parent = nullptr);
  ~SaveLoadSlotDialog();
  inline int getSelectedSlot() { return mSelectedSlot; }
 

diff --git a/libgui/cashier/searchcustomerdialog.cpp b/libgui/cashier/searchcustomerdialog.cpp
@@ -51,6 +51,7 @@ SearchCustomerDialog::SearchCustomerDialog(LibG::MessageBus *bus, QWidget *paren
  model->addColumnMoney("reward", tr("Reward"));
  model->addColumnMoney("credit", tr("Credit"));
  model->setTypeCommand(MSG_TYPE::CUSTOMER, MSG_COMMAND::QUERY);
+ ui->table->setDefaultPerPage(3);
  ui->table->setupTable();
  connect(ui->lineName, SIGNAL(returnPressed()), SLOT(nameDone()));
  GuiUtil::setColumnWidth(ui->table->getTableView(), QList<int>() << 80 << 100 << 100 << 100 << 100 << 100);

diff --git a/libgui/cashier/searchcustomerdialog.h b/libgui/cashier/searchcustomerdialog.h
@@ -38,7 +38,7 @@ class SearchCustomerDialog : public QDialog
  Q_OBJECT
 
 public:
- SearchCustomerDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ SearchCustomerDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~SearchCustomerDialog();
  inline QVariantMap getSelectedData() { return mSelectedData; }
  inline bool isOk() { return mIsOk; }

diff --git a/libgui/cashier/searchitemdialog.cpp b/libgui/cashier/searchitemdialog.cpp
@@ -50,6 +50,7 @@ SearchItemDialog::SearchItemDialog(MessageBus *bus, bool advance, QWidget *paren
  model->addColumnMoney("sell_price", tr("Price"));
  model->addColumnMoney("stock", tr("Stock"));
  model->setTypeCommand(MSG_TYPE::ITEM, MSG_COMMAND::QUERY);
+ mTableWidget->setDefaultPerPage(3);
  mTableWidget->setupTable();
  ui->verticalLayout->addWidget(mTableWidget);
  connect(ui->lineName, SIGNAL(returnPressed()), SLOT(nameDone()));

diff --git a/libgui/cashier/searchitemdialog.h b/libgui/cashier/searchitemdialog.h
@@ -40,7 +40,7 @@ class SearchItemDialog : public QDialog
  Q_OBJECT
 
 public:
- SearchItemDialog(LibG::MessageBus *bus, bool advance, QWidget *parent = 0);
+ SearchItemDialog(LibG::MessageBus *bus, bool advance, QWidget *parent = nullptr);
  ~SearchItemDialog();
  inline QString getSelectedBarcode() { return mSelectedBarcode; }
  void setNameField(const QString &str);

diff --git a/libgui/cashier/solditemlistdialog.h b/libgui/cashier/solditemlistdialog.h
@@ -35,7 +35,7 @@ class SoldItemListDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- SoldItemListDialog(const QVariantMap &data, LibG::MessageBus *bus, QWidget *parent = 0);
+ SoldItemListDialog(const QVariantMap &data, LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~SoldItemListDialog();
  inline bool isOk() { return mIsOk; }
  inline QVariantMap getData() { return mData; }

diff --git a/libgui/cashier/transactionlistdialog.h b/libgui/cashier/transactionlistdialog.h
@@ -37,7 +37,7 @@ class TransactionListDialog : public QDialog, public LibG::MessageHandler
 
 public:
  enum DialogType { Cashier, SoldReturn };
- TransactionListDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ TransactionListDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~TransactionListDialog();
  void setType(int type);
  inline void setPrintFunction(std::function<void(QVariantMap)> func) { mPrintFunction = func; }

diff --git a/libgui/category/categorywidget.h b/libgui/category/categorywidget.h
@@ -39,7 +39,7 @@ class CategoryWidget : public QWidget, public LibG::MessageHandler
 {
  Q_OBJECT
 public:
- CategoryWidget(LibG::MessageBus *bus, QWidget *parent = 0);
+ CategoryWidget(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~CategoryWidget();
 
 protected:

diff --git a/libgui/category/categotyadddialog.h b/libgui/category/categotyadddialog.h
@@ -35,7 +35,7 @@ class CategoryAddDialog : public QDialog
  Q_OBJECT
 
 public:
- CategoryAddDialog(QWidget *parent = 0);
+ CategoryAddDialog(QWidget *parent = nullptr);
  ~CategoryAddDialog();
  void reset();
  void fill(int id, int parent, const QString &name, const QString &code);

diff --git a/libgui/checkstock/checkstockadddialog.h b/libgui/checkstock/checkstockadddialog.h
@@ -35,7 +35,7 @@ class CheckStockAddDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- CheckStockAddDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ CheckStockAddDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~CheckStockAddDialog();
  void reset();
 

diff --git a/libgui/checkstock/checkstockwidget.h b/libgui/checkstock/checkstockwidget.h
@@ -37,7 +37,7 @@ class CheckStockWidget : public QWidget, public LibG::MessageHandler
 {
  Q_OBJECT
 public:
- CheckStockWidget(LibG::MessageBus *bus, QWidget *parent = 0);
+ CheckStockWidget(LibG::MessageBus *bus, QWidget *parent = nullptr);
 
 protected:
  void messageReceived(LibG::Message *msg);

diff --git a/libgui/customer/addcreditpaymentdialog.h b/libgui/customer/addcreditpaymentdialog.h
@@ -34,7 +34,7 @@ class AddCreditPaymentDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- AddCreditPaymentDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ AddCreditPaymentDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~AddCreditPaymentDialog();
  void fill(int id, double total);
 

diff --git a/libgui/customer/addpoindialog.h b/libgui/customer/addpoindialog.h
@@ -34,7 +34,7 @@ class AddPoinDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- AddPoinDialog(LibG::MessageBus *bus, int id, const QString &number, int poin, QWidget *parent = 0);
+ AddPoinDialog(LibG::MessageBus *bus, int id, const QString &number, int poin, QWidget *parent = nullptr);
  ~AddPoinDialog();
 
 private:

diff --git a/libgui/customer/customeradddialog.h b/libgui/customer/customeradddialog.h
@@ -34,7 +34,7 @@ class CustomerAddDialog : public QDialog, public LibG::MessageHandler
  Q_OBJECT
 
 public:
- CustomerAddDialog(LibG::MessageBus *bus, QWidget *parent = 0);
+ CustomerAddDialog(LibG::MessageBus *bus, QWidget *parent = nullptr);
  ~CustomerAddDialog();
  void reset();
  void fill(const QVariantMap &data);

diff --git a/libgui/customer/customerrewardwidget.h b/libgui/customer/customerrewardwidget.h
@@ -36,7 +36,7 @@ class CustomerRewardWidget : public QWidget, public LibG::MessageHandler
 {
  Q_OBJECT
 public:
- CustomerRewardWidget(int id, const QString &number, LibG::MessageBus *bus, QWidget *parent = 0);
+ CustomerRewardWidget(int id, const QString &number, LibG::MessageBus *bus, QWidget *parent = nullptr);
  inline int getId() { return mId; }
 
 protected:

diff --git a/libgui/customer/customerwidget.cpp b/libgui/customer/customerwidget.cpp
@@ -88,7 +88,7 @@ CustomerWidget::CustomerWidget(LibG::MessageBus *bus, QWidget *parent) :
  connect(button, SIGNAL(clicked(bool)), SLOT(rewardClicked()));
  connect(mTableWidget, SIGNAL(addClicked()), SLOT(addClicked()));
  connect(mTableWidget, SIGNAL(updateClicked(QModelIndex)), SLOT(updateClicked(QModelIndex)));
- connect(mTableWidget, SIGNAL(deleteClicked(QModelIndex)), SLOT(deleteClicked(QModelIndex)));
+ connect(mTableWidget, SIGNAL(deleteClicked(QModelIndexList)), SLOT(deleteClicked(QModelIndexList)));
  connect(mAddDialog, SIGNAL(customerAdded()), SLOT(customerAdded()));
  connect(mAddDialog, SIGNAL(customerUpdated(int)), SLOT(customerUpdated(int)));
  connect(model, SIGNAL(firstDataLoaded()), SLOT(refreshSummary()));
@@ -122,14 +122,18 @@ void CustomerWidget::updateClicked(const QModelIndex &index)
  mAddDialog->show();
 }
 
-void CustomerWidget::deleteClicked(const QModelIndex &index)
+void CustomerWidget::deleteClicked(const QModelIndexList &index)
 {
- if(!index.isValid()) return;
- auto item = static_cast<TableItem*>(index.internalPointer());
+ if(index.empty()) return;
  int ret = QMessageBox::question(this, tr("Delete Confirmation"), tr("Make sure the credit is 0 before delete. Are you sure to delete the customer?"));
  if(ret == QMessageBox::Yes) {
+ QList<QVariant> ids;
+ for(int i = 0; i < index.size(); i++) {
+ auto item = static_cast<TableItem*>(index[i].internalPointer());
+ ids.append(item->id);
+ }
  Message msg(MSG_TYPE::CUSTOMER, MSG_COMMAND::DEL);
- msg.addData("id", item->id);
+ msg.addData("id", ids);
  sendMessage(&msg);
  }
 }