# HG changeset patch # User Michiel Broek # Date 1659464285 -7200 # Node ID 7945bf3be1f9a83378a6ee96ef7c92f7eb0bea3c # Parent 2e30c9c20d22df9c7cd7dd8f07736754d7bf1ab2 Import brew logs added. diff -r 2e30c9c20d22 -r 7945bf3be1f9 CMakeLists.txt --- a/CMakeLists.txt Mon Aug 01 21:49:57 2022 +0200 +++ b/CMakeLists.txt Tue Aug 02 20:18:05 2022 +0200 @@ -230,6 +230,7 @@ ${SRCDIR}/ChartiSpindel.cpp ${SRCDIR}/EditProduct.cpp ${SRCDIR}/ImportXML.cpp + ${SRCDIR}/ImportBrew.cpp ${SRCDIR}/Setup.cpp ${SRCDIR}/Utils.cpp ${SRCDIR}/PrinterDialog.cpp @@ -294,6 +295,7 @@ ${SRCDIR}/ChartiSpindel.h ${SRCDIR}/EditProduct.h ${SRCDIR}/ImportXML.h + ${SRCDIR}/ImportBrew.h ${SRCDIR}/Setup.h ${SRCDIR}/Utils.h ${SRCDIR}/PrinterDialog.h @@ -334,6 +336,7 @@ ${UIDIR}/DetailCO2meter.ui ${UIDIR}/DetailiSpindel.ui ${UIDIR}/ImportXML.ui + ${UIDIR}/ImportBrew.ui ${UIDIR}/MainWindow.ui ) diff -r 2e30c9c20d22 -r 7945bf3be1f9 src/ImportBrew.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ImportBrew.cpp Tue Aug 02 20:18:05 2022 +0200 @@ -0,0 +1,208 @@ +/** + * ImportBrew.cpp is part of bmsapp. + * + * bmsapp is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * bmsapp is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include "ImportBrew.h" +#include "../ui/ui_ImportBrew.h" +#include "global.h" +#include "Utils.h" +#include "database/db_product.h" +#include "MainWindow.h" + + +ImportBrew::ImportBrew(QWidget *parent) : QDialog(parent), ui(new Ui::ImportBrew) +{ + qDebug() << "ImportBrew start"; + ui->setupUi(this); + WindowTitle(); + ui->progressBar->setValue(0); + connect(ui->quitButton, SIGNAL(clicked()), parent, SLOT(fromImportBrew())); +} + + +ImportBrew::~ImportBrew() +{ + qDebug() << "ImportBrew done"; + delete ui; +} + + +void ImportBrew::WindowTitle() +{ + QString txt = QString(tr("BMSapp - Import Brewlog")); + setWindowTitle(txt); +} + + +void ImportBrew::on_openButton_clicked() +{ + QSqlQuery query; + QString log, sql, code, name, uuid; + int total = 0, errors = 0, updates = 0; + + QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), QDir::homePath() + "/*.json", tr("Files (*.json)")); + if (fileName == 0) { + QMessageBox::warning(this, tr("Open File"), tr("No Brewlog JSON file selected.")); + return; + } + ui->fileEdit->setText(fileName); + + QFile file(fileName); + qint64 fsize = file.size(); + + log = "Import Brewlog file `" + fileName + "`\n\n"; + qInfo() << "Import Brewlog" << fileName << "length" << fsize << "bytes"; + + file.open(QIODevice::ReadOnly); + QByteArray val = file.readAll(); + file.close(); + + QJsonParseError parseError; + QJsonDocument brewlog = QJsonDocument::fromJson(val, &parseError); + if (parseError.error != QJsonParseError::NoError) { + qWarning() << "Parse error: " << parseError.errorString() << "at" << parseError.offset ; + } else { + QJsonObject root = brewlog.object(); + QJsonValue value = root.value(QString("brew")); + + /* + * The logfile is a array with just 1 item. + */ + QJsonArray array = value.toArray(); + foreach (const QJsonValue & v, array) { + /* + * 4 items in a object is a complete brewlog. + */ + QString Recipe = v.toObject().value("Recipe").toString(); + QDateTime Date = QDateTime::fromString(v.toObject().value("Date").toString()); + QJsonArray data = v.toObject().value("brewdata").toArray(); + QJsonArray events = v.toObject().value("annotations").toArray(); + qDebug() << Recipe << Date << data.size() << events.size(); + code = Recipe.split(" ").at(0); + name = Recipe.remove(0, code.size() + 1); + log.append(QString(tr("Brew: ") + code + " " + name + "\n")); + + sql = "SELECT uuid FROM products WHERE code='" + code + "'"; + query.exec(sql); + if (query.first()) { + uuid = query.value(0).toString(); + qDebug() << uuid; + } else { + uuid = ""; + errors++; + qWarning() << "ImportBrew" << code << "product not found"; + continue; + } + + sql = "DELETE FROM log_brews WHERE code='" + code + "'"; + query.exec(sql); + if (query.numRowsAffected() > 0) { + log.append(QString(tr("Deleted %1 old records\n")).arg(query.numRowsAffected())); + qDebug() << "ImportBrew deleted" << query.numRowsAffected(); + } + + for (int j = 0; j < data.size(); j++) { + + QJsonObject obj = data.at(j).toObject(); + + /* + * It's fucking crazy that despite all Googling this cannot be + * done with an internal function. All examples are not working + * for this very very simple problem, add the time string converted + * to QTime to a QDateTime. + * + * Solution that always works, split the string, and do the math. + */ + QStringList Times = obj["Label"].toString().split(":"); + int seconds = Times[0].toInt() * 3600 + Times[1].toInt() * 60; + QDateTime logDate = Date.addSecs(seconds); + QString dt = logDate.toString("yyyy-MM-dd HH:mm:ss"); + + sql = "INSERT INTO log_brews SET version='2', datetime='" + dt + "'"; + sql.append(", uuid='" + uuid + "'"); + sql.append(", code='" + code + "'"); + sql.append(", name='" + name + "'"); + sql.append(", pv_mlt='" + obj["MLT_pv"].toString() + "'"); + sql.append(", sp_mlt='" + obj["MLT_sp"].toString() + "'"); + sql.append(", pwm_mlt='" + obj["MLT_pwm"].toString() + "'"); + if (obj["HLT_pv"].toString().size()) { + sql.append(", pv_hlt='" + obj["HLT_pv"].toString() + "'"); + sql.append(", sp_hlt='" + obj["HLT_sp"].toString() + "'"); + sql.append(", pwm_hlt='" + obj["HLT_pwm"].toString() + "'"); + } + //qDebug() << sql; + + query.exec(sql); + if (query.lastError().isValid()) { + qWarning() << "ImportBrew" << query.lastError(); + errors++; + } + total++; + + /* + * The first 90% is for the normal data + */ + ui->progressBar->setValue((total * 90) / data.size()); + } + log.append(QString(tr("Inserted %1 new records\n")).arg(total - errors)); + + /* + * Update events, they are annotations in the json file. + */ + for (int j = 0; j < events.size(); j++) { + + QJsonObject obj = events.at(j).toObject(); + + QStringList Times = obj["value"].toString().split(":"); + int seconds = Times[0].toInt() * 3600 + Times[1].toInt() * 60; + QDateTime logDate = Date.addSecs(seconds); + QString dt = logDate.toString("yyyy-MM-dd HH:mm:ss"); + QJsonObject label = obj["label"].toObject(); + QString evt = label["content"].toString(); + + sql = "UPDATE log_brews SET event='" + evt + "' WHERE datetime='" + dt + "' AND uuid='" + uuid + "'"; + //qDebug() << sql; + query.exec(sql); + if (query.lastError().isValid()) { + qWarning() << "ImportBrew" << query.lastError(); + errors++; + } else { + updates++; + } + + /* + * The last 10% is for the updates. + */ + ui->progressBar->setValue(((updates * 10) / events.size()) + 90); + } + log.append(QString(tr("Updated %1 records with events\n")).arg(updates)); + + if (errors == 0) { + sql = "UPDATE products SET log_brew=1 WHERE code='" + code + "'"; + query.exec(sql); + if (query.numRowsAffected()) + log.append(QString(tr("Marked brew graph available in product\n"))); + } + } + + } + + ui->logEdit->setPlainText(log); + qInfo() << "Import" << total << "records, " << total - errors << "ok, " << errors << "errors"; + + ui->progressBar->setValue(100); +} + + diff -r 2e30c9c20d22 -r 7945bf3be1f9 src/ImportBrew.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ImportBrew.h Tue Aug 02 20:18:05 2022 +0200 @@ -0,0 +1,28 @@ +#ifndef _IMPORTBREW_H +#define _IMPORTBREW_H + +#include +#include + +namespace Ui { +class ImportBrew; +} + +class ImportBrew : public QDialog +{ + Q_OBJECT + +public: + explicit ImportBrew(QWidget *parent = 0); + ~ImportBrew(); + +private slots: + void on_openButton_clicked(); + +private: + Ui::ImportBrew *ui; + + void WindowTitle(); +}; + +#endif diff -r 2e30c9c20d22 -r 7945bf3be1f9 src/MainWindow.cpp --- a/src/MainWindow.cpp Mon Aug 01 21:49:57 2022 +0200 +++ b/src/MainWindow.cpp Tue Aug 02 20:18:05 2022 +0200 @@ -38,6 +38,7 @@ #include "MonCO2meters.h" #include "MoniSpindels.h" #include "ImportXML.h" +#include "ImportBrew.h" #include "Setup.h" #include "PrinterDialog.h" #include "../ui/ui_MainWindow.h" @@ -413,6 +414,27 @@ } +void MainWindow::fromImportBrew() +{ + ui->mainStack->setCurrentIndex(-1); + ui->mainStack->removeWidget(ImportBrewWindow); + delete ImportBrewWindow; + setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); + ui->menuBar->setVisible(true); +} + + +void MainWindow::on_actionImport_Brew_triggered() +{ + ImportBrewWindow = new ImportBrew(this); + int index = ui->mainStack->count(); + ui->mainStack->addWidget(ImportBrewWindow); + ui->mainStack->setCurrentIndex(index); + setWindowTitle( QString("BMSapp - %1 - Import Brewlog").arg(VERSIONSTRING)); + ui->menuBar->setVisible(false); +} + + void MainWindow::fromMonNodes() { ui->mainStack->setCurrentIndex(-1); diff -r 2e30c9c20d22 -r 7945bf3be1f9 src/MainWindow.h --- a/src/MainWindow.h Mon Aug 01 21:49:57 2022 +0200 +++ b/src/MainWindow.h Tue Aug 02 20:18:05 2022 +0200 @@ -23,6 +23,7 @@ #include "MonCO2meters.h" #include "MoniSpindels.h" #include "ImportXML.h" +#include "ImportBrew.h" #include "Setup.h" #include @@ -133,6 +134,7 @@ MonCO2meters *MonCO2metersWindow; MoniSpindels *MoniSpindelsWindow; ImportXML *ImportXMLWindow; + ImportBrew *ImportBrewWindow; Setup *SetupWindow; signals: @@ -143,6 +145,7 @@ private slots: void on_actionImport_XML_triggered(); + void on_actionImport_Brew_triggered(); void on_actionExit_triggered(); void on_actionMon_Nodes_triggered(); void on_actionMon_Fermenters_triggered(); @@ -175,6 +178,7 @@ public slots: void fromImportXML(); + void fromImportBrew(); void fromMonNodes(); void fromMonFermenters(); void fromMonCO2meters(); diff -r 2e30c9c20d22 -r 7945bf3be1f9 translations/bmsapp_en.ts --- a/translations/bmsapp_en.ts Mon Aug 01 21:49:57 2022 +0200 +++ b/translations/bmsapp_en.ts Tue Aug 02 20:18:05 2022 +0200 @@ -8080,6 +8080,84 @@ + ImportBrew + + + Dialog + + + + + Brew logfile: + + + + + Quit + + + + + Open + + + + + Results + + + + + BMSapp - Import Brewlog + + + + + + Open File + + + + + Files (*.json) + + + + + No Brewlog JSON file selected. + + + + + Brew: + + + + + Deleted %1 old records + + + + + + Inserted %1 new records + + + + + + Updated %1 records with events + + + + + + Marked brew graph available in product + + + + + ImportXML @@ -8721,218 +8799,223 @@ - + Help - + Settings - + Inventory - + Monitor - + Products - - + + Archive - - + + Recipes - + Exit - + About - + Fermenters - + iSpindels - + Suppliers - + Reports - + Fermentables - + Hops - + Yeasts - + Miscs - + Waters - + Equipments - + Supplies list - + Yeast bank - + Water profiles - + Mash schedules - + Beer styles - + Fermentation schedules - + Global settings - + Import beerxml - + In Production - + On Name - + On Code - + On Date - + On Beerstyle - + Import beerXML - + dummy - + hh - + hj - + ll - - + + Nodes - + Carbonation - + Total Production - + Efficiency - + Fermentation + + + Import brew log + + ManoMeter diff -r 2e30c9c20d22 -r 7945bf3be1f9 translations/bmsapp_nl.ts --- a/translations/bmsapp_nl.ts Mon Aug 01 21:49:57 2022 +0200 +++ b/translations/bmsapp_nl.ts Tue Aug 02 20:18:05 2022 +0200 @@ -8635,6 +8635,88 @@ + ImportBrew + + + Dialog + Dialog + + + + Brew logfile: + Brouw logbestand: + + + + Quit + Terug + + + + Open + Open + + + + Results + Resultaat + + + + BMSapp - Import Brewlog + BMSapp - importeer brouwlog + + + + + Open File + Open bestand + + + + Files (*.json) + Bestanden (*.json) + + + + No Brewlog JSON file selected. + Geen brouwlog JSON bestand gekozen. + + + + Brew: + Brouw: + + + + Deleted %1 old records + + %1 oude records verwijderd + + + + + Inserted %1 new records + + %1 nieuwe records ingevoegd + + + + + Updated %1 records with events + + %1 records bijgewerkt met events + + + + + Marked brew graph available in product + + Brouw grafiek beschikbaar gezet in product + + + + ImportXML @@ -9488,49 +9570,49 @@ Bestand - + Help Hulp - + Settings Instellingen - + Inventory Inventaris - + Monitor Monitoren - + Products Productie - - + + Archive Archief - - + + Recipes Recepten - + Exit Afsluiten - + About Over @@ -9539,7 +9621,7 @@ Systemen - + Fermenters Vergisting @@ -9548,166 +9630,171 @@ CO2 meters - + iSpindels iSpindels - + Suppliers Leveranciers - + Reports Rapporten - + Fermentables Vergistbare ingredienten - + Hops Hoppen - + Yeasts Gisten - + Miscs Overige ingredienten - + Waters Water - + Equipments Brouw apparatuur - + Supplies list Voorraad lijst - + Yeast bank Gistbank lijst - + Water profiles Water profielen - + Mash schedules Maisch schemas - + Beer styles Bierstijlen - + Fermentation schedules Vergisting profielen - + Global settings Instellingen - + Import beerxml Importeer beerxml - + In Production In Productie - + On Name Op naam - + On Code Op code - + On Date Op datum - + On Beerstyle Op bierstijl - + Import beerXML Importeer beerXML - + dummy - + hh - + hj - + ll - - + + Nodes Systemen - + Carbonation Carbonatie - + Total Production Totaal productie - + Efficiency Rendement - + Fermentation Vergisting + + + Import brew log + Importeer brouwlog + ManoMeter diff -r 2e30c9c20d22 -r 7945bf3be1f9 ui/ImportBrew.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/ImportBrew.ui Tue Aug 02 20:18:05 2022 +0200 @@ -0,0 +1,145 @@ + + + ImportBrew + + + + 0 + 0 + 1280 + 640 + + + + Dialog + + + + + + + + 170 + 20 + 121 + 20 + + + + Brew logfile: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 310 + 20 + 661 + 23 + + + + 128 + + + + + + 600 + 540 + 80 + 23 + + + + + 0 + 0 + + + + Quit + + + + :icons/silk/door_out.png:icons/silk/door_out.png + + + + + true + + + + 1000 + 20 + 80 + 23 + + + + Open + + + + :/icons/silk/application_form_add.png:/icons/silk/application_form_add.png + + + + + + 200 + 80 + 881 + 431 + + + + Results + + + + + 30 + 90 + 821 + 311 + + + + + Courier 10 Pitch + + + + + + + 30 + 40 + 821 + 23 + + + + 24 + + + + + + + + + fileEdit + quitButton + openButton + + + + + + diff -r 2e30c9c20d22 -r 7945bf3be1f9 ui/MainWindow.ui --- a/ui/MainWindow.ui Mon Aug 01 21:49:57 2022 +0200 +++ b/ui/MainWindow.ui Tue Aug 02 20:18:05 2022 +0200 @@ -48,6 +48,7 @@ File + @@ -495,6 +496,15 @@ Fermentation + + + + :/icons/silk/chart_line_add.png:/icons/silk/chart_line_add.png + + + Import brew log + +