diff --git a/src/main/java/org/ecocean/servlet/export/EncounterAnnotationExportExcelFile.java b/src/main/java/org/ecocean/servlet/export/EncounterAnnotationExportExcelFile.java index 665653284f..da365c077d 100644 --- 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);