Project

General

Profile

« Previous | Next » 

Revision 59813

[Trunk | Monitor Service]:
1. In all enums, add capitalized values too (maybe in the future, lowercased values will be removed - NOT NOW).
2. Visibility.java: New enumeration Visibility added with values: PUBLIC, RESTRICTED, PRIVATE (will replace isPublic and isActive fields).
3. Stakeholder.java:
a. Add field "isUpload" (default value: false) to define if "logoUrl" is a link, or a locally uploaded image.
b. Remove fields "isActive" and "isPublic" and add field "visibility" (default value: Visibility.PRIVATE).
c. Remove unused field "managers" (managers are defined from aai roles).
4. Topic.java & Category.java & SubCategory.java:
a. Remove fields "isActive" and "isPublic" and add field "visibility" (default value: Visibility.PRIVATE).
b. Add fields "creationDate" and "updateDate".
5. Section.java: Add fields "creationDate" and "updateDate".
6. Indicator.java:
a. Rename enumeration "IndicatorWidth" to "IndicatorSize" (will be used for width and height).
b. Add field "additionalDescription" (for default profiles, "description" can now be changed only by default profiles settings,
while "additionalDescription" can also be changed by managers too).
c. Add field "height" (default value: IndicatorSize.MEDIUM).
d. Remove fields "isActive" and "isPublic" and add field "visibility" (default value: Visibility.PRIVATE).
e. Add fields "creationDate" and "updateDate".

View differences:

modules/uoa-monitor-service/trunk/src/main/java/eu/dnetlib/uoamonitorservice/entities/Section.java
4 4
import org.springframework.data.annotation.Id;
5 5

  
6 6
import java.util.ArrayList;
7
import java.util.Date;
7 8
import java.util.List;
8 9

  
9 10
enum SectionType {
10 11
    // Do not rename or remove existring values. This may cause problems with already stored values in DB
11
    number, chart;
12
    number, chart,
13
    NUMBER, CHART;
12 14
}
13 15

  
14 16
public class Section<StringOrIndicator> {
......
20 22
    private String defaultId;
21 23
    private String stakeholderAlias;
22 24
    private SectionType type;
25
    private Date creationDate;
26
    private Date updateDate;
23 27
    private List<StringOrIndicator> indicators;
24 28

  
25 29
    public Section() {}
......
30 34
        defaultId = section.getDefaultId();
31 35
        stakeholderAlias = section.getStakeholderAlias();
32 36
        setType(section.getType());
37
        creationDate = section.getCreationDate();
38
        updateDate = section.getUpdateDate();
33 39
    }
34 40

  
35 41
    public void copyFromDefault(Section defaultSection) {
36 42
        setTitle(defaultSection.getTitle());
37 43
        setType(defaultSection.getType());
38 44
        setDefaultId(defaultSection.id);
45
        setCreationDate(defaultSection.getCreationDate());
46
        setUpdateDate(defaultSection.getUpdateDate());
39 47
        setIndicators(new ArrayList<>());
40 48
    }
41 49

  
......
87 95
        }
88 96
    }
89 97

  
98
    public Date getCreationDate() {
99
        return creationDate;
100
    }
101

  
102
    public void setCreationDate(Date creationDate) {
103
        this.creationDate = creationDate;
104
    }
105

  
106
    public Date getUpdateDate() {
107
        return updateDate;
108
    }
109

  
110
    public void setUpdateDate(Date updateDate) {
111
        this.updateDate = updateDate;
112
    }
113

  
90 114
    public List<StringOrIndicator> getIndicators() {
91 115
        return indicators;
92 116
    }
modules/uoa-monitor-service/trunk/src/main/java/eu/dnetlib/uoamonitorservice/entities/Stakeholder.java
10 10
enum StakeholderType
11 11
{
12 12
    // Do not rename or remove existring values. This may cause problems with already stored values in DB
13
    funder, ri, project, organization;
13
    funder, ri, project, organization,
14
    FUNDER, RI, PROJECT, ORGANIZATION;
14 15
}
15 16

  
16 17

  
......
24 25
    private String index_name;
