MCPD V2 enumerations for sampStat, collSrc, storage

src/main/resources/content/language.properties

@@ -175,6 +175,18 @@ accession.not-available-for-distribution=The accession is NOT available for dist
 accession.available-for-distribution=The accession is available for distribution. 
 accession.elevation=Elevation
 accession.geolocation=Geolocation (lat, long)
+
+accession.storage=Germplasm storage
+accession.storage.10=Seed collection
+accession.storage.11=Short term
+accession.storage.12=Medium term
+accession.storage.13=Long term
+accession.storage.20=Field collection
+accession.storage.30=In vitro collection
+accession.storage.40=Cryopreserved collection
+accession.storage.50=DNA collection
+accession.storage.99=Other
+
 accession.breeding=Breeder information
 accession.breederCode=Breeder Code
 accession.pedigree=Pedigree
@@ -185,6 +197,30 @@ accession.collecting.number=Collecting number
 accession.collecting.date=Collecting date
 accession.collecting.mission=Collecting mission ID
 accession.collecting.source=Collecting source
+
+accession.collectingSource.10=Wild habitat
+accession.collectingSource.11=Forest or woodland
+accession.collectingSource.12=Shrubland
+accession.collectingSource.13=Grassland
+accession.collectingSource.14=Desert or tundra
+accession.collectingSource.15=Aquatic habitat
+accession.collectingSource.20=Field or cultivated habitat
+accession.collectingSource.21=Field
+accession.collectingSource.22=Orchard
+accession.collectingSource.23=Backyard, kitchen or home garden (urban, peri-urban or rural)
+accession.collectingSource.24=Fallow land
+accession.collectingSource.25=Pasture
+accession.collectingSource.26=Farm store
+accession.collectingSource.27=Threshing floor
+accession.collectingSource.28=Park
+accession.collectingSource.30=Market or shop
+accession.collectingSource.40=Institute, Experimental station, Research organization, Genebank
+accession.collectingSource.50=Seed company
+accession.collectingSource.60=Weedy, disturbed or ruderal habitat
+accession.collectingSource.61=Roadside
+accession.collectingSource.62=Field margin
+accession.collectingSource.99=Other
+
 accession.donor.institute=Donor institute
 accession.donor.accessionNumber=Donor accession ID
 accession.geo=Geographic information
@@ -192,10 +228,12 @@ accession.geo.datum=Coordinate datum
 accession.geo.method=Georeferencing method
 accession.geo.uncertainty=Coordinate uncertainty
 accession.sampleStatus=Sample status
+
 accession.sampleStatus.=
 accession.sampleStatus.100=Wild
 accession.sampleStatus.110=Natural
-accession.sampleStatus.120=Semi Natural/Wild
+accession.sampleStatus.120=Semi-natural/wild
+accession.sampleStatus.130=Semi-natural/sown
 accession.sampleStatus.200=Weedy
 accession.sampleStatus.300=Traditional cultivar/Landrace
 accession.sampleStatus.400=Breeding/Research Material
@@ -205,9 +243,15 @@ accession.sampleStatus.412=Hybrid
 accession.sampleStatus.413=Founder stock/base population
 accession.sampleStatus.414=Inbred line
 accession.sampleStatus.415=Segregating population
-accession.sampleStatus.420=Mutant/genetic stock
+accession.sampleStatus.416=Clonal selection
+accession.sampleStatus.420=Genetic stock
+accession.sampleStatus.421=Mutant
+accession.sampleStatus.422=Cytogenetic stocks
+accession.sampleStatus.422=Other genetic stocks
 accession.sampleStatus.500=Advanced/improved cultivar
+accession.sampleStatus.600=GMO
 accession.sampleStatus.999=Other
+
 accession.availability=Availability
 accession.aliasType.GENERIC=
 accession.aliasType.DONORNAME=(Donor accession name)

src/main/webapp/WEB-INF/jsp/accession/details.jsp

@@ -104,6 +104,18 @@
 					href="<c:url value="/wiews/${accession.institute.code.toLowerCase()}/t/${accession.taxonomy.genus}/${accession.taxonomy.species}" />"><spring:message code="accession.taxonomy-at-institute" arguments="${accession.taxonomy.taxonName}|||${accession.institute.code}" argumentSeparator="|||" /></a></td>
 			</tr>
 
+			<tr>
+				<td><spring:message code="accession.sampleStatus" /></td>
+				<td><spring:message code="accession.sampleStatus.${accession.sampleStatus}" /></td>
+			</tr>
+
+			<tr>
+				<td><spring:message code="accession.storage" /></td>
+				<td><c:forEach items="${accession.storage.split('[;,]')}" var="storage">
+					<div><spring:message code="accession.storage.${storage}" /></div>
+				</c:forEach></td>
+			</tr>
+
 			<tr>
 				<td><spring:message code="accession.availability" /></td>
 				<td><spring:message code="accession.availability.${accession.availability}" /></td>
@@ -129,11 +141,6 @@
 				</td>
 			</tr>
 			
-			<tr>
-				<td><spring:message code="accession.sampleStatus" /></td>
-				<td><spring:message code="accession.sampleStatus.${accession.sampleStatus}" /></td>
-			</tr>
-
 
 			<c:if test="${accessionExchange ne null}">
 				<tr>
@@ -181,7 +188,7 @@
 				</tr>
 				<tr>
 					<td><spring:message code="accession.collecting.source" /></td>
-					<td>${accessionCollect.collSrc}</td>
+					<td><spring:message code="accession.collectingSource.${accessionCollect.collSrc}" /></td>
 				</tr>
 			</c:if>