dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11495
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-07-23 22:15:16 +0200
message:
  Minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java	2013-07-23 17:21:14 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java	2013-07-23 20:15:16 +0000
@@ -41,7 +41,7 @@
 /**
  * @author Lars Helge Overland
  */
-@JacksonXmlRootElement( localName = "dashboardItem", namespace = DxfNamespaces.DXF_2_0)
+@JacksonXmlRootElement( localName = "dashboard", namespace = DxfNamespaces.DXF_2_0 )
 public class Dashboard
     extends BaseIdentifiableObject
 {

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java	2013-02-28 16:52:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java	2013-07-23 20:15:16 +0000
@@ -49,7 +49,7 @@
 /**
  * @author Kristian Nordal
  */
-@JacksonXmlRootElement( localName = "dataElementGroup", namespace = DxfNamespaces.DXF_2_0)
+@JacksonXmlRootElement( localName = "dataElementGroup", namespace = DxfNamespaces.DXF_2_0 )
 public class DataElementGroup
     extends BaseNameableObject
 {

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java	2013-04-23 12:02:26 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java	2013-07-23 20:15:16 +0000
@@ -37,6 +37,7 @@
 import org.hisp.dhis.common.DxfNamespaces;
 import org.hisp.dhis.concept.Concept;
 import org.hisp.dhis.constant.Constant;
+import org.hisp.dhis.dashboard.Dashboard;
 import org.hisp.dhis.datadictionary.DataDictionary;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategory;
@@ -115,12 +116,16 @@
 
     private List<DataElementCategoryOptionCombo> categoryOptionCombos = new ArrayList<DataElementCategoryOptionCombo>();
 
+    private List<Dashboard> dashboards = new ArrayList<Dashboard>();
+    
     private List<DataElement> dataElements = new ArrayList<DataElement>();
 
     private List<DataElementGroup> dataElementGroups = new ArrayList<DataElementGroup>();
 
     private List<DataElementGroupSet> dataElementGroupSets = new ArrayList<DataElementGroupSet>();
 
+    private List<DimensionalObject> dimensions = new ArrayList<DimensionalObject>();
+    
     private List<Indicator> indicators = new ArrayList<Indicator>();
 
     private List<IndicatorGroup> indicatorGroups = new ArrayList<IndicatorGroup>();
@@ -169,8 +174,6 @@
 
     private List<ProgramStage> programStages = new ArrayList<ProgramStage>();
 
-    private List<DimensionalObject> dimensions = new ArrayList<DimensionalObject>();
-    
     public MetaData()
     {
     }
@@ -617,6 +620,19 @@
     }
 
     @JsonProperty
+    @JacksonXmlElementWrapper( localName = "dashboards", namespace = DxfNamespaces.DXF_2_0 )
+    @JacksonXmlProperty( localName = "dashboard", namespace = DxfNamespaces.DXF_2_0 )
+    public List<Dashboard> getDashboards()
+    {
+        return dashboards;
+    }
+
+    public void setDashboards( List<Dashboard> dashboards )
+    {
+        this.dashboards = dashboards;
+    }
+
+    @JsonProperty
     @JacksonXmlElementWrapper( localName = "maps", namespace = DxfNamespaces.DXF_2_0 )
     @JacksonXmlProperty( localName = "map", namespace = DxfNamespaces.DXF_2_0 )
     public List<Map> getMaps()
@@ -739,6 +755,7 @@
         return "MetaData{" +
             "attributeTypes=" + attributeTypes +
             ", documents=" + documents +
+            ", dashboards=" + dashboards +
             ", constants=" + constants +
             ", concepts=" + concepts +
             ", users=" + users +