25 26
    private String index_shortName;
26 27
    private String logoUrl;
28
    private boolean isUpload = false;
27 29
    private String name;
28 30
    private String alias;
29 31
    private String description;
30 32
    private String defaultId = null;
31
    private boolean isActive;
32
    private boolean isPublic;
33
    private Visibility visibility = Visibility.PRIVATE;
33 34
    private Date creationDate;
34 35
    private Date updateDate;
35
    private List<String> managers;
36 36

  
37 37
    private List<StringOrTopic> topics;
38 38

  
......
46 46
        index_name = stakeholder.getIndex_name();
47 47
        index_shortName = stakeholder.getIndex_shortName();
48 48
        logoUrl = stakeholder.getLogoUrl();
49
        isUpload = stakeholder.getIsUpload();
49 50
        name = stakeholder.getName();
50 51
        alias = stakeholder.getAlias();
51 52
        description = stakeholder.getDescription();
52 53
        defaultId = stakeholder.getDefaultId();
53
        isActive = stakeholder.getIsActive();
54
        isPublic = stakeholder.getIsPublic();
54
        setVisibility(stakeholder.getVisibility());
55 55
        creationDate = stakeholder.getCreationDate();
56 56
        updateDate = stakeholder.getUpdateDate();
57
        managers = stakeholder.getManagers();
58 57
    }
59 58

  
60 59
    public String getId() {
......
121 120
        this.logoUrl = logoUrl;
122 121
    }
123 122

  
123
    public boolean getIsUpload() {
124
        return isUpload;
125
    }
126

  
127
    public void setIsUpload(boolean isUpload) {
128
        this.isUpload = isUpload;
129
    }
130

  
124 131
    public String getName() { return name; }
125 132

  
126 133
    public void setName(String name) { this.name = name; }
......
149 156
        this.defaultId = defaultId;
150 157
    }
151 158

  
152
    public boolean getIsActive() {
153
        return isActive;
159
    public Visibility getVisibility() {
160
        //return visibility.getLabel();
161
        return visibility;
154 162
    }
155 163

  
156
    public void setIsActive(boolean isActive) {
157
        this.isActive = isActive;
164
    public void setVisibility(Visibility visibility) {
165
        //this.visibility = Visibility.get(visibility);
166
        this.visibility = visibility;
158 167
    }
159 168

  
160
    public boolean getIsPublic() {
161
        return isPublic;
162
    }
163

  
164
    public void setIsPublic(boolean isPublic) {
165
        this.isPublic = isPublic;
166
    }
167

  
168 169
    public Date getCreationDate() {
169 170
        return creationDate;
170 171
    }
......
181 182
        this.updateDate = updateDate;
182 183
    }
183 184

  
184
    public List<String> getManagers() {
185
        return managers;
186
    }
187

  
188
    public void setManagers(List<String> managers) {
189
        this.managers = managers;
190
    }
191

  
192 185
    public List<StringOrTopic> getTopics() {
193 186
        return topics;
194 187
    }
modules/uoa-monitor-service/trunk/src/main/java/eu/dnetlib/uoamonitorservice/entities/SubCategory.java
4 4
import org.springframework.data.annotation.Id;
5 5

  
6 6
import java.util.ArrayList;
7
import java.util.Date;
7 8
import java.util.List;
8 9

  
9 10
public class SubCategory<StringOrSection> {
......
14 15
    private String name;
15 16
    private String alias;
16 17
    private String description;
17
    private boolean isActive;
18
    private boolean isPublic;
18
    private Visibility visibility = Visibility.PRIVATE;
19
    private Date creationDate;
20
    private Date updateDate;
19 21
    private String defaultId;
20 22
    private List<StringOrSection> charts;
21 23
    private List<StringOrSection> numbers;
......
26 28
        name = subCategory.getName();
27 29
        alias = subCategory.getAlias();
28 30
        description = subCategory.getDescription();
29
        isActive = subCategory.getIsActive();
30
        isPublic = subCategory.getIsPublic();
31
        setVisibility(subCategory.getVisibility());
32
        creationDate = subCategory.getCreationDate();
33
        updateDate = subCategory.getUpdateDate();
31 34
        defaultId = subCategory.getDefaultId();
32 35
    }
33 36

  
34 37
    public void createOverviewSubCategory(Category category) {
35 38
        setName("Overview");
36 39
        setAlias("overview");
37
        setIsActive(category.getIsActive());
38
        setIsPublic(category.getIsPublic());
40
        setVisibility(category.getVisibility());
41
        setCreationDate(category.getCreationDate());
42
        setUpdateDate(category.getUpdateDate());
39 43
        setCharts(new ArrayList<>());
40 44
        setNumbers(new ArrayList<>());
41 45
    }
......
44 48
        setName(defaultSubCategory.getName());
45 49
        setAlias(defaultSubCategory.getAlias());
46 50
        setDescription(defaultSubCategory.getDescription());
47
        setIsActive(defaultSubCategory.getIsActive());
48
        setIsPublic(defaultSubCategory.getIsPublic());
51
        setVisibility(defaultSubCategory.getVisibility());
52
        setCreationDate(defaultSubCategory.getCreationDate());
53
        setUpdateDate(defaultSubCategory.getUpdateDate());
49 54
        setDefaultId(defaultSubCategory.getId());
50 55
        setCharts(new ArrayList());
51 56
        setNumbers(new ArrayList());
......
83 88
        this.description = description;
84 89
    }
