------------------------------------------------------------
revno: 2563
committer: Mithilesh Kumar Thakur<mithilesh.h...@gmail.com>
branch nick: trunk
timestamp: Fri 2011-01-14 14:25:07 +0530
message:
Added methods declaration in dhis-in-api
modified:
local/in/dhis-in-api/src/main/java/org/hisp/dhis/detarget/DeTargetService.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/detarget/DeTargetStore.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/detargetdatavalue/DeTargetDataValueService.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/detargetdatavalue/DeTargetDataValueStore.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 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/detarget/DeTargetService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/detarget/DeTargetService.java 2011-01-13 07:06:44 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/detarget/DeTargetService.java 2011-01-14 08:55:07 +0000
@@ -144,7 +144,7 @@
*
* @param DeTargetMember The DeTargetMember to delete.
*/
- int deleteDeTargetMember( DeTargetMember deTargetMember,DataElement dataelement ,DataElementCategoryOptionCombo deoptioncombo );
+ int deleteDeTargetMember( DeTarget deTargetr,DataElement dataelement ,DataElementCategoryOptionCombo deoptioncombo );
/**
* Returns Collection of DeTarget members.
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/detarget/DeTargetStore.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/detarget/DeTargetStore.java 2011-01-13 07:06:44 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/detarget/DeTargetStore.java 2011-01-14 08:55:07 +0000
@@ -135,7 +135,7 @@
*
* @param DeTargetMember The DeTargetMember to delete.
*/
- int deleteDeTargetMember( DeTargetMember deTargetMember ,DataElement dataelement ,DataElementCategoryOptionCombo deoptioncombo );
+ int deleteDeTargetMember( DeTarget deTarget ,DataElement dataelement ,DataElementCategoryOptionCombo deoptioncombo );
/**
* Returns Collection of DeTarget members.
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/detargetdatavalue/DeTargetDataValueService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/detargetdatavalue/DeTargetDataValueService.java 2011-01-13 09:02:15 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/detargetdatavalue/DeTargetDataValueService.java 2011-01-14 08:55:07 +0000
@@ -31,7 +31,7 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.detarget.DeTarget;
-import org.hisp.dhis.detarget.DeTargetMember;
+import org.hisp.dhis.period.Period;
import org.hisp.dhis.source.Source;
@@ -110,7 +110,21 @@
* @return the DeTargetDataValue which corresponds to the given parameters, or null
* if no match.
*/
- DeTargetDataValue getDeTargetDataValue( Source source, DeTarget deTarget );
+ // DeTargetDataValue getDeTargetDataValue( Source source, DeTarget deTarget );
+
+ /**
+ * Returns a DeTargetDataValue.
+ *
+ * @param source the Source of the DeTargetDataValue.
+ * @param deTarget the DeTarget of the DeTargetDataValue.
+ * @param period the DeTarget of the DeTargetDataValue.
+ * @param source the DeTarget of the DeTargetDataValue.
+ * @param dataElement the DeTarget of the DeTargetDataValue.
+ * @param optioncombo the DeTarget of the DeTargetDataValue.
+ * @return the DeTargetDataValue which corresponds to the given parameters, or null
+ * if no match.
+ */
+ DeTargetDataValue getDeTargetDataValue( Source source, DeTarget deTarget ,Period period, DataElement dataelement ,DataElementCategoryOptionCombo deoptioncombo );
// -------------------------------------------------------------------------
// Collections of DataValues
@@ -200,7 +214,17 @@
*/
Collection<DeTargetDataValue> getDeTargetDataValues( DeTarget deTarget );
- Collection<DeTargetDataValue> getDeTargetMemberDataValues( DeTargetMember deTargetMember ,DataElement dataelement ,DataElementCategoryOptionCombo decategoryOptionCombo );
+ //Collection<DeTargetDataValue> getDeTargetMemberDataValues( DeTargetMember deTargetMember ,DataElement dataelement ,DataElementCategoryOptionCombo decategoryOptionCombo );
+
+ Collection<DeTargetDataValue> getDeTargetDataValues( DeTarget deTarget ,DataElement dataelement ,DataElementCategoryOptionCombo decategoryOptionCombo );
+
+ /**
+ * Returns all DeTargetDataValue for a given collection of DeTarget.
+ *
+ * @param deTarget the DeTarget of the DeTargetDataValue.
+ * @return a collection of all DeTargetDataValue which mach the given collection of DeTarget.
+ */
+ Collection<DeTargetDataValue> getDeTargetDataValues( DeTarget deTarget , Source source, Period period);
/**
@@ -212,5 +236,7 @@
* @return
*/
DeTargetDataValue getDeTargetDataValue( Source source, DeTarget deTarget, DataElement dataelement ,DataElementCategoryOptionCombo deoptioncombo );
-
+
+ Double getAggregatedDeTargetDataValue( Source source, DeTarget deTarget,Period period, DataElement dataelement ,DataElementCategoryOptionCombo deoptioncombo );
+
}
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/detargetdatavalue/DeTargetDataValueStore.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/detargetdatavalue/DeTargetDataValueStore.java 2011-01-13 09:02:15 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/detargetdatavalue/DeTargetDataValueStore.java 2011-01-14 08:55:07 +0000
@@ -31,7 +31,7 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.detarget.DeTarget;
-import org.hisp.dhis.detarget.DeTargetMember;
+import org.hisp.dhis.period.Period;
import org.hisp.dhis.source.Source;
/**
@@ -106,7 +106,22 @@
* @return the DeTargetDataValue which corresponds to the given parameters, or null
* if no match.
*/
- DeTargetDataValue getDeTargetDataValue( Source source, DeTarget deTarget );
+ // DeTargetDataValue getDeTargetDataValue( Source source, DeTarget deTarget );
+
+ /**
+ * Returns a DeTargetDataValue.
+ *
+ * @param source the Source of the DeTargetDataValue.
+ * @param deTarget the DeTarget of the DeTargetDataValue.
+ * @param period the DeTarget of the DeTargetDataValue.
+ * @param source the DeTarget of the DeTargetDataValue.
+ * @param dataElement the DeTarget of the DeTargetDataValue.
+ * @param optioncombo the DeTarget of the DeTargetDataValue.
+ * @return the DeTargetDataValue which corresponds to the given parameters, or null
+ * if no match.
+ */
+ DeTargetDataValue getDeTargetDataValue( Source source, DeTarget deTarget ,Period period, DataElement dataelement ,DataElementCategoryOptionCombo deoptioncombo );
+
// -------------------------------------------------------------------------
// Collections of DataValues
@@ -187,7 +202,9 @@
* and Sources, limited by the firstResult and maxResults property.
*/
Collection<DeTargetDataValue> getDeTargetDataValues( Collection<DeTarget> deTargets, Collection<? extends Source> sources, int firstResult, int maxResults );
- Collection<DeTargetDataValue> getDeTargetMemberDataValues( DeTargetMember deTargetMember ,DataElement dataelement ,DataElementCategoryOptionCombo decategoryOptionCombo );
+ //Collection<DeTargetDataValue> getDeTargetMemberDataValues( DeTargetMember deTargetMember ,DataElement dataelement ,DataElementCategoryOptionCombo decategoryOptionCombo );
+ Collection<DeTargetDataValue> getDeTargetDataValues( DeTarget deTarget ,DataElement dataelement ,DataElementCategoryOptionCombo decategoryOptionCombo );
+
/**
* Returns all DeTargetDataValue for a given collection of DeTarget.
*
@@ -196,6 +213,15 @@
*/
Collection<DeTargetDataValue> getDeTargetDataValues( DeTarget deTarget );
+ /**
+ * Returns all DeTargetDataValue for a given collection of DeTarget.
+ *
+ * @param deTarget the DeTarget of the DeTargetDataValue.
+ * @return a collection of all DeTargetDataValue which mach the given collection of DeTarget.
+ */
+ Collection<DeTargetDataValue> getDeTargetDataValues( DeTarget deTarget , Source source, Period period );
+
+
/**
*
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
