dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31217
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15893: Refactored timestamp property of DataValue to lastUpdated as per blueprint datavalue-last-updated.
------------------------------------------------------------
revno: 15893
committer: Halvdan Hoem Grelland <halvdanhg@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-06-27 18:27:09 +0200
message:
Refactored timestamp property of DataValue to lastUpdated as per blueprint datavalue-last-updated.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DeflatedDataValue.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/DataValueSMSListener.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/J2MEDataValueSMSListener.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueDailyConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataValueImporter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DataValueRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DeflatedDataValueNameMinMaxRowMapper.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DeflatedDataValueRowMapper.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueController.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.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/datavalue/DataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java 2014-06-27 14:15:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java 2014-06-27 16:27:09 +0000
@@ -69,7 +69,7 @@
private String storedBy;
- private Date timestamp; // TODO rename to lastUpated
+ private Date lastUpdated;
private String comment;
@@ -107,11 +107,12 @@
* @param attributeOptionCombo the attribute option combo.
* @param value the value.
* @param storedBy the user that stored this data value.
- * @param timestamp the time of creation of this data value.
+ //* @param timestamp the time of creation of this data value.
+ * @param lastUpdated the time of the last update to this data value.
* @param comment the comment.
*/
public DataValue( DataElement dataElement, Period period, OrganisationUnit source, DataElementCategoryOptionCombo categoryOptionCombo,
- DataElementCategoryOptionCombo attributeOptionCombo, String value, String storedBy, Date timestamp, String comment )
+ DataElementCategoryOptionCombo attributeOptionCombo, String value, String storedBy, Date lastUpdated, String comment )
{
this.dataElement = dataElement;
this.period = period;
@@ -120,7 +121,8 @@
this.attributeOptionCombo = attributeOptionCombo;
this.value = value;
this.storedBy = storedBy;
- this.timestamp = timestamp;
+ this.lastUpdated = lastUpdated;
+ //this.timestamp = timestamp;
this.comment = comment;
}
@@ -303,7 +305,7 @@
{
this.storedBy = storedBy;
}
-
+ /*
public Date getTimestamp()
{
return timestamp;
@@ -313,24 +315,17 @@
{
this.timestamp = timestamp;
}
-
- public String getComment()
- {
- return comment;
- }
-
- public void setComment( String comment )
- {
- this.comment = comment;
- }
-
- public Boolean getFollowup()
- {
- return followup;
- }
-
- public void setFollowup( Boolean followup )
- {
- this.followup = followup;
- }
-}
+ */
+
+ public String getComment() { return comment; }
+
+ public void setComment( String comment ) { this.comment = comment; }
+
+ public Boolean getFollowup() { return followup; }
+
+ public void setFollowup( Boolean followup ) { this.followup = followup; }
+
+ public Date getLastUpdated() { return lastUpdated; }
+
+ public void setLastUpdated( Date lastUpdated ) { this.lastUpdated = lastUpdated; }
+}
\ No newline at end of file
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java 2014-05-27 02:41:16 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java 2014-06-27 16:27:09 +0000
@@ -288,8 +288,7 @@
* @param periodType the Period Type of period of the DataValue
* @param organisationUnit the Organisation Unit of the DataValue
* @return a Latest DataValue
- */
-
+ */
DataValue getLatestDataValues( DataElement dataElement, PeriodType periodType, OrganisationUnit organisationUnit );
/**
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DeflatedDataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DeflatedDataValue.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DeflatedDataValue.java 2014-06-27 16:27:09 +0000
@@ -59,7 +59,7 @@
private String storedBy;
- private Date timestamp;
+ private Date lastUpdated;
private String comment;
@@ -97,7 +97,7 @@
this.categoryOptionComboId = dataValue.getCategoryOptionCombo().getId();
this.value = dataValue.getValue();
this.storedBy = dataValue.getStoredBy();
- this.timestamp = dataValue.getTimestamp();
+ this.lastUpdated = dataValue.getLastUpdated();
this.comment = dataValue.getComment();
this.followup = dataValue.isFollowup();
}
@@ -166,14 +166,14 @@
this.storedBy = storedBy;
}
- public Date getTimestamp()
+ public Date getLastUpdated()
{
- return timestamp;
+ return lastUpdated;
}
- public void setTimestamp( Date timestamp )
+ public void setLastUpdated( Date lastUpdated )
{
- this.timestamp = timestamp;
+ this.lastUpdated = lastUpdated;
}
public String getComment()
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java 2014-06-27 16:27:09 +0000
@@ -92,7 +92,7 @@
this.sourceId = dataValue.getSource().getId();
this.value = dataValue.getValue();
this.storedBy = dataValue.getStoredBy();
- this.timestamp = dataValue.getTimestamp();
+ this.timestamp = dataValue.getLastUpdated();
this.comment = dataValue.getComment();
this.status = status.name();
}
@@ -119,7 +119,7 @@
value.getSource().setId( this.sourceId );
value.setValue( this.value );
value.setStoredBy( this.storedBy );
- value.setTimestamp( this.timestamp );
+ value.setLastUpdated( this.timestamp );
value.setComment( this.comment );
return value;
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/DataValueSMSListener.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/DataValueSMSListener.java 2014-06-27 11:45:23 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/DataValueSMSListener.java 2014-06-27 16:27:09 +0000
@@ -407,7 +407,7 @@
}
dv.setValue( value );
- dv.setTimestamp( new java.util.Date() );
+ dv.setLastUpdated( new java.util.Date() );
dv.setStoredBy( storedBy );
if ( newDataValue )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/J2MEDataValueSMSListener.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/J2MEDataValueSMSListener.java 2014-06-27 11:45:23 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/J2MEDataValueSMSListener.java 2014-06-27 16:27:09 +0000
@@ -235,7 +235,7 @@
}
dv.setValue( value );
- dv.setTimestamp( new java.util.Date() );
+ dv.setLastUpdated( new java.util.Date() );
dv.setStoredBy( storedBy );
if ( ValidationUtils.dataValueIsValid( value, dv.getDataElement() ) != null )
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml 2013-12-19 18:12:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml 2014-06-27 16:27:09 +0000
@@ -6,19 +6,21 @@
<hibernate-mapping>
<class name="org.hisp.dhis.datavalue.DataValue" table="datavalue">
- <composite-id>
- <key-many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid" foreign-key="fk_datavalue_dataelementid" />
- <key-many-to-one name="period" class="org.hisp.dhis.period.Period" column="periodid" foreign-key="fk_datavalue_periodid" />
+ <composite-id>
+ <key-many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid" foreign-key="fk_datavalue_dataelementid" />
+ <key-many-to-one name="period" class="org.hisp.dhis.period.Period" column="periodid" foreign-key="fk_datavalue_periodid" />
<key-many-to-one name="source" class="org.hisp.dhis.organisationunit.OrganisationUnit" column="sourceid" foreign-key="fk_datavalue_organisationunitid" />
<key-many-to-one name="categoryOptionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" column="categoryoptioncomboid" foreign-key="fk_datavalue_categoryoptioncomboid" />
- <key-many-to-one name="attributeOptionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" column="attributeoptioncomboid" foreign-key="fk_datavalue_attributeoptioncomboid" />
+ <key-many-to-one name="attributeOptionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" column="attributeoptioncomboid" foreign-key="fk_datavalue_attributeoptioncomboid" />
</composite-id>
<property name="value" length="255" />
<property name="storedBy" column="storedby" length="100" />
-
+<!--
<property name="timestamp" column="lastupdated" type="timestamp" />
+-->
+ <property name="lastUpdated" column="lastupdated" type="timestamp" />
<property name="comment" length="360" />
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-06-23 21:31:31 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-06-27 16:27:09 +0000
@@ -546,7 +546,7 @@
internalValue.setStoredBy( dataValue.getStoredBy() );
}
- internalValue.setTimestamp( parseDate( dataValue.getLastUpdated() ) );
+ internalValue.setLastUpdated( parseDate( dataValue.getLastUpdated() ) );
internalValue.setComment( trimToNull( dataValue.getComment() ) );
internalValue.setFollowup( dataValue.getFollowup() );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java 2014-06-27 16:27:09 +0000
@@ -186,9 +186,9 @@
out.write( getCsvValue( 0 ) );
out.write( getCsvValue( csvEncode( value.getComment() ) ) );
out.write( getCsvValue( 1594 ) );
- if ( value.getTimestamp() != null )
+ if ( value.getLastUpdated() != null )
{
- out.write( getCsvEndValue( DateUtils.getAccessDateString( value.getTimestamp() ) ) );
+ out.write( getCsvEndValue( DateUtils.getAccessDateString( value.getLastUpdated() ) ) );
}
else
{
@@ -275,7 +275,7 @@
}
value.setComment( values[13] );
- value.setTimestamp( DateUtils.getDefaultDate( values[15] ) );
+ value.setLastUpdated( DateUtils.getDefaultDate( values[15] ) );
value.setCategoryOptionCombo( proxyCategoryOptionCombo );
value.setStoredBy( owner );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueDailyConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueDailyConverter.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueDailyConverter.java 2014-06-27 16:27:09 +0000
@@ -258,9 +258,9 @@
out.write( getCsvValue( 0 ) );
out.write( getCsvValue( csvEncode( value.getComment() ) ) );
out.write( getCsvValue( 1594 ) );
- if ( value.getTimestamp() != null )
+ if ( value.getLastUpdated() != null )
{
- out.write( getCsvEndValue( DateUtils.getAccessDateString( value.getTimestamp() ) ) );
+ out.write( getCsvEndValue( DateUtils.getAccessDateString( value.getLastUpdated() ) ) );
}
else
{
@@ -432,7 +432,7 @@
value.setSourceId( newDataValue.getSourceId() );
value.setSourceName( newDataValue.getSourceName() );
value.setStoredBy( newDataValue.getStoredBy() );
- value.setTimestamp( newDataValue.getTimestamp() );
+ value.setLastUpdated( newDataValue.getLastUpdated() );
value.setValue( newDataValue.getValue() );
if ( period.endsWith( "-01" ) )
@@ -624,7 +624,7 @@
}
value.setComment( values[13] );
- value.setTimestamp( DateUtils.getDefaultDate( values[15] ) );
+ value.setLastUpdated( DateUtils.getDefaultDate( values[15] ) );
value.setCategoryOptionCombo( proxyCategoryOptionCombo );
value.setStoredBy( owner );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataValueImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataValueImporter.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataValueImporter.java 2014-06-27 16:27:09 +0000
@@ -74,7 +74,7 @@
{
match.setValue( object.getValue() );
match.setStoredBy( object.getStoredBy() );
- match.setTimestamp( object.getTimestamp() );
+ match.setLastUpdated( object.getLastUpdated() );
match.setComment( object.getComment() );
batchHandler.updateObject( match );
@@ -108,7 +108,7 @@
{
return false;
}
- if ( !isSimiliar( object.getTimestamp(), existing.getTimestamp() ) || ( isNotNull( object.getTimestamp(), existing.getTimestamp() ) && !object.getTimestamp().equals( existing.getTimestamp() ) ) )
+ if ( !isSimiliar( object.getLastUpdated(), existing.getLastUpdated() ) || ( isNotNull( object.getLastUpdated(), existing.getLastUpdated() ) && !object.getLastUpdated().equals( existing.getLastUpdated() ) ) )
{
return false;
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java 2014-06-27 16:27:09 +0000
@@ -717,7 +717,7 @@
original.setSource( update.getSource() );
original.setValue( update.getValue() );
original.setStoredBy( update.getStoredBy() );
- original.setTimestamp( update.getTimestamp() );
+ original.setLastUpdated( update.getLastUpdated() );
original.setComment( update.getComment() );
original.setCategoryOptionCombo( update.getCategoryOptionCombo() );
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java 2014-06-23 21:31:31 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java 2014-06-27 16:27:09 +0000
@@ -496,7 +496,7 @@
else
{
dataValue.setValue( value );
- dataValue.setTimestamp( new Date() );
+ dataValue.setLastUpdated( new Date() );
dataValueService.updateDataValue( dataValue );
}
}
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java 2014-06-27 16:27:09 +0000
@@ -120,7 +120,7 @@
statementBuilder.setValue( value.getAttributeOptionCombo().getId() );
statementBuilder.setValue( value.getValue() );
statementBuilder.setValue( value.getStoredBy() );
- statementBuilder.setValue( getLongDateString( value.getTimestamp() ) );
+ statementBuilder.setValue( getLongDateString( value.getLastUpdated() ) );
statementBuilder.setValue( value.getComment() );
statementBuilder.setValue( value.isFollowup() );
}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DataValueRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DataValueRowMapper.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DataValueRowMapper.java 2014-06-27 16:27:09 +0000
@@ -62,7 +62,7 @@
dataValue.getCategoryOptionCombo().setId( resultSet.getInt( 4 ) );
dataValue.setValue( resultSet.getString( 5 ) );
dataValue.setStoredBy( resultSet.getString( 6 ) );
- dataValue.setTimestamp( resultSet.getDate( 7 ) );
+ dataValue.setLastUpdated( resultSet.getDate( 7 ) );
dataValue.setComment( resultSet.getString( 8 ) );
return dataValue;
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DeflatedDataValueNameMinMaxRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DeflatedDataValueNameMinMaxRowMapper.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DeflatedDataValueNameMinMaxRowMapper.java 2014-06-27 16:27:09 +0000
@@ -89,7 +89,7 @@
value.setCategoryOptionComboId( resultSet.getInt( "categoryoptioncomboid" ) );
value.setValue( resultSet.getString( "value" ) );
value.setStoredBy( resultSet.getString( "storedby" ) );
- value.setTimestamp( resultSet.getDate( "lastupdated" ) );
+ value.setLastUpdated( resultSet.getDate( "lastupdated" ) );
value.setComment( resultSet.getString( "comment" ) );
value.setFollowup( resultSet.getBoolean( "followup" ) );
value.setMin( minMap != null ? minMap.get( value.getSourceId() ) : resultSet.getInt( "minimumvalue" ) );
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DeflatedDataValueRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DeflatedDataValueRowMapper.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DeflatedDataValueRowMapper.java 2014-06-27 16:27:09 +0000
@@ -52,7 +52,7 @@
value.setCategoryOptionComboId( resultSet.getInt( 4 ) );
value.setValue( resultSet.getString( 5 ) );
value.setStoredBy( resultSet.getString( 6 ) );
- value.setTimestamp( resultSet.getTimestamp( 7 ) );
+ value.setLastUpdated( resultSet.getTimestamp( 7 ) );
value.setComment( resultSet.getString( 8 ) );
return value;
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2014-06-26 09:29:30 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2014-06-27 16:27:09 +0000
@@ -903,7 +903,7 @@
dataValue.setValue( value );
dataValue.setComment( "Comment" );
dataValue.setStoredBy( "StoredBy" );
- dataValue.setTimestamp( date );
+ dataValue.setLastUpdated( date );
return dataValue;
}
@@ -929,7 +929,7 @@
dataValue.setValue( value );
dataValue.setComment( "Comment" );
dataValue.setStoredBy( "StoredBy" );
- dataValue.setTimestamp( date );
+ dataValue.setLastUpdated( date );
return dataValue;
}
@@ -956,7 +956,7 @@
dataValue.setValue( value );
dataValue.setComment( "Comment" );
dataValue.setStoredBy( "StoredBy" );
- dataValue.setTimestamp( lastupdated );
+ dataValue.setLastUpdated( lastupdated );
return dataValue;
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueController.java 2014-06-27 16:10:53 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueController.java 2014-06-27 16:27:09 +0000
@@ -233,7 +233,7 @@
dataValue.toggleFollowUp();
}
- dataValue.setTimestamp( now );
+ dataValue.setLastUpdated( now );
dataValue.setStoredBy( storedBy );
dataValueService.updateDataValue( dataValue );
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java 2014-06-25 15:13:15 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java 2014-06-27 16:27:09 +0000
@@ -151,7 +151,7 @@
else
{
dataValue.setValue( resultValue );
- dataValue.setTimestamp( new Date() );
+ dataValue.setLastUpdated( new Date() );
dataValue.setStoredBy( CaseAggregationCondition.AUTO_STORED_BY );
dataValueService.updateDataValue( dataValue );
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2014-03-04 00:59:32 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2014-06-27 16:27:09 +0000
@@ -7,6 +7,7 @@
timestamp=Timestamp
stored_by=Stored by
stored_date=Stored date
+last_updated=Last updated
no_value=No value
maximum=Maximum
organisation_unit=Organisation Unit
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm 2014-01-24 15:20:17 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm 2014-06-27 16:27:09 +0000
@@ -70,8 +70,8 @@
<td>$!encoder.htmlEncode( $storedBy )</td>
</tr>
<tr>
- <td colspan="2" style="background-color: #e0e0e0; height:26px;">$i18n.getString( "stored_date" )</td>
- <td>$!format.formatDate( $dataValue.timestamp )</td>
+ <td colspan="2" style="background-color: #e0e0e0; height:26px;">$i18n.getString( "last_updated" )</td>
+ <td>$!format.formatDate( $dataValue.lastUpdated )</td>
</tr>
</table>
</td>
@@ -95,7 +95,7 @@
<<div class="historyHeader">>$encoder.htmlEncode( $i18n.getString( "datavalue_history" ) )</div>
#foreach( $eachDataValueAudit in $dataValueAudits )
<p>
- $encoder.htmlEncode( $i18n.getString( "on" ) ) $eachDataValueAudit.timeStamp,
+ $encoder.htmlEncode( $i18n.getString( "on" ) ) $eachDataValueAudit.timeStamp,
$eachDataValueAudit.storedBy
$encoder.htmlEncode( $i18n.getString( "change_from" ) ) $eachDataValueAudit.value
</p>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java 2014-06-23 21:31:31 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java 2014-06-27 16:27:09 +0000
@@ -416,7 +416,7 @@
needsValidation = true;
dataValue.setValue( value );
- dataValue.setTimestamp( new Date() );
+ dataValue.setLastUpdated( new Date() );
dataValue.setStoredBy( storedBy );
dataValueService.updateDataValue( dataValue );
