Mercurial > bmsapp / changeset

--- a/src/database/db_product.cpp	Wed Jun 15 16:45:43 2022 +0200
+++ b/src/database/db_product.cpp	Thu Jun 16 11:45:20 2022 +0200
@@ -393,13 +393,13 @@
 		    Miscs m;
 		    m.avail = false;
 		    m.inventory = 0;
-		    m.name = obj["name"].toString();
-		    m.amount = obj["amount"].toDouble();
-		    m.type = obj["type"].toInt();
-		    m.use_use = obj["use_use"].toInt();
-		    m.time = obj["time"].toDouble();
-		    m.amount_is_weight = obj["amount_is_weight"].toInt() ? true:false;
-		    m.cost = obj["cost"].toDouble();
+		    m.name = obj["m_name"].toString();
+		    m.amount = obj["m_amount"].toDouble();
+		    m.type = obj["m_type"].toInt();
+		    m.use_use = obj["m_use_use"].toInt();
+		    m.time = obj["m_time"].toDouble();
+		    m.amount_is_weight = obj["m_amount_is_weight"].toInt() ? true:false;
+		    m.cost = obj["m_cost"].toDouble();
 		    /* Check and update inventory */
                     yquery.prepare("SELECT inventory FROM inventory_miscs WHERE name=:name");
                     yquery.bindValue(":name", m.name);
@@ -905,13 +905,13 @@
         QJsonArray array;
         for (int i = 0; i < prod->miscs.size(); i++) {
                 QJsonObject obj;
-		obj.insert("name", prod->miscs.at(i).name);
-		obj.insert("amount", round(prod->miscs.at(i).amount * 100000) / 100000);
-		obj.insert("type", prod->miscs.at(i).type);
-		obj.insert("use_use", prod->miscs.at(i).use_use);
-		obj.insert("time", round(prod->miscs.at(i).time));
-		obj.insert("amount_is_weight", prod->miscs.at(i).amount_is_weight ? 1:0);
-		obj.insert("cost", round(prod->miscs.at(i).cost * 10000) / 10000);
+		obj.insert("m_name", prod->miscs.at(i).name);
+		obj.insert("m_amount", round(prod->miscs.at(i).amount * 100000) / 100000);
+		obj.insert("m_type", prod->miscs.at(i).type);
+		obj.insert("m_use_use", prod->miscs.at(i).use_use);
+		obj.insert("m_time", round(prod->miscs.at(i).time));
+		obj.insert("m_amount_is_weight", prod->miscs.at(i).amount_is_weight ? 1:0);
+		obj.insert("m_cost", round(prod->miscs.at(i).cost * 10000) / 10000);
 //                qDebug() << "miscs_Json" << i << obj;
                 array.append(obj);      /* Append this object */
         }

--- a/src/database/db_recipe.cpp	Wed Jun 15 16:45:43 2022 +0200
+++ b/src/database/db_recipe.cpp	Thu Jun 16 11:45:20 2022 +0200
@@ -226,13 +226,13 @@
 	    for (int i = 0; i < miscs.array().size(); i++) {
 		QJsonObject obj = miscs.array().at(i).toObject();
 		Miscs m;
-		m.name = obj["name"].toString();
-		m.amount = obj["amount"].toDouble();
-		m.type = obj["type"].toInt();
-		m.use_use = obj["use_use"].toInt();
-		m.time = obj["time"].toDouble();
-		m.amount_is_weight = obj["amount_is_weight"].toInt() ? true:false;
-		m.cost = obj["cost"].toDouble();
+		m.name = obj["m_name"].toString();
+		m.amount = obj["m_amount"].toDouble();
+		m.type = obj["m_type"].toInt();
+		m.use_use = obj["m_use_use"].toInt();
+		m.time = obj["m_time"].toDouble();
+		m.amount_is_weight = obj["m_amount_is_weight"].toInt() ? true:false;
+		m.cost = obj["m_cost"].toDouble();
 		reci->miscs.append(m);
 	    }
 	}
@@ -549,13 +549,13 @@
         QJsonArray array;
         for (int i = 0; i < reci->miscs.size(); i++) {
                 QJsonObject obj;
-		obj.insert("name", reci->miscs.at(i).name);
-		obj.insert("amount", round(reci->miscs.at(i).amount * 10000) / 10000);
-		obj.insert("type", reci->miscs.at(i).type);
-		obj.insert("use_use", reci->miscs.at(i).use_use);
-		obj.insert("time", round(reci->miscs.at(i).time));
-		obj.insert("amount_is_weight", reci->miscs.at(i).amount_is_weight ? 1:0);
-		obj.insert("cost", round(reci->miscs.at(i).cost * 10000) / 10000);
+		obj.insert("m_name", reci->miscs.at(i).name);
+		obj.insert("m_amount", round(reci->miscs.at(i).amount * 10000) / 10000);
+		obj.insert("m_type", reci->miscs.at(i).type);
+		obj.insert("m_use_use", reci->miscs.at(i).use_use);
+		obj.insert("m_time", round(reci->miscs.at(i).time));
+		obj.insert("m_amount_is_weight", reci->miscs.at(i).amount_is_weight ? 1:0);
+		obj.insert("m_cost", round(reci->miscs.at(i).cost * 10000) / 10000);
                 array.append(obj);      /* Append this object */
         }
 	QJsonDocument doc;