Commit 5f1241eb authored by Nora Castaneda-Alvarez's avatar Nora Castaneda-Alvarez Committed by Matija Obreza
Browse files

Texts updated

- descriptor parser
- descriptor lists (form and stepper)
- dataset stepper (list of accessions, location), descriptor (form and display) and descriptor list display.
- steppers: basic information, creators and location
parent 1ad9826a
Pipeline #6357 passed with stages
in 9 minutes and 28 seconds
......@@ -131,12 +131,13 @@ class DescriptorParser extends React.Component<IDescriptorParser, any> {
<div className={ `${this.props.className} m-20 p-20 even-row` }>
<div>
<h4>INSTRUCTIONS FOR USE</h4>
<ul>
<ol type="1">
<li>Use "Descriptors" sheet from template: <a href="/templates/genesys-catalog-template.xlsx" target="_blank">Genesys Catalog template</a>.</li>
<li>Do not change header names in the template!</li>
<li>Fill the template with the descriptor information, save it.</li>
<li>Copy and paste the table from Excel into the text field below.</li>
</ul>
<li>The first row in the template contains the header names, the second row contains a description of the content expected on each column, and rows three and four contain examples to help you fill in the template.</li>
<li>Do not change the header names in the template</li>
<li>Fill the template with the descriptor information, remove the rows that contain the description of each column (second row) and examples (third and fourth row) and save the file.</li>
<li>Copy and paste the table from Excel into the text field "Descriptor definitions".</li>
</ol>
</div>
<CSVConfiguration onChange={ this.onUpdateCsvConfig } config={ this.state.csvConfig } />
......
......@@ -16,7 +16,7 @@ const steps = [
},
{
id: 4,
name: 'Location',
name: 'Location and timing',
link: 'edit/location',
},
{
......@@ -26,12 +26,12 @@ const steps = [
},
{
id: 6,
name: 'Pasting traits',
name: 'Select descriptors in batch',
link: 'edit/pasting-traits',
},
{
id: 7,
name: 'Traits observed',
name: 'Browse and select descriptors',
link: 'edit/traits-observed',
},
{
......
......@@ -93,12 +93,13 @@ class ListOfAccession extends React.Component<IListOfAccession, any> {
<div className={ `${ classes.root } m-20 p-20 even-row` }>
<div>
<h4>INSTRUCTIONS FOR USE</h4>
<ul>
<li>Use "Acccessions" sheet from template: <a href="/templates/genesys-catalog-template.xlsx" target="_blank">Genesys Catalog template</a>.</li>
<li>Do not change header name in the template</li>
<li>Fill the template with the informations of the accessions, save it.</li>
<li>Copy and paste the table from Excel into the text field below.</li>
</ul>
<ol type="1">
<li>Use the "Acccessions" sheet from the template: <a href="/templates/genesys-catalog-template.xlsx" target="_blank">Genesys Catalog template</a>.</li>
<li>The first row in the template contains the header names, whilst the second contains a description of the content expected on each column.</li>
<li>Do not change the header names in the template</li>
<li>Fill the template with the informations of the accessions, remove the row that contains the description of each column (second row) and save the file.</li>
<li>Copy and paste the table from Excel into the text field "List of accessions described in the dataset".</li>
</ol>
</div>
<CSVConfiguration onChange={ this.onUpdateCsvConfig } config={ this.state.csvConfig } />
......
......@@ -42,8 +42,8 @@ class BasicInfoStep extends React.Component<ILoginContainerProps, any> {
name="title"
basicMarkdown
component={ MarkdownField }
label="Title of the dataset"
placeholder="Title"
label="Dataset title"
placeholder="Name given to the dataset (e.g., Characterization of maize accessions in Kenya)"
validate={ [ Validators.required ] }
/>
<Field required
......@@ -57,12 +57,12 @@ class BasicInfoStep extends React.Component<ILoginContainerProps, any> {
name="description"
component={ MarkdownField }
label="Dataset description"
placeholder="An abstract, short or long description of the resource. Descriptive details improves discoverability of the resource."
placeholder="An abstract, short or long description of the dataset. Descriptive details improves discoverability of the resource."
/>
<Field
name="created"
component={ TextField }
label="Date of creation of the document"
label="Date of creation of the dataset"
/>
<Field
name="rights"
......@@ -72,7 +72,7 @@ class BasicInfoStep extends React.Component<ILoginContainerProps, any> {
name="language"
component={ VocabularyTermPicker }
label="Language"
placeholder="Select language"
placeholder="Select language of the dataset"
suggestionLabel="title"
vocabularyUuid="21b10067-ba15-44dd-867f-6a18a117fee8"
/>
......@@ -80,6 +80,7 @@ class BasicInfoStep extends React.Component<ILoginContainerProps, any> {
name="source"
component={ TextField }
label="Source"
placeholder="A related resource from which the described dataset is derived (e.g., journal article, data article, conference proceedings). Use DOI, URL, Journal title, or Journal/conference title; vol., no. (year)"
/>
<FieldArray
name="crops"
......
......@@ -124,8 +124,8 @@ class DatasetCreatorForm extends React.Component<IDatasetCreatorFormProps, any>
<Field name={ `${creator}.instituteAddress` }
component={ TextField }
type="text"
label="Address"
placeholder="Address"
label="Institutional address"
placeholder="Address of institution of affiliation when the dataset was created."
/>
</div>
),
......
......@@ -99,7 +99,7 @@ class LocationForm extends React.Component<ILocationFormProps, any> {
name={ `${location}.userCountry` }
component={ MaterialAutosuggest }
label="Country"
placeholder="Select country"
placeholder="Select country where the characterization/evaluation was performed."
suggestions={ countries }
suggestionLabel="name"
validate={ [ Validators.required ] }
......@@ -129,8 +129,8 @@ class LocationForm extends React.Component<ILocationFormProps, any> {
<Field
name={ `${location}.verbatimLocality` }
component={ TextField }
label="Locality description"
placeholder="Locality description"
label="Locality"
placeholder="Description of the locality where the characterization/evaluation was performed."
inputProps={ {
maxLength: 255,
} }
......@@ -139,29 +139,31 @@ class LocationForm extends React.Component<ILocationFormProps, any> {
<Field
name={ `${location}.decimalLatitude` }
component={ TextField }
label="Latitude"
label="Decimal latitude"
placeholder="The latitude of the site where the characterization/evaluation was conducted (decimal degrees)."
onBlur={ this.updateCountryInfo(fields, index)('decimalLatitude') }
validate={ [ Validators.decimalNumber ] }
/>
<Field
name={ `${location}.decimalLongitude` }
component={ TextField }
label="Longitude"
label="Decimal longitude"
placeholder="The longitude of the site where the characterization/evaluation was conducted (decimal degrees)."
onBlur={ this.updateCountryInfo(fields, index)('decimalLongitude') }
validate={ [ Validators.decimalNumber ] }
/>
<Field
name={ `${location}.startDate` }
component={ TextField }
label="Start of evaluation"
placeholder="YYYYMMDD"
label="Starting date of characterization/evaluation"
placeholder="YYYYMMDD. If the month or day are missing, this should be indicated with ‘00’ [double zero] (e.g. 1975----, 19750000; 197506--, 19750600)"
validate={ [ Validators.mcpdDate ] }
/>
<Field
name={ `${location}.endDate` }
component={ TextField }
label="End of evaluation"
placeholder="YYYYMMDD"
label="Ending date of characterization/evaluation"
placeholder="YYYYMMDD. If the month or day are missing, this should be indicated with ‘00’ [double zero] (e.g. 1975----, 19750000; 197506--, 19750600)"
validate={ [ Validators.mcpdDate ] }
/>
</div>
......
......@@ -65,7 +65,7 @@ class DisplayPage extends React.Component<IDisplayPageProps, any> {
const {descriptor, publishDescriptor} = this.props;
confirm(<span>Publish <b>{ descriptor.title }</b>?</span>, {
description: `The descriptor will be reviewing by administrator before publishing.`,
description: `The descriptor will be reviewed by the administrator before publishing.`,
confirmLabel: 'Publish',
abortLabel: 'Cancel',
}).then(() => {
......
......@@ -159,7 +159,7 @@ class DescriptorForm extends React.Component<any, any> {
validate={ [ Validators.required ] }
/>
<Field name="crop"
label="Crop code"
label="Crop"
component={ CropSelector }
single
/>
......@@ -169,7 +169,7 @@ class DescriptorForm extends React.Component<any, any> {
validate={ [ Validators.required ] }
/>
<Field required name="versionTag"
label="Version tag" placeholder="1.0"
label="Version" placeholder="1.0"
component={ TextField }
validate={ [ Validators.required ] }
/>
......@@ -182,7 +182,7 @@ class DescriptorForm extends React.Component<any, any> {
component={ MarkdownField }
/>
<Field name="key"
label="Flag as key access and utilization descriptor"
label="Flag as key access and utilization descriptor as defined in Alercia (2011)"
component={ Toggle }
/>
<Field required name="category"
......
......@@ -70,7 +70,7 @@ class DetailInfo extends React.Component<IDetailInfoProps, any> {
const {descriptorList, publishDescriptorList} = this.props;
confirm(<span>Publish <b>{ descriptorList.title }</b>?</span>, {
description: `The descriptor list will be reviewing by administrator before publishing.`,
description: `The descriptor list will be reviewed by administrator before publishing.`,
confirmLabel: 'Publish',
abortLabel: 'Cancel',
}).then(() => {
......
......@@ -50,7 +50,7 @@ class DescriptorListForm extends React.Component<any, any> {
</Authorize>
<Field name="crop"
label="Crop code"
label="Crop"
placeholder="maize"
component={ CropSelector }
single
......@@ -58,7 +58,7 @@ class DescriptorListForm extends React.Component<any, any> {
<Field required
name="title"
label="Descriptor list title"
placeholder="Descriptors for"
placeholder="Descriptors for pearl millet"
basicMarkdown
component={ MarkdownField }
validate={ [Validators.required] }
......@@ -66,7 +66,7 @@ class DescriptorListForm extends React.Component<any, any> {
<Field required
disabled={ !!initialValues.uuid }
name="versionTag"
label="Version tag"
label="Version"
placeholder="1.0"
component={ TextField }
validate={ [Validators.required] }
......@@ -83,13 +83,13 @@ class DescriptorListForm extends React.Component<any, any> {
validate={ [Validators.url] }
/>
<Field name="publisher"
label="Publisher"
placeholder=""
label="Original publisher"
placeholder="IPGRI"
component={ TextField }
/>
<Field name="bibliographicCitation"
label="Bibliographic citation"
placeholder=""
placeholder="Complete bibliographic citation of the crop descriptor. Use APA formatting style (https://owl.english.purdue.edu/owl/resource/560/01/)"
component={ TextField }
multiline
/>
......
......@@ -91,7 +91,7 @@ class DescriptorListStepper extends React.Component<IDescriptorListProps, any> {
const {descriptorList, publishDescriptorList} = this.props;
confirm(<span>Publish <b>{ descriptorList.title }</b>?</span>, {
description: `The descriptor list will be reviewing by administrator before publishing.`,
description: `The descriptor list will be reviewed by the administrator before publishing.`,
confirmLabel: 'Publish',
abortLabel: 'Cancel',
}).then(() => {
......
......@@ -7,7 +7,7 @@ const steps = [
},
{
id: 2,
name: 'Select descriptors',
name: 'Select registered descriptors',
link: 'edit/select-descriptors',
},
{
......
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