Revision 57964
Added by Konstantina Galouni over 4 years ago
| SubCategory.java | ||
|---|---|---|
| 6 | 6 |
import java.util.ArrayList; |
| 7 | 7 |
import java.util.List; |
| 8 | 8 |
|
| 9 |
public class SubCategory<StringOrIndicator> {
|
|
| 9 |
public class SubCategory<StringOrSection> {
|
|
| 10 | 10 |
@Id |
| 11 | 11 |
@JsonProperty("_id")
|
| 12 | 12 |
private String id; |
| ... | ... | |
| 17 | 17 |
private boolean isActive; |
| 18 | 18 |
private boolean isPublic; |
| 19 | 19 |
private String defaultId; |
| 20 |
private String stakeholderId; |
|
| 21 |
private List<StringOrIndicator> charts; |
|
| 22 |
private List<StringOrIndicator> numbers; |
|
| 20 |
private List<StringOrSection> charts; |
|
| 21 |
private List<StringOrSection> numbers; |
|
| 23 | 22 |
|
| 24 | 23 |
public SubCategory() {}
|
| 25 | 24 |
public SubCategory(SubCategory subCategory) {
|
| ... | ... | |
| 108 | 107 |
this.defaultId = defaultId; |
| 109 | 108 |
} |
| 110 | 109 |
|
| 111 |
public String getStakeholderId() {
|
|
| 112 |
return stakeholderId; |
|
| 113 |
} |
|
| 114 |
|
|
| 115 |
public void setStakeholderId(String stakeholderId) {
|
|
| 116 |
this.stakeholderId = stakeholderId; |
|
| 117 |
} |
|
| 118 |
|
|
| 119 |
public List<StringOrIndicator> getCharts() {
|
|
| 110 |
public List<StringOrSection> getCharts() {
|
|
| 120 | 111 |
return charts; |
| 121 | 112 |
} |
| 122 | 113 |
|
| 123 |
public void setCharts(List<StringOrIndicator> charts) {
|
|
| 114 |
public void setCharts(List<StringOrSection> charts) {
|
|
| 124 | 115 |
this.charts = charts; |
| 125 | 116 |
} |
| 126 | 117 |
|
| 127 |
public List<StringOrIndicator> getNumbers() {
|
|
| 118 |
public List<StringOrSection> getNumbers() {
|
|
| 128 | 119 |
return numbers; |
| 129 | 120 |
} |
| 130 | 121 |
|
| 131 |
public void setNumbers(List<StringOrIndicator> numbers) {
|
|
| 122 |
public void setNumbers(List<StringOrSection> numbers) {
|
|
| 132 | 123 |
this.numbers = numbers; |
| 133 | 124 |
} |
| 134 | 125 |
} |
Also available in: Unified diff
[Trunk | Monitor Service]:
1. Section entity level added. Hierarchy changed from: Stakeholder > Topic > Category > SubCategory > Indicator to: Stakeholder > Topic > Category > SubCategory > Section > Indicator.
2. Section.java & SectionDAO.java & MongoDBSectionDAO.java & SectionController.java: New entity 'Section', DAOs for Section, Controller for section added.
3. In all controllers fix hierarchy of model to include Section.
4. SubCategoryController.java & IndicatorController.java: Helper method 'checkForExceptions()' added (instead of checking in every method separately).