Added TYPE_ROLES when casting item values into JSON.

UIs/BeetRoundWidgets/assets/icons.qrc

@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file>software-application.png</file>
+        <file>no-picture.png</file>
-        <file>feature.png</file>
+        <file>application-icon.png</file>
-        <file>no-picture-taking.png</file>
     </qresource>
 </RCC>

UIs/BeetRoundWidgets/mainwindow.cpp

@@ -38,7 +38,7 @@ MainWindow::MainWindow(QWidget* parent)
   setWindowTitle(QCoreApplication::applicationName() + " [*]");
 
   /// application icon
-  const QString iconString = "://feature.png";
+  const QString iconString = "://application-icon.png";
 #ifdef QT_DEBUG
   QPixmap pixmap       = QPixmap(iconString);
   QTransform transform = QTransform();
@@ -163,6 +163,11 @@ void MainWindow::onAboutClicked() {
                  "Solidarische Landwirtschaft (SoLaWi))."
                  "<br><br><a href=\"https://working-copy.org/\">Working-Copy_Collective website</a>"
                  "<br><br><a href=\"mailto:support@working-copy.org\">Mail to support</a>"
+                 "<br><br>Icon credits:"
+                 "<br><a href=\"https://www.flaticon.com/free-icons/money\" title=\"money "
+                 "icons\">Money icons created by Freepik - Flaticon</a>"
+                 "<br><a href=\"https://www.flaticon.com/free-icons/no-photo\" title=\"no photo "
+                 "icons\">No photo icons created by kerismaker - Flaticon</a>"
                  "<br><br>It uses the <a href=\"https://qt.io\">Qt Framework</a>.")
              .arg(applicationName)
              .arg(APPLICATION_VERSION)

UIs/BeetRoundWidgets/views/itemdetailmapper.cpp

@@ -262,7 +262,7 @@ void ItemDetailMapper::onCurrentIndexChanged(const QModelIndex& current,
 void ItemDetailMapper::updateQRCode(const QString text) {
   QImage unscaledImage;
   if (text.isEmpty()) {
-    unscaledImage = QImage("://no-picture-taking.png");
+    unscaledImage = QImage("://no-picture.png");
   } else {
     unscaledImage = m_generator.generateQr(text);
   }

libs/BeetRoundCore/formats/csvparser.cpp

@@ -23,9 +23,12 @@ QList<ModelItemValues> CsvParser::getItemsFromCSVFile(const QString& fileName) {
 
 bool CsvParser::exportToCSVFile(const QList<QStringList>& rows, const QString& filePath) {
   Document doc(std::string(), LabelParams(0, -1));
-  const QList<QString> headerNames = GET_HEADER_NAMES();
+  // const QList<QString> headerNames = GET_HEADER_NAMES();
-  for (int column = 0; column < headerNames.size(); ++column) {
+  const int columnCount = USER_FACING_ROLES.size();
-    doc.SetColumnName(column, headerNames.at(column).toStdString());
+  for (int column = 0; column < columnCount; ++column) {
+    const UserRoles role   = GET_ROLE_FOR_COLUMN(column);
+    std::string columnName = ROLE_NAMES.value(role).toStdString();
+    doc.SetColumnName(column, columnName);
   }
   for (int row = 0; row < rows.size(); ++row) {
     QStringList rowValues = rows.at(row);
@@ -129,8 +132,22 @@ ModelItemValues CsvParser::getItemValuesForRow(
 QVariant CsvParser::parseItemValue(const int role, const std::string& valueString) {
   QVariant result;
   if (STRING_ROLES.contains(role)) {
+    if (role == ShareTypeRole) {
+      if (valueString == "AGA") {
+        result = "erarbeitet";
+      } else if (valueString == "ja") {
+        result = "bezahlt";
+
+      } else if (valueString == "teils") {
+        result = "teils/teils";
+
+      } else {
+        result = "";
+      }
+    } else {
       /// string values
       result = QString::fromStdString(valueString);
+    }
   } else if (INT_ROLES.contains(role)) {
     /// int values
 

libs/BeetRoundCore/formats/jsonparser.cpp

@@ -53,6 +53,8 @@ QByteArray JsonParser::itemValuesListToJson(const QList<ModelItemValues>& itemVa
       const QVariant value   = itemValues.value(role);
       if (STRING_ROLES.contains(role)) {
         itemObject.insert(roleName, value.toString());
+      } else if (TYPE_ROLES.contains(role)) {
+        itemObject.insert(roleName, value.toString());
       } else if (INT_ROLES.contains(role)) {
         itemObject.insert(roleName, value.toInt());
       } else if (DOUBLE_ROLES.contains(role)) {

libs/BeetRoundCore/genericcore.cpp

@@ -164,7 +164,6 @@ void GenericCore::onLoginSuccessful() {
 
 void GenericCore::onBiddingsChanged(const QList<bidding> biddings) {
   qInfo() << "onBiddingsChanged: biddings:" << biddings.count();
-  // NEXT merge biddings into model
   m_mainModel->updateBiddings(biddings);
 }