Revision 46460
Added by Panagiotis Kanakakis over 7 years ago
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/server/widget/AutoCompleteServiceImpl.java | ||
|---|---|---|
| 1 | 1 |
package eu.dnetlib.server.widget; |
| 2 | 2 |
|
| 3 |
import com.google.gwt.user.client.Window; |
|
| 4 | 3 |
import com.google.gwt.user.server.rpc.RemoteServiceServlet; |
| 5 | 4 |
import eu.dnetlib.client.widgets.AutoCompleteService; |
| 6 | 5 |
import eu.dnetlib.goldoa.domain.*; |
| 7 | 6 |
import eu.dnetlib.goldoa.service.SearchManager; |
| 8 |
import eu.dnetlib.goldoa.service.dao.UserDAO; |
|
| 9 |
import org.apache.commons.logging.Log; |
|
| 10 |
import org.apache.commons.logging.LogFactory; |
|
| 11 | 7 |
import org.springframework.context.ApplicationContext; |
| 12 | 8 |
import org.springframework.web.context.support.WebApplicationContextUtils; |
| 13 | 9 |
|
| ... | ... | |
| 53 | 49 |
|
| 54 | 50 |
|
| 55 | 51 |
List<Object> objectList = searchManager.search(searchType, matchString); |
| 56 |
|
|
| 57 | 52 |
if (type.equals("project")){
|
| 58 | 53 |
for(Object obj : objectList) {
|
| 59 | 54 |
Project p = (Project) obj; |
| 60 |
matchingNames.add(new Vocabulary(p.getId(), p.getAcronym() + " - " + p.getGrant() + " (" + p.getTitle() + ")", p));
|
|
| 55 |
Vocabulary voc = new Vocabulary(); |
|
| 56 |
voc.setId(p.getId()); |
|
| 57 |
voc.setName(p.getAcronym() + " - " + p.getGrant() |
|
| 58 |
+ " (" + p.getTitle() + ")");
|
|
| 59 |
voc.setProject(p); |
|
| 60 |
//matchingNames.add(new Vocabulary(p.getId(), p.getAcronym() + " - " + p.getGrant() |
|
| 61 |
// + " (" + p.getTitle() + ")"));
|
|
| 62 |
matchingNames.add(voc); |
|
| 61 | 63 |
} |
| 62 | 64 |
}else if (type.equals("organisation")){
|
| 63 | 65 |
for(Object obj : objectList) {
|
| 64 | 66 |
Organization org = (Organization) obj; |
| 65 |
matchingNames.add(new Vocabulary(org.getId(), org.getName(), org)); |
|
| 67 |
Vocabulary voc = new Vocabulary(); |
|
| 68 |
voc.setId(org.getId()); |
|
| 69 |
voc.setName(org.getName()); |
|
| 70 |
voc.setOrganization(org); |
|
| 71 |
matchingNames.add(voc); |
|
| 72 |
//matchingNames.add(new Vocabulary(org.getId(), org.getName(), org)); |
|
| 66 | 73 |
} |
| 67 | 74 |
}else if (type.equals("journal")) {
|
| 68 | 75 |
for (Object obj : objectList) {
|
| 69 | 76 |
Journal j = (Journal) obj; |
| 70 |
matchingNames.add(new Vocabulary(j.getId(), j.getTitle() + " (" + j.getIssn() + ")", j));
|
|
| 77 |
Vocabulary voc = new Vocabulary(); |
|
| 78 |
voc.setId(j.getId()); |
|
| 79 |
voc.setName(j.getTitle() + " (" + j.getIssn() + ")");
|
|
| 80 |
voc.setJournal(j); |
|
| 81 |
matchingNames.add(voc); |
|
| 82 |
//matchingNames.add(new Vocabulary(j.getId(), j.getTitle() + " (" + j.getIssn() + ")", j));
|
|
| 71 | 83 |
} |
| 72 | 84 |
}else if (type.equals("publisher")){
|
| 73 | 85 |
for(Object obj : objectList){
|
| 74 | 86 |
Publisher p = (Publisher) obj; |
| 75 |
matchingNames.add(new Vocabulary(p.getId(),p.getName(),p)); |
|
| 87 |
Vocabulary voc = new Vocabulary(); |
|
| 88 |
voc.setId(p.getId()); |
|
| 89 |
voc.setName(p.getName()); |
|
| 90 |
voc.setPublisher(p); |
|
| 91 |
matchingNames.add(voc); |
|
| 92 |
//matchingNames.add(new Vocabulary(p.getId(),p.getName(),p)); |
|
| 76 | 93 |
} |
| 77 | 94 |
}else if (type.equals("funder")){
|
| 78 | 95 |
for(Object obj : objectList){
|
| 79 | 96 |
Funder f = (Funder) obj; |
| 80 |
matchingNames.add(new Vocabulary(f.getId(),f.getName(),f)); |
|
| 97 |
Vocabulary voc = new Vocabulary(); |
|
| 98 |
voc.setId(f.getId()); |
|
| 99 |
voc.setName(f.getName()); |
|
| 100 |
voc.setFunder(f); |
|
| 101 |
matchingNames.add(voc); |
|
| 102 |
//matchingNames.add(new Vocabulary(f.getId(),f.getName(),f)); |
|
| 81 | 103 |
} |
| 82 | 104 |
} |
| 83 |
|
|
| 84 | 105 |
} catch(Exception e) {
|
| 85 | 106 |
e.printStackTrace(); |
| 86 | 107 |
} |
| 87 |
Log log = LogFactory.getLog(AutoCompleteServiceImpl.class); |
|
| 88 |
log.debug("matching name size ->" + matchingNames.get(0).getId() + "/" + matchingNames.get(0).getName());
|
|
| 89 | 108 |
return matchingNames; |
| 90 | 109 |
} |
| 91 | 110 |
} |
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/monitor/MonitorFundingRequestsWidget.java | ||
|---|---|---|
| 82 | 82 |
public MonitorFundingRequestsWidget() {
|
| 83 | 83 |
|
| 84 | 84 |
List<Vocabulary> statusOptions = new ArrayList<>(); |
| 85 |
statusOptions.add(new Vocabulary(Request.RequestStatus.SUBMITTED.name(), Request.RequestStatus.SUBMITTED.getValue(),null));
|
|
| 86 |
statusOptions.add(new Vocabulary(Request.RequestStatus.INCOMPLETE.name(), Request.RequestStatus.INCOMPLETE.getValue(),null));
|
|
| 87 |
statusOptions.add(new Vocabulary(Request.RequestStatus.CONDITIONALLY_APPROVED.name(), Request.RequestStatus.CONDITIONALLY_APPROVED.getValue(),null));
|
|
| 88 |
statusOptions.add(new Vocabulary(Request.RequestStatus.APPROVED.name(), Request.RequestStatus.APPROVED.getValue(),null));
|
|
| 89 |
statusOptions.add(new Vocabulary(Request.RequestStatus.REJECTED.name(), Request.RequestStatus.REJECTED.getValue(),null));
|
|
| 90 |
statusOptions.add(new Vocabulary(Request.RequestStatus.LIBRARY_FUND_SUBMITTED.name(), Request.RequestStatus.LIBRARY_FUND_SUBMITTED.getValue(),null));
|
|
| 91 |
statusOptions.add(new Vocabulary(Request.RequestStatus.PUBLISHER_FUND_SUBMITTED.name(), Request.RequestStatus.PUBLISHER_FUND_SUBMITTED.getValue(),null));
|
|
| 92 |
statusOptions.add(new Vocabulary(Request.RequestStatus.LIBRARY_FUND_PAID.name(), Request.RequestStatus.LIBRARY_FUND_PAID.getValue(),null));
|
|
| 93 |
statusOptions.add(new Vocabulary(Request.RequestStatus.PUBLISHER_FUND_PAID.name(), Request.RequestStatus.PUBLISHER_FUND_PAID.getValue(),null));
|
|
| 94 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PROCESSING.name(), Request.RequestStatus.ACCOUNTING_PROCESSING.getValue(),null));
|
|
| 95 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PAID.name(), Request.RequestStatus.ACCOUNTING_PAID.getValue(),null));
|
|
| 96 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_ON_HOLD.name(), Request.RequestStatus.ACCOUNTING_ON_HOLD.getValue(),null));
|
|
| 97 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_DENIED.name(), Request.RequestStatus.ACCOUNTING_DENIED.getValue(),null));
|
|
| 85 |
statusOptions.add(new Vocabulary(Request.RequestStatus.SUBMITTED.name(), Request.RequestStatus.SUBMITTED.getValue())); |
|
| 86 |
statusOptions.add(new Vocabulary(Request.RequestStatus.INCOMPLETE.name(), Request.RequestStatus.INCOMPLETE.getValue())); |
|
| 87 |
statusOptions.add(new Vocabulary(Request.RequestStatus.CONDITIONALLY_APPROVED.name(), Request.RequestStatus.CONDITIONALLY_APPROVED.getValue())); |
|
| 88 |
statusOptions.add(new Vocabulary(Request.RequestStatus.APPROVED.name(), Request.RequestStatus.APPROVED.getValue())); |
|
| 89 |
statusOptions.add(new Vocabulary(Request.RequestStatus.REJECTED.name(), Request.RequestStatus.REJECTED.getValue())); |
|
| 90 |
statusOptions.add(new Vocabulary(Request.RequestStatus.LIBRARY_FUND_SUBMITTED.name(), Request.RequestStatus.LIBRARY_FUND_SUBMITTED.getValue())); |
|
| 91 |
statusOptions.add(new Vocabulary(Request.RequestStatus.PUBLISHER_FUND_SUBMITTED.name(), Request.RequestStatus.PUBLISHER_FUND_SUBMITTED.getValue())); |
|
| 92 |
statusOptions.add(new Vocabulary(Request.RequestStatus.LIBRARY_FUND_PAID.name(), Request.RequestStatus.LIBRARY_FUND_PAID.getValue())); |
|
| 93 |
statusOptions.add(new Vocabulary(Request.RequestStatus.PUBLISHER_FUND_PAID.name(), Request.RequestStatus.PUBLISHER_FUND_PAID.getValue())); |
|
| 94 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PROCESSING.name(), Request.RequestStatus.ACCOUNTING_PROCESSING.getValue())); |
|
| 95 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PAID.name(), Request.RequestStatus.ACCOUNTING_PAID.getValue())); |
|
| 96 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_ON_HOLD.name(), Request.RequestStatus.ACCOUNTING_ON_HOLD.getValue())); |
|
| 97 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_DENIED.name(), Request.RequestStatus.ACCOUNTING_DENIED.getValue())); |
|
| 98 | 98 |
|
| 99 | 99 |
dropdownCheckbox = new DropdownCheckbox(statusOptions); |
| 100 | 100 |
|
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/accountingmonitor/AccountingMonitorFundingRequestsWidget.java | ||
|---|---|---|
| 84 | 84 |
public AccountingMonitorFundingRequestsWidget() {
|
| 85 | 85 |
|
| 86 | 86 |
List<Vocabulary> statusOptions = new ArrayList<>(); |
| 87 |
statusOptions.add(new Vocabulary(Request.RequestStatus.APPROVED.name(), Request.RequestStatus.APPROVED.getValue(),null));
|
|
| 88 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PROCESSING.name(), Request.RequestStatus.ACCOUNTING_PROCESSING.getValue(),null));
|
|
| 89 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PAID.name(), Request.RequestStatus.ACCOUNTING_PAID.getValue(),null));
|
|
| 90 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_ON_HOLD.name(), Request.RequestStatus.ACCOUNTING_ON_HOLD.getValue(),null));
|
|
| 91 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_DENIED.name(), Request.RequestStatus.ACCOUNTING_DENIED.getValue(),null));
|
|
| 87 |
statusOptions.add(new Vocabulary(Request.RequestStatus.APPROVED.name(), Request.RequestStatus.APPROVED.getValue())); |
|
| 88 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PROCESSING.name(), Request.RequestStatus.ACCOUNTING_PROCESSING.getValue())); |
|
| 89 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PAID.name(), Request.RequestStatus.ACCOUNTING_PAID.getValue())); |
|
| 90 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_ON_HOLD.name(), Request.RequestStatus.ACCOUNTING_ON_HOLD.getValue())); |
|
| 91 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_DENIED.name(), Request.RequestStatus.ACCOUNTING_DENIED.getValue())); |
|
| 92 | 92 |
|
| 93 | 93 |
dropdownCheckbox = new DropdownCheckbox(statusOptions); |
| 94 | 94 |
|
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/fundingrequest/existingrequests/ExistingFundingRequestsWidget.java | ||
|---|---|---|
| 75 | 75 |
public ExistingFundingRequestsWidget() {
|
| 76 | 76 |
|
| 77 | 77 |
List<Vocabulary> statusOptions = new ArrayList<>(); |
| 78 |
statusOptions.add(new Vocabulary(Request.RequestStatus.SUBMITTED.name(), Request.RequestStatus.SUBMITTED.getValue(),null));
|
|
| 79 |
statusOptions.add(new Vocabulary(Request.RequestStatus.INCOMPLETE.name(), Request.RequestStatus.INCOMPLETE.getValue(),null));
|
|
| 80 |
statusOptions.add(new Vocabulary(Request.RequestStatus.CONDITIONALLY_APPROVED.name(), Request.RequestStatus.CONDITIONALLY_APPROVED.getValue(),null));
|
|
| 81 |
statusOptions.add(new Vocabulary(Request.RequestStatus.APPROVED.name(), Request.RequestStatus.APPROVED.getValue(),null));
|
|
| 82 |
statusOptions.add(new Vocabulary(Request.RequestStatus.REJECTED.name(), Request.RequestStatus.REJECTED.getValue(),null));
|
|
| 83 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PROCESSING.name(), Request.RequestStatus.ACCOUNTING_PROCESSING.getValue(),null));
|
|
| 84 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PAID.name(), Request.RequestStatus.ACCOUNTING_PAID.getValue(),null));
|
|
| 85 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_ON_HOLD.name(), Request.RequestStatus.ACCOUNTING_ON_HOLD.getValue(),null));
|
|
| 86 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_DENIED.name(), Request.RequestStatus.ACCOUNTING_DENIED.getValue(),null));
|
|
| 78 |
statusOptions.add(new Vocabulary(Request.RequestStatus.SUBMITTED.name(), Request.RequestStatus.SUBMITTED.getValue())); |
|
| 79 |
statusOptions.add(new Vocabulary(Request.RequestStatus.INCOMPLETE.name(), Request.RequestStatus.INCOMPLETE.getValue())); |
|
| 80 |
statusOptions.add(new Vocabulary(Request.RequestStatus.CONDITIONALLY_APPROVED.name(), Request.RequestStatus.CONDITIONALLY_APPROVED.getValue())); |
|
| 81 |
statusOptions.add(new Vocabulary(Request.RequestStatus.APPROVED.name(), Request.RequestStatus.APPROVED.getValue())); |
|
| 82 |
statusOptions.add(new Vocabulary(Request.RequestStatus.REJECTED.name(), Request.RequestStatus.REJECTED.getValue())); |
|
| 83 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PROCESSING.name(), Request.RequestStatus.ACCOUNTING_PROCESSING.getValue())); |
|
| 84 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PAID.name(), Request.RequestStatus.ACCOUNTING_PAID.getValue())); |
|
| 85 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_ON_HOLD.name(), Request.RequestStatus.ACCOUNTING_ON_HOLD.getValue())); |
|
| 86 |
statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_DENIED.name(), Request.RequestStatus.ACCOUNTING_DENIED.getValue())); |
|
| 87 | 87 |
|
| 88 | 88 |
dropdownCheckbox = new DropdownCheckbox(statusOptions); |
| 89 | 89 |
|
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/widgets/AutoCompleteWidget.java | ||
|---|---|---|
| 12 | 12 |
import com.google.gwt.user.client.ui.Label; |
| 13 | 13 |
import com.google.gwt.user.client.ui.Widget; |
| 14 | 14 |
import com.sencha.gxt.widget.core.client.info.Info; |
| 15 |
import eu.dnetlib.goldoa.domain.Request; |
|
| 16 |
import eu.dnetlib.goldoa.domain.RequestSort; |
|
| 17 |
import eu.dnetlib.goldoa.domain.RequestSortOrder; |
|
| 18 |
import eu.dnetlib.goldoa.domain.Vocabulary; |
|
| 15 |
import eu.dnetlib.goldoa.domain.*; |
|
| 16 |
import eu.dnetlib.goldoa.service.SearchManager; |
|
| 19 | 17 |
|
| 20 | 18 |
import java.util.List; |
| 21 | 19 |
|
| ... | ... | |
| 156 | 154 |
this.autoCompleteListener = autoCompleteListener; |
| 157 | 155 |
} |
| 158 | 156 |
|
| 159 |
private void createSuggestionList(String type, String matchString) {
|
|
| 157 |
private void createSuggestionList(final String type, String matchString) {
|
|
| 160 | 158 |
|
| 161 | 159 |
autoCompleteVocabularyService.getAutoCompleteVocabulary(type, matchString, new AsyncCallback<List<Vocabulary>>() {
|
| 162 | 160 |
|
| 163 | 161 |
@Override |
| 164 | 162 |
public void onFailure(Throwable caught) {
|
| 165 |
Window.alert("Suggestion list error!");
|
|
| 163 |
|
|
| 164 |
//Window.alert("Suggestion list error!");
|
|
| 166 | 165 |
} |
| 167 | 166 |
|
| 168 | 167 |
@Override |
| ... | ... | |
| 171 | 170 |
FlowPanel suggestionList = new FlowPanel(); |
| 172 | 171 |
|
| 173 | 172 |
if (!vocabularyList.isEmpty()) {
|
| 174 |
for (final Vocabulary vocabulary : vocabularyList) {
|
|
| 173 |
for (final Vocabulary vocabulary:vocabularyList) {
|
|
| 175 | 174 |
|
| 176 | 175 |
Anchor anchor = new Anchor(); |
| 177 | 176 |
anchor.setText(vocabulary.getName()); |
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/user/UserRegistrationForm.java | ||
|---|---|---|
| 79 | 79 |
|
| 80 | 80 |
private boolean isProjectSelected = false; |
| 81 | 81 |
private String projectId = null; |
| 82 |
private Project project = null; |
|
| 82 | 83 |
|
| 83 | 84 |
private boolean isPublisherSelected = false; |
| 84 | 85 |
private Publisher publisher = null; |
| ... | ... | |
| 267 | 268 |
@Override |
| 268 | 269 |
public void valueSelected(Vocabulary vocabulary) {
|
| 269 | 270 |
isProjectSelected = true; |
| 270 |
projectId = vocabulary.getId();
|
|
| 271 |
project = vocabulary.getProject();
|
|
| 271 | 272 |
} |
| 272 | 273 |
}; |
| 273 | 274 |
projectAutoComplete.setAutoCompleteListener(projectAutoCompleteListener); |
| ... | ... | |
| 279 | 280 |
@Override |
| 280 | 281 |
public void valueSelected(Vocabulary vocabulary) {
|
| 281 | 282 |
isPublisherSelected = true; |
| 282 |
publisher = new Publisher(); |
|
| 283 |
publisher.setId(vocabulary.getId()); |
|
| 284 |
publisher.setName(vocabulary.getName()); |
|
| 283 |
publisher = vocabulary.getPublisher(); |
|
| 285 | 284 |
} |
| 286 | 285 |
}; |
| 287 | 286 |
publisherAutoComplete.setAutoCompleteListener(publisherAutoCompleteListener); |
| ... | ... | |
| 507 | 506 |
person.setOrcidid(orcidID.getValue().trim()); |
| 508 | 507 |
|
| 509 | 508 |
List<Project> coordinatedProjects = new ArrayList<>(); |
| 510 |
if(projectId!=null){
|
|
| 511 |
Project p = new Project(); |
|
| 512 |
p.setId(projectId); |
|
| 513 |
coordinatedProjects.add(p); |
|
| 509 |
if(project!=null) {
|
|
| 510 |
Window.alert(project.getAcronym()); |
|
| 511 |
coordinatedProjects.add(project); |
|
| 514 | 512 |
} |
| 515 | 513 |
|
| 516 | 514 |
person.setCoordinatedProjects(coordinatedProjects); |
Also available in: Unified diff