dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14642
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-04-03 18:34:22 +0200
message:
  Code style
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js


--
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/common/BaseAnalyticalObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java	2014-04-02 13:17:31 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java	2014-04-03 16:34:22 +0000
@@ -1057,21 +1057,23 @@
     }
 
     @JsonProperty
-    @JsonView( {DetailedView.class, ExportView.class} )
-    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
-    public String getDigitGroupSeparator() {
-		return digitGroupSeparator;
-	}
+    @JsonView( { DetailedView.class, ExportView.class } )
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+    public String getDigitGroupSeparator()
+    {
+        return digitGroupSeparator;
+    }
 
-	public void setDigitGroupSeparator(String digitGroupSeparator) {
-		this.digitGroupSeparator = digitGroupSeparator;
-	}
+    public void setDigitGroupSeparator( String digitGroupSeparator )
+    {
+        this.digitGroupSeparator = digitGroupSeparator;
+    }
 
     // -------------------------------------------------------------------------
     // Transient properties
     // -------------------------------------------------------------------------
 
-	@JsonIgnore
+    @JsonIgnore
     public List<OrganisationUnit> getTransientOrganisationUnits()
     {
         return transientOrganisationUnits;

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java	2014-03-31 17:44:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java	2014-04-03 16:34:22 +0000
@@ -302,57 +302,67 @@
     }
 
     @JsonProperty
-    @JsonView( {DetailedView.class, ExportView.class, DimensionalView.class} )
-    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
-	public boolean isTotals() {
-		return totals;
-	}
-
-	public void setTotals(boolean totals) {
-		this.totals = totals;
-	}
-
-	@JsonProperty
-    @JsonView( {DetailedView.class, ExportView.class, DimensionalView.class} )
-    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
-	public boolean isSubtotals() {
-		return subtotals;
-	}
-
-	public void setSubtotals(boolean subtotals) {
-		this.subtotals = subtotals;
-	}
-
-	@JsonProperty
-    @JsonView( {DetailedView.class, ExportView.class, DimensionalView.class} )
-    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
-	public boolean isHideEmptyRows() {
-		return hideEmptyRows;
-	}
-
-	public void setHideEmptyRows(boolean hideEmptyRows) {
-		this.hideEmptyRows = hideEmptyRows;
-	}
-
-	@JsonProperty
-    @JsonView( {DetailedView.class, ExportView.class, DimensionalView.class} )
-    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
-	public String getDisplayDensity() {
-		return displayDensity;
-	}
-
-	public void setDisplayDensity(String displayDensity) {
-		this.displayDensity = displayDensity;
-	}
-
-	@JsonProperty
-    @JsonView( {DetailedView.class, ExportView.class, DimensionalView.class} )
-    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
-	public String getFontSize() {
-		return fontSize;
-	}
-
-	public void setFontSize(String fontSize) {
-		this.fontSize = fontSize;
-	}    
+    @JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+    public boolean isTotals()
+    {
+        return totals;
+    }
+
+    public void setTotals( boolean totals )
+    {
+        this.totals = totals;
+    }
+
+    @JsonProperty
+    @JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+    public boolean isSubtotals()
+    {
+        return subtotals;
+    }
+
+    public void setSubtotals( boolean subtotals )
+    {
+        this.subtotals = subtotals;
+    }
+
+    @JsonProperty
+    @JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+    public boolean isHideEmptyRows()
+    {
+        return hideEmptyRows;
+    }
+
+    public void setHideEmptyRows( boolean hideEmptyRows )
+    {
+        this.hideEmptyRows = hideEmptyRows;
+    }
+
+    @JsonProperty
+    @JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+    public String getDisplayDensity()
+    {
+        return displayDensity;
+    }
+
+    public void setDisplayDensity( String displayDensity )
+    {
+        this.displayDensity = displayDensity;
+    }
+
+    @JsonProperty
+    @JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+    public String getFontSize()
+    {
+        return fontSize;
+    }
+
+    public void setFontSize( String fontSize )
+    {
+        this.fontSize = fontSize;
+    }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm	2014-04-02 16:07:27 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm	2014-04-03 16:34:22 +0000
@@ -90,6 +90,8 @@
 <input type="button" value='$i18n.getString( "cancel" )' style="width:120px" onclick="hideCriteria()">
 </div>
 
+<div class="inputSection">
+</div>
 </div>
 
 #parse( "dhis-web-commons/loader/loader.vm" )

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js	2014-04-03 12:01:11 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js	2014-04-03 16:34:22 +0000
@@ -21,6 +21,7 @@
 
 dhis2.appr.orgUnitSelected = function( event, ou )
 {
+	dhis2.appr.displayCategoryOptionGroups( ou );
 }
 
 dhis2.appr.displayPeriods = function()
@@ -44,6 +45,15 @@
     dhis2.appr.displayPeriods();
 }
 
+dhis2.appr.displayCategoryOptionGroups = function( ou )
+{
+	var url = "getCategoryOptionGroups.action";
+	
+	$.getJSON( url, {ou:ou}, function( json ) {
+		
+	} ):
+}
+
 //------------------------------------------------------------------------------
 // Approval
 //------------------------------------------------------------------------------