[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 9922: Minor fix ui of program-validation.
revno: 9922 committer: Tran Chau branch nick: dhis2 timestamp: Thu 2013-02-28 14:29:11 +0700 message: Minor fix ui of program-validation. modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm -- 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-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm 2013-01-30 09:38:43 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm 2013-02-28 07:29:11 + @@ -53,7 +53,7 @@ - + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm 2013-02-26 04:24:48 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm 2013-02-28 07:29:11 + @@ -1,6 +1,6 @@ $i18n.getString( "patient_registration_form_management" ) #openHelp( "program" ) - + #set($display = 'block') #foreach( $registrationForm in $registrationForms ) #if( $!registrationForm.program ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2013-01-23 10:27:28 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2013-02-28 07:29:11 + @@ -11,12 +11,12 @@ - + $i18n.getString( "filter_by_name" ): + - === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2013-02-05 14:51:56 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2013-02-28 07:29:11 + @@ -55,7 +55,7 @@ - + ___ 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
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 9921: Fix bug: Don't create expression for calculated patient attribute.
revno: 9921
committer: Tran Chau
branch nick: dhis2
timestamp: Thu 2013-02-28 14:12:57 +0700
message:
Fix bug: Don't create expression for calculated patient attribute.
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/showAddCaseAggregationForm.vm
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm
--
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-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2013-02-28 06:45:35 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2013-02-28 07:12:57 +
@@ -143,7 +143,7 @@
#foreach($attribute in $attributes )
#set($value = "")
#set($value = $patientAttributeValueMap.get($attribute.id))
- #if( $attribute.valueType != 'CALCULATED')
+ #if( $attribute.valueType != 'calculated')
$encoder.htmlEncode($attribute.displayName) #if($attribute.mandatory)* #end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm 2013-02-20 13:46:42 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm 2013-02-28 07:12:57 +
@@ -41,12 +41,12 @@
$i18n.getString( "value_type" ) *
-$i18n.getString( "number" )
-$i18n.getString( "text" )
-$i18n.getString( "yes_no" )
-$i18n.getString( "date" )
-$i18n.getString( "attribute_combo_type" )
-$i18n.getString( "calculated" )
+$i18n.getString( "number" )
+$i18n.getString( "text" )
+$i18n.getString( "yes_no" )
+$i18n.getString( "date" )
+$i18n.getString( "attribute_combo_type" )
+$i18n.getString( "calculated" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm 2012-10-30 03:46:59 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm 2013-02-28 07:12:57 +
@@ -51,7 +51,7 @@
$i18n.getString( "type" )
- $i18n.getString( "text" )
+ $i18n.getString( "text" )
$i18n.getString( "number" )
$i18n.getString( "letter_only" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2013-02-20 13:46:42 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2013-02-28 07:12:57 +
@@ -44,7 +44,7 @@
ATTRIBUTE_OPTION.addOption();
}
}
- else if (jQuery(this_).val() == "CALCULATED"){
+ else if (jQuery(this_).val() == "calculated"){
if( jQuery("#availableAttribute option").length == 0 )
{
jQuery.getJSON( 'getCalPatientAttributeParams.action', { },
@@ -84,7 +84,7 @@
},
checkOnSubmit : function ()
{
- if( jQuery("#valueType").val() != "COMBO" )
+ if( jQuery("#valueType").val() != "combo" )
{
jQuery("#attrOptionContainer").children().remo
[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 651: updated poms to 2.11-SNAPSHOT
revno: 651 committer: Morten Olav Hansen branch nick: dhis2-docbook-docs timestamp: Thu 2013-02-28 14:11:09 +0700 message: updated poms to 2.11-SNAPSHOT modified: db-pom.xml es-pom.xml pom.xml pt-pom.xml rtf-pom.xml vn-pom.xml -- lp:~dhis2-documenters/dhis2/dhis2-docbook-docs https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription === modified file 'db-pom.xml' --- db-pom.xml 2012-04-09 08:21:39 + +++ db-pom.xml 2013-02-28 07:11:09 + @@ -4,7 +4,7 @@ org.hisp.dhis dhis-documentation-docbook DHIS2 Documentation - 2.8-SNAPSHOT + 2.11-SNAPSHOT DHIS 2 Documentation pom === modified file 'es-pom.xml' --- es-pom.xml 2012-11-14 14:10:45 + +++ es-pom.xml 2013-02-28 07:11:09 + @@ -5,7 +5,7 @@ org.hisp.dhis dhis-documentation-docbook DHIS 2 Documentation - 2.9-SNAPSHOT + 2.11-SNAPSHOT DHIS 2 Documentation pom === modified file 'pom.xml' --- pom.xml 2012-09-27 14:08:31 + +++ pom.xml 2013-02-28 07:11:09 + @@ -4,7 +4,7 @@ org.hisp.dhis dhis-documentation-docbook DHIS2 Documentation - 2.9-SNAPSHOT + 2.11-SNAPSHOT DHIS 2 Documentation pom === modified file 'pt-pom.xml' --- pt-pom.xml 2012-05-11 08:32:23 + +++ pt-pom.xml 2013-02-28 07:11:09 + @@ -5,7 +5,7 @@ org.hisp.dhis dhis-documentation-docbook DHIS 2 Documentation - 2.8-SNAPSHOT + 2.11-SNAPSHOT DHIS 2 Documentation pom === modified file 'rtf-pom.xml' --- rtf-pom.xml 2012-09-07 02:48:46 + +++ rtf-pom.xml 2013-02-28 07:11:09 + @@ -4,7 +4,7 @@ org.hisp.dhis dhis-documentation-docbook DHIS2 Documentation - 2.8-SNAPSHOT + 2.11-SNAPSHOT DHIS 2 Documentation pom === modified file 'vn-pom.xml' --- vn-pom.xml 2011-03-15 11:54:33 + +++ vn-pom.xml 2013-02-28 07:11:09 + @@ -5,7 +5,7 @@ org.hisp.dhis dhis-documentation-docbook DHIS 2 Documentation - 2.0.4-SNAPSHOT + 2.11-SNAPSHOT DHIS 2 Documentation pom ___ 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
Re: [Dhis2-devs] [Dhis2-users] DHIS2 Mobile
Thank you so much Lars. Your advice is well noted. Best, John From: Lars Kristian Roland To: Knut Staring Cc: DHIS developers ; John Ojo ; dhis1-users Sent: Wednesday, February 27, 2013 5:23 PM Subject: Re: [Dhis2-devs] [Dhis2-users] DHIS2 Mobile Hi, I would also recommend using the j2me, but I think it is a good idea that you implement sms in parallel. There are many existing and upcoming features on sms that may be useful. One is that you can fall back to using sms as a transport instead of gprs, though gprs works well in most contexts. Additionally, if you have smaller data sets, these would work well on sms. You can also use sms for messaging and alerts. But as your general route for those data sets, j2me is probably the best option. Note that j2me works best when you buy the phones, so you can test that it works as expected. Lars On 2013 2 27 20:13, "Knut Staring" wrote: Hi John, > >For your scenario, SMS would not work well. It seems to me that the >J2ME solution (for feature phones such as many Nokias, e.g. 2690 or >C2-02) could be the best option. They also of course have much better >battery duraiton than smartphones. > >Knut > >On Wed, Feb 27, 2013 at 12:07 PM, John Ojo wrote: >> Hi Olav, >> >> Thanks once again. >> >> We are starting with two data sets with the plan to add more as time goes on >> and users become more comfortable using the system. Eventually, we hope to >> have about 4-5 data sets. >> >> There's likely to be values for most fields every period. We anticipate >> blank fields to be no more than 1 to 5% every period. >> >> Can our scenario fit the SMS option? Please what is the procedure for >> setting up the SMS reporting system. Does it work with version 2.10? >> >> Thank you. >> John >> >> >> >> From: Olav Poppe >> To: John Ojo >> Cc: DHIS developers ; dhis1-users >> >> Sent: Wednesday, February 27, 2013 8:02 AM >> >> Subject: Re: [Dhis2-users] DHIS2 Mobile >> >> Hi, >> see replies below. >> >> 27. feb. 2013 kl. 07:46 skrev John Ojo : >> >> >> - what type of phones will be used: do the phones support java? If it is >> smartphones, do they use a browser that supports offline storage? >> I am yet to assess the phones available on the market. However, it is likely >> that the phones will support Java at the minimum. We will also want to >> benefit from the offline data entry capabilities of DHIS2 so we will most >> likely use phones that support offline storage. >> >> - do you require support for offline data entry? >> Yes. Could you please kindly explain how this can impact my case if the >> response is yes or no. >> >> >> Any phone that supports the java-client will also support offline data >> entry. Also, newer smartphones supports offline data entry in the browser >> (others on the dev/user list might know the exact requirements for the >> browser/phone). If offline support is not a requirement, you have the option >> of accessing DHIS2 using a mobile browser on a regular "non-smart" phone. If >> you require offline support, the java client or smartphone browser are the >> options. Using the browser rather than java-client will likely be easier to >> administer, but how important that is depends on how many phones will be >> used. >> >> >> - how much data are they supposed to enter? If it is only a few data >> elements, the new SMS reporting might be an option. >> The data is not much. for each data set, we are talking about between 35 to >> 40 data elements. >> >> >> How many data sets? Is there likely to be values for most fields every >> period, or will most of them be blank? If only a few values will be sent >> every week/month, structured SMS might be an option. >> >> >> >> Thank you so much. >> >> Best regards. >> John >> >> John Ojo MD, FMCPH >> Accra, Ghana. >> Mobile: +233 234691626 >> Skype: Johnojo >> Email: jn...@yahoo.com >> >> >> From: Olav Poppe >> To: John Ojo >> Cc: DHIS developers ; dhis1-users >> >> Sent: Tuesday, February 26, 2013 7:28 PM >> Subject: Re: [Dhis2-users] DHIS2 Mobile >> >> Hi John, >> there are quite a few options for reporting to DHIS2 using mobile phones, >> can you give us a bit more information about your case: >> - is this aggregate data or case-based data? >> - what type of phones will be used: do the phones support java? If it is >> smartphones, do they use a browser that supports offline storage? >> - do you require support for offline data entry? >> - how much data are they supposed to enter? If it is only a few data >> elements, the new SMS reporting might be an option. >> >> Regards >> Olav >> >> 26. feb. 2013 kl. 17:51 skrev John Ojo : >> >> Dear All, >> >> I need to enable field workers in a country to be able to report into a >> DHIS2 (version 2.10) database using mobile phones. >> Please, I need a step-by-step instructions on how to go about achieving >> this. >> >> I will appreciate your kind assi
Re: [Dhis2-devs] [Dhis2-users] DHIS2 Mobile
Thank you so much Knut. We shall take all these into consideration. Best, John From: Knut Staring To: John Ojo Cc: Olav Poppe ; dhis1-users ; DHIS developers Sent: Wednesday, February 27, 2013 5:13 PM Subject: Re: [Dhis2-devs] [Dhis2-users] DHIS2 Mobile Hi John, For your scenario, SMS would not work well. It seems to me that the J2ME solution (for feature phones such as many Nokias, e.g. 2690 or C2-02) could be the best option. They also of course have much better battery duraiton than smartphones. Knut On Wed, Feb 27, 2013 at 12:07 PM, John Ojo wrote: > Hi Olav, > > Thanks once again. > > We are starting with two data sets with the plan to add more as time goes on > and users become more comfortable using the system. Eventually, we hope to > have about 4-5 data sets. > > There's likely to be values for most fields every period. We anticipate > blank fields to be no more than 1 to 5% every period. > > Can our scenario fit the SMS option? Please what is the procedure for > setting up the SMS reporting system. Does it work with version 2.10? > > Thank you. > John > > > > From: Olav Poppe > To: John Ojo > Cc: DHIS developers ; dhis1-users > > Sent: Wednesday, February 27, 2013 8:02 AM > > Subject: Re: [Dhis2-users] DHIS2 Mobile > > Hi, > see replies below. > > 27. feb. 2013 kl. 07:46 skrev John Ojo : > > > - what type of phones will be used: do the phones support java? If it is > smartphones, do they use a browser that supports offline storage? > I am yet to assess the phones available on the market. However, it is likely > that the phones will support Java at the minimum. We will also want to > benefit from the offline data entry capabilities of DHIS2 so we will most > likely use phones that support offline storage. > > - do you require support for offline data entry? > Yes. Could you please kindly explain how this can impact my case if the > response is yes or no. > > > Any phone that supports the java-client will also support offline data > entry. Also, newer smartphones supports offline data entry in the browser > (others on the dev/user list might know the exact requirements for the > browser/phone). If offline support is not a requirement, you have the option > of accessing DHIS2 using a mobile browser on a regular "non-smart" phone. If > you require offline support, the java client or smartphone browser are the > options. Using the browser rather than java-client will likely be easier to > administer, but how important that is depends on how many phones will be > used. > > > - how much data are they supposed to enter? If it is only a few data > elements, the new SMS reporting might be an option. > The data is not much. for each data set, we are talking about between 35 to > 40 data elements. > > > How many data sets? Is there likely to be values for most fields every > period, or will most of them be blank? If only a few values will be sent > every week/month, structured SMS might be an option. > > > > Thank you so much. > > Best regards. > John > > John Ojo MD, FMCPH > Accra, Ghana. > Mobile: +233 234691626 > Skype: Johnojo > Email: jn...@yahoo.com > > > From: Olav Poppe > To: John Ojo > Cc: DHIS developers ; dhis1-users > > Sent: Tuesday, February 26, 2013 7:28 PM > Subject: Re: [Dhis2-users] DHIS2 Mobile > > Hi John, > there are quite a few options for reporting to DHIS2 using mobile phones, > can you give us a bit more information about your case: > - is this aggregate data or case-based data? > - what type of phones will be used: do the phones support java? If it is > smartphones, do they use a browser that supports offline storage? > - do you require support for offline data entry? > - how much data are they supposed to enter? If it is only a few data > elements, the new SMS reporting might be an option. > > Regards > Olav > > 26. feb. 2013 kl. 17:51 skrev John Ojo : > > Dear All, > > I need to enable field workers in a country to be able to report into a > DHIS2 (version 2.10) database using mobile phones. > Please, I need a step-by-step instructions on how to go about achieving > this. > > I will appreciate your kind assistance in this direction. > > Thank you. > John. > > John Ojo MD, FMCPH > Accra, Ghana. > Mobile: +233 234691626 > Skype: Johnojo > Email: jn...@yahoo.com > ___ > Mailing list: https://launchpad.net/~dhis2-users > Post to : dhis2-us...@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dhis2-users > More help : https://help.launchpad.net/ListHelp > > > > > > > > > ___ > 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 > -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 9919: (OrganisationUnitGroup) - Allowed to add/update a list of data set when creating an orgUnitGroup
revno: 9919
committer: Hieu
branch nick: dhis2
timestamp: Thu 2013-02-28 12:58:17 +0700
message:
(OrganisationUnitGroup) - Allowed to add/update a list of data set when
creating an orgUnitGroup
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DataSetDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/UpdateOrganisationUnitGroupAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm
--
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/dataset/DataSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2013-02-27 10:24:44 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2013-02-28 05:58:17 +
@@ -48,6 +48,7 @@
import org.hisp.dhis.dataentryform.DataEntryForm;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.user.UserGroup;
@@ -57,7 +58,7 @@
/**
* This class is used for defining the standardized DataSets. A DataSet consists
* of a collection of DataElements.
- *
+ *
* @author Kristian Nordal
*/
@JacksonXmlRootElement( localName = "dataSet", namespace = DxfNamespaces.DXF_2_0 )
@@ -65,8 +66,11 @@
extends BaseNameableObject
{
public static final String TYPE_DEFAULT = "default";
+
public static final String TYPE_SECTION = "section";
+
public static final String TYPE_CUSTOM = "custom";
+
public static final String TYPE_SECTION_MULTIORG = "multiorg_section";
public static final int NO_EXPIRY = 0;
@@ -88,8 +92,8 @@
private Set dataElements = new HashSet();
/**
- * Indicators associated with this data set. Indicators are used for view and
- * output purposes, such as calculated fields in forms and reports.
+ * Indicators associated with this data set. Indicators are used for view
+ * and output purposes, such as calculated fields in forms and reports.
*/
@Scanned
private Set indicators = new HashSet();
@@ -107,6 +111,11 @@
private Set sources = new HashSet();
/**
+ * All OrganisationUnitGroup that register data with this DataSet.
+ */
+private Set organisationUnitGroups = new HashSet();
+
+/**
* The Sections associated with the DataSet.
*/
private Set sections = new HashSet();
@@ -117,7 +126,8 @@
private Integer sortOrder;
/**
- * Property indicating if the dataset could be collected using mobile data entry.
+ * Property indicating if the dataset could be collected using mobile data
+ * entry.
*/
private boolean mobile;
@@ -142,12 +152,14 @@
private boolean skipAggregation;
/**
- * User group which will receive notifications when data set is marked complete.
+ * User group which will receive notifications when data set is marked
+ * complete.
*/
private UserGroup notificationRecipients;
/**
- * Indicating whether the user completing this data set should be sent a notification.
+ * Indicating whether the user completing this data set should be sent a
+ * notification.
*/
private boolean notifyCompletingUser;
@@ -156,7 +168,8 @@
// -
/**
- * Property indicating whether it should allow to enter data for future periods.
+
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 9918: more fixes to dxf2 importer
revno: 9918
committer: Morten Olav Hansen
branch nick: dhis2
timestamp: Thu 2013-02-28 12:17:00 +0700
message:
more fixes to dxf2 importer
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java
dhis-2/dhis-dxf2/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
--
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/common/SharingUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java 2013-02-20 08:38:11 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java 2013-02-28 05:17:00 +
@@ -51,7 +51,7 @@
/**
* @author Morten Olav Hansen
*/
-public class SharingUtils
+public final class SharingUtils
{
public static Map, String> PUBLIC_AUTHORITIES = new HashMap, String>();
@@ -283,4 +283,8 @@
{
return user != null && user.getUserCredentials().getAllAuthorities().contains( SHARING_OVERRIDE_AUTHORITY );
}
+
+private SharingUtils()
+{
+}
}
=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java 2013-02-27 10:24:44 +
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java 2013-02-28 05:17:00 +
@@ -132,7 +132,7 @@
// Populate Helpers
//---
-@SuppressWarnings("unchecked")
+@SuppressWarnings( "unchecked" )
private void populateIdentifiableObjectMap( Class clazz )
{
Collection map = new ArrayList();
@@ -148,7 +148,7 @@
}
}
-@SuppressWarnings("unchecked")
+@SuppressWarnings( "unchecked" )
private void populateIdentifiableObjectMap( Class clazz, IdentifiableObject.IdentifiableProperty property )
{
Map map = new HashMap();
@@ -218,6 +218,8 @@
{
manager.save( (IdentifiableObject) object );
}
+
+_updateInternalMaps( object );
}
else
{
@@ -288,7 +290,7 @@
}
@Override
-@SuppressWarnings("unchecked")
+@SuppressWarnings( "unchecked" )
public Collection getAllObjects( Class clazz )
{
return (Collection) masterMap.get( clazz );
@@ -320,7 +322,7 @@
// Internal Methods
//---
-@SuppressWarnings("unchecked")
+@SuppressWarnings( "unchecked" )
private Collection _findMatches( T object )
{
Collection objects = new HashSet();
@@ -405,6 +407,19 @@
map.put( identifiableObject.getCode(), identifiableObject );
}
+
+if ( identifiableObject.haveUniqueNames() && identifiableObject.getName() != null )
+{
+Map map = nameMap.get( identifiableObject.getClass() );
+
+if ( map == null )
+{
+// might be dynamically sub-classed by javassist or cglib, fetch superclass and try again
+map = nameMap.get( identifiableObject.getClass().getSuperclass() );
+}
+
+map.put( identifiableObject.getCode(), identifiableObject );
+}
}
}
=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2013-02-27 10:24:44 +
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2013-02-28 05:17:00 +
@@ -150,7 +150,7 @@
deleteAttributeValues( object );
deleteExpression( object, "leftSide" );
deleteExpression( object, "rightSide" );
-// deleteDataElementOperands( object, "compulsoryDataElementOperands" );
+// deleteDataElementOperands( idObject, "compulsoryDataElementOperands" );
deleteDataElementOperands( object, "greyedFields" );
}
}
@@ -160,7 +160,7 @@
saveAttributeValues( object, attributeValues );
saveExpression( object, "leftSide", leftSide );
saveExpressio
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 9917: Add filter values for identifiers/attributes tab.
revno: 9917
committer: Tran Chau
branch nick: dhis2
timestamp: Thu 2013-02-28 11:34:35 +0700
message:
Add filter values for identifiers/attributes tab.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveAggregateReportAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveTabularReportAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonPatientProperties.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm
--
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-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveAggregateReportAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveAggregateReportAction.java 2013-02-22 13:29:25 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveAggregateReportAction.java 2013-02-28 04:34:35 +
@@ -230,7 +230,7 @@
throws Exception
{
userOrganisationUnit = (userOrganisationUnit == null) ? false : userOrganisationUnit;
-userOrganisationUnitChildren = (userOrganisationUnitChildren = null) ? false : userOrganisationUnitChildren;
+userOrganisationUnitChildren = (userOrganisationUnitChildren == null) ? false : userOrganisationUnitChildren;
PatientAggregateReport aggregateReport = new PatientAggregateReport();
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveTabularReportAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveTabularReportAction.java 2013-02-22 13:29:25 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveTabularReportAction.java 2013-02-28 04:34:35 +
@@ -233,7 +233,7 @@
throws Exception
{
userOrganisationUnit = (userOrganisationUnit == null) ? false : userOrganisationUnit;
-userOrganisationUnitChildren = (userOrganisationUnitChildren = null) ? false : userOrganisationUnitChildren;
+userOrganisationUnitChildren = (userOrganisationUnitChildren == null) ? false : userOrganisationUnitChildren;
Set orgunits = new HashSet(
organisationUnitService.getOrganisationUnits( orgunitIds ) );
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2013-02-27 14:39:27 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2013-02-28 04:34:35 +
@@ -511,20 +511,42 @@
else if( xtype == 'combobox' )
{
var deId = id.split('_')[1];
+ var fixedId = id.substring(0, id.lastIndexOf('_') );
params.typeAhead = true;
params.forceSelection = true;
- if( valueType == 'bool')
+ if( valueType == 'bool' || fixedId=='fixedAttr_gender' || fixedId=='fixedAttr_dobType')
{
params.queryMode = 'local';
params.valueField = 'value';
params.displayField = 'name';
params.editable = false;
params.value = 'true';
- params.store = new Ext.data.ArrayStore({
- fields: ['value', 'name'],
- data: [['true', TR.i18n.yes],
-['false', TR.i18n.no]]
- });
+ if( fixedId=='fixedAttr_gender')
+ {
+ params.store = new Ext.data.ArrayStore({
+fields: ['value', 'name'],
+data: [['M', TR.i18n.male],
+ ['F', TR.i18n.female],
+ ['T', TR.i18n.transgender]]
+ });
+ }
+ else if( fixedId=='fixedAttr_dobType')
+ {
+ params.store = new Ext.data.ArrayStore({
+fields: ['value', 'name'],
+data: [['V', TR.i18n.verified],
+ ['D', TR.i18n.declared],
+ ['A', TR.i18n.approximated]]
+ });
+ }
+ else if (valueType == 'bool')
+ {
+ params.store = new Ext.data.ArrayStore({
+fields: ['value', 'name'],
+data: [['true', TR.i18n.yes],
+ ['false', TR.i18n.no]]
+ });
+ }
}
else if( valueType == 'trueOnly')
{
@@ -1036,25 +1058,29 @@
}
// Patient properties
+ Ext.getCmp('filterPropPanel').removeAll();
+ Ext.getCmp('filterPropPanel').doLayout();
TR.store.patientProperty.selected.removeAll();
Re: [Dhis2-devs] Ordering of category option names in the resource tables
On 20 February 2013 07:59, Lars Helge Øverland wrote: > Hi, > > sorry for the late reply. > > >> It was later discovered, probably when making pivot table views for >> Excel would be my guess, that in fact a persisted name is quite handy >> - many times easier than doing the sql equivalent of what is is done >> in java to produce "(Male,<1)" (or "(<1,Male)" ). So we created the >> _catoptcomboname table. > > > This is right. The names when used inside the application are generated on > the fly based on the category options and category combination. When > creating SQL reports, however, it is tricky to generate this (for anyone > except Jason that is;), so we decided to have a resource table for it. The > reason for not putting it on the categoryoptioncombo table is that this > table is generated by Hibernate and is part of the domain model - it is by > many people including me considered bad practice to tamper with entity > database tables. Having a separate table is cleaner and not really a > problem. One might also want to expand this with more information later. > My suggestion was that the name should be part of the model, not that we just add columns to the entity tables, which I agree would be bad. The categoryoptioncombo name *is* part of the java implementation of the model. In fact it currently even extends BaseNameableObject. And there is a working assumption in the system that these things have names. Everything else in our model with a name has a field added to the model rather than a separate table. So it would have been good practice (I think) to maintain the pattern. Still this is far from the most pressing of our concerns .. > > The reason for the sort order flaw is a bit boring. The association > between category option and option combination is bi-directional. Category > option - > option combination is represented as a Java List, which is an > ordered collection. Option combination -> category option is represented as > a Java Set, which is an unordered collection. The reason for this is that > maintaining a bidirectional association with Lists in both ends does not > make sense - you might get conflicts when you have overlapping objects. > > So for the resource table I can see we use the Set association from option > combination -> category option to render the names. We should ideally use > the association from the other end to maintain sort order. Will see if we > can fix this shortly. > > regards, > > Lars > > ___ 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
Re: [Dhis2-devs] [Dhis2-users] DHIS2 Mobile
Hi, I would also recommend using the j2me, but I think it is a good idea that you implement sms in parallel. There are many existing and upcoming features on sms that may be useful. One is that you can fall back to using sms as a transport instead of gprs, though gprs works well in most contexts. Additionally, if you have smaller data sets, these would work well on sms. You can also use sms for messaging and alerts. But as your general route for those data sets, j2me is probably the best option. Note that j2me works best when you buy the phones, so you can test that it works as expected. Lars On 2013 2 27 20:13, "Knut Staring" wrote: > Hi John, > > For your scenario, SMS would not work well. It seems to me that the > J2ME solution (for feature phones such as many Nokias, e.g. 2690 or > C2-02) could be the best option. They also of course have much better > battery duraiton than smartphones. > > Knut > > On Wed, Feb 27, 2013 at 12:07 PM, John Ojo wrote: > > Hi Olav, > > > > Thanks once again. > > > > We are starting with two data sets with the plan to add more as time > goes on > > and users become more comfortable using the system. Eventually, we hope > to > > have about 4-5 data sets. > > > > There's likely to be values for most fields every period. We anticipate > > blank fields to be no more than 1 to 5% every period. > > > > Can our scenario fit the SMS option? Please what is the procedure for > > setting up the SMS reporting system. Does it work with version 2.10? > > > > Thank you. > > John > > > > > > > > From: Olav Poppe > > To: John Ojo > > Cc: DHIS developers ; dhis1-users > > > > Sent: Wednesday, February 27, 2013 8:02 AM > > > > Subject: Re: [Dhis2-users] DHIS2 Mobile > > > > Hi, > > see replies below. > > > > 27. feb. 2013 kl. 07:46 skrev John Ojo : > > > > > > - what type of phones will be used: do the phones support java? If it is > > smartphones, do they use a browser that supports offline storage? > > I am yet to assess the phones available on the market. However, it is > likely > > that the phones will support Java at the minimum. We will also want to > > benefit from the offline data entry capabilities of DHIS2 so we will most > > likely use phones that support offline storage. > > > > - do you require support for offline data entry? > > Yes. Could you please kindly explain how this can impact my case if the > > response is yes or no. > > > > > > Any phone that supports the java-client will also support offline data > > entry. Also, newer smartphones supports offline data entry in the browser > > (others on the dev/user list might know the exact requirements for the > > browser/phone). If offline support is not a requirement, you have the > option > > of accessing DHIS2 using a mobile browser on a regular "non-smart" > phone. If > > you require offline support, the java client or smartphone browser are > the > > options. Using the browser rather than java-client will likely be easier > to > > administer, but how important that is depends on how many phones will be > > used. > > > > > > - how much data are they supposed to enter? If it is only a few data > > elements, the new SMS reporting might be an option. > > The data is not much. for each data set, we are talking about between 35 > to > > 40 data elements. > > > > > > How many data sets? Is there likely to be values for most fields every > > period, or will most of them be blank? If only a few values will be sent > > every week/month, structured SMS might be an option. > > > > > > > > Thank you so much. > > > > Best regards. > > John > > > > John Ojo MD, FMCPH > > Accra, Ghana. > > Mobile: +233 234691626 > > Skype: Johnojo > > Email: jn...@yahoo.com > > > > > > From: Olav Poppe > > To: John Ojo > > Cc: DHIS developers ; dhis1-users > > > > Sent: Tuesday, February 26, 2013 7:28 PM > > Subject: Re: [Dhis2-users] DHIS2 Mobile > > > > Hi John, > > there are quite a few options for reporting to DHIS2 using mobile phones, > > can you give us a bit more information about your case: > > - is this aggregate data or case-based data? > > - what type of phones will be used: do the phones support java? If it is > > smartphones, do they use a browser that supports offline storage? > > - do you require support for offline data entry? > > - how much data are they supposed to enter? If it is only a few data > > elements, the new SMS reporting might be an option. > > > > Regards > > Olav > > > > 26. feb. 2013 kl. 17:51 skrev John Ojo : > > > > Dear All, > > > > I need to enable field workers in a country to be able to report into a > > DHIS2 (version 2.10) database using mobile phones. > > Please, I need a step-by-step instructions on how to go about achieving > > this. > > > > I will appreciate your kind assistance in this direction. > > > > Thank you. > > John. > > > > John Ojo MD, FMCPH > > Accra, Ghana. > > Mobile: +233 234691626 > > Skype: Johnojo > > Email: jn...@ya
Re: [Dhis2-devs] [Dhis2-users] DHIS2 Mobile
Hi John, For your scenario, SMS would not work well. It seems to me that the J2ME solution (for feature phones such as many Nokias, e.g. 2690 or C2-02) could be the best option. They also of course have much better battery duraiton than smartphones. Knut On Wed, Feb 27, 2013 at 12:07 PM, John Ojo wrote: > Hi Olav, > > Thanks once again. > > We are starting with two data sets with the plan to add more as time goes on > and users become more comfortable using the system. Eventually, we hope to > have about 4-5 data sets. > > There's likely to be values for most fields every period. We anticipate > blank fields to be no more than 1 to 5% every period. > > Can our scenario fit the SMS option? Please what is the procedure for > setting up the SMS reporting system. Does it work with version 2.10? > > Thank you. > John > > > > From: Olav Poppe > To: John Ojo > Cc: DHIS developers ; dhis1-users > > Sent: Wednesday, February 27, 2013 8:02 AM > > Subject: Re: [Dhis2-users] DHIS2 Mobile > > Hi, > see replies below. > > 27. feb. 2013 kl. 07:46 skrev John Ojo : > > > - what type of phones will be used: do the phones support java? If it is > smartphones, do they use a browser that supports offline storage? > I am yet to assess the phones available on the market. However, it is likely > that the phones will support Java at the minimum. We will also want to > benefit from the offline data entry capabilities of DHIS2 so we will most > likely use phones that support offline storage. > > - do you require support for offline data entry? > Yes. Could you please kindly explain how this can impact my case if the > response is yes or no. > > > Any phone that supports the java-client will also support offline data > entry. Also, newer smartphones supports offline data entry in the browser > (others on the dev/user list might know the exact requirements for the > browser/phone). If offline support is not a requirement, you have the option > of accessing DHIS2 using a mobile browser on a regular "non-smart" phone. If > you require offline support, the java client or smartphone browser are the > options. Using the browser rather than java-client will likely be easier to > administer, but how important that is depends on how many phones will be > used. > > > - how much data are they supposed to enter? If it is only a few data > elements, the new SMS reporting might be an option. > The data is not much. for each data set, we are talking about between 35 to > 40 data elements. > > > How many data sets? Is there likely to be values for most fields every > period, or will most of them be blank? If only a few values will be sent > every week/month, structured SMS might be an option. > > > > Thank you so much. > > Best regards. > John > > John Ojo MD, FMCPH > Accra, Ghana. > Mobile: +233 234691626 > Skype: Johnojo > Email: jn...@yahoo.com > > > From: Olav Poppe > To: John Ojo > Cc: DHIS developers ; dhis1-users > > Sent: Tuesday, February 26, 2013 7:28 PM > Subject: Re: [Dhis2-users] DHIS2 Mobile > > Hi John, > there are quite a few options for reporting to DHIS2 using mobile phones, > can you give us a bit more information about your case: > - is this aggregate data or case-based data? > - what type of phones will be used: do the phones support java? If it is > smartphones, do they use a browser that supports offline storage? > - do you require support for offline data entry? > - how much data are they supposed to enter? If it is only a few data > elements, the new SMS reporting might be an option. > > Regards > Olav > > 26. feb. 2013 kl. 17:51 skrev John Ojo : > > Dear All, > > I need to enable field workers in a country to be able to report into a > DHIS2 (version 2.10) database using mobile phones. > Please, I need a step-by-step instructions on how to go about achieving > this. > > I will appreciate your kind assistance in this direction. > > Thank you. > John. > > John Ojo MD, FMCPH > Accra, Ghana. > Mobile: +233 234691626 > Skype: Johnojo > Email: jn...@yahoo.com > ___ > Mailing list: https://launchpad.net/~dhis2-users > Post to : dhis2-us...@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dhis2-users > More help : https://help.launchpad.net/ListHelp > > > > > > > > > ___ > 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 > -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ 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
Re: [Dhis2-devs] [Dhis2-users] DHIS2 Mobile
Hi Olav, Thanks once again. We are starting with two data sets with the plan to add more as time goes on and users become more comfortable using the system. Eventually, we hope to have about 4-5 data sets. There's likely to be values for most fields every period. We anticipate blank fields to be no more than 1 to 5% every period. Can our scenario fit the SMS option? Please what is the procedure for setting up the SMS reporting system. Does it work with version 2.10? Thank you. John From: Olav Poppe To: John Ojo Cc: DHIS developers ; dhis1-users Sent: Wednesday, February 27, 2013 8:02 AM Subject: Re: [Dhis2-users] DHIS2 Mobile Hi, see replies below. 27. feb. 2013 kl. 07:46 skrev John Ojo : > >- what type of phones will be used: do the phones support java? If it is >smartphones, do they use a browser that supports offline storage? >I am yet to assess the phones available on the market. However, it is likely >that the phones will support Java at the minimum. We will also want to benefit >from the offline data entry capabilities of DHIS2 so we will most likely use >phones that support offline storage. - do you require support for offline data entry? >Yes. Could you please kindly explain how this can impact my case if the >response is yes or no. Any phone that supports the java-client will also support offline data entry. Also, newer smartphones supports offline data entry in the browser (others on the dev/user list might know the exact requirements for the browser/phone). If offline support is not a requirement, you have the option of accessing DHIS2 using a mobile browser on a regular "non-smart" phone. If you require offline support, the java client or smartphone browser are the options. Using the browser rather than java-client will likely be easier to administer, but how important that is depends on how many phones will be used. > >- how much data are they supposed to enter? If it is only a few data elements, >the new SMS reporting might be an option. >The data is not much. for each data set, we are talking about between 35 to 40 >data elements. How many data sets? Is there likely to be values for most fields every period, or will most of them be blank? If only a few values will be sent every week/month, structured SMS might be an option. > >Thank you so much. > > >Best regards. >John > > >John Ojo MD, FMCPH > >Accra, Ghana. > >Mobile: +233 234691626 >Skype: Johnojo >Email: jn...@yahoo.com > > > > > > From: Olav Poppe >To: John Ojo >Cc: DHIS developers ; dhis1-users > >Sent: Tuesday, February 26, 2013 7:28 PM >Subject: Re: [Dhis2-users] DHIS2 Mobile > > >Hi John, >there are quite a few options for reporting to DHIS2 using mobile phones, can >you give us a bit more information about your case: >- is this aggregate data or case-based data? >- what type of phones will be used: do the phones support java? If it is >smartphones, do they use a browser that supports offline storage? >- do you require support for offline data entry? >- how much data are they supposed to enter? If it is only a few data elements, >the new SMS reporting might be an option. > > >Regards >Olav > > >26. feb. 2013 kl. 17:51 skrev John Ojo : > >Dear All, >> >> >>I need to enable field workers in a country to be able to report into a DHIS2 >> (version 2.10) database using mobile phones. >>Please, I need a step-by-step instructions on how to go about achieving this. >> >> >>I will appreciate your kind assistance in this direction. >> >> >>Thank you. >>John. >> >>John Ojo MD, FMCPH >> >>Accra, Ghana. >> >>Mobile: +233 234691626 >>Skype: Johnojo >>Email: jn...@yahoo.com >>___ >>Mailing list: https://launchpad.net/~dhis2-users >>Post to : dhis2-us...@lists.launchpad.net >>Unsubscribe : https://launchpad.net/~dhis2-users >>More help : https://help.launchpad.net/ListHelp >> > > >___ 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
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 9916: Report table, using lists of dimensions instead of hard-coded boolean properties to determine whi...
revno: 9916 committer: Lars Helge Øverland branch nick: dhis2 timestamp: Wed 2013-02-27 17:14:56 +0100 message: Report table, using lists of dimensions instead of hard-coded boolean properties to determine which dimensions go on columns, rows, filters modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.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/reporttable/ReportTable.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2013-02-27 11:10:13 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2013-02-27 16:14:56 + @@ -27,16 +27,22 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonView; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.commons.lang.StringUtils; -import org.hisp.dhis.common.*; +import org.hisp.dhis.common.BaseIdentifiableObject; +import org.hisp.dhis.common.BaseNameableObject; +import org.hisp.dhis.common.CombinationGenerator; +import org.hisp.dhis.common.DxfNamespaces; +import org.hisp.dhis.common.IdentifiableObject; +import org.hisp.dhis.common.ListMap; +import org.hisp.dhis.common.NameableObject; import org.hisp.dhis.common.adapter.JacksonMapListIdentifiableObjectSerializer; import org.hisp.dhis.common.adapter.JacksonPeriodDeserializer; import org.hisp.dhis.common.adapter.JacksonPeriodSerializer; @@ -58,7 +64,14 @@ import org.hisp.dhis.period.RelativePeriods; import org.hisp.dhis.period.comparator.AscendingPeriodComparator; -import java.util.*; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; /** * The ReportTable object represents a customizable database table. It has @@ -66,7 +79,6 @@ * columns. * * @author Lars Helge Overland - * @version $Id$ */ @JacksonXmlRootElement( localName = "reportTable", namespace = DxfNamespaces.DXF_2_0) public class ReportTable @@ -76,7 +88,12 @@ * Determines if a de-serialized file is compatible with this class. */ private static final long serialVersionUID = 5618655666320890565L; - + +public static final String DATA_X_DIM_ID = "dx"; // IN, DE, DS +public static final String CATEGORYOPTIONCOMBO_DIM_ID = "coc"; +public static final String PERIOD_DIM_ID = "pe"; +public static final String ORGUNIT_DIM_ID = "ou"; + public static final String DATAELEMENT_ID = "dataelementid"; public static final String CATEGORYCOMBO_ID = "categoryoptioncomboid"; public static final String CATEGORYOPTION_ID = "categoryoptionid"; @@ -235,6 +252,20 @@ @Scanned private List organisationUnitGroups = new ArrayList(); +/** + * Dimensions to crosstabulate / use as columns. + */ +private List columnDimensions = new ArrayList(); + +/** + * Dimensions to use as rows. + */ +private List rowDimensions = new ArrayList(); + +/** + * Dimensions to use as filter. + */ +private List filterDimensions = new ArrayList(); /** * The DataElementCategoryCombo for the ReportTable. @@ -242,22 +273,6 @@ private DataElementCategoryCombo categ
[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 650: Minor
revno: 650
committer: Lars Helge Øverland
branch nick: dhis2-docbook-docs
timestamp: Wed 2013-02-27 12:35:50 +0100
message:
Minor
modified:
src/docbkx/en/dhis2_implementation_guide_installation.xml
src/docbkx/en/dhis2_user_man_web_api.xml
--
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs
Your team DHIS 2 developers is subscribed to branch
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription
=== modified file 'src/docbkx/en/dhis2_implementation_guide_installation.xml'
--- src/docbkx/en/dhis2_implementation_guide_installation.xml 2013-02-11 11:41:42 +
+++ src/docbkx/en/dhis2_implementation_guide_installation.xml 2013-02-27 11:35:50 +
@@ -27,9 +27,7 @@
Make the changes take effect by invoking sudo sysctl -p
Install Java
Install Java by invoking the following:
-sudo apt-get install openjdk-7-jdk
-
-sudo update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-7-openjdk/bin/java 1
+sudo apt-get install openjdk-7-jdk
Please check that the path the Java binaries are correct as they might vary from system to system, e.g. on AMD systems you might see ../java-7-openjdk-amd64/.. Check that your installation is okay by invoking java -version
Install PostgreSQL
To install PostgreSQL version 9.2 we first need to add a Ubuntu package repository to our system.
=== modified file 'src/docbkx/en/dhis2_user_man_web_api.xml'
--- src/docbkx/en/dhis2_user_man_web_api.xml 2013-02-04 17:41:18 +
+++ src/docbkx/en/dhis2_user_man_web_api.xml 2013-02-27 11:35:50 +
@@ -284,7 +284,7 @@
retrieved.curl -H "Accept: application/xml" -u user:pass {HOST}/api/metaData?lastUpdated=02/2012
-Example: Sending data values
+Sending data values
A common use-case for system integration is the need to send a set of data values from a third-party system into DHIS. In this example we will use the DHIS 2 demo on http://apps.dhis2.org/demo"/> as basis and we recommend that you follow the provided links with a web browser while reading (log in with admin/district as username/password). We assume that we have collected case-based data using a simple software client running on mobile phones for the Mortality <5 years data set in the community of Ngelehun CHC (in Badjia chiedom, Bo district) for the month of January 2012. We have now aggregated our data into a statistical report and want to send that data to the national DHIS 2 instance.
The entry point for the Web API running on the demo instance is http://apps.dhis2.org/demo/api"/>. The entry point provides a convenient HTML page with links to all of the available resources in the Web API. The resource which is most appropriate for our purpose of sending data values is the dataValueSets resource. A data value set represents a set of data values which have a logical relationship, usually from being captured off the same data entry form. We follow the link to the HTML representation which will take us to http://apps.dhis2.org/demo/api/dataValueSets"/>. The default representation is a HTML page which provides us with useful instructions on how to interact with this resources. It tells us that we can use the POST verb to send values using a XML format defined by the http://dhis2.org/schema/dxf/2.0 namespace:
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 9914: Web api, added custom serializer for some report table associations
revno: 9914
committer: Lars Helge Øverland
branch nick: dhis2
timestamp: Wed 2013-02-27 12:10:13 +0100
message:
Web api, added custom serializer for some report table associations
added:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonMapListIdentifiableObjectSerializer.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/Parameter.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/Parameters.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/ParametersMapXmlAdapter.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.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
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonMapListIdentifiableObjectSerializer.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonMapListIdentifiableObjectSerializer.java 1970-01-01 00:00:00 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonMapListIdentifiableObjectSerializer.java 2013-02-27 11:10:13 +
@@ -0,0 +1,71 @@
+package org.hisp.dhis.common.adapter;
+
+/*
+ * Copyright (c) 2004-2012, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import org.hisp.dhis.common.IdentifiableObject;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+/**
+ * @author Lars Helge Overland
+ */
+public class JacksonMapListIdentifiableObjectSerializer
+extends JsonSerializer>>
+{
+@Override
+public void serialize( Map> value, JsonGenerator jgen, SerializerProvider provider )
+throws IOException
+{
+if ( value != null )
+{
+jgen.writeStartObject();
+
+for ( String key : value.keySet() )
+{
+jgen.writeArrayFieldStart( key );
+
+for ( IdentifiableObject object : value.get( key ) )
+{
+jgen.writeStartObject();
+jgen.writeStringField( "id", object.getUid() );
+jgen.writeEndObject();
+}
+
+jgen.writeEndArray();
+}
+
+jgen.writeEndObject();
+}
+}
+}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/Parameter.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/Parameter.java 2011-12-20 12:46:37 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/Parameter.java 2013-02-27 11:10:13 +
@@ -1,12 +1,38 @@
package org.hisp.dhis.common.adapter;
+/*
+ * Copyright (c) 2004-2012, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the ab
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 9913: dxf2 import fixes
revno: 9913
committer: Morten Olav Hansen
branch nick: dhis2
timestamp: Wed 2013-02-27 17:24:44 +0700
message:
dxf2 import fixes
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ObjectBridge.java
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java
dhis-2/dhis-dxf2/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.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/dataelement/DataElementGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java 2013-02-13 03:57:52 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java 2013-02-27 10:24:44 +
@@ -150,45 +150,6 @@
}
// -
-// hashCode and equals
-// -
-
-@Override
-public int hashCode()
-{
-return name.hashCode();
-}
-
-@Override
-public boolean equals( Object o )
-{
-if ( this == o )
-{
-return true;
-}
-
-if ( o == null )
-{
-return false;
-}
-
-if ( !(o instanceof DataElementGroup) )
-{
-return false;
-}
-
-final DataElementGroup other = (DataElementGroup) o;
-
-return name.equals( other.getName() );
-}
-
-@Override
-public String toString()
-{
-return "[" + name + "]";
-}
-
-// -
// Getters and setters
// -
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2013-02-25 12:33:35 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2013-02-27 10:24:44 +
@@ -213,16 +213,16 @@
// Logic
// -
-public void addOrganisationUnit( OrganisationUnit unit )
+public void addOrganisationUnit( OrganisationUnit organisationUnit )
{
-sources.add( unit );
-unit.getDataSets().add( this );
+sources.add( organisationUnit );
+organisationUnit.getDataSets().add( this );
}
-public void removeOrganisationUnit( OrganisationUnit unit )
+public void removeOrganisationUnit( OrganisationUnit organisationUnit )
{
-sources.remove( unit );
-unit.getDataSets().remove( this );
+sources.remove( organisationUnit );
+organisationUnit.getDataSets().remove( this );
}
public void removeAllOrganisationUnits()
@@ -379,9 +379,11 @@
this.periodType = periodType;
}
+/*
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+*/
public DataEntryForm getDataEntryForm()
{
return dataEntryForm;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java 2013-02-13 03:57:52 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java 2013-02-27 10:24:44 +
@@ -44,7 +44,7 @@
import java.util.List;
import java.util.Set;
-@JacksonXmlRootElement( localName = "section", namespace = DxfNamespaces.DXF_2_0)
+@JacksonXmlRootElement(localName = "section", namespace = DxfNamespaces.DXF_2_0)
public class Section
extends BaseIdentifiableObject
{
@@ -151,52 +151,13 @@
}
// -
-// hashCode, equals and toString
-// -
-
-@Override
-public int hashCode()
-{
-return name.hashCode();
-}
-
-@Override
-public boolean equals( Object object )
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 9912: Web API, impl PUT and DELETE of report table
revno: 9912
committer: Lars Helge Øverland
branch nick: dhis2
timestamp: Wed 2013-02-27 11:13:13 +0100
message:
Web API, impl PUT and DELETE of report table
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapController.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/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2013-02-26 19:53:54 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2013-02-27 10:13:13 +
@@ -225,6 +225,7 @@
/**
* The list of DataElementGroups the ReportTable contains.
*/
+@Scanned
private List dataElementGroups = new ArrayList();
/**
@@ -304,8 +305,14 @@
// Presentation properties
// -
+/**
+ * Map of data element group set uids and data element groups.
+ */
private Map> dataElementGroupSets = new HashMap>();
+/**
+ * Map of organisation unit group uids and organisation unit groups.
+ */
private Map> organisationUnitGroupSets = new HashMap>();
// -
@@ -864,6 +871,11 @@
organisationUnits.clear();
}
+public void removeAllDataElementGroups()
+{
+dataElementGroups.clear();
+}
+
public void removeAllOrganisationUnitGroups()
{
organisationUnitGroups.clear();
@@ -1325,9 +1337,9 @@
// Get- and set-methods for presentation properties
// -
-@JsonProperty
+@JsonProperty( value = "dataElementGroupSets" )
+@JsonSerialize( contentAs = BaseIdentifiableObject.class )
@JsonView( {DetailedView.class, ExportView.class} )
-@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
public Map> getDataElementGroupSets()
{
return dataElementGroupSets;
@@ -1338,9 +1350,9 @@
this.dataElementGroupSets = dataElementGroupSets;
}
-@JsonProperty
+@JsonProperty( value = "organisationUnitGroupSets" )
+@JsonSerialize( contentAs = BaseIdentifiableObject.class )
@JsonView( {DetailedView.class, ExportView.class} )
-@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
public Map> getOrganisationUnitGroupSets()
{
return organisationUnitGroupSets;
@@ -1499,9 +1511,20 @@
reportParams = reportTable.getReportParams() == null ? reportParams : reportTable.getReportParams();
sortOrder = reportTable.getSortOrder() == null ? sortOrder : reportTable.getSortOrder();
topLimit = reportTable.getTopLimit() == null ? topLimit : reportTable.getTopLimit();
-
-removeAllOrganisationUnitGroups();
-organisationUnitGroups.addAll( reportTable.getOrganisationUnitGroups() );
+subtotals = reportTable.isSubtotals();
+displayDensity = reportTable.getDisplayDensity();
+fontSize = reportTable.getFontSize();
+userOrganisationUnit = reportTable.isUserOrganisationUnit();
+userOrganisationUnitChildren = reportTable.isUserOrganisationUnitChildren();
+
+removeAllDataElements();
+dataElements.addAll( reportTable.getDataElements() );
+
+removeAllIndicators();
+indicators.addAll( reportTable.getIndicators() );
+
+removeAllDataSets();
+dataSets.addAll( reportTable.getDataSets() );
removeAllOrganisationUnits();
organisationUnits.addAll( reportTable.getOrganisationUnits() );
@@ -1509,14 +1532,11 @@
removeAllPeriods();
periods.addAll( reportTable.getPeriods() );
-removeAllDataSets();
-dataSets.addAll( reportTable.getDataSets() );
-
-removeAllIndicators();
-indicators.addAll( reportTable.getIndicators() );
-
-removeAllDataElements();
-dataElements.addAll( reportTable.getDataElements() );
+removeAllDataElementGroups();
+dataElementGroups.addAll( reportTable.getDataElementGroups() );
+
+removeAllOrganisationUnitGroups();
+organisationUnitGroups.addAll( reportTable.getOrganisationUnitGroups() );
}
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dh
Re: [Dhis2-devs] [Dhis2-users] DHIS2 Mobile
Hi, see replies below. 27. feb. 2013 kl. 07:46 skrev John Ojo : > > - what type of phones will be used: do the phones support java? If it is > smartphones, do they use a browser that supports offline storage? > I am yet to assess the phones available on the market. However, it is likely > that the phones will support Java at the minimum. We will also want to > benefit from the offline data entry capabilities of DHIS2 so we will most > likely use phones that support offline storage. > - do you require support for offline data entry? > Yes. Could you please kindly explain how this can impact my case if the > response is yes or no. Any phone that supports the java-client will also support offline data entry. Also, newer smartphones supports offline data entry in the browser (others on the dev/user list might know the exact requirements for the browser/phone). If offline support is not a requirement, you have the option of accessing DHIS2 using a mobile browser on a regular "non-smart" phone. If you require offline support, the java client or smartphone browser are the options. Using the browser rather than java-client will likely be easier to administer, but how important that is depends on how many phones will be used. > > - how much data are they supposed to enter? If it is only a few data > elements, the new SMS reporting might be an option. > The data is not much. for each data set, we are talking about between 35 to > 40 data elements. How many data sets? Is there likely to be values for most fields every period, or will most of them be blank? If only a few values will be sent every week/month, structured SMS might be an option. > > > Thank you so much. > > Best regards. > John > > John Ojo MD, FMCPH > Accra, Ghana. > Mobile: +233 234691626 > Skype: Johnojo > Email: jn...@yahoo.com > > From: Olav Poppe > To: John Ojo > Cc: DHIS developers ; dhis1-users > > Sent: Tuesday, February 26, 2013 7:28 PM > Subject: Re: [Dhis2-users] DHIS2 Mobile > > Hi John, > there are quite a few options for reporting to DHIS2 using mobile phones, can > you give us a bit more information about your case: > - is this aggregate data or case-based data? > - what type of phones will be used: do the phones support java? If it is > smartphones, do they use a browser that supports offline storage? > - do you require support for offline data entry? > - how much data are they supposed to enter? If it is only a few data > elements, the new SMS reporting might be an option. > > Regards > Olav > > 26. feb. 2013 kl. 17:51 skrev John Ojo : > >> Dear All, >> >> I need to enable field workers in a country to be able to report into a >> DHIS2 (version 2.10) database using mobile phones. >> Please, I need a step-by-step instructions on how to go about achieving this. >> >> I will appreciate your kind assistance in this direction. >> >> Thank you. >> John. >> >> John Ojo MD, FMCPH >> Accra, Ghana. >> Mobile: +233 234691626 >> Skype: Johnojo >> Email: jn...@yahoo.com >> ___ >> Mailing list: https://launchpad.net/~dhis2-users >> Post to : dhis2-us...@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~dhis2-users >> More help : https://help.launchpad.net/ListHelp > > > ___ 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
