Commit ab0fd258 authored by Maxym Borodenko's avatar Maxym Borodenko
Browse files

Extended MCPD Excel export

parent d0401c8e
......@@ -63,6 +63,7 @@ import org.genesys2.server.model.genesys.AccessionRemark;
import org.genesys2.server.model.genesys.PDCI;
import org.genesys2.server.model.genesys.QAccession;
import org.genesys2.server.model.genesys.Taxonomy2;
import org.genesys2.server.model.grin.TaxonomySpecies;
import org.genesys2.server.model.impl.Country;
import org.genesys2.server.model.impl.FaoInstitute;
import org.genesys2.server.mvc.JspHelper;
......@@ -105,36 +106,39 @@ public class DownloadServiceImpl implements DownloadService {
private static final int COL_SPAUTHOR = 10;
private static final int COL_SUBTAXA = 11;
private static final int COL_SUBTAUTHOR = 12;
private static final int COL_CROPNAME = 13;
private static final int COL_ACCENAME = 14;
private static final int COL_ACQDATE = 15;
private static final int COL_ORIGCTY = 16;
private static final int COL_COLLSITE = 17;
private static final int COL_DECLATITUDE = 18;
private static final int COL_DECLONGITUDE = 19;
private static final int COL_COORDUNCERT = 20;
private static final int COL_COORDDATUM = 21;
private static final int COL_GEOREFMETH = 22;
private static final int COL_ELEVATION = 23;
private static final int COL_COLLDATE = 24;
private static final int COL_BREDCODE = 25;
private static final int COL_SAMPSTAT = 27;
private static final int COL_ANCEST = 28;
private static final int COL_COLLSRC = 29;
private static final int COL_DONORCODE = 30;
private static final int COL_DONORNAME = 31;
private static final int COL_DONORNUMB = 32;
private static final int COL_OTHERNUMB = 33;
private static final int COL_DUPLSITE = 34;
private static final int COL_STORAGE = 36;
private static final int COL_MLSSTAT = 37;
private static final int COL_UUID = 38;
private static final int COL_HISTORIC = 39;
private static final int COL_ACCEURL = 40;
private static final int COL_REMARKS = 41;
private static final int COL_LASTMODIFIED = 42;
private static final int COL_GRIN_TAXON_ID = 13;
private static final int COL_GRIN_NAME = 14;
private static final int COL_GRIN_AUTHOR = 15;
private static final int COL_CROPNAME = 16;
private static final int COL_ACCENAME = 17;
private static final int COL_ACQDATE = 18;
private static final int COL_ORIGCTY = 19;
private static final int COL_COLLSITE = 20;
private static final int COL_DECLATITUDE = 21;
private static final int COL_DECLONGITUDE = 22;
private static final int COL_COORDUNCERT = 23;
private static final int COL_COORDDATUM = 24;
private static final int COL_GEOREFMETH = 25;
private static final int COL_ELEVATION = 26;
private static final int COL_COLLDATE = 27;
private static final int COL_BREDCODE = 28;
// 29
private static final int COL_SAMPSTAT = 30;
private static final int COL_ANCEST = 31;
private static final int COL_COLLSRC = 32;
private static final int COL_DONORCODE = 33;
private static final int COL_DONORNAME = 34;
private static final int COL_DONORNUMB = 35;
private static final int COL_OTHERNUMB = 36;
private static final int COL_DUPLSITE = 37;
// 38
private static final int COL_STORAGE = 39;
private static final int COL_MLSSTAT = 40;
private static final int COL_UUID = 41;
private static final int COL_HISTORIC = 42;
private static final int COL_ACCEURL = 43;
private static final int COL_REMARKS = 44;
private static final int COL_LASTMODIFIED = 45;
@Autowired
private AccessionProcessor accessionProcessor;
......@@ -345,6 +349,13 @@ public class DownloadServiceImpl implements DownloadService {
updateCell(row, COL_SPAUTHOR, taxonomy.getSpAuthor());
updateCell(row, COL_SUBTAXA, taxonomy.getSubtaxa());
updateCell(row, COL_SUBTAUTHOR, taxonomy.getSubtAuthor());
TaxonomySpecies currentGrinTaxonomy = taxonomy.getCurrentTaxonomySpecies();
if (currentGrinTaxonomy != null) {
updateCell(row, COL_GRIN_TAXON_ID, currentGrinTaxonomy.getId());
updateCell(row, COL_GRIN_NAME, currentGrinTaxonomy.getName());
updateCell(row, COL_GRIN_AUTHOR, currentGrinTaxonomy.getNameAuthority());
}
}
updateCell(row, COL_CROPNAME, accession.getCropName());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment