From 6af4bb84fd619a82e81f6e69df2b1f1c6a9a2d24 Mon Sep 17 00:00:00 2001
From: David <david@opengis.ch>
Date: Fri, 27 Oct 2017 12:26:11 +0200
Subject: [PATCH] relationconfig

---
 src/app/qgsattributesformproperties.cpp | 61 +++++++++++++++++++++----
 src/app/qgsattributesformproperties.h   | 17 +++++++
 2 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/src/app/qgsattributesformproperties.cpp b/src/app/qgsattributesformproperties.cpp
index 8d89fc902f12..910e9ef0142d 100644
--- a/src/app/qgsattributesformproperties.cpp
+++ b/src/app/qgsattributesformproperties.cpp
@@ -188,6 +188,22 @@ QgsAttributesFormProperties::FieldConfig QgsAttributesFormProperties::configForC
   return FieldConfig();
 }
 
+QgsAttributesFormProperties::RelationConfig QgsAttributesFormProperties::configForRelationChild( const QString &relationName )
+{
+  QTreeWidgetItemIterator itemIt( mAvailableWidgetsTree );
+  while ( *itemIt )
+  {
+    QTreeWidgetItem *item = *itemIt;
+    if ( item->data( 0, FieldNameRole ).toString() == relationName )
+      return item->data( 0, RelationConfigRole ).value<RelationConfig>();
+    ++itemIt;
+  }
+
+  // Should never get here
+  Q_ASSERT( false );
+  return RelationConfig();
+}
+
 
 QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAttributeEditorElement *const widgetDef, QTreeWidgetItem *parent, DnDTree *tree )
 {
@@ -313,14 +329,16 @@ void QgsAttributesFormProperties::initAvailableWidgetsTree()
 
   for ( const QgsRelation &relation : relations )
   {
-    DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::Relation, relation.name() );
+    DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::Relation, QStringLiteral( "%1" ).arg( relation.id() )); //relation.name() );
     itemData.setShowLabel( true );
 
+    //daveRelation
+    RelationConfig cfg( mLayer, relation.id() );
+
     QTreeWidgetItem *item = mAvailableWidgetsTree->addItem( catitem, itemData );
-    item->setData( 0, FieldNameRole, relation.name() );
+    item->setData( 0, RelationConfigRole, cfg );
+    item->setData( 0, FieldNameRole, QStringLiteral( "%1" ).arg( relation.id() ) ); //relation.name() );
   }
-
-
 }
 
 
@@ -416,10 +434,12 @@ void QgsAttributesFormProperties::apply()
 
   QTreeWidgetItem* fieldContainer=mAvailableWidgetsTree->invisibleRootItem()->child(0);
 
+  int idx;
+
   for ( int i = 0; i < fieldContainer->childCount(); i++ )
   {
     QTreeWidgetItem *fieldItem = fieldContainer->child( i );
-    int idx=fieldContainer->indexOfChild( fieldItem );
+    idx=fieldContainer->indexOfChild( fieldItem );
 
     QString name = mLayer->fields().at( idx ).name();
     FieldConfig cfg = configForChild( idx );
@@ -479,16 +499,24 @@ void QgsAttributesFormProperties::apply()
   editFormConfig.setSuppress( ( QgsEditFormConfig::FeatureFormSuppress )mFormSuppressCmbBx->currentIndex() );
   */
 
-  /*
+
   // relations
   QTreeWidgetItem* relationContainer=mAvailableWidgetsTree->invisibleRootItem()->child(1);
 
   for ( int i = 0; i < relationContainer->childCount(); i++ )
   {
     QTreeWidgetItem *relationItem = relationContainer->child( i );
-    int idx=relationContainer->indexOfChild( relationItem );
+    DnDTreeItemData itemData= relationItem->data( 0, DnDTreeRole ).value<DnDTreeItemData>();
 
-    QString name = mLayer->fields().at( idx ).name();
+    RelationConfig relCfg = configForRelChild( itemData.name() );
+
+    QVariantMap cfg;
+    cfg[QStringLiteral( "nm-rel" )]=relCfg.mCardinality;
+
+    editFormConfig.setWidgetConfig( itemData.name(), cfg );
+  }
+
+/*
 
   for ( int i = 0; i < mRelationsList->rowCount(); ++i )
   {
@@ -509,6 +537,7 @@ void QgsAttributesFormProperties::apply()
     editFormConfig.setWidgetConfig( relationName, cfg );
   }
 */
+
   mLayer->setEditFormConfig( editFormConfig );
 }
 
@@ -552,6 +581,22 @@ QgsAttributesFormProperties::FieldConfig::operator QVariant()
   return QVariant::fromValue<QgsAttributesFormProperties::FieldConfig>( *this );
 }
 
+
+/*
+ * RelationConfig implementation
+ */
+QgsAttributesFormProperties::RelationConfig::RelationConfig( QgsVectorLayer *layer, const QString &relationId )
+{
+  const QVariant nmrelcfg = layer->editFormConfig().widgetConfig( relationId ).value( QStringLiteral( "nm-rel" ) );
+
+  mCardinality=nmrelcfg.toString();
+}
+
+QgsAttributesFormProperties::RelationConfig::operator QVariant()
+{
+  return QVariant::fromValue<QgsAttributesFormProperties::RelationConfig>( *this );
+}
+
 /*
  * DnDTree implementation
  */
diff --git a/src/app/qgsattributesformproperties.h b/src/app/qgsattributesformproperties.h
index 20d5a5916940..569a8b4d1b75 100644
--- a/src/app/qgsattributesformproperties.h
+++ b/src/app/qgsattributesformproperties.h
@@ -58,6 +58,7 @@ class APP_EXPORT QgsAttributesFormProperties : public QWidget, private Ui_QgsAtt
     {
       DnDTreeRole = Qt::UserRole,
       FieldConfigRole,
+      RelationConfigRole,
       FieldNameRole
     };
 
@@ -156,6 +157,20 @@ class APP_EXPORT QgsAttributesFormProperties : public QWidget, private Ui_QgsAtt
       operator QVariant();
     };
 
+
+    /**
+     * Holds the configuration for a relation
+     */
+    struct RelationConfig
+    {
+      RelationConfig();
+      RelationConfig( QgsVectorLayer *layer, const QString &relationId );
+
+      QString mCardinality;
+
+      operator QVariant();
+    };
+
   public:
     explicit QgsAttributesFormProperties( QgsVectorLayer *layer, QWidget *parent = nullptr );
     ~QgsAttributesFormProperties();
@@ -179,6 +194,8 @@ class APP_EXPORT QgsAttributesFormProperties : public QWidget, private Ui_QgsAtt
     FieldConfig configForChild( int index );
     void setConfigForChild( int index, const FieldConfig &cfg );
 
+    RelationConfig configForRelationChild( const QString &relationName );
+
     //QList<QgsRelation> mRelations;
     QgsVectorLayer *mLayer = nullptr;