work on reporting columns

univie-nutrition · Aug 6, 2024 · e72bab1 · e72bab1
1 parent c9cee8f
commit e72bab1
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 3 deletions.
diff --git a/recall24/reporter/src/main/java/dita/recall24/reporter/dom/ConsumptionRow.java b/recall24/reporter/src/main/java/dita/recall24/reporter/dom/ConsumptionRow.java
@@ -55,6 +55,14 @@
  * code
  * @param meal meal happened
  * when and where
+ * @param food name of consumed
+ * food
+ * @param foodId food identifier
+ * @param group food group
+ * @param subgroup food subgroup
+ * @param subSubgroup food sub-subgroup
+ * @param facetIds facet descriptor
+ * identifiers
  * @param quantity quantity
  * consumed [g]
  * @param GCALZB Energie
@@ -142,14 +150,58 @@ public record ConsumptionRow(
         @PropertyLayout(
                 fieldSetId = "details",
                 sequence = "9",
+                describedAs = "name of consumed\n"
+                                + "food",
+                hidden = Where.NOWHERE
+        )
+        String food,
+        @PropertyLayout(
+                fieldSetId = "details",
+                sequence = "10",
+                describedAs = "food identifier",
+                hidden = Where.NOWHERE
+        )
+        String foodId,
+        @PropertyLayout(
+                fieldSetId = "details",
+                sequence = "11",
+                describedAs = "food group",
+                hidden = Where.NOWHERE
+        )
+        String group,
+        @PropertyLayout(
+                fieldSetId = "details",
+                sequence = "12",
+                describedAs = "food subgroup",
+                hidden = Where.NOWHERE
+        )
+        String subgroup,
+        @PropertyLayout(
+                fieldSetId = "details",
+                sequence = "13",
+                describedAs = "food sub-subgroup",
+                hidden = Where.NOWHERE
+        )
+        String subSubgroup,
+        @PropertyLayout(
+                fieldSetId = "details",
+                sequence = "14",
+                describedAs = "facet descriptor\n"
+                                + "identifiers",
+                hidden = Where.NOWHERE
+        )
+        String facetIds,
+        @PropertyLayout(
+                fieldSetId = "details",
+                sequence = "15",
                 describedAs = "quantity\n"
                                 + "consumed [g]",
                 hidden = Where.NOWHERE
         )
         BigDecimal quantity,
         @PropertyLayout(
                 fieldSetId = "details",
-                sequence = "10",
+                sequence = "16",
                 describedAs = "Energie\n"
                                 + "inkl. Ballaststoffen\n"
                                 + "[kcal]",

diff --git a/recall24/reporter/src/main/java/dita/recall24/reporter/tabular/TabularReporters.java b/recall24/reporter/src/main/java/dita/recall24/reporter/tabular/TabularReporters.java
@@ -110,6 +110,9 @@ private static class RowFactory {
             LocalDate consumptionDate;
             String fco;
             String meal;
+            String group = "wip";
+            String subgroup = "wip";
+            String subSubgroup = "wip";
             //
             ConsumptionRow row(
                     final Record24.Consumption cRec,
@@ -125,6 +128,12 @@ ConsumptionRow row(
                         consumptionDate,
                         fco,
                         meal,
+                        foodConsumption.name(),
+                        foodConsumption.foodId().fullFormat(":"),
+                        group,
+                        subgroup,
+                        subSubgroup,
+                        foodConsumption.facetIds().fullFormat(","),
                         cRec.amountConsumed(),
                         compositionEntry
                             .flatMap(e->e.lookupDatapoint(BLS302.Component.GCALZB.componentId()))

diff --git a/recall24/reporter/src/main/resources/companion-schema.yaml b/recall24/reporter/src/main/resources/companion-schema.yaml
@@ -79,7 +79,39 @@ viewmodels:
       required: true
       description: |
         meal happened
-        when and where        
+        when and where
+    food:
+      type: String
+      required: true
+      description: |
+        name of consumed
+        food
+    foodId:
+      type: String
+      required: true
+      description: |
+        food identifier     
+    group:
+      type: String
+      required: true
+      description: |
+        food group
+    subgroup:
+      type: String
+      required: true
+      description: |
+        food subgroup
+    subSubgroup:
+      type: String
+      required: true
+      description: |
+        food sub-subgroup
+    facetIds:
+      type: String
+      required: true
+      description: |
+        facet descriptor
+        identifiers                  
     quantity:
       type: BigDecimal
       required: true

diff --git a/recall24/reporter/src/main/resources/records/ConsumptionRow.yaml b/recall24/reporter/src/main/resources/records/ConsumptionRow.yaml
@@ -67,7 +67,33 @@ viewmodel:
       type: String
       description: |
         meal happened
-        when and where        
+        when and where
+    food:
+      type: String
+      description: |
+        name of consumed
+        food
+    foodId:
+      type: String
+      description: |
+        food identifier     
+    group:
+      type: String
+      description: |
+        food group
+    subgroup:
+      type: String
+      description: |
+        food subgroup
+    subSubgroup:
+      type: String
+      description: |
+        food sub-subgroup
+    facetIds:
+      type: String
+      description: |
+        facet descriptor
+        identifiers                  
     quantity:
       type: BigDecimal
       description: |