=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/MobileModel.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/MobileModel.java 2011-01-12 09:13:36 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/MobileModel.java 2011-03-16 07:27:49 +0000 @@ -30,6 +30,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import java.util.Date; import java.util.List; import javax.xml.bind.annotation.XmlRootElement; @@ -41,6 +42,8 @@ private ActivityPlan activityPlan; private List programs; + + private Date serverCurrentDate; private List datasets; @@ -63,8 +66,17 @@ { this.programs = programs; } - - public List getDatasets() + + + public Date getServerCurrentDate() { + return serverCurrentDate; + } + + public void setServerCurrentDate(Date serverCurrentDate) { + this.serverCurrentDate = serverCurrentDate; + } + + public List getDatasets() { return datasets; } @@ -102,6 +114,8 @@ { this.activityPlan.serialize( dout ); } + + dout.writeLong(serverCurrentDate.getTime()); // Write DataSets if ( datasets == null ) === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/OrgUnitResource.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/OrgUnitResource.java 2011-03-15 07:35:40 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/OrgUnitResource.java 2011-03-16 07:27:49 +0000 @@ -27,6 +27,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import java.util.Date; + import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.HeaderParam; @@ -126,7 +128,7 @@ mobileModel.setActivityPlan( activityReportingService.getCurrentActivityPlan( getUnit(), locale ) ); mobileModel.setPrograms( programService.getPrograms( getUnit(), locale ) ); mobileModel.setDatasets( facilityReportingService.getMobileDataSetsForUnit( getUnit(), locale ) ); - + mobileModel.setServerCurrentDate(new Date()); return mobileModel; } @@ -173,6 +175,7 @@ MobileModel model = new MobileModel(); model.setPrograms( programService.updateProgram( programsFromClient, locale, getUnit() ) ); model.setActivityPlan( activityReportingService.getCurrentActivityPlan( getUnit(), locale ) ); + model.setServerCurrentDate(new Date()); return model; }