dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1762
committer: Quang <Quang@Quang-PC>
branch nick: trunk
timestamp: Fri 2010-04-09 22:15:42 +0700
message:
  Change dependency of DataValueStore from DataValueAuditStore to DataValueAuditService. Minor fix in i18n file.
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java
  dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties


--
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-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java	2010-04-08 17:02:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java	2010-04-09 15:15:42 +0000
@@ -42,6 +42,7 @@
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.datavalue.DataValue;
+import org.hisp.dhis.datavalue.DataValueAuditService;
 import org.hisp.dhis.datavalue.DataValueAuditStore;
 import org.hisp.dhis.datavalue.DataValueStore;
 import org.hisp.dhis.period.Period;
@@ -82,11 +83,11 @@
         this.periodStore = periodStore;
     }
     
-    private DataValueAuditStore dataValueAuditStore;
+    private DataValueAuditService dataValueAuditService;
     
-    public void setDataValueAuditStore( DataValueAuditStore dataValueAuditStore )
+    public void setDataValueAuditService( DataValueAuditService dataValueAuditService )
     {
-        this.dataValueAuditStore = dataValueAuditStore;
+        this.dataValueAuditService = dataValueAuditService;
     }
     
     // -------------------------------------------------------------------------
@@ -144,7 +145,7 @@
     @Transactional
     public void deleteDataValue( DataValue dataValue )
     {
-        dataValueAuditStore.deleteDataValueAuditByDataValue( dataValue );
+        dataValueAuditService.deleteDataValueAuditByDataValue( dataValue );
         
         Session session = sessionFactory.getCurrentSession();
         
@@ -154,7 +155,7 @@
     @Transactional
     public int deleteDataValuesBySource( Source source )
     {
-        dataValueAuditStore.deleteDataValueAuditBySource(source);
+        dataValueAuditService.deleteDataValueAuditBySource(source);
         
         Session session = sessionFactory.getCurrentSession();
         
@@ -168,7 +169,7 @@
     @Transactional
     public int deleteDataValuesByDataElement( DataElement dataElement )
     {
-        dataValueAuditStore.deleteDataValueAuditByDataElement( dataElement );
+        dataValueAuditService.deleteDataValueAuditByDataElement( dataElement );
         
         Session session = sessionFactory.getCurrentSession();
         

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2010-04-08 17:02:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2010-04-09 15:15:42 +0000
@@ -53,7 +53,7 @@
     <property name="sessionFactory" ref="sessionFactory"/>
     <property name="statementManager" ref="statementManager"/>
     <property name="periodStore" ref="org.hisp.dhis.period.PeriodStore"/>
-	<property name="dataValueAuditStore" ref="org.hisp.dhis.datavalue.DataValueAuditStore"/>
+	<property name="dataValueAuditService" ref="org.hisp.dhis.datavalue.DataValueAuditService"/>
   </bean>
   
   <bean id="org.hisp.dhis.indicator.IndicatorStore"

=== 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	2010-04-02 02:43:38 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-04-09 15:15:42 +0000
@@ -122,6 +122,6 @@
 specify_valid_input_date			= Please enter a valid input date
 no_outlier_values_found				= No outlier values found.
 datavalue_history					= Data Value History
-change_from							= change from
+change_from							= changed from
 to									= to
 on									= On
\ No newline at end of file