bmsapp: comparison src/EditProductTab6.cpp

-:8a25dbe682eb
+:e13763ec829f
 }
 void EditProduct::yeast_select_changed(int val)
 {
-QSqlQuery query;
+QSqlQuery query, query1;
 bool instock = yinstockEdit->isChecked();
 QString w;
 QTableWidgetItem *item;
 int oldform = product->yeasts.at(product->yeasts_row).form;
 product->yeasts[product->yeasts_row].sg_lo = query.value("sg_lo").toDouble();
 product->yeasts[product->yeasts_row].gr_hl_hi = query.value("gr_hl_hi").toInt();
 product->yeasts[product->yeasts_row].sg_hi = query.value("sg_hi").toDouble();
 product->yeasts[product->yeasts_row].cost = query.value("cost").toDouble();
 product->yeasts[product->yeasts_row].inventory = query.value("inventory").toDouble();
+product->yeasts[product->yeasts_row].yp_uuid = QString();
 /*
 * Update the visible fields
 */
 const QSignalBlocker blocker1(yamountEdit);
 	yamountEdit->setSingleStep(0.5);
 	yamountLabel->setText(tr("Amount in ml:"));
 	product->yeast_pitchrate = 0;
 }
+/*
+* Clear package and rebuild package select table.
+*/
+this->ypackageEdit->setCurrentIndex(-1);
+this->ypackageEdit->clear();
+this->ypackageEdit->addItem("");	// Start with empty value
+query1.prepare("SELECT * FROM inventory_yeastpack WHERE laboratory=:laboratory AND form=:form AND valid='1' ORDER BY laboratory,package");
+query1.bindValue(":laboratory", query.value("laboratory").toString());
+query1.bindValue(":form", query.value("form").toInt());
+qDebug() << "  search" << query.value("laboratory").toString() << query.value("form").toInt();
+query1.exec();
+while (query1.next()) {
+	this->ypackageEdit->addItem(query1.value("laboratory").toString()+" - "+query1.value("package").toString());
+	qDebug() << "  add package" << query1.value("laboratory").toString() << query1.value("package").toString();
+}
 ui->yeastsTable->setItem(product->yeasts_row, 0, new QTableWidgetItem(product->yeasts.at(product->yeasts_row).name));
 ui->yeastsTable->setItem(product->yeasts_row, 1, new QTableWidgetItem(product->yeasts.at(product->yeasts_row).laboratory));
 ui->yeastsTable->setItem(product->yeasts_row, 2, new QTableWidgetItem(product->yeasts.at(product->yeasts_row).product_id));
 item = new QTableWidgetItem(QCoreApplication::translate("YeastForm", g_yeast_forms[product->yeasts.at(product->yeasts_row).form]));
 qDebug() << "Edit yeast row" << product->yeasts_row;
 #endif
 Yeasts backup = product->yeasts.at(product->yeasts_row);
 QDialog* dialog = new QDialog(this);
-dialog->resize(738, 260);
+dialog->resize(738, 290);
 QDialogButtonBox *buttonBox = new QDialogButtonBox(dialog);
 buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
-buttonBox->setGeometry(QRect(30, 210, 671, 32));
+buttonBox->setGeometry(QRect(30, 240, 671, 32));
 buttonBox->setLayoutDirection(Qt::LeftToRight);
 buttonBox->setOrientation(Qt::Horizontal);
 buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
 buttonBox->setCenterButtons(true);
 QLabel *instockLabel = new QLabel(dialog);
 instockLabel->setObjectName(QString::fromUtf8("instockLabel"));
 instockLabel->setText(tr("In stock:"));
 instockLabel->setGeometry(QRect(525,100, 121, 20));
 instockLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+QLabel *packageLabel = new QLabel(dialog);
+packageLabel->setObjectName(QString::fromUtf8("packageLabel"));
+packageLabel->setText(tr("Select package:"));
+packageLabel->setGeometry(QRect(10,130, 141, 20));
+packageLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 yamountLabel = new QLabel(dialog);
 yamountLabel->setObjectName(QString::fromUtf8("amountLabel"));
 if (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_LIQUID)
 	yamountLabel->setText(tr("Total packs:"));
 else if ((product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_DRY) || (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_DRIED))
 	yamountLabel->setText(tr("Amount in gr:"));
 else
 	yamountLabel->setText(tr("Amount in ml:"));
-yamountLabel->setGeometry(QRect(10, 130, 141, 20));
+yamountLabel->setGeometry(QRect(10, 160, 141, 20));
 yamountLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 QLabel *useatLabel = new QLabel(dialog);
 useatLabel->setObjectName(QString::fromUtf8("useatLabel"));
 useatLabel->setText(tr("Use at:"));
-useatLabel->setGeometry(QRect(10, 160, 141, 20));
+useatLabel->setGeometry(QRect(10, 190, 141, 20));
 useatLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 ynameEdit = new QLineEdit(dialog);
 ynameEdit->setObjectName(QString::fromUtf8("ynameEdit"));
 ynameEdit->setText(product->yeasts.at(product->yeasts_row).name);
 yselectEdit->setGeometry(QRect(160,100, 371, 23));
 yinstockEdit = new QCheckBox(dialog);
 yinstockEdit->setObjectName(QString::fromUtf8("yinstockEdit"));
 yinstockEdit->setGeometry(QRect(655,100, 85, 21));
 yinstockEdit->setChecked(true);
+ypackageEdit = new QComboBox(dialog);
+ypackageEdit->setObjectName(QString::fromUtf8("packageEdit"));
+ypackageEdit->setGeometry(QRect(160,130, 371, 23));
 yamountEdit = new QDoubleSpinBox(dialog);
 yamountEdit->setObjectName(QString::fromUtf8("yamountEdit"));
-yamountEdit->setGeometry(QRect(160, 130, 121, 24));
+yamountEdit->setGeometry(QRect(160, 160, 121, 24));
 yamountEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 yamountEdit->setAccelerated(true);
 yamountEdit->setMaximum(10000.0);
 if (product->yeasts.at(product->yeasts_row).form == YEAST_FORMS_LIQUID) {
 	yamountEdit->setDecimals(0);
 	yamountEdit->setValue(product->yeasts.at(product->yeasts_row).amount * 1000.0);
 }
 yamountEdit->setMaximum(1000000000.0);
 useatEdit = new QComboBox(dialog);
 useatEdit->setObjectName(QString::fromUtf8("useatEdit"));
-useatEdit->setGeometry(QRect(160, 160, 161, 23));
+useatEdit->setGeometry(QRect(160, 190, 161, 23));
 useatEdit->addItem(tr("Primary"));
 useatEdit->addItem(tr("Secondary"));
 useatEdit->addItem(tr("Tertiary"));
 useatEdit->addItem(tr("Bottle"));
 useatEdit->setCurrentIndex(product->yeasts.at(product->yeasts_row).use);

Mercurial > bmsapp / file comparison

comparison: src/EditProductTab6.cpp

src/EditProductTab6.cpp