AC#1074/backend/group-column-show-member

src/main/resources/schema/schema_v36.sql

@@ -0,0 +1,2 @@
+ALTER TABLE system_columns
+  ADD COLUMN show_member_columns BOOLEAN DEFAULT 'FALSE';

src/main/resources/swagger.json

@@ -3882,6 +3882,11 @@
           "type": "string",
           "description": "Pattern for the frontend how to render the content of a group column",
           "example": "{{1}} × {{2}} × {{3}} mm (B × H × T)"
+        },
+        "showMemberColumns": {
+          "type": "boolean",
+          "description": "Flag if the member columns should be displayed in the frontend table view (They are always displayed in entity view).",
+          "example": true
         }
       },
       "description": "A column object, which is used to create a new column.",
@@ -3919,7 +3924,8 @@
             1,
             2
           ],
-          "formatPattern": "city {{1}} has {{2}} inhabitants"
+          "formatPattern": "city {{1}} has {{2}} inhabitants",
+          "showMemberColumns": true
         }
       ]
     },

src/main/scala/com/campudus/tableaux/controller/StructureController.scala

@@ -455,7 +455,8 @@ class StructureController(
       rules: Option[JsonArray],
       hidden: Option[Boolean],
       maxLengthTry: Try[Option[Int]],
-      minLengthTry: Try[Option[Int]]
+      minLengthTry: Try[Option[Int]],
+      showMemberColumns: Option[Boolean]
   )(implicit user: TableauxUser): Future[ColumnType[_]] = {
     checkArguments(
       greaterZero(tableId),
@@ -471,10 +472,11 @@ class StructureController(
           separator,
           attributes,
           rules,
-          hidden
+          hidden,
+          showMemberColumns
         ),
         Seq(maxLengthTry, minLengthTry),
-        "name, ordering, kind, identifier, displayInfos, countryCodes, separator, attributes, rules, hidden, maxLength, minLength"
+        "name, ordering, kind, identifier, displayInfos, countryCodes, separator, attributes, rules, hidden, maxLength, minLength, showMemberColumns"
       )
     )
     val maxLength = maxLengthTry match {
@@ -510,7 +512,8 @@ class StructureController(
           rules,
           hidden,
           maxLength,
-          minLength
+          minLength,
+          showMemberColumns
         )
 
     for {

src/main/scala/com/campudus/tableaux/database/domain/column.scala

@@ -706,29 +706,34 @@ case class ConcatColumn(
   override val kind: ConcatType.type = ConcatType
 
   override def getJson: JsonObject =
-    super.getJson mergeIn Json.obj("concats" -> columns.map(_.getJson))
+    super.getJson.mergeIn(
+      Json.obj("concats" -> columns.map(_.getJson))
+    )
 
 }
 
 case class GroupColumn(
     override val columnInformation: ColumnInformation,
     override val columns: Seq[ColumnType[_]],
-    formatPattern: Option[String]
+    formatPattern: Option[String],
+    showMemberColumns: Boolean
 )(implicit override val roleModel: RoleModel, val user: TableauxUser) extends ConcatenateColumn {
   override val kind: GroupType.type = GroupType
 
   override def getJson: JsonObject = {
-    val json = super.getJson mergeIn Json.obj("groups" -> columns.map(_.getJson))
+    val json = super.getJson.mergeIn(Json.obj("groups" -> columns.map(_.getJson)))
 
-    formatPattern match {
-      case Some(pattern) =>
-        json mergeIn Json.obj("formatPattern" -> pattern)
+    val formatPatternJson = formatPattern match {
+      case Some(pattern) => Json.obj("formatPattern" -> pattern)
+      case None => Json.emptyObj()
+    }
 
-      case None =>
-      // do nothing
+    val showMemberColumnsJson = showMemberColumns match {
+      case true => Json.obj("showMemberColumns" -> showMemberColumns)
+      case false => Json.emptyObj()
     }
 
-    json
+    json.mergeIn(formatPatternJson).mergeIn(showMemberColumnsJson)
   }
 }
 

src/main/scala/com/campudus/tableaux/database/domain/createcolumn.scala

@@ -113,7 +113,8 @@ case class CreateGroupColumn(
     override val displayInfos: Seq[DisplayInfo],
     groups: Seq[ColumnId],
     override val attributes: Option[JsonObject],
-    override val hidden: Boolean = false
+    override val hidden: Boolean = false,
+    showMemberColumns: Boolean = false
 ) extends CreateColumn {
   override val kind: TableauxDbType = GroupType
   override val languageType: LanguageType = LanguageNeutral

src/main/scala/com/campudus/tableaux/database/model/SystemModel.scala

@@ -161,7 +161,8 @@ class SystemModel(override protected[this] val connection: DatabaseConnection) e
     setupVersion(readSchemaFile("schema_v32"), 32),
     setupVersion(readSchemaFile("schema_v33"), 33),
     setupVersion(readSchemaFile("schema_v34"), 34),
-    setupVersion(readSchemaFile("schema_v35"), 35)
+    setupVersion(readSchemaFile("schema_v35"), 35),
+    setupVersion(readSchemaFile("schema_v36"), 36)
   )
 
   private def readSchemaFile(name: String): String = {