Merge pull request #28 from uonafya/upstream-updates

Upstream updates

dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java

@@ -263,4 +263,20 @@ public DateTimeUnit isoStartOfYear( int year )
     {
         return new DateTimeUnit( year, 1, 1 );
     }
+
+    @Override
+    public boolean isValid( DateTimeUnit dateTime )
+    {
+        if ( dateTime.getMonth() < 1 || dateTime.getMonth() > monthsInYear() )
+        {
+            return false;
+        }
+
+        if ( dateTime.getDay() < 1 || dateTime.getDay() > daysInMonth( dateTime.getYear(), dateTime.getMonth() ) )
+        {
+            return false;
+        }
+
+        return true;
+    }
 }

dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java

@@ -407,4 +407,12 @@ public interface Calendar
      * @return
      */
     DateTimeUnit isoStartOfYear( int year );
+
+    /**
+     * Is DateTimeUnit valid for this calendar.
+     *
+     * @param dateTime DateTime to check
+     * @return true if valid, false if not
+     */
+    boolean isValid( DateTimeUnit dateTime );
 }

dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java

@@ -47,6 +47,7 @@
 import org.hisp.dhis.i18n.I18nFormat;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.period.Period;
+import org.hisp.dhis.schema.annotation.PropertyRange;
 import org.hisp.dhis.user.User;
 
 import java.util.ArrayList;
@@ -420,6 +421,7 @@ public void setRangeAxisMaxValue( Double rangeAxisMaxValue )
 
     @JsonProperty
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+    @PropertyRange( min = Integer.MIN_VALUE )
     public Double getRangeAxisMinValue()
     {
         return rangeAxisMinValue;

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java

@@ -144,6 +144,8 @@ public abstract class BaseAnalyticalObject
 
     protected String title;
 
+    protected String subtitle;
+
     protected Set<Interpretation> interpretations = new HashSet<>();
 
     // -------------------------------------------------------------------------
@@ -853,12 +855,14 @@ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
                 relatives = object.getRelatives();
                 aggregationType = object.getAggregationType();
                 title = object.getTitle();
+                subtitle = object.getSubtitle();
             }
             else if ( mergeMode.isMerge() )
             {
                 relatives = object.getRelatives() == null ? relatives : object.getRelatives();
                 aggregationType = object.getAggregationType() == null ? aggregationType : object.getAggregationType();
                 title = object.getTitle() == null ? title : object.getTitle();
+                subtitle = object.getSubtitle() == null ? subtitle : object.getSubtitle();
             }
 
             dataDimensionItems.addAll( object.getDataDimensionItems() );
@@ -1167,6 +1171,18 @@ public void setTitle( String title )
         this.title = title;
     }
 
+    @JsonProperty
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+    public String getSubtitle()
+    {
+        return subtitle;
+    }
+
+    public void setSubtitle( String subtitle )
+    {
+        this.subtitle = subtitle;
+    }
+
     @JsonProperty
     @JsonSerialize( contentAs = BaseIdentifiableObject.class )
     @JacksonXmlElementWrapper( localName = "interpretations", namespace = DxfNamespaces.DXF_2_0 )

dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java

@@ -211,9 +211,10 @@ List<DataValue> getRecursiveDeflatedDataValues( DataElement dataElement, DataEle
      * date time.
      * 
      * @param date the date time.
+     * @param includeDeleted whether to include deleted data values.
      * @return the number of DataValues.
      */
-    int getDataValueCountLastUpdatedAfter( Date date );
+    int getDataValueCountLastUpdatedAfter( Date date, boolean includeDeleted );
 
     /**
      * Returns a map of values for each attribute option combo found.

dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java

@@ -188,9 +188,10 @@ List<DeflatedDataValue> sumRecursiveDeflatedDataValues(
      * date time.
      * 
      * @param date the date time.
+     * @param includeDeleted whether to include deleted data values.
      * @return the number of DataValues.
      */
-    int getDataValueCountLastUpdatedAfter( Date date );
+    int getDataValueCountLastUpdatedAfter( Date date, boolean includeDeleted );
 
     /**
      * Returns a map of values for each attribute option combo found.

dhis-2/dhis-api/src/main/java/org/hisp/dhis/keyjsonvalue/KeyJsonValueService.java

@@ -29,6 +29,7 @@
  */
 
 import java.util.List;
+import java.util.Date;
 
 /**
  * @author Stian Sandvold
@@ -48,6 +49,14 @@ public interface KeyJsonValueService
      */
     List<String> getKeysInNamespace( String namespace );
 
+    /**
+     * Retrieves a list of keys from a namespace which are updated after lastUpdated time
+     * @param namespace the namespace to retrieve keys from
+     * @param lastUpdated the lastUpdated time to retrieve keys from
+     * @return a list of strings representing the keys from the namespace
+     */
+    List<String> getKeysInNamespace( String namespace, Date lastUpdated );
+
     /**
      * Deletes all keys associated with a given namespace
      * @param namespace the namespace to delete

dhis-2/dhis-api/src/main/java/org/hisp/dhis/keyjsonvalue/KeyJsonValueStore.java

@@ -31,6 +31,7 @@
 import org.hisp.dhis.common.GenericIdentifiableObjectStore;
 
 import java.util.List;
+import java.util.Date;
 
 /**
  * @author Stian Sandvold
@@ -51,6 +52,14 @@ public interface KeyJsonValueStore
      */
     List<String> getKeysInNamespace( String namespace );
 
+    /**
+     * Retrieves a list of keys associated with a given namespace which are updated after lastUpdated time.
+     * @param namespace the namespace to retrieve keys from
+     * @param lastUpdated the lastUpdated time to retrieve keys from
+     * @return a list of strings representing the different keys in the namespace
+     */
+    List<String> getKeysInNamespace( String namespace, Date lastUpdated );
+
     /**
      * Retrieves a list of KeyJsonValue objects based on a given namespace
      * @param namespace the namespace to retrieve KeyJsonValues from