ITsolved/prodejna
2
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

UI functions on Save receipt form.

Browse Source
This commit is contained in:
Josef Rokos
2016-06-03 15:55:21 +02:00
parent 5035c4ce05
commit 4593161261
9 changed files with 278 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addressbook/addressbook.pro
+4 -2
View File
@@ -17,14 +17,16 @@ SOURCES += addressbook.cpp \
data/addressbookdata.cpp \
addressbookform.cpp \
addressbookgrid.cpp \
addressbooktablemodel.cpp
addressbooktablemodel.cpp \
addressbookservice.cpp
HEADERS += addressbook.h\
addressbook_global.h \
data/addressbookdata.h \
addressbookform.h \
addressbookgrid.h \
addressbooktablemodel.h
addressbooktablemodel.h \
addressbookservice.h
unix {
target.path = /usr/lib
addressbook/addressbookservice.cpp
+18
View File
@@ -0,0 +1,18 @@
#include <service.h>
#include "addressbookservice.h"
#include "addressbook-odb.hxx"
AddressBookService::AddressBookService()
{
}
AddressBookService::~AddressBookService()
{
}
QList<QSharedPointer<AddressbookData> > AddressBookService::all(const QString &where)
{
Service<AddressbookData> srv;
return srv.all(where);
}
addressbook/addressbookservice.h
+19
View File
@@ -0,0 +1,19 @@
#ifndef ADDRESSBOOKSERVICE_H
#define ADDRESSBOOKSERVICE_H
#include <QList>
#include <QSharedPointer>
#include "data/addressbookdata.h"
#include "addressbook_global.h"
class ADDRESSBOOKSHARED_EXPORT AddressBookService
{
public:
AddressBookService();
~AddressBookService();
QList<QSharedPointer<AddressbookData> > all(const QString &where = "");
};
#endif // ADDRESSBOOKSERVICE_H
addressbook/data/addressbookdata.cpp
+100 -89
View File
@@ -1,108 +1,119 @@
#include "addressbookdata.h"
AddressbookData::AddressbookData(QObject * parent)
:QObject(parent)
:ComboItem(parent)
{
}
QString AddressbookData::title() const
{
return m_title;
}
QString AddressbookData::title() const
{
return m_title;
}
void AddressbookData::setTitle(const QString &title)
{
m_title = title;
}
QString AddressbookData::firstName() const
{
return m_firstName;
}
void AddressbookData::setTitle(const QString &title)
{
m_title = title;
}
QString AddressbookData::firstName() const
{
return m_firstName;
}
void AddressbookData::setFirstName(const QString &firstName)
{
m_firstName = firstName;
}
QString AddressbookData::lastName() const
{
return m_lastName;
}
void AddressbookData::setFirstName(const QString &firstName)
{
m_firstName = firstName;
}
QString AddressbookData::lastName() const
{
return m_lastName;
}
void AddressbookData::setLastName(const QString &lastName)
{
m_lastName = lastName;
}
QDate AddressbookData::birthDate() const
{
return m_birthDate;
}
void AddressbookData::setLastName(const QString &lastName)
{
m_lastName = lastName;
}
QDate AddressbookData::birthDate() const
{
return m_birthDate;
}
void AddressbookData::setBirthDate(const QDate &birthDate)
{
m_birthDate = birthDate;
}
QString AddressbookData::idCardNumber() const
{
return m_idCardNumber;
}
void AddressbookData::setBirthDate(const QDate &birthDate)
{
m_birthDate = birthDate;
}
QString AddressbookData::idCardNumber() const
{
return m_idCardNumber;
}
void AddressbookData::setIdCardNumber(const QString &idCardNumber)
{
m_idCardNumber = idCardNumber;
}
bool AddressbookData::ztp() const
{
return m_ztp;
}
void AddressbookData::setIdCardNumber(const QString &idCardNumber)
{
m_idCardNumber = idCardNumber;
}
bool AddressbookData::ztp() const
{
return m_ztp;
}
void AddressbookData::setZtp(bool ztp)
{
m_ztp = ztp;
}
QString AddressbookData::addressCity() const
{
return m_addressCity;
}
void AddressbookData::setZtp(bool ztp)
{
m_ztp = ztp;
}
QString AddressbookData::addressCity() const
{
return m_addressCity;
}
void AddressbookData::setAddressCity(const QString &addressCity)
{
m_addressCity = addressCity;
}
QString AddressbookData::addressStreet() const
{
return m_addressStreet;
}
void AddressbookData::setAddressCity(const QString &addressCity)
{
m_addressCity = addressCity;
}
QString AddressbookData::addressStreet() const
{
return m_addressStreet;
}
void AddressbookData::setAddressStreet(const QString &addressStreet)
{
m_addressStreet = addressStreet;
}
QString AddressbookData::addressHouseNumber() const
{
return m_addressHouseNumber;
}
void AddressbookData::setAddressStreet(const QString &addressStreet)
{
m_addressStreet = addressStreet;
}
QString AddressbookData::addressHouseNumber() const
{
return m_addressHouseNumber;
}
void AddressbookData::setAddressHouseNumber(const QString &addressHouseNumber)
{
m_addressHouseNumber = addressHouseNumber;
}
QString AddressbookData::addressZipCode() const
{
return m_addressZipCode;
}
void AddressbookData::setAddressHouseNumber(const QString &addressHouseNumber)
{
m_addressHouseNumber = addressHouseNumber;
}
QString AddressbookData::addressZipCode() const
{
return m_addressZipCode;
}
void AddressbookData::setAddressZipCode(const QString &addressZipCode)
{
m_addressZipCode = addressZipCode;
}
int AddressbookData::id() const
{
return m_id;
}
void AddressbookData::setAddressZipCode(const QString &addressZipCode)
{
m_addressZipCode = addressZipCode;
}
int AddressbookData::id() const
{
return m_id;
}
void AddressbookData::setId(int id)
{
m_id = id;
}
void AddressbookData::setId(int id)
{
m_id = id;
}
bool AddressbookData::eq(ComboItem *other)
{
AddressbookData *adb = qobject_cast<AddressbookData*>(other);
return adb != NULL && adb->id() == this->id();
}
QString AddressbookData::toString()
{
return m_firstName + " " + m_lastName + ", " + m_addressStreet + " " + m_addressHouseNumber + ", " + m_addressCity;
}
addressbook/data/addressbookdata.h
+8 -1
View File
@@ -7,6 +7,8 @@
#include <odb/core.hxx>
#include <QtCore/qglobal.h>
#include <data/comboitem.h>
#if defined(ADDRESSBOOK_LIBRARY)
# define ADDRESSBOOKSHARED_EXPORT Q_DECL_EXPORT
#else
@@ -14,7 +16,7 @@
#endif
#pragma db object
class ADDRESSBOOKSHARED_EXPORT AddressbookData : public QObject
class ADDRESSBOOKSHARED_EXPORT AddressbookData : public ComboItem
{
Q_OBJECT
Q_PROPERTY(QString title READ title WRITE setTitle)
@@ -77,6 +79,11 @@ private:
QString m_addressStreet;
QString m_addressHouseNumber;
QString m_addressZipCode;
// ComboItem interface
public:
virtual bool eq(ComboItem *other);
virtual QString toString();
};
#endif // ADDRESSBOOKDATA_H
shop/receiptsaveform.cpp
+74
View File
@@ -1,14 +1,88 @@
#include "receiptsaveform.h"
#include "ui_receiptsaveform.h"
#include <QList>
#include <QCompleter>
#include <QSortFilterProxyModel>
#include <service.h>
#include <iplugin.h>
#include <addressbookservice.h>
#include <addressbookdata.h>
#include "data/voucher.h"
#include "shop-odb.hxx"
ReceiptSaveForm::ReceiptSaveForm(QWidget *parent) :
QDialog(parent),
ui(new Ui::ReceiptSaveForm)
{
ui->setupUi(this);
m_voucherModel = new AutoTableModel<Voucher>(this);
Service<Voucher> srv;
m_voucherModel->setData(srv.all());
m_voucherModel->setTranslations(Context::instance().plugin("SHOP")->translations());
ui->tabVouchers->setModel(m_voucherModel);
ui->tabVouchers->hideColumn(3);
ui->tabVouchers->hideColumn(4);
ui->tabVouchers->hideColumn(5);
ui->tabVouchers->hideColumn(6);
ui->tabVouchers->hideColumn(7);
ui->tabVouchers->hideColumn(8);
ui->tabVouchers->hideColumn(10);
ui->tabVouchers->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
ui->tabVouchers->setColumnWidth(0, 190);
ui->tabVouchers->setColumnWidth(2, 200);
AddressBookService srvAdb;
QList<ComboData> comboData;
foreach (QSharedPointer<AddressbookData> adb, srvAdb.all()) {
comboData << ComboData(adb);
}
m_binder.setData(new Voucher);
m_binder.registerBinding(ui->contact, comboData);
m_binder.bindToUi();
ui->contact->completer()->setCompletionMode(QCompleter::PopupCompletion);
ui->contact->setCurrentIndex(-1);
m_saveAsNew = false;
ui->groupBox_2->setEnabled(false);
}
ReceiptSaveForm::~ReceiptSaveForm()
{
delete ui;
}
void ReceiptSaveForm::on_lineEdit_textChanged(const QString &text)
{
QSortFilterProxyModel proxy;
proxy.setSourceModel(m_voucherModel);
proxy.setFilterKeyColumn(0);
proxy.setFilterFixedString(text);
QModelIndex matchingIndex = proxy.mapToSource(proxy.index(0,0));
if(matchingIndex.isValid()){
ui->tabVouchers->scrollTo(matchingIndex,QAbstractItemView::EnsureVisible);
ui->tabVouchers->setCurrentIndex(matchingIndex);
}
}
void ReceiptSaveForm::on_radioAdd_toggled(bool checked)
{
if (checked)
{
m_saveAsNew = false;
ui->groupBox_2->setEnabled(false);
ui->groupBox->setEnabled(true);
}
else
{
m_saveAsNew = true;
ui->groupBox_2->setEnabled(true);
ui->groupBox->setEnabled(false);
}
}
shop/receiptsaveform.h
+11
View File
@@ -2,6 +2,9 @@
#define RECEIPTSAVEFORM_H
#include <QDialog>
#include <objectbinder.h>
#include <autotablemodel.h>
#include "data/voucher.h"
namespace Ui {
class ReceiptSaveForm;
@@ -15,8 +18,16 @@ public:
explicit ReceiptSaveForm(QWidget *parent = 0);
~ReceiptSaveForm();
private slots:
void on_lineEdit_textChanged(const QString &text);
void on_radioAdd_toggled(bool checked);
private:
Ui::ReceiptSaveForm *ui;
ObjectBinder m_binder;
AutoTableModel<Voucher> *m_voucherModel;
bool m_saveAsNew;
};
#endif // RECEIPTSAVEFORM_H
shop/receiptsaveform.ui
+43 -12
View File
@@ -6,14 +6,27 @@
<rect>
<x>0</x>
<y>0</y>
<width>419</width>
<height>545</height>
<width>804</width>
<height>513</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
<string>Save receipt</string>
</property>
<property name="modal">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QRadioButton" name="radioAdd">
<property name="text">
<string>Add to existing</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
@@ -30,18 +43,35 @@
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit"/>
</item>
<item row="1" column="1">
<widget class="QTableView" name="tableView"/>
<item row="1" column="0" colspan="2">
<widget class="QTableView" name="tabVouchers">
<property name="minimumSize">
<size>
<width>0</width>
<height>250</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioSave">
<property name="text">
<string>Save as new</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>GroupBox</string>
<string>New receipt</string>
</property>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
@@ -50,7 +80,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_2"/>
<widget class="QLineEdit" name="name"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
@@ -60,7 +90,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_3"/>
<widget class="QLineEdit" name="description"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
@@ -70,10 +100,11 @@
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEdit_4"/>
</item>
<item row="3" column="1">
<widget class="QTableView" name="tableView_2"/>
<widget class="QComboBox" name="contact">
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
shop/shop.pro
+1
View File
@@ -61,6 +61,7 @@ else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../plugins/ -laddre
else:unix: LIBS += -L$$OUT_PWD/../plugins/ -laddressbook
INCLUDEPATH += $$PWD/../addressbook/data
INCLUDEPATH += $$PWD/../addressbook
DEPENDPATH += $$PWD/../addressbook
DESTDIR = ../plugins