Merge pull request 'task_24282' (!8) from task_24282 into master
Reviewed-on: #8
This commit is contained in:
commit
7e81f7a347
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry including="**/*.java" kind="src" output="target/geoportal-data-entry-app-3.0.0/WEB-INF/classes" path="src/main/java">
|
<classpathentry including="**/*.java" kind="src" output="target/geoportal-data-entry-app-3.0.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
|
@ -31,5 +31,5 @@
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="output" path="target/geoportal-data-entry-app-3.0.0/WEB-INF/classes"/>
|
<classpathentry kind="output" path="target/geoportal-data-entry-app-3.0.1-SNAPSHOT/WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
jarsExcludedFromWebInfLib=
|
jarsExcludedFromWebInfLib=
|
||||||
lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-3.0.0
|
lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-3.0.1-SNAPSHOT
|
||||||
warSrcDir=src/main/webapp
|
warSrcDir=src/main/webapp
|
||||||
warSrcDirIsOutput=false
|
warSrcDirIsOutput=false
|
||||||
|
|
|
@ -70,7 +70,9 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<wb-module deploy-name="geoportal-data-entry-app-3.0.0">
|
|
||||||
|
<wb-module deploy-name="geoportal-data-entry-app-3.0.1-SNAPSHOT">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -193,6 +195,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -265,6 +268,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -307,6 +311,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -361,6 +366,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -433,6 +439,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -505,6 +512,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -577,6 +585,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,12 @@
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [v3.0.1-SNAPSHOT] - 2022-12-13
|
||||||
|
|
||||||
|
#### Fixes
|
||||||
|
|
||||||
|
- [#24281] Fixed filtering selection label
|
||||||
|
- [#24049] Fixed "Show on Map" facility vs Chrome browser
|
||||||
|
|
||||||
## [v3.0.0] - 2022-11-09
|
## [v3.0.0] - 2022-11-09
|
||||||
|
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -14,7 +14,7 @@
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>geoportal-data-entry-app</artifactId>
|
<artifactId>geoportal-data-entry-app</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<version>3.0.0</version>
|
<version>3.0.1-SNAPSHOT</version>
|
||||||
<name>GeoPortal Data Entry App</name>
|
<name>GeoPortal Data Entry App</name>
|
||||||
<description>The GeoPortal Data Entry App is an application to build the web forms for data entries needed to create projects/documents (based on UCD) in the D4Science Geoportal service</description>
|
<description>The GeoPortal Data Entry App is an application to build the web forms for data entries needed to create projects/documents (based on UCD) in the D4Science Geoportal service</description>
|
||||||
<scm>
|
<scm>
|
||||||
|
|
|
@ -61,7 +61,6 @@ import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.HTMLUtil;
|
||||||
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.HTMLUtil.HTML_TAG;
|
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.HTMLUtil.HTML_TAG;
|
||||||
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.LoaderIcon;
|
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.LoaderIcon;
|
||||||
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.ModalConfirm;
|
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.ModalConfirm;
|
||||||
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.NewBrowserWindow;
|
|
||||||
import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
|
import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
|
||||||
import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtendedConfigProfile;
|
import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtendedConfigProfile;
|
||||||
import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject;
|
import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject;
|
||||||
|
@ -78,6 +77,7 @@ import com.github.gwtbootstrap.client.ui.Button;
|
||||||
import com.github.gwtbootstrap.client.ui.Modal;
|
import com.github.gwtbootstrap.client.ui.Modal;
|
||||||
import com.github.gwtbootstrap.client.ui.constants.AlertType;
|
import com.github.gwtbootstrap.client.ui.constants.AlertType;
|
||||||
import com.github.gwtbootstrap.client.ui.constants.ButtonType;
|
import com.github.gwtbootstrap.client.ui.constants.ButtonType;
|
||||||
|
import com.github.gwtbootstrap.client.ui.constants.LabelType;
|
||||||
import com.google.gwt.core.client.EntryPoint;
|
import com.google.gwt.core.client.EntryPoint;
|
||||||
import com.google.gwt.core.client.GWT;
|
import com.google.gwt.core.client.GWT;
|
||||||
import com.google.gwt.core.client.Scheduler;
|
import com.google.gwt.core.client.Scheduler;
|
||||||
|
@ -91,6 +91,7 @@ import com.google.gwt.event.logical.shared.ResizeHandler;
|
||||||
import com.google.gwt.event.shared.HandlerManager;
|
import com.google.gwt.event.shared.HandlerManager;
|
||||||
import com.google.gwt.user.client.Window;
|
import com.google.gwt.user.client.Window;
|
||||||
import com.google.gwt.user.client.rpc.AsyncCallback;
|
import com.google.gwt.user.client.rpc.AsyncCallback;
|
||||||
|
import com.google.gwt.user.client.ui.Anchor;
|
||||||
import com.google.gwt.user.client.ui.HTML;
|
import com.google.gwt.user.client.ui.HTML;
|
||||||
import com.google.gwt.user.client.ui.HorizontalPanel;
|
import com.google.gwt.user.client.ui.HorizontalPanel;
|
||||||
import com.google.gwt.user.client.ui.Image;
|
import com.google.gwt.user.client.ui.Image;
|
||||||
|
@ -389,8 +390,8 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
||||||
mainTabPanel.setPageHeader(handlerDeclarationDV);
|
mainTabPanel.setPageHeader(handlerDeclarationDV);
|
||||||
|
|
||||||
// TODO AVOIDING THE CACHE
|
// TODO AVOIDING THE CACHE
|
||||||
//TODO I NEED TO CHECK WHY THE BY USING THE CACHE THE WEB-FORM IS FULL (EQUAL TO PREVIOUS ONE) AND NOT RESET PERFORMED
|
// TODO I NEED TO CHECK WHY THE BY USING THE CACHE THE WEB-FORM IS FULL (EQUAL
|
||||||
|
// TO PREVIOUS ONE) AND NOT RESET PERFORMED
|
||||||
|
|
||||||
// List<GeoNaFormCardModel> cardsPerIT = geoportalCaches.getGcubeProfilePerItemType(handlerDeclarationDV.getItemType());
|
// List<GeoNaFormCardModel> cardsPerIT = geoportalCaches.getGcubeProfilePerItemType(handlerDeclarationDV.getItemType());
|
||||||
// if (cardsPerIT != null) {
|
// if (cardsPerIT != null) {
|
||||||
|
@ -437,12 +438,12 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
||||||
// ordered values
|
// ordered values
|
||||||
Collection<GeoNaFormCardModel> gnaCardsModels = treemapOrderedGNAProfiles.values();
|
Collection<GeoNaFormCardModel> gnaCardsModels = treemapOrderedGNAProfiles.values();
|
||||||
GWT.log("TreeMap values: " + gnaCardsModels);
|
GWT.log("TreeMap values: " + gnaCardsModels);
|
||||||
List<GeoNaFormCardModel> listGNAFormCardModel = new ArrayList<GeoNaFormCardModel>(gnaCardsModels);
|
List<GeoNaFormCardModel> listGNAFormCardModel = new ArrayList<GeoNaFormCardModel>(
|
||||||
|
gnaCardsModels);
|
||||||
geoportalCaches.putGcubeProfilePerItemType(handlerDeclarationDV.getItemType(),
|
geoportalCaches.putGcubeProfilePerItemType(handlerDeclarationDV.getItemType(),
|
||||||
listGNAFormCardModel);
|
listGNAFormCardModel);
|
||||||
// orderedCards.addAll(new ArrayList<GeoNaFormCardModel>(gnaCardsModels));
|
// orderedCards.addAll(new ArrayList<GeoNaFormCardModel>(gnaCardsModels));
|
||||||
buildNewCards(profileID, handlerDeclarationDV.getItemType(),
|
buildNewCards(profileID, handlerDeclarationDV.getItemType(), listGNAFormCardModel);
|
||||||
listGNAFormCardModel);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -775,9 +776,9 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
||||||
GWT.log("Fired: " + getListOfRecordsEvent);
|
GWT.log("Fired: " + getListOfRecordsEvent);
|
||||||
SearchingFilter searchingFilter = getListOfRecordsEvent.getSearchingFilter();
|
SearchingFilter searchingFilter = getListOfRecordsEvent.getSearchingFilter();
|
||||||
|
|
||||||
|
CacheSearchingFilterParametersFromConfig seachingFilterParameters = geoportalCaches
|
||||||
CacheSearchingFilterParametersFromConfig seachingFilterParameters =
|
.getFilterParametersForProfileId(getListOfRecordsEvent.getProfileID(),
|
||||||
geoportalCaches.getFilterParametersForProfileId(getListOfRecordsEvent.getProfileID(), GEOPORTAL_DATA_HANDLER.geoportal_data_list);
|
GEOPORTAL_DATA_HANDLER.geoportal_data_list);
|
||||||
|
|
||||||
// CacheSearchingFilterParametersFromConfig seachingFilterParameters = geoportalCaches
|
// CacheSearchingFilterParametersFromConfig seachingFilterParameters = geoportalCaches
|
||||||
// .getFilterParametersForProfileId(getListOfRecordsEvent.getProfileID());
|
// .getFilterParametersForProfileId(getListOfRecordsEvent.getProfileID());
|
||||||
|
@ -1196,7 +1197,9 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
}
|
}
|
||||||
|
|
||||||
String stepString = wActionOnItem.getAction().getCallSteps().length==1?"Step":"Steps";
|
String stepString = wActionOnItem.getAction().getCallSteps().length == 1
|
||||||
|
? "Step"
|
||||||
|
: "Steps";
|
||||||
|
|
||||||
String stepsToString = "";
|
String stepsToString = "";
|
||||||
for (String step : wActionOnItem.getAction().getCallSteps()) {
|
for (String step : wActionOnItem.getAction().getCallSteps()) {
|
||||||
|
@ -1204,13 +1207,14 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
||||||
}
|
}
|
||||||
|
|
||||||
Alert alert = new Alert(
|
Alert alert = new Alert(
|
||||||
stepString +" "+ stepsToString
|
stepString + " " + stepsToString + "performed correclty!");
|
||||||
+ "performed correclty!");
|
|
||||||
alert.setType(AlertType.INFO);
|
alert.setType(AlertType.INFO);
|
||||||
alert.setClose(false);
|
alert.setClose(false);
|
||||||
modal.add(alert);
|
modal.add(alert);
|
||||||
|
|
||||||
GeoportalDataEntryServiceAsync.Util.getInstance().getResultDocumentFoProjectByID(result.getProfileID(), result.getId(), new AsyncCallback<ResultDocumentDV>() {
|
GeoportalDataEntryServiceAsync.Util.getInstance()
|
||||||
|
.getResultDocumentFoProjectByID(result.getProfileID(),
|
||||||
|
result.getId(), new AsyncCallback<ResultDocumentDV>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
|
@ -1219,26 +1223,37 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(ResultDocumentDV theResultDocument) {
|
public void onSuccess(
|
||||||
|
ResultDocumentDV theResultDocument) {
|
||||||
VerticalPanel vp = new VerticalPanel();
|
VerticalPanel vp = new VerticalPanel();
|
||||||
vp.getElement().getStyle().setMarginTop(20, Unit.PX);
|
vp.getElement().getStyle().setMarginTop(20,
|
||||||
vp.add(new Label("Check outcome in the Publication Report"));
|
Unit.PX);
|
||||||
|
vp.add(new Label(
|
||||||
|
"Check outcome in the Publication Report"));
|
||||||
Button buttonShowPublicationReport = new Button(
|
Button buttonShowPublicationReport = new Button(
|
||||||
"Show Publication Report");
|
"Show Publication Report");
|
||||||
buttonShowPublicationReport.setType(ButtonType.INFO);
|
buttonShowPublicationReport
|
||||||
buttonShowPublicationReport.addClickHandler(new ClickHandler() {
|
.setType(ButtonType.INFO);
|
||||||
|
buttonShowPublicationReport
|
||||||
|
.addClickHandler(new ClickHandler() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(ClickEvent event) {
|
public void onClick(
|
||||||
|
ClickEvent event) {
|
||||||
modal.hide();
|
modal.hide();
|
||||||
appManagerBus.fireEvent(new OperationOnItemEvent<DocumentDV>(
|
appManagerBus.fireEvent(
|
||||||
Arrays.asList(theResultDocument),
|
new OperationOnItemEvent<DocumentDV>(
|
||||||
|
Arrays.asList(
|
||||||
|
theResultDocument),
|
||||||
OPERATION_ON_ITEM.VIEW_REPORT));
|
OPERATION_ON_ITEM.VIEW_REPORT));
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
buttonShowPublicationReport.getElement().getStyle().setMarginTop(10, Unit.PX);
|
buttonShowPublicationReport.getElement()
|
||||||
buttonShowPublicationReport.getElement().getStyle().setMarginBottom(20, Unit.PX);
|
.getStyle().setMarginTop(10, Unit.PX);
|
||||||
|
buttonShowPublicationReport.getElement()
|
||||||
|
.getStyle()
|
||||||
|
.setMarginBottom(20, Unit.PX);
|
||||||
vp.add(buttonShowPublicationReport);
|
vp.add(buttonShowPublicationReport);
|
||||||
|
|
||||||
modal.add(vp);
|
modal.add(vp);
|
||||||
|
@ -1398,32 +1413,58 @@ public class GeoPortalDataEntryApp implements EntryPoint {
|
||||||
case VIEW_ON_MAP: {
|
case VIEW_ON_MAP: {
|
||||||
|
|
||||||
final Modal modal = new Modal(true, true);
|
final Modal modal = new Modal(true, true);
|
||||||
|
modal.setTitle("Show on Map the Project...");
|
||||||
modal.setCloseVisible(true);
|
modal.setCloseVisible(true);
|
||||||
final HorizontalPanel hpGetLink = new HorizontalPanel();
|
final HorizontalPanel hpGetLink = new HorizontalPanel();
|
||||||
final LoaderIcon lc = new LoaderIcon("Just moment getting link...");
|
final LoaderIcon lc = new LoaderIcon("Just moment getting link...");
|
||||||
hpGetLink.add(lc);
|
hpGetLink.add(lc);
|
||||||
modal.add(hpGetLink);
|
modal.add(hpGetLink);
|
||||||
|
|
||||||
final NewBrowserWindow newBrowserWindow = NewBrowserWindow.open("", "_blank", "");
|
// final NewBrowserWindow newBrowserWindow = NewBrowserWindow.open("", "_blank",
|
||||||
|
// "");
|
||||||
|
|
||||||
GeoportalDataEntryServiceAsync.Util.getInstance().getLinksFor(resultDocumentDV.getId(),
|
GeoportalDataEntryServiceAsync.Util.getInstance().getLinksFor(resultDocumentDV.getId(),
|
||||||
resultDocumentDV.getProfileID(), new AsyncCallback<GeoportalItemReferences>() {
|
resultDocumentDV.getProfileID(), new AsyncCallback<GeoportalItemReferences>() {
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
hpGetLink.clear();
|
try {
|
||||||
|
hpGetLink.setVisible(false);
|
||||||
|
modal.remove(hpGetLink);
|
||||||
|
} catch (Exception e) {
|
||||||
|
// TODO: handle exception
|
||||||
|
}
|
||||||
Alert alert = new Alert(caught.getMessage(), AlertType.ERROR);
|
Alert alert = new Alert(caught.getMessage(), AlertType.ERROR);
|
||||||
alert.setClose(false);
|
alert.setClose(false);
|
||||||
hpGetLink.add(alert);
|
hpGetLink.add(alert);
|
||||||
newBrowserWindow.close();
|
// newBrowserWindow.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(GeoportalItemReferences result) {
|
public void onSuccess(GeoportalItemReferences result) {
|
||||||
|
try {
|
||||||
|
hpGetLink.setVisible(false);
|
||||||
|
modal.remove(hpGetLink);
|
||||||
|
} catch (Exception e) {
|
||||||
|
// TODO: handle exception
|
||||||
|
}
|
||||||
String theURL = result.getRestrictedLink().getShortURL() != null
|
String theURL = result.getRestrictedLink().getShortURL() != null
|
||||||
? result.getRestrictedLink().getShortURL()
|
? result.getRestrictedLink().getShortURL()
|
||||||
: result.getRestrictedLink().getCompleteURL();
|
: result.getRestrictedLink().getCompleteURL();
|
||||||
newBrowserWindow.setUrl(theURL);
|
// newBrowserWindow.setUrl(theURL);
|
||||||
modal.hide();
|
|
||||||
|
Anchor anchor = new Anchor(theURL);
|
||||||
|
anchor.setHref(theURL);
|
||||||
|
anchor.setTarget("_blank");
|
||||||
|
anchor.setTitle(
|
||||||
|
"Show on Map the project with id: " + resultDocumentDV.getId());
|
||||||
|
com.github.gwtbootstrap.client.ui.Label label = new com.github.gwtbootstrap.client.ui.Label(
|
||||||
|
"Go to Map by clicking the link");
|
||||||
|
label.setType(LabelType.SUCCESS);
|
||||||
|
|
||||||
|
modal.add(label);
|
||||||
|
modal.add(new HTML("<br>"));
|
||||||
|
modal.add(anchor);
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,6 @@ import org.gcube.application.geoportalcommon.shared.guipresentation.Header;
|
||||||
import org.gcube.portlets.user.geoportaldataentry.client.ConstantsGeoPortalDataEntryApp;
|
import org.gcube.portlets.user.geoportaldataentry.client.ConstantsGeoPortalDataEntryApp;
|
||||||
import org.gcube.portlets.user.geoportaldataentry.client.GeoPortalClientCaches.CacheSearchingFilterParametersFromConfig;
|
import org.gcube.portlets.user.geoportaldataentry.client.GeoPortalClientCaches.CacheSearchingFilterParametersFromConfig;
|
||||||
import org.gcube.portlets.user.geoportaldataentry.client.events.CreateNewProjectEvent;
|
import org.gcube.portlets.user.geoportaldataentry.client.events.CreateNewProjectEvent;
|
||||||
import org.gcube.portlets.user.geoportaldataentry.client.events.GetListOfRecordsEvent;
|
|
||||||
import org.gcube.portlets.user.geoportaldataentry.client.events.OperationOnItemEvent;
|
import org.gcube.portlets.user.geoportaldataentry.client.events.OperationOnItemEvent;
|
||||||
import org.gcube.portlets.user.geoportaldataentry.client.ui.form.GeonaDataEntryMainForm;
|
import org.gcube.portlets.user.geoportaldataentry.client.ui.form.GeonaDataEntryMainForm;
|
||||||
import org.gcube.portlets.user.geoportaldataentry.client.ui.projects.ListOfProjectTablePanel;
|
import org.gcube.portlets.user.geoportaldataentry.client.ui.projects.ListOfProjectTablePanel;
|
||||||
|
@ -458,19 +457,21 @@ public class GeonaMainTabPanel extends Composite {
|
||||||
|
|
||||||
if (dataListHandler != null) {
|
if (dataListHandler != null) {
|
||||||
|
|
||||||
NavLink link = new NavLink(ucd.getName());
|
// NavLink link = new NavLink(ucd.getName());
|
||||||
link.addClickHandler(new ClickHandler() {
|
// link.addClickHandler(new ClickHandler() {
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void onClick(ClickEvent event) {
|
// public void onClick(ClickEvent event) {
|
||||||
|
//
|
||||||
appManagerBus.fireEvent(new GetListOfRecordsEvent(false, ucd.getProfileID(),
|
// appManagerBus.fireEvent(new GetListOfRecordsEvent(false, ucd.getProfileID(),
|
||||||
getCurrentProjectsSearchingFilter(), true));
|
// getCurrentProjectsSearchingFilter(), true));
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
ucdProjectTypesForListingDataView.add(ucd);
|
ucdProjectTypesForListingDataView.add(ucd);
|
||||||
|
|
||||||
listOfProjectTablePanel.addProjectType(link);
|
// listOfProjectTablePanel.addProjectType(link);
|
||||||
|
|
||||||
|
listOfProjectTablePanel.addProjectType(ucd);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -203,15 +203,16 @@ public class ListOfProjectTablePanel extends Composite {
|
||||||
alertSearchFor.setText(searchForFields.get(0).getDisplayName());
|
alertSearchFor.setText(searchForFields.get(0).getDisplayName());
|
||||||
alertSortBy.setText(toLabelFilter((sortByFields.get(0)), SearchingFilter.ORDER.ASC));
|
alertSortBy.setText(toLabelFilter((sortByFields.get(0)), SearchingFilter.ORDER.ASC));
|
||||||
|
|
||||||
for (ItemFieldDV record_FIELD : searchForFields) {
|
for (final ItemFieldDV record_FIELD : searchForFields) {
|
||||||
|
|
||||||
NavLink nav = new NavLink(record_FIELD.getDisplayName());
|
final NavLink navSearch = new NavLink(record_FIELD.getDisplayName());
|
||||||
dropdownSearchFor.add(nav);
|
dropdownSearchFor.add(navSearch);
|
||||||
|
|
||||||
nav.addClickHandler(new ClickHandler() {
|
navSearch.addClickHandler(new ClickHandler() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(ClickEvent event) {
|
public void onClick(ClickEvent event) {
|
||||||
|
GWT.log("Search for: " + record_FIELD.getDisplayName());
|
||||||
alertSearchFor.setText(record_FIELD.getDisplayName());
|
alertSearchFor.setText(record_FIELD.getDisplayName());
|
||||||
|
|
||||||
if (searchField.getText().length() >= MIN_LENGHT_SERCHING_STRING) {
|
if (searchField.getText().length() >= MIN_LENGHT_SERCHING_STRING) {
|
||||||
|
@ -318,15 +319,15 @@ public class ListOfProjectTablePanel extends Composite {
|
||||||
public void execute() {
|
public void execute() {
|
||||||
|
|
||||||
// noProjectSelectionMessage.setVisible(true);
|
// noProjectSelectionMessage.setVisible(true);
|
||||||
// SELECTION on the first item
|
// Selecting directly the unique UCD type.
|
||||||
if (ucdProjectTypesForListingDataView.size() > 0) {
|
if (ucdProjectTypesForListingDataView.size() == 1) {
|
||||||
// noProjectSelectionMessage.setVisible(false);
|
// noProjectSelectionMessage.setVisible(false);
|
||||||
UseCaseDescriptorDV singleUCD = ucdProjectTypesForListingDataView.get(0);
|
UseCaseDescriptorDV singleUCD = ucdProjectTypesForListingDataView.get(0);
|
||||||
alertProjectType.setText(singleUCD.getName());
|
alertProjectType.setText(singleUCD.getName());
|
||||||
// setFilteringParameters(displayFields, sortByFields, searchForFields,
|
// setFilteringParameters(displayFields, sortByFields, searchForFields,
|
||||||
// currentSearchingFilter);
|
// currentSearchingFilter);
|
||||||
appManagerBus.fireEvent(
|
appManagerBus.fireEvent(new GetListOfRecordsEvent(true, singleUCD.getProfileID(),
|
||||||
new GetListOfRecordsEvent(true, singleUCD.getProfileID(), getCurrentSearchingFilter(), true));
|
getCurrentSearchingFilter(), true));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -449,12 +450,19 @@ public class ListOfProjectTablePanel extends Composite {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public void addProjectType(final UseCaseDescriptorDV ucd) {
|
||||||
* Adds the project type.
|
|
||||||
*
|
NavLink link = new NavLink(ucd.getName());
|
||||||
* @param link the link
|
link.addClickHandler(new ClickHandler() {
|
||||||
*/
|
|
||||||
public void addProjectType(NavLink link) {
|
@Override
|
||||||
|
public void onClick(ClickEvent event) {
|
||||||
|
alertProjectType.setText(ucd.getName());
|
||||||
|
appManagerBus
|
||||||
|
.fireEvent(new GetListOfRecordsEvent(false, ucd.getProfileID(), builtSearchingFilter(), true));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
ddProjectType.add(link);
|
ddProjectType.add(link);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -482,7 +482,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
|
||||||
.getGeportalViewerResourceProfile(getThreadLocalRequest());
|
.getGeportalViewerResourceProfile(getThreadLocalRequest());
|
||||||
GeoportalCommon gc = new GeoportalCommon(grViewerProfile);
|
GeoportalCommon gc = new GeoportalCommon(grViewerProfile);
|
||||||
GeoportalItemReferences item = new GeoportalItemReferences(itemId, profileID);
|
GeoportalItemReferences item = new GeoportalItemReferences(itemId, profileID);
|
||||||
item = gc.getPublicLinksFor(item, false);
|
item = gc.getPublicLinksFor(item, true);
|
||||||
LOG.info("Returning: " + item);
|
LOG.info("Returning: " + item);
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue