MaDgIK
/
uoa-monitor-service
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into production

This commit is contained in:
Konstantinos Triantafyllou 2023-07-31 11:00:37 +03:00
parent 9f9f05b793 8446c19ea9
commit f0d5e399c4
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/eu/dnetlib/uoamonitorservice/controllers/IndicatorController.java
View File

@ -71,6 +71,10 @@ public class IndicatorController {
private void createSectionsAndSaveBulk(Date date, List<Section<Indicator>> old_sections,
Stakeholder stakeholder, String topicId, String categoryId, String subcategoryId) throws UnsupportedEncodingException {
for(Section<Indicator> section : old_sections) {
if(section == null) {
continue;
}
Section chart_section = null;
Section number_section = null;
@ -87,6 +91,10 @@ public class IndicatorController {
List<Indicator> indicators = section.getIndicators();
for (Indicator indicator : indicators) {
if(indicator == null) {
continue;
}
if (indicator.getType().equals("chart")) {
saveIndicatorAndAddInSection(indicator, date, stakeholder, subcategoryId, chart_section, chart_indicators);
@ -210,7 +218,7 @@ public class IndicatorController {
for (String sectionId : sections) {
Section section = sectionDAO.findById(sectionId);
if(section.getDefaultId().equals(defaultSection.getId())) {
if(section.getDefaultId() != null && section.getDefaultId().equals(defaultSection.getId())) {
Indicator indicatorNew = new Indicator();
indicatorNew.copyFromDefault(indicator, subCategory.getVisibility());
for (IndicatorPath indicatorPath : indicatorNew.getIndicatorPaths()) {

10
src/main/java/eu/dnetlib/uoamonitorservice/entities/Stakeholder.java
View File

@ -31,6 +31,7 @@ public class Stakeholder<StringOrTopic> {
private String id;
private StakeholderType type; // private StakeholderType type;
private Date projectUpdateDate = null;
private String index_id;
private String index_name;
private String index_shortName;
@ -54,6 +55,7 @@ public class Stakeholder<StringOrTopic> {
public Stakeholder(Stakeholder stakeholder) {
id = stakeholder.getId();
setType(stakeholder.getType());
projectUpdateDate = stakeholder.getProjectUpdateDate();
index_id = stakeholder.getIndex_id();
index_name = stakeholder.getIndex_name();
index_shortName = stakeholder.getIndex_shortName();
@ -102,6 +104,14 @@ public class Stakeholder<StringOrTopic> {
}
}
public Date getProjectUpdateDate() {
return projectUpdateDate;
}
public void setProjectUpdateDate(Date projectUpdateDate) {
this.projectUpdateDate = projectUpdateDate;
}
public String getIndex_id() {
return index_id;
}