Merge pull request #1295 from WildMeOrg/gs-export-more-fields

Get these standard bulk import fields into exports as well

Author: naknomum

src/main/java/org/ecocean/servlet/export/EncounterAnnotationExportExcelFile.java

@@ -185,7 +185,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
             List<ExportColumn> columns = new ArrayList<ExportColumn>();
 
             newEasyColumn("Occurrence.occurrenceID", columns);
-
+            newEasyColumn("Occurrence.sightingPlatform", columns);
+            newEasyColumn("Occurrence.fieldSurveyCode", columns);
             // added new Column for Encounter weburl
             // method is null as we current approach does not support parameters
             // used Encounter.getWebUrl(request, enc.getCatalogNumber()

src/main/java/org/ecocean/servlet/export/EncounterSearchExportMetadataExcel.java

@@ -148,6 +148,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
             MultiValueExportColumn.addNameColumns(numNameCols, columns);
             newEasyColumn("Occurrence.occurrenceID", columns);
             newEasyColumn("Occurrence.sightingPlatform", columns);
+            newEasyColumn("Occurrence.fieldSurveyCode", columns);
             newEasyColumn("Encounter.decimalLatitude", columns);
             newEasyColumn("Encounter.decimalLongitude", columns);
             newEasyColumn("Encounter.locationID", columns);