85 90

  
86
    public boolean getIsActive() {
87
        return isActive;
91
    public Visibility getVisibility() {
92
        return visibility;
88 93
    }
89 94

  
90
    public void setIsActive(boolean isActive) {
91
        this.isActive = isActive;
95
    public void setVisibility(Visibility visibility) {
96
        this.visibility = visibility;
92 97
    }
93 98

  
94
    public boolean getIsPublic() {
95
        return isPublic;
99
    public Date getCreationDate() {
100
        return creationDate;
96 101
    }
97 102

  
98
    public void setIsPublic(boolean isPublic) {
99
        this.isPublic = isPublic;
103
    public void setCreationDate(Date creationDate) {
104
        this.creationDate = creationDate;
100 105
    }
101 106

  
107
    public Date getUpdateDate() {
108
        return updateDate;
109
    }
110

  
111
    public void setUpdateDate(Date updateDate) {
112
        this.updateDate = updateDate;
113
    }
114

  
102 115
    public String getDefaultId() {
103 116
        return defaultId;
104 117
    }
modules/uoa-monitor-service/trunk/src/main/java/eu/dnetlib/uoamonitorservice/entities/Visibility.java
1
package eu.dnetlib.uoamonitorservice.entities;
2

  
3
import java.util.HashMap;
4
import java.util.Map;
5

  
6
public enum Visibility {
7
    // Do not rename or remove existring values. This may cause problems with already stored values in DB
8
    // PUBLIC("public"), RESTRICTED("restricted"), PRIVATE("private");
9

  
10
    PUBLIC, RESTRICTED, PRIVATE
11
//    private String label;
12
//
13
//    private Visibility(String label) {
14
//        this.label = label;
15
//    }
16
//
17
//    public String getLabel() {
18
//        return this.label;
19
//    }
20
//
21
//    //Lookup table
22
//    private static final Map<String, Visibility> lookup = new HashMap<>();
23
//
24
//    //Populate the lookup table on loading time
25
//    static
26
//    {
27
//        for(Visibility visibility : Visibility.values())
28
//        {
29
//            lookup.put(visibility.getLabel(), visibility);
30
//        }
31
//    }
32
//
33
//    //This method can be used for reverse lookup purpose
34
//    public static Visibility get(String visibility)
35
//    {
36
//        return lookup.get(visibility);
37
//    }
38
}
modules/uoa-monitor-service/trunk/src/main/java/eu/dnetlib/uoamonitorservice/entities/IndicatorPath.java
5 5

  
6 6
enum IndicatorPathType {
7 7
    // Do not rename or remove existring values. This may cause problems with already stored values in DB
8
    table, bar, column, pie, line, other;
8
    table, bar, column, pie, line, other,
9
    TABLE, BAR, COLUMN, PIE, LINE, OTHER;
9 10
}
10 11

  
12
//enum SourceType {
13
//    STATISTICS, SEARCH, METRICS, STATS_TOOL,OLD,IMAGE;
14
//}
15

  
11 16
public class IndicatorPath {
12 17
    private IndicatorPathType type;  // for charts is type of chart {table, bar, column, etc}
13 18
    private String source; // for numbers is the service {statistics, search, metrics} for charts is the tool {stats-tool,old,metrics, image}
modules/uoa-monitor-service/trunk/src/main/java/eu/dnetlib/uoamonitorservice/entities/Indicator.java
3 3
import com.fasterxml.jackson.annotation.JsonProperty;
4 4
import org.springframework.data.annotation.Id;
5 5

  
6
import java.util.ArrayList;
6
import java.util.Date;
7 7
import java.util.List;
8 8

  
9 9
enum IndicatorType {
10 10
    // Do not rename or remove existring values. This may cause problems with already stored values in DB
11
    number, chart;
11
    number, chart,
12
    NUMBER, CHART;
12 13
}
13 14

  
14
enum IndicatorWidth {
15
enum IndicatorSize {
15 16
    // Do not rename or remove existring values. This may cause problems with already stored values in DB
16
    small, medium, large;
17
    small, medium, large,
18
    SMALL, MEDIUM, LARGE;
17 19
}
18 20

  
19 21
public class Indicator {
......
23 25

  
24 26
    private String name;
25 27
    private String description;
28
    private String additionalDescription;
26 29
    private IndicatorType type; //number,chart
27
    private IndicatorWidth width; //small,medium,large
30
    private IndicatorSize width; //small,medium,large
31
    private IndicatorSize height = IndicatorSize.MEDIUM; //small,medium,large
28 32
    private List<String> tags;  // this field is not used anywhere now
29
    private boolean isActive;
30
    private boolean isPublic;
33
    private Visibility visibility = Visibility.PRIVATE;
34
    private Date creationDate;
35
    private Date updateDate;
31 36
    private String defaultId;
32 37
    private List<IndicatorPath> indicatorPaths;
33 38

  
34 39
    public void copyFromDefault(Indicator defaultIndicator) {
35 40
        setName(defaultIndicator.getName());
36 41
        setDescription(defaultIndicator.getDescription());
42
        setAdditionalDescription(defaultIndicator.getAdditionalDescription());
37 43
        setType(defaultIndicator.getType());
38 44
        setWidth(defaultIndicator.getWidth());
45
        setHeight(defaultIndicator.getHeight());
39 46
        setTags(defaultIndicator.getTags());
40
        setIsActive(defaultIndicator.getIsActive());
41
        setIsPublic(defaultIndicator.getIsPublic());
47
        setVisibility(defaultIndicator.getVisibility());
48
        setCreationDate(defaultIndicator.getCreationDate());
49
        setUpdateDate(defaultIndicator.getUpdateDate());
42 50
        setDefaultId(defaultIndicator.getId());
43 51
        setIndicatorPaths(defaultIndicator.getIndicatorPaths());
44 52
    }
......
67 75
        this.description = description;
68 76
    }
69 77

  
78
    public String getAdditionalDescription() {
79
        return additionalDescription;
80
    }
81

  
82
    public void setAdditionalDescription(String description) {
83
        this.additionalDescription = description;
84
    }
85

  
70 86
    public String getType() {
71 87
        if(type == null) {
72 88
            return null;
......
90 106
        }
91 107
    }
92 108

  
93
    public IndicatorWidth getWidth() {
109
    public IndicatorSize getWidth() {
94 110
        return width;
95 111
    }
96 112

  
97
    public void setWidth(IndicatorWidth width) {
113
    public void setWidth(IndicatorSize width) {
98 114
        this.width = width;
99 115
    }
100 116

  
117
    public IndicatorSize getHeight() {
118
        return height;
119
    }
120

  
121
    public void setHeight(IndicatorSize height) {
122
        this.height = height;
123
    }
124

  
101 125
    public List<String> getTags() {
102 126
        return tags;
103 127
    }
......
106 130
        this.tags = tags;
107 131
    }
108 132

  
109
    public boolean getIsActive() {
110
        return isActive;
133
    public Visibility getVisibility() {
134
        return visibility;
111 135
    }
112 136

  
113
    public void setIsActive(boolean isActive) {
114
        this.isActive = isActive;
137
    public void setVisibility(Visibility visibility) {
138
        this.visibility = visibility;
115 139
    }
116 140

  
117
    public boolean getIsPublic() {
118
        return isPublic;
141
    public Date getCreationDate() {
142
        return creationDate;
119 143
    }
120 144

  
121
    public void setIsPublic(boolean isPublic) {
122
        this.isPublic = isPublic;
145
    public void setCreationDate(Date creationDate) {
146
        this.creationDate = creationDate;
123 147
    }
124 148

  
149
    public Date getUpdateDate() {
150
        return updateDate;
151
    }
152

  
153
    public void setUpdateDate(Date updateDate) {
154
        this.updateDate = updateDate;
155
    }
156

  
125 157
    public String getDefaultId() {
126 158
        return defaultId;
127 159
    }
modules/uoa-monitor-service/trunk/src/main/java/eu/dnetlib/uoamonitorservice/entities/Category.java
4 4
import org.springframework.data.annotation.Id;
5 5

  
6 6
import java.util.ArrayList;
7
import java.util.Date;
7 8
import java.util.List;
8 9

  
9 10
public class Category<StringOrSubcategory> {
......
14 15
    private String name;
15 16
    private String alias;
16 17
    private String description;
17
    private boolean isActive;
18
    private boolean isPublic;
18
    private Visibility visibility = Visibility.PRIVATE;
19
    private Date creationDate;
20
    private Date updateDate;
19 21
    private boolean isOverview;
20 22
    private String defaultId;
21 23
    private List<StringOrSubcategory> subCategories;
......
26 28
        name = category.getName();
27 29
        alias = category.getAlias();
28 30
        description = category.getDescription();
29
        isActive = category.getIsActive();
30
        isPublic = category.getIsPublic();
31
        setVisibility(category.getVisibility());
32
        creationDate = category.getCreationDate();
33
        updateDate = category.getUpdateDate();
31 34
        isOverview = category.getIsOverview();
32 35
        defaultId = category.getDefaultId();
33 36
    }
......
36 39
        setName(defaultCategory.getName());
37 40
        setAlias(defaultCategory.getAlias());
38 41
        setDescription(defaultCategory.getDescription());
39
        setIsActive(defaultCategory.getIsActive());
40
        setIsPublic(defaultCategory.getIsPublic());
42
        setVisibility(defaultCategory.getVisibility());
43
        setCreationDate(defaultCategory.getCreationDate());
44
        setUpdateDate(defaultCategory.getUpdateDate());
41 45
        setIsOverview(defaultCategory.getIsOverview());
42 46
        setDefaultId(defaultCategory.getId());
43 47
        setSubCategories(new ArrayList());
......
75 79
        this.description = description;
76 80
    }
77 81

  
78
    public boolean getIsActive() {
79
        return isActive;
82
    public Visibility getVisibility() {
83
        return visibility;
80 84
    }
81 85

  
82
    public void setIsActive(boolean isActive) {
83
        this.isActive = isActive;
86
    public void setVisibility(Visibility visibility) {
87
        this.visibility = visibility;
84 88
    }
85 89

  
86
    public boolean getIsPublic() {
87
        return isPublic;
90
    public Date getCreationDate() {
91
        return creationDate;
88 92
    }
89 93

  
90
    public void setIsPublic(boolean isPublic) {
91
        this.isPublic = isPublic;
94
    public void setCreationDate(Date creationDate) {
95
        this.creationDate = creationDate;
92 96
    }
93 97

  
98
    public Date getUpdateDate() {
99
        return updateDate;
100
    }
101

  
102
    public void setUpdateDate(Date updateDate) {
103
        this.updateDate = updateDate;
104
    }
105

  
94 106
    public boolean getIsOverview() {
95 107
        return isOverview;
96 108
    }
modules/uoa-monitor-service/trunk/src/main/java/eu/dnetlib/uoamonitorservice/entities/Topic.java
4 4
import org.springframework.data.annotation.Id;
5 5

  
6 6
import java.util.ArrayList;
7
import java.util.Date;
7 8
import java.util.List;
8 9

  
9 10
public class Topic<StringOrCategory> {
......
15 16
    private String alias;
16 17
    private String description;
17 18
    private String icon;
18
    private boolean isActive;
19
    private boolean isPublic;
19
    private Visibility visibility = Visibility.PRIVATE;
20
    private Date creationDate;
21
    private Date updateDate;
20 22
    private String defaultId;
21 23
    private List<StringOrCategory> categories;
22 24

  
......
27 29
        alias = topic.getAlias();
28 30
        description = topic.getDescription();
29 31
        icon = topic.getIcon();
30
        isActive = topic.getIsActive();
31
        isPublic = topic.getIsPublic();
32
        setVisibility(topic.getVisibility());
33
        creationDate = topic.getCreationDate();
34
        updateDate = topic.getUpdateDate();
32 35
        defaultId = topic.getDefaultId();
33 36
    }
34 37

  
......
37 40
        setAlias(defaultTopic.getAlias());
38 41
        setDescription(defaultTopic.getDescription());
39 42
        setIcon(defaultTopic.getIcon());
40
        setIsActive(defaultTopic.getIsActive());
41
        setIsPublic(defaultTopic.getIsPublic());
43
        setVisibility(defaultTopic.getVisibility());
44
        setCreationDate(defaultTopic.getCreationDate());
45
        setUpdateDate(defaultTopic.getUpdateDate());
42 46
        setDefaultId(defaultTopic.getId());
43 47
        setCategories(new ArrayList());
44 48
    }
......
83 87
        this.icon = icon;
84 88
    }
85 89

  
86
    public boolean getIsActive() {
87
        return isActive;
90
    public Visibility getVisibility() {
91
        return visibility;
88 92
    }
89 93

  
90
    public void setIsActive(boolean isActive) {
91
        this.isActive = isActive;
94
    public void setVisibility(Visibility visibility) {
95
        this.visibility = visibility;
92 96
    }
93 97

  
94
    public boolean getIsPublic() {
95
        return isPublic;
98
    public Date getCreationDate() {
99
        return creationDate;
96 100
    }
97 101

  
98
    public void setIsPublic(boolean isPublic) {
99
        this.isPublic = isPublic;
102
    public void setCreationDate(Date creationDate) {
103
        this.creationDate = creationDate;
100 104
    }
101 105

  
106
    public Date getUpdateDate() {
107
        return updateDate;
108
    }
109

  
110
    public void setUpdateDate(Date updateDate) {
111
        this.updateDate = updateDate;
112
    }
113

  
102 114
    public String getDefaultId() {
103 115
        return defaultId;
104 116
    }

Also available in: Unified diff