Commit 4b535c5a authored by Jérémy Destin's avatar Jérémy Destin
Browse files

fix: Add the country of origin on the germplasm result page. Minor fixes. GNP-4309

parent e8b38210
......@@ -112,7 +112,6 @@ public class GermplasmRepositoryImpl implements GermplasmRepository {
@Override
public GermplasmSearchResponse esShouldFind(FaidareGermplasmPOSTShearchCriteria germplasmSearchCriteria) {
try {
// QueryBuilder query = queryFactory.createOrQuery(germplasmSearchCriteria);
// Prepare search request
SearchRequest request = prepareSearchRequest(germplasmSearchCriteria);
......
......@@ -29,5 +29,11 @@
<orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Gradle: org.elasticsearch.client:elasticsearch-rest-high-level-client:6.5.4" level="project" />
<orderEntry type="library" name="Gradle: org.elasticsearch:elasticsearch-core:6.5.4" level="project" />
<orderEntry type="library" name="Gradle: org.springframework:spring-core:5.1.4.RELEASE" level="project" />
<orderEntry type="library" name="Gradle: org.apache.tomcat.embed:tomcat-embed-core:9.0.14" level="project" />
<orderEntry type="library" name="Gradle: com.opencsv:opencsv:4.4" level="project" />
<orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.8.1" level="project" />
<orderEntry type="library" name="Gradle: org.apache.lucene:lucene-join:7.5.0" level="project" />
<orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
</component>
</module>
\ No newline at end of file
<ng-template #germplasmDetailsPopup>
<div class="card ngb-popover-window ">
<br>
This is a button to view more information about the germplasm
(germplasm name, accession number, genus species, institute name * , biological status.)
that are return by your research. <br>
You can also download the data in GnpIS Plant Material standard.<br>
<br>
* The name of the institute which store the accession.
Activation of the button allows to view more information about the germplasm.<br>
You can also download the germplasm list.
</div>
</ng-template>
......@@ -28,7 +24,7 @@
</label>
<div id="germplasmSearch"
title="Focus on germplasm details with export data link"
title=""
style="margin-top: 5px"
*ngIf="term.term == 'Germplasm' && !criteriaIsEmpty">
<label for="selectSwitchButton" style="margin-right: 5px"
......@@ -45,7 +41,8 @@
[autoClose]="'outside'"
[ngbPopover]="germplasmDetailsPopup"
[popoverTitle]="'Details button\'s help.'" container="body">
<img src="assets/faidare/images/question-mark.png" alt="help" title=""
<img src="assets/faidare/images/question-mark.png" alt="help"
title="This is a button to view more information about the germplasm that are return by your search. You can also download the results in standard format."
height="20px" style="margin-top: -10px"/>
</a>
</div>
......
......@@ -22,7 +22,7 @@
<button type="button" class="btn btn-outline-success mb-2"
(click)="exportPlantMaterial(localCriteria)">
Export GnpIS Plant Material
Export Plant Material list
<img src="assets/faidare/images/csv-logo.png" alt="csv logo" title=""
height="20px"/>
</button>
......@@ -64,6 +64,7 @@
<td>{{ accession.genusSpecies }}</td>
<td>{{ accession.instituteName }}</td>
<td>{{ accession.biologicalStatusOfAccessionCode }}</td>
<td>{{ accession.countryOfOriginCode }}</td>
</tr>
</ng-container>
</tbody>
......
......@@ -30,7 +30,13 @@ export class GermplasmResultPageComponent implements OnInit {
@Input() germplasmSearchCriteria$: BehaviorSubject<GermplasmSearchCriteria>;
@Input() germplasmFacets$: BehaviorSubject<DataDiscoveryFacet[]>;
headers: string[] = ['germplasmName', 'accessionNumber', 'genusSpecies', 'instituteName', 'biologicalStatusOfAccessionCode'];
headers: string[] = [
'germplasmName',
'accessionNumber',
'genusSpecies',
'instituteName',
'biologicalStatusOfAccessionCode',
'countryOfOriginCode'];
elementPerPage: number[] = [15, 20, 25];
loading: boolean;
fieldSortState: object = {
......@@ -46,7 +52,8 @@ export class GermplasmResultPageComponent implements OnInit {
'accessionNumber': 'Accession number',
'genusSpecies': 'Genus species',
'instituteName': 'Institute name',
'biologicalStatusOfAccessionCode': 'Biological status'
'biologicalStatusOfAccessionCode': 'Biological status',
'countryOfOriginCode': 'Country of origin'
};
pagination = {
......
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