Accession forms cleanup

workspaces/client/locales/en/client.json

@@ -521,26 +521,47 @@
     "AccessionSource": {
       "accessionSource": "Accession Source",
       "geography": "Geography",
+      "geography_hint": "geography_id -- The Geography where the accession was collected, developed or donated.",
       "quantityCollected": "Quantity Collected",
+      "quantityCollected_hint": "quantity_collected -- Quantity of material collected",
       "environmentDescription": "Environment Description",
+      "environmentDescription_hint": "environment_description -- Description of the biological and physical environment of the locality",
       "collectorVerbatimLocality": "Collector Verbatim Locality",
+      "collectorVerbatimLocality_hint": "collector_verbatim_locality -- Locality description recorded in a standard format",
       "acquisitionSource": "Collecting or Acquisition Source",
+      "acquisitionSource_hint": "acquisition_source_code -- The collecting or acquisition source. Must be a value in the ACCESSION_SOURCE_HABITAT_TYPE Code Group.",
       "sourceTypeCode": "Source Type",
+      "sourceTypeCode_hint": "source_type_code -- Indicates how the accession was first obtained. Must be a value in the ACCESSION_SOURCE_TYPE Code Group.",
+      "isOrigin": "Is Origin?",
+      "isOrigin_hint": "is_origin -- Indicates that this source considered as the provenance of material.",
       "sourceDate": "Source Date",
+      "sourceDate_hint": "source_date -- Date when the source event occurred",
       "sourceDateCode": "Source Date Format",
-      "isOrigin": "Is Origin?",
+      "sourceDateCode_hint": "source_date_code -- Format of the source event date. Must be a value in the DATE_FORMAT Code Group",
       "unitQuantityCollectedCode": "Unit Quantity Collected",
+      "unitQuantityCollectedCode_hint": "unit_quantity_collected_code -- Units of the quantity collected. Must be a value in the UNIT_OF_QUANTITY Code Group. ",
       "collectedFormCode": "Collected Form",
+      "collectedFormCode_hint": "collected_form_code -- The form of the material collected. Must be a value in the GERMPLASM_FORM Code Group.",
       "numberPlantsSampled": "Number Plants Sampled",
+      "numberPlantsSampled_hint": "number_plants_sampled -- Number of plants sampled to obtain quantity collected",
       "elevationMeters": "Elevation (meters)",
+      "elevationMeters_hint": "elevation_meters -- Elevation of the collection site (in meters)",
       "latitude": "Latitude",
+      "latitude_hint": "latitude -- Latitude of the collection site in decimal format.",
       "longitude": "Longitude",
+      "longitude_hint": "longitude -- Longitude of collection site in decimal format.",
       "uncertainty": "Uncertainty (meters)",
+      "uncertainty_hint": "uncertainty -- Maximum possible error in the georeferenced location.",
       "formattedLocality": "Formatted Locality",
+      "formattedLocality_hint": "formatted_locality -- Locality description recorded in a standard format.",
       "georeferenceDatum": "Geodetic Datum",
+      "georeferenceDatum_hint": "georeference_datum -- Geodetic system upon which the latitude and longitude are based",
       "georeferenceProtocolCode": "Georeference Protocol",
+      "georeferenceProtocolCode_hint": "georeference_protocol_code -- A code used to describe how georeferencing was carried out. Must be a value in the GEOREFERENCE_PROTOCOL Code Group.",
       "georeferenceAnnotation": "Georeference Annotation",
-      "associatedSpecies": "Associated Species"
+      "georeferenceAnnotation_hint": "georeference_annotation -- The descriptive details of the protocol used to determine the coordinates. For example: if GPS indicate receiver brand, model, mode and uncertainty; if GIS indicate software, version, digital maps used; if google or BioGeoMancer indicate URL.",
+      "associatedSpecies": "Associated Species",
+      "associatedSpecies_hint": "associated_species -- Associated Species"
     },
     "AccessionSourceMap": {
       "accessionSourceMap": "Accession Source Map",

workspaces/client/src/model/translations.json

@@ -508,26 +508,47 @@
   "AccessionSource": {
     "accessionSource": "Accession Source",
     "geography": "Geography",
+    "geography_hint": "geography_id -- The Geography where the accession was collected, developed or donated.",
     "quantityCollected": "Quantity Collected",
+    "quantityCollected_hint": "quantity_collected -- Quantity of material collected",
     "environmentDescription": "Environment Description",
+    "environmentDescription_hint": "environment_description -- Description of the biological and physical environment of the locality",
     "collectorVerbatimLocality": "Collector Verbatim Locality",
+    "collectorVerbatimLocality_hint": "collector_verbatim_locality -- Locality description recorded in a standard format",
     "acquisitionSource": "Collecting or Acquisition Source",
+    "acquisitionSource_hint": "acquisition_source_code -- The collecting or acquisition source. Must be a value in the ACCESSION_SOURCE_HABITAT_TYPE Code Group.",
     "sourceTypeCode": "Source Type",
+    "sourceTypeCode_hint": "source_type_code -- Indicates how the accession was first obtained. Must be a value in the ACCESSION_SOURCE_TYPE Code Group.",
+    "isOrigin": "Is Origin?",
+    "isOrigin_hint": "is_origin -- Indicates that this source considered as the provenance of material.",
     "sourceDate": "Source Date",
+    "sourceDate_hint": "source_date -- Date when the source event occurred",
     "sourceDateCode": "Source Date Format",
-    "isOrigin": "Is Origin?",
+    "sourceDateCode_hint": "source_date_code -- Format of the source event date. Must be a value in the DATE_FORMAT Code Group",
     "unitQuantityCollectedCode": "Unit Quantity Collected",
+    "unitQuantityCollectedCode_hint": "unit_quantity_collected_code -- Units of the quantity collected. Must be a value in the UNIT_OF_QUANTITY Code Group. ",
     "collectedFormCode": "Collected Form",
+    "collectedFormCode_hint": "collected_form_code -- The form of the material collected. Must be a value in the GERMPLASM_FORM Code Group.",
     "numberPlantsSampled": "Number Plants Sampled",
+    "numberPlantsSampled_hint": "number_plants_sampled -- Number of plants sampled to obtain quantity collected",
     "elevationMeters": "Elevation (meters)",
+    "elevationMeters_hint": "elevation_meters -- Elevation of the collection site (in meters)",
     "latitude": "Latitude",
+    "latitude_hint": "latitude -- Latitude of the collection site in decimal format.",
     "longitude": "Longitude",
+    "longitude_hint": "longitude -- Longitude of collection site in decimal format.",
     "uncertainty": "Uncertainty (meters)",
+    "uncertainty_hint": "uncertainty -- Maximum possible error in the georeferenced location.",
     "formattedLocality": "Formatted Locality",
+    "formattedLocality_hint": "formatted_locality -- Locality description recorded in a standard format.",
     "georeferenceDatum": "Geodetic Datum",
+    "georeferenceDatum_hint": "georeference_datum -- Geodetic system upon which the latitude and longitude are based",
     "georeferenceProtocolCode": "Georeference Protocol",
+    "georeferenceProtocolCode_hint": "georeference_protocol_code -- A code used to describe how georeferencing was carried out. Must be a value in the GEOREFERENCE_PROTOCOL Code Group.",
     "georeferenceAnnotation": "Georeference Annotation",
-    "associatedSpecies": "Associated Species"
+    "georeferenceAnnotation_hint": "georeference_annotation -- The descriptive details of the protocol used to determine the coordinates. For example: if GPS indicate receiver brand, model, mode and uncertainty; if GIS indicate software, version, digital maps used; if google or BioGeoMancer indicate URL.",
+    "associatedSpecies": "Associated Species",
+    "associatedSpecies_hint": "associated_species -- Associated Species"
   },
   "AccessionSourceMap": {
     "accessionSourceMap": "Accession Source Map",

workspaces/ui-express/locales/en/express.json

@@ -210,11 +210,11 @@
           "title": "Accession",
           "attachments": "Attachments",
           "groups": "Groups",
-          "quarantine": "Accession quarantine",
+          "quarantine": "Quarantine records",
           "citations": "Accession citations",
           "pedigree": "Accession pedigree",
-          "sources": "Accession sources",
-          "ipr": "Accession IPR",
+          "sources": "Accession source history",
+          "ipr": "Intellectual Property Rights/Restrictions",
           "names": "Accession names",
           "delete": "Do you really want to delete {{name}} accession?",
           "deleteRecords": "Do you really want to delete {{count,number}} {{what, lowercase}}?"
@@ -256,12 +256,12 @@
           }
         },
         "AccessionInvNameDialog": {
-          "edit": "Edit accession inventory name",
-          "add": "Add accession inventory name"
+          "edit": "Edit germplasm name",
+          "add": "Add germplasm name"
         },
         "AccessionIprDialog": {
-          "edit": "Edit accession IPR",
-          "add": "Add accession IPR"
+          "edit": "Edit Intellectual Property Right/Restriction",
+          "add": "Add Intellectual Property Right/Restriction"
         },
         "AccessionSourceDialog": {
           "edit": "Edit accession source",

workspaces/ui-express/src/accession/translations.json

@@ -32,11 +32,11 @@
         "title": "Accession",
         "attachments": "Attachments",
         "groups": "Groups",
-        "quarantine": "Accession quarantine",
+        "quarantine": "Quarantine records",
         "citations": "Accession citations",
         "pedigree": "Accession pedigree",
-        "sources": "Accession sources",
-        "ipr": "Accession IPR",
+        "sources": "Accession source history",
+        "ipr": "Intellectual Property Rights/Restrictions",
         "names": "Accession names",
         "delete": "Do you really want to delete {{name}} accession?",
         "deleteRecords": "Do you really want to delete {{count,number}} {{what, lowercase}}?"
@@ -78,12 +78,12 @@
         }
       },
       "AccessionInvNameDialog": {
-        "edit": "Edit accession inventory name",
-        "add": "Add accession inventory name"
+        "edit": "Edit germplasm name",
+        "add": "Add germplasm name"
       },
       "AccessionIprDialog": {
-        "edit": "Edit accession IPR",
-        "add": "Add accession IPR"
+        "edit": "Edit Intellectual Property Right/Restriction",
+        "add": "Add Intellectual Property Right/Restriction"
       },
       "AccessionSourceDialog": {
         "edit": "Edit accession source",

workspaces/ui-express/src/accession/ui/AccessionDetailsPage.tsx

@@ -688,35 +688,6 @@ class AccessionDetailsPage extends React.Component<IDetailsPageProps, IDetailsPa
                   error={ { error, clear: this.clearError } }
                 />
 
-                <AccessionSectionTable
-                  sectionName="ipr"
-                  model={ { modelName: 'AccessionIpr', modelClass: AccessionIpr } }
-                  tableConfig={ {
-                    defaultColumns: [
-                      'id',
-                      'typeCode',
-                      'iprNumber',
-                      'iprFullName',
-                      'iprCropName',
-                      'issuedDate',
-                      'expectedDate',
-                      'acceptedDate',
-                      'expiredDate',
-                    ],
-                    ignoredColumns: [ 'accession' ],
-                    columnRenderers: {
-                      acceptedDate: Renderers.DATE_RENDERER,
-                      expectedDate: Renderers.DATE_RENDERER,
-                      expiredDate: Renderers.DATE_RENDERER,
-                      typeCode: ExtraRenderers.CODEVALUE_RENDERER(AccessionIpr.CodeGroup.typeCode),
-                    },
-                  } }
-                  dialogForm={ AccessionIprForm }
-                  removeAction={ removeAccessionIprAction }
-                  handleSubmit={ this.handleIprSubmit }
-                  error={ { error, clear: this.clearError } }
-                />
-
                 <AccessionSectionTable
                   sectionName="sources"
                   model={ { modelName: 'AccessionSource', modelClass: AccessionSource } }
@@ -749,6 +720,35 @@ class AccessionDetailsPage extends React.Component<IDetailsPageProps, IDetailsPa
                   hasMap
                 />
 
+                <AccessionSectionTable
+                  sectionName="ipr"
+                  model={ { modelName: 'AccessionIpr', modelClass: AccessionIpr } }
+                  tableConfig={ {
+                    defaultColumns: [
+                      'id',
+                      'typeCode',
+                      'iprNumber',
+                      'iprFullName',
+                      'iprCropName',
+                      'issuedDate',
+                      'expectedDate',
+                      'acceptedDate',
+                      'expiredDate',
+                    ],
+                    ignoredColumns: [ 'accession' ],
+                    columnRenderers: {
+                      acceptedDate: Renderers.DATE_RENDERER,
+                      expectedDate: Renderers.DATE_RENDERER,
+                      expiredDate: Renderers.DATE_RENDERER,
+                      typeCode: ExtraRenderers.CODEVALUE_RENDERER(AccessionIpr.CodeGroup.typeCode),
+                    },
+                  } }
+                  dialogForm={ AccessionIprForm }
+                  removeAction={ removeAccessionIprAction }
+                  handleSubmit={ this.handleIprSubmit }
+                  error={ { error, clear: this.clearError } }
+                />
+
                 <AccessionSectionTable
                   sectionName="pedigree"
                   model={ { modelName: 'AccessionPedigree', modelClass: AccessionPedigree } }
@@ -783,23 +783,6 @@ class AccessionDetailsPage extends React.Component<IDetailsPageProps, IDetailsPa
                   error={ { error, clear: this.clearError } }
                 />
 
-                <AccessionSectionTable
-                  sectionName="citations"
-                  model={ { modelName: 'Citation', modelClass: Citation } }
-                  tableConfig={ {
-                    defaultColumns: [
-                      'id',
-                    ],
-                    ignoredColumns: [ 'accession', 'taxonomyFamily', 'taxonomyGenus', 'taxonomySpecies' ],
-                    columnRenderers: {
-                    },
-                  } }
-                  dialogForm={ AccessionCitationForm }
-                  removeAction={ removeCitationAction }
-                  handleSubmit={ this.handleCitationSubmit }
-                  error={ { error, clear: this.clearError } }
-                />
-
                 <AccessionSectionTable
                   sectionName="quarantine"
                   model={ { modelName: 'AccessionQuarantine', modelClass: AccessionQuarantine } }
@@ -829,7 +812,25 @@ class AccessionDetailsPage extends React.Component<IDetailsPageProps, IDetailsPa
                   handleSubmit={ this.handleQuarantineSubmit }
                   error={ { error, clear: this.clearError } }
                 />
+
+                <AccessionSectionTable
+                  sectionName="citations"
+                  model={ { modelName: 'Citation', modelClass: Citation } }
+                  tableConfig={ {
+                    defaultColumns: [
+                      'id',
+                    ],
+                    ignoredColumns: [ 'accession', 'taxonomyFamily', 'taxonomyGenus', 'taxonomySpecies' ],
+                    columnRenderers: {
+                    },
+                  } }
+                  dialogForm={ AccessionCitationForm }
+                  removeAction={ removeCitationAction }
+                  handleSubmit={ this.handleCitationSubmit }
+                  error={ { error, clear: this.clearError } }
+                />
               </GridContainer>
+
               <P.HasAccess action={ P.PassportData } permission={ P.write } siteId={ accession.site.id }>
                 <AccessionForm
                   onSubmit={ this.handleSubmit }

workspaces/ui-express/src/accession/ui/c/AccessionCitationForm.tsx

@@ -145,7 +145,7 @@ function AccessionCitationFormInternal(props: IAccessionCitationFormInternal) {
       </PageSection>
       }
       <CardActions>
-        <Button type="submit" variant="contained" color="primary">{ t('common:action.submit') }</Button>
+        <Button type="submit" variant="contained" color="primary">{ t('common:action.save') }</Button>
         <Button onClick={ onClose } variant="outlined" color="primary">{ t('common:action.cancel') }</Button>
       </CardActions>
     </form>

workspaces/ui-express/src/accession/ui/c/AccessionInvNameForm.tsx

@@ -113,7 +113,7 @@ function AccessionInvNameFormInternal(props: IAccessionInvNameFormInternal) {
       </PageSection>
       }
       <CardActions>
-        <Button type="submit" variant="contained" color="primary">{ t('common:action.submit') }</Button>
+        <Button type="submit" variant="contained" color="primary">{ t('common:action.save') }</Button>
         <Button onClick={ onClose } variant="outlined" color="primary">{ t('common:action.cancel') }</Button>
       </CardActions>
     </form>

workspaces/ui-express/src/accession/ui/c/AccessionIprForm.tsx

@@ -97,7 +97,7 @@ function AccessionIprFormInternal(props: IAccessionIprFormInternal) {
       </PageSection>
       }
       <CardActions>
-        <Button type="submit" variant="contained" color="primary">{ t('common:action.submit') }</Button>
+        <Button type="submit" variant="contained" color="primary">{ t('common:action.save') }</Button>
         <Button onClick={ onClose } variant="outlined" color="primary">{ t('common:action.cancel') }</Button>
       </CardActions>
     </form>

workspaces/ui-express/src/accession/ui/c/AccessionPedigreeForm.tsx

@@ -105,7 +105,7 @@ function AccessionPedigreeFormInternal(props: IAccessionPedigreeFormInternal) {
       </PageSection>
       }
       <CardActions>
-        <Button type="submit" variant="contained" color="primary">{ t('common:action.submit') }</Button>
+        <Button type="submit" variant="contained" color="primary">{ t('common:action.save') }</Button>
         <Button onClick={ onClose } variant="outlined" color="primary">{ t('common:action.cancel') }</Button>
       </CardActions>
     </form>

workspaces/ui-express/src/accession/ui/c/AccessionQuarantineForm.tsx

@@ -96,7 +96,7 @@ function AccessionQuarantineFormInternal(props: IAccessionQuarantineFormInternal
       </PageSection>
       }
       <CardActions>
-        <Button type="submit" variant="contained" color="primary">{ t('common:action.submit') }</Button>
+        <Button type="submit" variant="contained" color="primary">{ t('common:action.save') }</Button>
         <Button onClick={ onClose } variant="outlined" color="primary">{ t('common:action.cancel') }</Button>
       </CardActions>
     </form>

workspaces/ui-express/src/accession/ui/c/AccessionSourceForm.tsx

@@ -35,28 +35,39 @@ function AccessionSourceFormInternal(props: IAccessionSourceFormInternal) {
   return (
     <form onSubmit={ handleSubmit }>
       <Grid container spacing={ 4 }>
-        <Grid item xs={ 12 } sm={ 6 }>
+        <Grid item xs={ 12 } md={ 4 }>
           <Field
-            placeholder={ t('client:model.AccessionSource.sourceTypeCode') }
             name="sourceTypeCode"
             type="text"
             component={ CodeValueField }
             codeGroup={ AccessionSource.CodeGroup.sourceTypeCode }
             label={ t('client:model.AccessionSource.sourceTypeCode') }
+            helperText={ t(['client:model.AccessionSource.sourceTypeCode_hint', 'client:model._._hint']) }
             required
             validate={ required }
           />
         </Grid>
-        <Grid item xs={ 12 } sm={ 6 }>
+        <Grid item xs={ 6 } md={ 4 }>
           <Field
-            placeholder={ t('client:model.AccessionSource.acquisitionSource') }
-            name="acquisitionSource"
-            type="text"
-            component={ CodeValueField }
-            codeGroup={ AccessionSource.CodeGroup.acquisitionSource }
-            label={ t('client:model.AccessionSource.acquisitionSource') }
+            label={ t([ 'client:model.AccessionSource.isOrigin', 'client:model._.isOrigin' ]) }
+            helperText={ t(['client:model.AccessionSource.isOrigin_hint', 'client:model._._hint']) }
+            name="isOrigin"
+            component={ YesNoSwitch }
+            labelPlacement="end"
+            defaultValue="N"
           />
         </Grid>
+        <Grid item xs={ 6 } md={ 4 }>
+          <Field
+            label={ t([ 'client:model.AccessionSource.isWebVisible', 'client:model._.isWebVisible' ]) }
+            helperText={ t(['client:model.AccessionSource.isWebVisible_hint', 'client:model._.isWebVisible_hint']) }
+            name="isWebVisible"
+            component={ YesNoSwitch }
+            labelPlacement="end"
+            defaultValue="N"
+          />
+        </Grid>
+
         <DateAndFormatComponent
           name="sourceDate"
           label={ t('client:model.AccessionSource.sourceDate') }
@@ -65,140 +76,155 @@ function AccessionSourceFormInternal(props: IAccessionSourceFormInternal) {
           helperText={ t(['client:model.AccessionSource.sourceDate_hint', 'client:model._._hint']) }
           shrink
         />
-        <Grid item xs={ 12 } sm={ 6 }>
+
+        <Grid item xs={ 12 }>
           <Field
-            placeholder={ t('client:model.AccessionSource.geography') }
-            name="geography"
+            placeholder={ t('client:model.AccessionSource.acquisitionSource') }
+            name="acquisitionSource"
             type="text"
-            component={ GeographyField }
-            label={ t('client:model.AccessionSource.geography') }
+            component={ CodeValueField }
+            codeGroup={ AccessionSource.CodeGroup.acquisitionSource }
+            label={ t('client:model.AccessionSource.acquisitionSource') }
+            helperText={ t(['client:model.AccessionSource.acquisitionSource_hint', 'client:model._._hint']) }
           />
         </Grid>
-        <Grid item xs={ 6 } sm={ 3 }>
+
+        <Grid item xs={ 12 }>
           <Field
-            label={ t([ 'client:model.AccessionSource.isOrigin', 'client:model._.isOrigin' ]) }
-            name="isOrigin"
-            component={ YesNoSwitch }
-            labelPlacement="end"
-            defaultValue="N"
+            name="geography"
+            type="text"
+            component={ GeographyField }
+            label={ t(['client:model.AccessionSource.geography', 'client:model._.geography']) }
+            helperText={ t(['client:model.AccessionSource.geography_hint', 'client:model._._hint']) }
           />
         </Grid>
-        <Grid item xs={ 6 } sm={ 3 }>
+
+        <Grid key="numberPlantsSampled" item xs={ 6 }>
           <Field
-            label={ t([ 'client:model.AccessionSource.isWebVisible', 'client:model._.isWebVisible' ]) }
-            name="isWebVisible"
-            component={ YesNoSwitch }
-            labelPlacement="end"
-            defaultValue="N"
+            name="numberPlantsSampled"
+            label={ t('client:model.AccessionSource.numberPlantsSampled') }
+            helperText={ t(['client:model.AccessionSource.numberPlantsSampled_hint', 'client:model._._hint']) }
+            component={ TextField }
+            type="text"
+            validate={ validatePositiveNumber }
           />
         </Grid>
-        { [
-          'elevationMeters', 'numberPlantsSampled',
-          'quantityCollected', 'uncertainty',
-        ].map((property) => (
-          <Grid key={ property } item xs={ 6 }>
-            <Field
-              name={ property }
-              label={ t([ `client:model.AccessionSource.${property}` ]) }
-              component={ TextField }
-              type="text"
-              placeholder={ t([ `client:model.AccessionSource.${property}` ]) }
-              validate={ validatePositiveNumber }
-            />
-          </Grid>
-        )) }
+
         <Grid item xs={ 6 }>
           <Field
-            placeholder={ t('client:model.AccessionSource.unitQuantityCollectedCode') }
-            name="unitQuantityCollectedCode"
+            name="collectedFormCode"
             type="text"
             component={ CodeValueField }
-            codeGroup={ AccessionSource.CodeGroup.unitQuantityCollectedCode }
-            label={ t('client:model.AccessionSource.unitQuantityCollectedCode') }
+            codeGroup={ AccessionSource.CodeGroup.collectedFormCode }
+            label={ t('client:model.AccessionSource.collectedFormCode') }
+            helperText={ t(['client:model.AccessionSource.collectedFormCode_hint', 'client:model._._hint']) }
+          />
+        </Grid>
+        <Grid key="quantityCollected" item xs={ 6 }>
+          <Field
+            name="quantityCollected"
+            label={ t([ 'client:model.AccessionSource.quantityCollected', 'client:model._.quantityCollected' ]) }
+            helperText={ t(['client:model.AccessionSource.quantityCollected_hint', 'client:model._._hint']) }
+            component={ TextField }
+            type="text"
+            validate={ validatePositiveNumber }
           />
         </Grid>
         <Grid item xs={ 6 }>
           <Field
-            placeholder={ t('client:model.AccessionSource.collectedFormCode') }
-            name="collectedFormCode"
+            name="unitQuantityCollectedCode"
             type="text"
             component={ CodeValueField }
-            codeGroup={ AccessionSource.CodeGroup.collectedFormCode }
-            label={ t('client:model.AccessionSource.collectedFormCode') }
+            codeGroup={ AccessionSource.CodeGroup.unitQuantityCollectedCode }
+            label={ t('client:model.AccessionSource.unitQuantityCollectedCode') }
+            helperText={ t(['client:model.AccessionSource.unitQuantityCollectedCode_hint', 'client:model._._hint']) }
           />
         </Grid>
-        { [
-          'associatedSpecies',
-          'collectorVerbatimLocality', 'environmentDescription',
-          'formattedLocality',
-        ].map((property) => (
-          <Grid key={ property } item xs={ 12 } sm={ 6 }>
+
+        { [ 'environmentDescription', 'associatedSpecies', 'collectorVerbatimLocality', 'formattedLocality' ].map((property) => (
+          <Grid key={ property } item xs={ 12 }>
             <Field
               name={ property }
-              label={ t([ `client:model.AccessionSource.${property}` ]) }
+              label={ t([ `client:model.AccessionSource.${property}`, `client:model._.${property}` ]) }
+              helperText={ t([`client:model.AccessionSource.${property}_hint`, 'client:model._._hint']) }
               component={ TextField }
               type="text"
-              placeholder={ t([ `client:model.AccessionSource.${property}` ]) }
             />
           </Grid>
         )) }
-        <Grid item xs={ 12 } md={ 4 }>
+
+        <Grid item xs={ 3 } md={ 4 }>
           <Field
-            placeholder={ t('client:model.AccessionSource.georeferenceAnnotation') }
-            name="georeferenceAnnotation"
+            name="latitude"
             type="text"
             component={ TextField }
-            label={ t('client:model.AccessionSource.georeferenceAnnotation') }
+            label={ t('client:model.AccessionSource.latitude') }
+            helperText={ t(['client:model.AccessionSource.latitude_hint', 'client:model._._hint']) }
+            validate={ validateLatitude }
           />
         </Grid>
-        <Grid item xs={ 12 } md={ 4 }>
+        <Grid item xs={ 3 } md={ 4 }>
+          <Field
+            name="longitude"
+            type="text"
+            component={ TextField }
+            label={ t('client:model.AccessionSource.longitude') }
+            helperText={ t(['client:model.AccessionSource.longitude_hint', 'client:model._._hint']) }
+            validate={ validateLongitude }
+          />
+        </Grid>
+        <Grid item xs={ 6 } md={ 4 }>
           <Field
-            placeholder={ t('client:model.AccessionSource.georeferenceDatum') }
             name="georeferenceDatum"
             type="text"
             component={ CodeValueField }
             codeGroup={ AccessionSource.CodeGroup.georeferenceDatum }
             label={ t('client:model.AccessionSource.georeferenceDatum') }
+            helperText={ t(['client:model.AccessionSource.georeferenceDatum_hint', 'client:model._._hint']) }
           />
         </Grid>
-        <Grid item xs={ 12 } md={ 4 }>
+
+        { [ 'elevationMeters', 'uncertainty' ].map((property) => (
+          <Grid key={ property } item xs={ 6 }>
+            <Field
+              name={ property }
+              label={ t([ `client:model.AccessionSource.${property}`, `client:model._.${property}` ]) }
+              helperText={ t([`client:model.AccessionSource.${property}_hint`, 'client:model._._hint']) }
+              component={ TextField }
+              type="text"
+              validate={ validatePositiveNumber }
+            />
+          </Grid>
+        )) }
+