merged from master branch
This commit is contained in:
parent
62c02216af
commit
3becbdf47f
Binary file not shown.
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 24 KiB |
Binary file not shown.
After Width: | Height: | Size: 21 KiB |
|
@ -286,7 +286,8 @@ public class SearchFacilityUI extends Composite {
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(ResultSetPaginatedDataIDs result) {
|
public void onSuccess(ResultSetPaginatedDataIDs result) {
|
||||||
|
|
||||||
appManagerBus.fireEvent(new SearchPerformedEvent(profileID, result.getResultSetProjectIDs(), false));
|
appManagerBus
|
||||||
|
.fireEvent(new SearchPerformedEvent(profileID, result.getResultSetProjectIDs(), false));
|
||||||
|
|
||||||
setSearchEnabled(true);
|
setSearchEnabled(true);
|
||||||
latestResult = result;
|
latestResult = result;
|
||||||
|
@ -304,18 +305,18 @@ public class SearchFacilityUI extends Composite {
|
||||||
|
|
||||||
String message = "";
|
String message = "";
|
||||||
if (allItems > returnedItems) {
|
if (allItems > returnedItems) {
|
||||||
message = "Too many results found. Below are " + returnedItems + " out of " + allItems
|
message = "Your query returns too many results (" + allItems
|
||||||
+ " results";
|
+ "). Please find below the top " + returnedItems + ".<br>";
|
||||||
} else if (returnedItems>0){
|
} else if (returnedItems > 0) {
|
||||||
message = "Found " + returnedItems;
|
message = "Found " + returnedItems;
|
||||||
message += returnedItems > 0 ? " items" : " item";
|
message += returnedItems > 0 ? " items" : " item";
|
||||||
|
message += ". ";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (returnedItems>0) {
|
if (returnedItems > 0) {
|
||||||
message += ". Projects (with a centroid) matching your search are shown on the Map";
|
message += "On the map you can see all the projects with a centroid matching the query";
|
||||||
}
|
}
|
||||||
|
|
||||||
HTML resultMessage = new HTML(message);
|
HTML resultMessage = new HTML(message);
|
||||||
resultMessage.getElement().addClassName("search_result_msg");
|
resultMessage.getElement().addClassName("search_result_msg");
|
||||||
|
|
||||||
|
@ -353,7 +354,7 @@ public class SearchFacilityUI extends Composite {
|
||||||
public void onClick(ClickEvent event) {
|
public void onClick(ClickEvent event) {
|
||||||
GeoportalItemReferences gir = new GeoportalItemReferences(resultDoc.getProjectID(),
|
GeoportalItemReferences gir = new GeoportalItemReferences(resultDoc.getProjectID(),
|
||||||
profileID);
|
profileID);
|
||||||
//here
|
// here
|
||||||
appManagerBus.fireEvent(new ClosedViewDetailsEvent());
|
appManagerBus.fireEvent(new ClosedViewDetailsEvent());
|
||||||
appManagerBus.fireEvent(new ShowDetailsEvent(gir, null, true));
|
appManagerBus.fireEvent(new ShowDetailsEvent(gir, null, true));
|
||||||
appManagerBus.fireEvent(new ShowPopupOnCentroiEvent(profileID,
|
appManagerBus.fireEvent(new ShowPopupOnCentroiEvent(profileID,
|
||||||
|
|
|
@ -71,7 +71,7 @@ public class GeoportalViewer_Tests {
|
||||||
*
|
*
|
||||||
* @return the client
|
* @return the client
|
||||||
*/
|
*/
|
||||||
@Before
|
//@Before
|
||||||
public void getClient() {
|
public void getClient() {
|
||||||
// assumeTrue(GCubeTest.isTestInfrastructureEnabled());
|
// assumeTrue(GCubeTest.isTestInfrastructureEnabled());
|
||||||
ScopeProvider.instance.set(CONTEXT);
|
ScopeProvider.instance.set(CONTEXT);
|
||||||
|
@ -274,7 +274,7 @@ public class GeoportalViewer_Tests {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
//@Test
|
||||||
public void getResultsWithSize() throws Exception {
|
public void getResultsWithSize() throws Exception {
|
||||||
// List<Project> listOfProjects = client.getListForProfileID(PROFILE_ID);
|
// List<Project> listOfProjects = client.getListForProfileID(PROFILE_ID);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue