comparison: src/database/db_recipe.cpp
src/database/db_recipe.cpp
- changeset 294
- afc763d9fd89
- parent 287
- 83e66c6b6e07
- child 374
- 74d541ac514c
equal
deleted
inserted
replaced
| 293:6df94ca2bfde | 294:afc763d9fd89 |
|---|---|
| 224 qWarning() << "Parse error: " << parseError.errorString() << "at" << parseError.offset; | 224 qWarning() << "Parse error: " << parseError.errorString() << "at" << parseError.offset; |
| 225 } else if (miscs.isArray()) { | 225 } else if (miscs.isArray()) { |
| 226 for (int i = 0; i < miscs.array().size(); i++) { | 226 for (int i = 0; i < miscs.array().size(); i++) { |
| 227 QJsonObject obj = miscs.array().at(i).toObject(); | 227 QJsonObject obj = miscs.array().at(i).toObject(); |
| 228 Miscs m; | 228 Miscs m; |
| 229 m.name = obj["name"].toString(); | 229 m.name = obj["m_name"].toString(); |
| 230 m.amount = obj["amount"].toDouble(); | 230 m.amount = obj["m_amount"].toDouble(); |
| 231 m.type = obj["type"].toInt(); | 231 m.type = obj["m_type"].toInt(); |
| 232 m.use_use = obj["use_use"].toInt(); | 232 m.use_use = obj["m_use_use"].toInt(); |
| 233 m.time = obj["time"].toDouble(); | 233 m.time = obj["m_time"].toDouble(); |
| 234 m.amount_is_weight = obj["amount_is_weight"].toInt() ? true:false; | 234 m.amount_is_weight = obj["m_amount_is_weight"].toInt() ? true:false; |
| 235 m.cost = obj["cost"].toDouble(); | 235 m.cost = obj["m_cost"].toDouble(); |
| 236 reci->miscs.append(m); | 236 reci->miscs.append(m); |
| 237 } | 237 } |
| 238 } | 238 } |
| 239 } else { | 239 } else { |
| 240 qDebug() << "empty miscs"; | 240 qDebug() << "empty miscs"; |
| 547 query.bindValue(":json_miscs", "[]"); | 547 query.bindValue(":json_miscs", "[]"); |
| 548 } else { | 548 } else { |
| 549 QJsonArray array; | 549 QJsonArray array; |
| 550 for (int i = 0; i < reci->miscs.size(); i++) { | 550 for (int i = 0; i < reci->miscs.size(); i++) { |
| 551 QJsonObject obj; | 551 QJsonObject obj; |
| 552 obj.insert("name", reci->miscs.at(i).name); | 552 obj.insert("m_name", reci->miscs.at(i).name); |
| 553 obj.insert("amount", round(reci->miscs.at(i).amount * 10000) / 10000); | 553 obj.insert("m_amount", round(reci->miscs.at(i).amount * 10000) / 10000); |
| 554 obj.insert("type", reci->miscs.at(i).type); | 554 obj.insert("m_type", reci->miscs.at(i).type); |
| 555 obj.insert("use_use", reci->miscs.at(i).use_use); | 555 obj.insert("m_use_use", reci->miscs.at(i).use_use); |
| 556 obj.insert("time", round(reci->miscs.at(i).time)); | 556 obj.insert("m_time", round(reci->miscs.at(i).time)); |
| 557 obj.insert("amount_is_weight", reci->miscs.at(i).amount_is_weight ? 1:0); | 557 obj.insert("m_amount_is_weight", reci->miscs.at(i).amount_is_weight ? 1:0); |
| 558 obj.insert("cost", round(reci->miscs.at(i).cost * 10000) / 10000); | 558 obj.insert("m_cost", round(reci->miscs.at(i).cost * 10000) / 10000); |
| 559 array.append(obj); /* Append this object */ | 559 array.append(obj); /* Append this object */ |
| 560 } | 560 } |
| 561 QJsonDocument doc; | 561 QJsonDocument doc; |
| 562 doc.setArray(array); | 562 doc.setArray(array); |
| 563 query.bindValue(":json_miscs", doc.toJson(QJsonDocument::Compact)); | 563 query.bindValue(":json_miscs", doc.toJson(QJsonDocument::Compact)); |
