birkeh/qtPartlist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Herwig Birke
2018-01-29 15:46:46 +01:00
parent 429aafbe3e
commit 2fafb12b44
6 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmainwindow.cpp
+4 -4
View File
@@ -236,7 +236,7 @@ void cMainWindow::loadDistributorList()
QSqlQuery query; QSqlQuery query;
QString szQuery; QString szQuery;
szQuery = "SELECT id, name, link, address, postal_code, city, country, phone, fax, email, link, description, logo FROM distributor ORDER BY name;"; szQuery = "SELECT id, name, link, address, postal_code, city, country, phone, fax, email, link, description, logo FROM distributor ORDER BY LOWER(name);";
if(!query.exec(szQuery)) if(!query.exec(szQuery))
{ {
@@ -278,7 +278,7 @@ void cMainWindow::loadPartGroupList()
QSqlQuery query; QSqlQuery query;
QString szQuery; QString szQuery;
szQuery = "SELECT id, name, description FROM partgroup ORDER BY name;"; szQuery = "SELECT id, name, description FROM partgroup ORDER BY LOWER(name);";
if(!query.exec(szQuery)) if(!query.exec(szQuery))
{ {
@@ -304,7 +304,7 @@ void cMainWindow::loadPartList()
QSqlQuery query; QSqlQuery query;
QString szQuery; QString szQuery;
szQuery = "SELECT part.id id, part.name name, part.description description, part.partgroupID partgroupID, part.link FROM part JOIN partgroup ON (part.partgroupID = partgroup.id) ORDER BY partgroup.name, part.name;"; szQuery = "SELECT part.id id, part.name name, part.description description, part.partgroupID partgroupID, part.link FROM part JOIN partgroup ON (part.partgroupID = partgroup.id) ORDER BY LOWER(partgroup.name), LOWER(part.name);";
if(!query.exec(szQuery)) if(!query.exec(szQuery))
{ {
@@ -336,7 +336,7 @@ void cMainWindow::loadPartDistributorList()
QSqlQuery query; QSqlQuery query;
QString szQuery; QString szQuery;
szQuery = "SELECT id, name, description, partID, distributorID, price, link FROM part_distributor ORDER BY name;"; szQuery = "SELECT id, name, description, partID, distributorID, price, link FROM part_distributor ORDER BY LOWER(name);";
if(!query.exec(szQuery)) if(!query.exec(szQuery))
{ {
cparteditdialog.cpp
+4 -1
View File
@@ -44,7 +44,7 @@ bool cPartEditDialog::somethingSelected()
return(false); return(false);
} }
void cPartEditDialog::setValues(cPart* lpPart, cPartGroupList* lpPartGroupList, cDistributorList *lpDistributorList, cPartDistributorList *lpPartDistributorList) void cPartEditDialog::setValues(cPart* lpPart, cPartGroupList* lpPartGroupList, cDistributorList *lpDistributorList, cPartDistributorList *lpPartDistributorList, QString szGroup)
{ {
m_lpPart = lpPart; m_lpPart = lpPart;
m_lpPartGroupList = lpPartGroupList; m_lpPartGroupList = lpPartGroupList;
@@ -66,6 +66,9 @@ void cPartEditDialog::setValues(cPart* lpPart, cPartGroupList* lpPartGroupList,
showPartDistributorList(); showPartDistributorList();
} }
if(!szGroup.isEmpty())
ui->m_lpGroup->setCurrentText(szGroup);
} }
void cPartEditDialog::showPartDistributorList() void cPartEditDialog::showPartDistributorList()
cparteditdialog.h
+1 -1
View File
@@ -24,7 +24,7 @@ public:
~cPartEditDialog(); ~cPartEditDialog();
qint32 id(); qint32 id();
void setValues(cPart* lpPart, cPartGroupList* lpPartGroupList, cDistributorList* lpDistributorList, cPartDistributorList* lpPartDistributorList); void setValues(cPart* lpPart, cPartGroupList* lpPartGroupList, cDistributorList* lpDistributorList, cPartDistributorList* lpPartDistributorList, QString szGroup = "");
bool somethingSelected(); bool somethingSelected();
private slots: private slots:
cpartlistitemdelegate.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ void cPartListItemDelegate::setModelData ( QWidget *editor, QAbstractItemModel *
cPartDistributor* lpPartDistributor = qvariant_cast<cPartDistributor*>(lpComboBox->currentData()); cPartDistributor* lpPartDistributor = qvariant_cast<cPartDistributor*>(lpComboBox->currentData());
model->setData(index, lpComboBox->currentText(), Qt::EditRole); model->setData(index, lpComboBox->currentText(), Qt::EditRole);
model->setData(index, QVariant::fromValue(lpPartDistributor), Qt::UserRole+1); // model->setData(index, QVariant::fromValue(lpPartDistributor), Qt::UserRole+1);
QStandardItemModel* lpModel = (QStandardItemModel*)index.model(); QStandardItemModel* lpModel = (QStandardItemModel*)index.model();
QStandardItem* lpItem = lpModel->itemFromIndex(lpModel->index(index.row(), 5)); QStandardItem* lpItem = lpModel->itemFromIndex(lpModel->index(index.row(), 5));
lpItem->setText(QString::number(lpPartDistributor->price(), 'f', 2)); lpItem->setText(QString::number(lpPartDistributor->price(), 'f', 2));
cpartlistwindow.cpp
-2
View File
@@ -508,8 +508,6 @@ void cPartlistWindow::onPartEdit()
qreal dPrice = lpDialog->price(); qreal dPrice = lpDialog->price();
QString szDescription = lpDialog->description(); QString szDescription = lpDialog->description();
QList<QStandardItem*> lpItems;
lpReferenceItem->setText(szReference.split("\n").join(", ")); lpReferenceItem->setText(szReference.split("\n").join(", "));
if(lpPart) if(lpPart)
{ {
cpartwindow.cpp
+15 -1
View File
@@ -160,8 +160,22 @@ void cPartWindow::deletePart()
void cPartWindow::onAdd() void cPartWindow::onAdd()
{ {
QStandardItem* lpItem = m_lpPartListModel->itemFromIndex(ui->m_lpPartList->selectionModel()->selectedIndexes().at(0));
QString szGroup;
if(lpItem)
{
QStandardItem* lpRoot;
lpRoot = lpItem->parent();
if(!lpRoot)
szGroup = lpItem->text();
else
szGroup = lpRoot->text();
}
cPartEditDialog* lpDialog = new cPartEditDialog(this); cPartEditDialog* lpDialog = new cPartEditDialog(this);
lpDialog->setValues(0, m_lpPartGroupList, m_lpDistributorList, m_lpPartDistributorList); lpDialog->setValues(0, m_lpPartGroupList, m_lpDistributorList, m_lpPartDistributorList, szGroup);
if(lpDialog->exec() == QDialog::Rejected) if(lpDialog->exec() == QDialog::Rejected)
{ {