Merge pull request #864 from WildMeOrg/annotation-export-sex-lifestage

annotation export: regrouped/labeled ind info, added enc info
WildMeOrg · Nov 8, 2024 · 1b6dce8 · 1b6dce8
2 parents 638f721 + cbbc559
commit 1b6dce8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/org/ecocean/servlet/export/EncounterAnnotationExportExcelFile.java b/src/main/java/org/ecocean/servlet/export/EncounterAnnotationExportExcelFile.java
@@ -204,12 +204,14 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
                     annViewpoint, columns);
                 aanViewpointK.setMaNum(maNum);
             }
+            // individual names and summaries
+            MultiValueExportColumn.addNameColumns(numNameCols, columns);
             ExportColumn markedIndividualSex = new ExportColumn(MarkedIndividual.class,
-                "Encounter.sex", markedIndividualSexName, columns);
+                "IndividualSummary.sex", markedIndividualSexName, columns);
             ExportColumn markedIndividuallifeStage = new ExportColumn(MarkedIndividual.class,
-                "Encounter.lifeStage", markedIndividualLifeStageName, columns);
+                "IndividualSummary.lifeStage", markedIndividualLifeStageName, columns);
 
-            MultiValueExportColumn.addNameColumns(numNameCols, columns);
+            // encounter information
             newEasyColumn("Encounter.genus", columns);
             newEasyColumn("Encounter.specificEpithet", columns);
             newEasyColumn("Encounter.verbatimLocality", columns);
@@ -222,6 +224,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
             newEasyColumn("Encounter.day", columns);
             newEasyColumn("Encounter.hour", columns);
             newEasyColumn("Encounter.minutes", columns);
+            newEasyColumn("Encounter.sex", columns);
+            newEasyColumn("Encounter.lifeStage", columns);
             newEasyColumn("Encounter.occurrenceRemarks", columns);
             ExportColumn OccurrenceComments = new ExportColumn(Occurrence.class,
                 "Occurrence.comments", occurrenceComments, columns);