Revision 46681
Added by Panagiotis Kanakakis about 7 years ago
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/ContentManager.java | ||
|---|---|---|
| 62 | 62 |
StatisticsWidget statisticsWidget = new StatisticsWidget(); |
| 63 | 63 |
widgetMap.put("statistics", statisticsWidget);
|
| 64 | 64 |
|
| 65 |
|
|
| 66 |
|
|
| 65 | 67 |
if(GoldOAPortal.currentUser!=null) {
|
| 66 |
|
|
| 67 | 68 |
List<FundingWizardStepWidget> wizardStepWidgets = new ArrayList<>(); |
| 68 | 69 |
|
| 69 | 70 |
ResearcherStepWidget researcherStepWidget = new ResearcherStepWidget("Researcher");
|
| ... | ... | |
| 125 | 126 |
|
| 126 | 127 |
MyAccountWidget myAccountWidget = new MyAccountWidget(); |
| 127 | 128 |
widgetMap.put("myAccount", myAccountWidget);
|
| 128 |
|
|
| 129 |
Window.alert("5");
|
|
| 129 | 130 |
EditAccountInfoWidget editAccountInfoWidget = new EditAccountInfoWidget(); |
| 130 | 131 |
widgetMap.put("editAccountInfo", editAccountInfoWidget);
|
| 132 |
Window.alert("6");
|
|
| 131 | 133 |
} |
| 132 | 134 |
} |
| 133 | 135 |
|
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/monitor/MonitorFundingRequestsWidget.java | ||
|---|---|---|
| 657 | 657 |
request.setStatus(requestStatus); |
| 658 | 658 |
|
| 659 | 659 |
if(comment!=null) {
|
| 660 |
RequestComment rc = new RequestComment(); |
|
| 661 |
rc.setComment(comment); |
|
| 662 |
rc.setRequest(request); |
|
| 663 |
//TODO find user |
|
| 664 |
//rc.setUser(); |
|
| 665 |
request.getRequestComments().add(rc); |
|
| 660 |
request.getRequestComments().add(comment); |
|
| 666 | 661 |
} |
| 667 | 662 |
addNewRequestInfo(accordion, request); |
| 668 | 663 |
} |
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/monitor/RequestInfoElement.java | ||
|---|---|---|
| 611 | 611 |
|
| 612 | 612 |
requestInfoPanel.add(secondDivider); |
| 613 | 613 |
if(request.getRequestComments()!=null && !request.getRequestComments().isEmpty()) {
|
| 614 |
List<Comment> comments = new ArrayList<>(); |
|
| 615 |
for(RequestComment rc : request.getRequestComments()) |
|
| 616 |
comments.add(rc.getComment()); |
|
| 614 |
List<Comment> comments = request.getRequestComments(); |
|
| 617 | 615 |
CommentsInfo commentsInfo = new CommentsInfo(comments); |
| 618 | 616 |
commentsInfo.addStyleName("requestComments");
|
| 619 | 617 |
requestInfoPanel.add(commentsInfo.asWidget()); |
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/accountingmonitor/AccountingRequestInfoElement.java | ||
|---|---|---|
| 22 | 22 |
import eu.dnetlib.goldoa.domain.Comment; |
| 23 | 23 |
import eu.dnetlib.goldoa.domain.Currency; |
| 24 | 24 |
import eu.dnetlib.goldoa.domain.Request; |
| 25 |
import eu.dnetlib.goldoa.domain.RequestComment; |
|
| 26 | 25 |
|
| 27 | 26 |
import java.util.ArrayList; |
| 28 | 27 |
import java.util.List; |
| ... | ... | |
| 402 | 401 |
|
| 403 | 402 |
if(request.getRequestComments()!=null && !request.getRequestComments().isEmpty()) {
|
| 404 | 403 |
List<Comment> comments = new ArrayList<>(); |
| 405 |
for(RequestComment rc : request.getRequestComments())
|
|
| 406 |
comments.add(rc.getComment());
|
|
| 404 |
for(Comment rc : request.getRequestComments()) |
|
| 405 |
comments.add(rc); |
|
| 407 | 406 |
|
| 408 | 407 |
CommentsInfo commentsInfo = new CommentsInfo(comments); |
| 409 | 408 |
commentsInfo.addStyleName("requestComments");
|
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/fundingrequest/newrequest/publicationstep/JournalInfoStep.java | ||
|---|---|---|
| 219 | 219 |
journal.setUrl(url.getValue().trim()); |
| 220 | 220 |
journal.setLanguages(languages.getValue().trim()); |
| 221 | 221 |
journal.setIssn(issnAndEissn.getValue().trim()); |
| 222 |
journal.setCountry(new Country(country.getValue().trim()));
|
|
| 222 |
journal.setCountry(country.getValue().trim());
|
|
| 223 | 223 |
journal.setSubjects(subjects.getValue().trim()); |
| 224 | 224 |
journal.setLicence(licence.getValue().trim()); |
| 225 | 225 |
|
| ... | ... | |
| 301 | 301 |
url.setValue(journal.getUrl()); |
| 302 | 302 |
languages.setValue(journal.getLanguages()); |
| 303 | 303 |
issnAndEissn.setValue(journal.getIssn()); |
| 304 |
country.setValue(journal.getCountry().getName());
|
|
| 304 |
country.setValue(journal.getCountry()); |
|
| 305 | 305 |
subjects.setValue(journal.getSubjects()); |
| 306 | 306 |
licence.setValue(journal.getLicence()); |
| 307 | 307 |
apc.setValue((Math.round(journal.getApc() * 100) / 100.0)+""); |
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/fundingrequest/newrequest/publicationstep/JournalDisplayInfo.java | ||
|---|---|---|
| 59 | 59 |
|
| 60 | 60 |
//TODO check country |
| 61 | 61 |
if (journal.getCountry() != null ) |
| 62 |
contents += "<dl class=\"dl-horizontal\"><dt>COUNTRY</dt><dd>" + journal.getCountry().getName()+ "</dd></dl>";
|
|
| 62 |
contents += "<dl class=\"dl-horizontal\"><dt>COUNTRY</dt><dd>" + journal.getCountry()+ "</dd></dl>"; |
|
| 63 | 63 |
|
| 64 | 64 |
if (journal.getSubjects() != null && !journal.getSubjects().trim().equals(""))
|
| 65 | 65 |
contents += "<dl class=\"dl-horizontal\"><dt>SUBJECTS</dt><dd>" + journal.getSubjects() + "</dd></dl>"; |
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/fundingrequest/existingrequests/ExistingRequestElement.java | ||
|---|---|---|
| 20 | 20 |
import eu.dnetlib.goldoa.domain.Comment; |
| 21 | 21 |
import eu.dnetlib.goldoa.domain.Currency; |
| 22 | 22 |
import eu.dnetlib.goldoa.domain.Request; |
| 23 |
import eu.dnetlib.goldoa.domain.RequestComment; |
|
| 24 | 23 |
|
| 25 | 24 |
import java.util.ArrayList; |
| 26 | 25 |
import java.util.List; |
| ... | ... | |
| 189 | 188 |
|
| 190 | 189 |
if(request.getRequestComments()!=null && !request.getRequestComments().isEmpty()) {
|
| 191 | 190 |
List<Comment> comments = new ArrayList<>(); |
| 192 |
for(RequestComment rc : request.getRequestComments())
|
|
| 193 |
comments.add(rc.getComment());
|
|
| 191 |
for(Comment rc : request.getRequestComments()) |
|
| 192 |
comments.add(rc); |
|
| 194 | 193 |
CommentsInfo commentsInfo = new CommentsInfo(comments); |
| 195 | 194 |
commentsInfo.addStyleName("requestComments");
|
| 196 | 195 |
requestInfoPanel.add(commentsInfo.asWidget()); |
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/fundingrequest/stepinfo/JournalChronologyInfo.java | ||
|---|---|---|
| 63 | 63 |
tooltipText += journal.getIssn() + "\n"; |
| 64 | 64 |
|
| 65 | 65 |
//TODO check country |
| 66 |
if(journal.getCountry()!=null /*&& !journal.getCountry().trim().equals("")*/)
|
|
| 67 |
tooltipText += journal.getCountry().getName() + "\n";
|
|
| 66 |
if(journal.getCountry()!=null && !journal.getCountry().trim().equals(""))
|
|
| 67 |
tooltipText += journal.getCountry() + "\n"; |
|
| 68 | 68 |
|
| 69 | 69 |
if(journal.getSubjects()!=null && !journal.getSubjects().trim().equals(""))
|
| 70 | 70 |
tooltipText += journal.getSubjects() + "\n"; |
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/fundingrequest/stepinfo/CommentsInfo.java | ||
|---|---|---|
| 5 | 5 |
import com.google.gwt.user.client.ui.IsWidget; |
| 6 | 6 |
import com.google.gwt.user.client.ui.Widget; |
| 7 | 7 |
import eu.dnetlib.goldoa.domain.Comment; |
| 8 |
import eu.dnetlib.goldoa.domain.RequestComment; |
|
| 9 | 8 |
|
| 10 | 9 |
import java.util.List; |
| 11 | 10 |
|
| modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/fundingrequest/stepinfo/JournalFullInfo.java | ||
|---|---|---|
| 35 | 35 |
journalInfoContents += "<dd>" + journal.getIssn() + "</dd>"; |
| 36 | 36 |
|
| 37 | 37 |
//TODO check country |
| 38 |
if(journal.getCountry()!=null /*&& !journal.getCountry().trim().equals("")*/)
|
|
| 39 |
journalInfoContents += "<dd>" + journal.getCountry().getName() + "</dd>";
|
|
| 38 |
if(journal.getCountry()!=null && !journal.getCountry().trim().equals(""))
|
|
| 39 |
journalInfoContents += "<dd>" + journal.getCountry() + "</dd>"; |
|
| 40 | 40 |
|
| 41 | 41 |
if(journal.getSubjects()!=null && !journal.getSubjects().trim().equals(""))
|
| 42 | 42 |
journalInfoContents += "<dd>" + journal.getSubjects() + "</dd>"; |
Also available in: Unified diff