date:20131211

[Dhis2-devs] Meta-data not importing

2013-12-11 Thread Dayo Adeyomoye

Dear All,

I have been trying to import meta-data and I keep getting this error which i 
copied from the log also. 

* INFO  09:44:53,423 [data element id scheme: UID, org unit id scheme: UID, dry 
run: false, strategy: NEW_AND_UPDATES, skip check: false] 
(ImportDataValueAction.java [278275@qtp-28223271-8])
* INFO  09:44:53,964 [Level: INFO, category: DATAVALUE_IMPORT, time: Wed Dec 11 
09:44:53 WAT 2013, message: Process started] (InMemoryNotifier.java 
[taskScheduler-1])
* ERROR 09:44:53,966 java.lang.IllegalStateException: Current event not 
START_ELEMENT
at 
com.ctc.wstx.sr.BasicStreamReader.getAttributeValue(BasicStreamReader.java:624)
at 
org.amplecode.staxwax.reader.DefaultXMLStreamReader.getAttributeValue(DefaultXMLStreamReader.java:219)
at 
org.hisp.dhis.dxf2.datavalueset.StreamingDataValueSet.getDataElementIdScheme(StreamingDataValueSet.java:85)
at 
org.hisp.dhis.dxf2.datavalueset.DefaultDataValueSetService.saveDataValueSet(DefaultDataValueSetService.java:247)
at 
org.hisp.dhis.dxf2.datavalueset.DefaultDataValueSetService.saveDataValueSet(DefaultDataValueSetService.java:199)
at 
org.hisp.dhis.importexport.action.util.ImportDataValueTask.run(ImportDataValueTask.java:71)
at 
org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:53)
at java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source)
at java.util.concurrent.FutureTask.run(Unknown Source)
at 
java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(Unknown
 Source)
at 
java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(Unknown
 Source)
at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
at java.lang.Thread.run(Unknown Source)
 (DefaultDataValueSetService.java [taskScheduler-1])

Can someone help explain this better?

Regards,

Adedayo___
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 13198: PBF Functionality

2013-12-11 Thread noreply


revno: 13198
committer: Samta Bajpayee
branch nick: dhis2
timestamp: Wed 2013-12-11 09:01:17 +
message:
  PBF Functionality
modified:
  
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java
  
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.java
  
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java
  
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java
  local/in/dhis-web-maintenance-pbf/src/main/resources/META-INF/dhis/beans.xml
  
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm
  
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadTariffData.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 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java	2013-12-10 12:41:41 +
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java	2013-12-11 09:01:17 +
@@ -4,6 +4,7 @@
 import java.util.Date;
 
 import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.dataelement.DataElementCategoryService;
 import org.hisp.dhis.dataelement.DataElementService;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -124,22 +125,39 @@
 		OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit(Integer.parseInt(orgUnitId));
 		
 		OrganisationUnitGroup orgUnitGrp = organisationUnitGroupService.getOrganisationUnitGroup(Integer.parseInt(pbfType));
-		
-		TariffDataValue tariffDataValue = new TariffDataValue();
-		
-		
-		tariffDataValue.setValue(Double.parseDouble(tariff));
-		tariffDataValue.setStartDate(sDate);
-		tariffDataValue.setEndDate(eDate);
-		tariffDataValue.setTimestamp(new Date());
-		tariffDataValue.setStoredBy(currentUserService.getCurrentUsername());
-		tariffDataValue.setDataElement(dataElement);
-		tariffDataValue.setOptionCombo(categoryService.getDefaultDataElementCategoryOptionCombo());
-		tariffDataValue.setOrganisationUnitGroup(orgUnitGrp);
-		tariffDataValue.setOrganisationUnit(orgUnit);
-		
-		tariffDataValueService.addTariffDataValue(tariffDataValue);
-		
+		DataElementCategoryOptionCombo optionCombo = categoryService.getDefaultDataElementCategoryOptionCombo();
+		
+		TariffDataValue tariffDataValue = tariffDataValueService.getTariffDataValue(orgUnit, dataElement, optionCombo, orgUnitGrp, sDate, eDate);
+		
+		TariffDataValue tariffDataValue1;
+		
+		if(tariffDataValue == null)
+		{
+			tariffDataValue1 = new TariffDataValue();
+		}
+		else
+		{
+			tariffDataValue1 = tariffDataValueService.getTariffDataValue(orgUnit, dataElement, optionCombo, orgUnitGrp, sDate, eDate);
+		}
+		
+		tariffDataValue1.setValue(Double.parseDouble(tariff));
+		tariffDataValue1.setStartDate(sDate);
+		tariffDataValue1.setEndDate(eDate);
+		tariffDataValue1.setTimestamp(new Date());
+		tariffDataValue1.setStoredBy(currentUserService.getCurrentUsername());
+		tariffDataValue1.setDataElement(dataElement);
+		tariffDataValue1.setOptionCombo(optionCombo);
+		tariffDataValue1.setOrganisationUnitGroup(orgUnitGrp);
+		tariffDataValue1.setOrganisationUnit(orgUnit);
+		
+		if(tariffDataValue == null)
+		{
+			tariffDataValueService.addTariffDataValue(tariffDataValue1);
+		}
+		else
+		{
+			tariffDataValueService.updateTariffDataValue(tariffDataValue1);
+		}		
 		return SUCCESS;
 	}
 }
\ No newline at end of file

=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.java	2013-12-10 12:41:41 +
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.java	2013-12-11 09:01:17 +
@@ -35,6 +35,7 @@
 	private String startDate;
 	
 	private String endDate;
+	
 	// -
 // Action implementation
 // -

=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java	2013-12-10 12:41:41 +
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDat

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13199: PBF Functionality

2013-12-11 Thread noreply


revno: 13199
committer: Samta Bajpayee
branch nick: dhis2
timestamp: Wed 2013-12-11 09:09:47 +
message:
  PBF Functionality
modified:
  
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java
  
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.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-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java	2013-12-11 09:01:17 +
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java	2013-12-11 09:09:47 +
@@ -74,8 +74,8 @@
 {
 		if(constantService.getConstantByName( TARIFF_SETTING_AUTHORITY) == null)
 		{
-			tariff_setting_authority = "Level 1";
-			List allLevelOrg =new ArrayList(organisationUnitService.getOrganisationUnitsAtLevel(1)) ;
+			tariff_setting_authority = "Level 3";
+			List allLevelOrg =new ArrayList(organisationUnitService.getOrganisationUnitsAtLevel(3)) ;
 			for(OrganisationUnit org : allLevelOrg)
 			{
 levelOrgUnitIds.add(org.getId());
@@ -84,7 +84,7 @@
 		else
 		{
 			Constant tariff_authority = constantService.getConstantByName( TARIFF_SETTING_AUTHORITY );
-			tariff_setting_authority = "Level "+Integer.parseInt(tariff_authority.getValue()+"");
+			tariff_setting_authority = "Level "+(int)tariff_authority.getValue();
 			List allLevelOrg =new ArrayList(organisationUnitService.getOrganisationUnitsAtLevel(Integer.parseInt(tariff_authority.getValue()+""))) ;
 			for(OrganisationUnit org : allLevelOrg)
 			{

=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java	2013-12-11 09:01:17 +
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java	2013-12-11 09:09:47 +
@@ -86,7 +86,7 @@
 	
 	public String execute()
 {
-		OrganisationUnitGroupSet organisationUnitGroupSet =  organisationUnitGroupService.getOrganisationUnitGroupSet(6709);
+		OrganisationUnitGroupSet organisationUnitGroupSet =  organisationUnitGroupService.getOrganisationUnitGroupSet(3);
 		orGroupList = new ArrayList(organisationUnitGroupSet.getOrganisationUnitGroups()) ;
 		selecteddataElement = dataElementService.getDataElementByName(dataElementName);
 		OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit(Integer.parseInt(orgUnitId));

___
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] Support for comma delimited identifiers in the API?

2013-12-11 Thread Saptarshi Purkayastha

Spring calls these Matrix Variables and is very easy to support using
Spring MVC.
http://docs.spring.io/spring/docs/current/spring-framework-reference/html/mvc.htm

I like the idea.

---
Regards,
Saptarshi PURKAYASTHA

On 11 December 2013 05:49, Jason Pickering wrote:

> Hi there.
>
>  I have been working with another REST API recently and one of the
> features is the support for comma delimited lists as part of a API request.
> From this example from the docs..
>
> curl 
> "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I&orgUnit=vWbkYPRmKyS&children=true";
>  -H "Accept:application/xml" -u admin:district -v
>
>
> It would be useful to support this request as well..
>
> curl 
> "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I,vWbkYPRmKyS&children=true";
>  -H "Accept:application/xml" -u admin:district -v
>
> In some cases, we have many dozens or hundreds of orgunit UIDs in the
> requests, and it might be just a bit simpler to have these delimited.
>
> Thoughts?
>
> Regards,
> Jason
>
>
>
>
>
>
> ___
> 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
>
>
___
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] Meta-data not importing

2013-12-11 Thread Morten Olav Hansen

Hi,

This is because you are doing data import, and not meta-data import. Make
sure that you select the correct choice in the menu.

--
Morten


On Wed, Dec 11, 2013 at 9:52 AM, Dayo Adeyomoye  wrote:

> Dear All,
>
> I have been trying to import meta-data and I keep getting this error which
> i copied from the log also.
>
> * INFO  09:44:53,423 [data element id scheme: UID, org unit id scheme:
> UID, dry run: false, strategy: NEW_AND_UPDATES, skip check: false]
> (ImportDataValueAction.java [278275@qtp-28223271-8])
> * INFO  09:44:53,964 [Level: INFO, category: DATAVALUE_IMPORT, time: Wed
> Dec 11 09:44:53 WAT 2013, message: Process started] (InMemoryNotifier.java
> [taskScheduler-1])
> * ERROR 09:44:53,966 java.lang.IllegalStateException: Current event not
> START_ELEMENT
> at
> com.ctc.wstx.sr.BasicStreamReader.getAttributeValue(BasicStreamReader.java:624)
>  at
> org.amplecode.staxwax.reader.DefaultXMLStreamReader.getAttributeValue(DefaultXMLStreamReader.java:219)
>  at
> org.hisp.dhis.dxf2.datavalueset.StreamingDataValueSet.getDataElementIdScheme(StreamingDataValueSet.java:85)
> at
> org.hisp.dhis.dxf2.datavalueset.DefaultDataValueSetService.saveDataValueSet(DefaultDataValueSetService.java:247)
>  at
> org.hisp.dhis.dxf2.datavalueset.DefaultDataValueSetService.saveDataValueSet(DefaultDataValueSetService.java:199)
>  at
> org.hisp.dhis.importexport.action.util.ImportDataValueTask.run(ImportDataValueTask.java:71)
> at
> org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:53)
> at java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source)
>  at java.util.concurrent.FutureTask.run(Unknown Source)
> at
> java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(Unknown
> Source)
>  at
> java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(Unknown
> Source)
>  at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
> at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
>  at java.lang.Thread.run(Unknown Source)
>  (DefaultDataValueSetService.java [taskScheduler-1])
>
> Can someone help explain this better?
>
> Regards,
>
> Adedayo
>
> ___
> 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

Re: [Dhis2-devs] [Dhis2-users] Meta-data not importing

2013-12-11 Thread Knut Staring

See this keyword in your log message: DATAVALUE_IMPORT


On Wed, Dec 11, 2013 at 10:21 AM, Morten Olav Hansen wrote:

> Hi,
>
> This is because you are doing data import, and not meta-data import. Make
> sure that you select the correct choice in the menu.
>
> --
> Morten
>
>
> On Wed, Dec 11, 2013 at 9:52 AM, Dayo Adeyomoye wrote:
>
>> Dear All,
>>
>> I have been trying to import meta-data and I keep getting this error
>> which i copied from the log also.
>>
>> * INFO  09:44:53,423 [data element id scheme: UID, org unit id scheme:
>> UID, dry run: false, strategy: NEW_AND_UPDATES, skip check: false]
>> (ImportDataValueAction.java [278275@qtp-28223271-8])
>> * INFO  09:44:53,964 [Level: INFO, category: DATAVALUE_IMPORT, time: Wed
>> Dec 11 09:44:53 WAT 2013, message: Process started] (InMemoryNotifier.java
>> [taskScheduler-1])
>> * ERROR 09:44:53,966 java.lang.IllegalStateException: Current event not
>> START_ELEMENT
>> at
>> com.ctc.wstx.sr.BasicStreamReader.getAttributeValue(BasicStreamReader.java:624)
>>  at
>> org.amplecode.staxwax.reader.DefaultXMLStreamReader.getAttributeValue(DefaultXMLStreamReader.java:219)
>>  at
>> org.hisp.dhis.dxf2.datavalueset.StreamingDataValueSet.getDataElementIdScheme(StreamingDataValueSet.java:85)
>> at
>> org.hisp.dhis.dxf2.datavalueset.DefaultDataValueSetService.saveDataValueSet(DefaultDataValueSetService.java:247)
>>  at
>> org.hisp.dhis.dxf2.datavalueset.DefaultDataValueSetService.saveDataValueSet(DefaultDataValueSetService.java:199)
>>  at
>> org.hisp.dhis.importexport.action.util.ImportDataValueTask.run(ImportDataValueTask.java:71)
>> at
>> org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:53)
>> at java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source)
>>  at java.util.concurrent.FutureTask.run(Unknown Source)
>> at
>> java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(Unknown
>> Source)
>>  at
>> java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(Unknown
>> Source)
>>  at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
>> at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
>>  at java.lang.Thread.run(Unknown Source)
>>  (DefaultDataValueSetService.java [taskScheduler-1])
>>
>> Can someone help explain this better?
>>
>> Regards,
>>
>> Adedayo
>>
>> ___
>> 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-users
> Post to : dhis2-us...@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-users
> 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] Meta-data not importing

2013-12-11 Thread Dayo Adeyomoye

It does the same even with the correct import.
 
BlackBerry: 3114F90C
Phone: 08028851441, 08035560463
emails: deemo...@yahoo.com, addyr...@yahoo.com
Yahoo IM: deemoyes
Facebook: pharael
twitter:pharaell



On Wednesday, December 11, 2013 10:25 AM, Knut Staring  wrote:
 
See this keyword in your log message: DATAVALUE_IMPORT



On Wed, Dec 11, 2013 at 10:21 AM, Morten Olav Hansen  wrote:

Hi,
>
>
>This is because you are doing data import, and not meta-data import. Make sure 
>that you select the correct choice in the menu.
>
>
>--
>Morten
>
>
>On Wed, Dec 11, 2013 at 9:52 AM, Dayo Adeyomoye  wrote:
>
>Dear All,
>>
>>
>>I have been trying to import meta-data and I keep getting this error which i 
>>copied from the log also. 
>>
>>
>>* INFO  09:44:53,423 [data element id scheme: UID, org unit id scheme: UID, 
>>dry run: false, strategy: NEW_AND_UPDATES, skip check: false] 
>>(ImportDataValueAction.java [278275@qtp-28223271-8])
>>* INFO  09:44:53,964 [Level: INFO, category: DATAVALUE_IMPORT, time: Wed Dec 
>>11 09:44:53 WAT 2013, message: Process started] (InMemoryNotifier.java 
>>[taskScheduler-1])
>>* ERROR 09:44:53,966 java.lang.IllegalStateException: Current event not 
>>START_ELEMENT
>>at 
>>com.ctc.wstx.sr.BasicStreamReader.getAttributeValue(BasicStreamReader.java:624)
>>at 
>>org.amplecode.staxwax.reader.DefaultXMLStreamReader.getAttributeValue(DefaultXMLStreamReader.java:219)
>>at 
>>org.hisp.dhis.dxf2.datavalueset.StreamingDataValueSet.getDataElementIdScheme(StreamingDataValueSet.java:85)
>>at 
>>org.hisp.dhis.dxf2.datavalueset.DefaultDataValueSetService.saveDataValueSet(DefaultDataValueSetService.java:247)
>>at 
>>org.hisp.dhis.dxf2.datavalueset.DefaultDataValueSetService.saveDataValueSet(DefaultDataValueSetService.java:199)
>>at 
>>org.hisp.dhis.importexport.action.util.ImportDataValueTask.run(ImportDataValueTask.java:71)
>>at 
>>org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:53)
>>at java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source)
>>at java.util.concurrent.FutureTask.run(Unknown Source)
>>at 
>>java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(Unknown
>> Source)
>>at 
>>java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(Unknown
>> Source)
>>at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
>>at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
>>at java.lang.Thread.run(Unknown Source)
>> (DefaultDataValueSetService.java [taskScheduler-1])
>>
>>
>>Can someone help explain this better?
>>
>>
>>Regards,
>>
>>
>>Adedayo
>>___
>>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-users
>Post to     : dhis2-us...@lists.launchpad.net
>Unsubscribe : https://launchpad.net/~dhis2-users
>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] Meta-data not importing

2013-12-11 Thread Morten Olav Hansen

Can you show the log? if you selected metadata import, the log can't be
exactly the same..

--
Morten


On Wed, Dec 11, 2013 at 11:47 AM, Dayo Adeyomoye  wrote:

> It does the same even with the correct import.
>
> BlackBerry: 3114F90C
> Phone: 08028851441, 08035560463
> emails: deemo...@yahoo.com, addyr...@yahoo.com
> Yahoo IM: deemoyes
> Facebook: pharael
> twitter:pharaell
>
>
>   On Wednesday, December 11, 2013 10:25 AM, Knut Staring 
> wrote:
>   See this keyword in your log message: DATAVALUE_IMPORT
>
>
> On Wed, Dec 11, 2013 at 10:21 AM, Morten Olav Hansen 
> wrote:
>
> Hi,
>
> This is because you are doing data import, and not meta-data import. Make
> sure that you select the correct choice in the menu.
>
> --
> Morten
>
>
> On Wed, Dec 11, 2013 at 9:52 AM, Dayo Adeyomoye wrote:
>
> Dear All,
>
> I have been trying to import meta-data and I keep getting this error which
> i copied from the log also.
>
> * INFO  09:44:53,423 [data element id scheme: UID, org unit id scheme:
> UID, dry run: false, strategy: NEW_AND_UPDATES, skip check: false]
> (ImportDataValueAction.java [278275@qtp-28223271-8])
> * INFO  09:44:53,964 [Level: INFO, category: DATAVALUE_IMPORT, time: Wed
> Dec 11 09:44:53 WAT 2013, message: Process started] (InMemoryNotifier.java
> [taskScheduler-1])
> * ERROR 09:44:53,966 java.lang.IllegalStateException: Current event not
> START_ELEMENT
> at
> com.ctc.wstx.sr.BasicStreamReader.getAttributeValue(BasicStreamReader.java:624)
>  at
> org.amplecode.staxwax.reader.DefaultXMLStreamReader.getAttributeValue(DefaultXMLStreamReader.java:219)
>  at
> org.hisp.dhis.dxf2.datavalueset.StreamingDataValueSet.getDataElementIdScheme(StreamingDataValueSet.java:85)
> at
> org.hisp.dhis.dxf2.datavalueset.DefaultDataValueSetService.saveDataValueSet(DefaultDataValueSetService.java:247)
>  at
> org.hisp.dhis.dxf2.datavalueset.DefaultDataValueSetService.saveDataValueSet(DefaultDataValueSetService.java:199)
>  at
> org.hisp.dhis.importexport.action.util.ImportDataValueTask.run(ImportDataValueTask.java:71)
> at
> org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:53)
> at java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source)
>  at java.util.concurrent.FutureTask.run(Unknown Source)
> at
> java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(Unknown
> Source)
>  at
> java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(Unknown
> Source)
>  at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
> at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
>  at java.lang.Thread.run(Unknown Source)
>  (DefaultDataValueSetService.java [taskScheduler-1])
>
> Can someone help explain this better?
>
> Regards,
>
> Adedayo
>
> ___
> 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-users
> Post to : dhis2-us...@lists.launchpad.net
> Unsubscribe : https://launchpad.net/~dhis2-users
> 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

[Dhis2-devs] Organisaitonunit Tree error in IE8

2013-12-11 Thread Bharath

In IE8, organisaitonunit tree is not working properly, for instance in
dataset management -> assign orgunits -> when we click on + symbol not
expanding.

http://apps.dhis2.org/demo/dhis-web-maintenance-dataset/defineDataSetAssociationsForm.action?dataSetId=394131


About DHIS 2 Current user:adminVersion:2.13Build revision:12921Build
date:2013-12-11
02:04User agent:Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1;
Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR
3.0.30729; Media Center PC 6.0; InfoPath.2; .NET4.0C)Server date:2013-12-11
12:09Environment variable:DHIS2_HOME

-- 

Regards,
Bharath Kumar. Ch
___
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] Organisaitonunit Tree error in IE8

2013-12-11 Thread Morten Olav Hansen

Are you seeing this [1] bug? This is known.. there have been quite a few
improvements, but it will only work for users with few orgUnits connected
to them.

[1] https://bugs.launchpad.net/dhis2/+bug/1258085

--
Morten


On Wed, Dec 11, 2013 at 12:10 PM, Bharath  wrote:

>
> In IE8, organisaitonunit tree is not working properly, for instance in
> dataset management -> assign orgunits -> when we click on + symbol not
> expanding.
>
>
> http://apps.dhis2.org/demo/dhis-web-maintenance-dataset/defineDataSetAssociationsForm.action?dataSetId=394131
>
>
> About DHIS 2 Current user:adminVersion:2.13Build revision:12921Build 
> date:2013-12-11
> 02:04User agent:Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1;
> Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR
> 3.0.30729; Media Center PC 6.0; InfoPath.2; .NET4.0C)Server date:2013-12-11
> 12:09Environment variable:DHIS2_HOME
>
> --
>
> Regards,
> Bharath Kumar. Ch
>
> ___
> 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
>
>
___
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] Analytics data querying problem

2013-12-11 Thread Maimoona Kausar

Thanks I would start working on it.

I have another question. For standard html reports, is there any way to
get/download report as pdf. Also in trying working with jrxml reports it
throws PermGen Space error. I am using dhis-live on a 4 GB machine.


On Wed, Dec 11, 2013 at 9:54 AM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> Sorry, gave you the wrong link to how to send the completeness
> information. It should be [1]
>
> You can see it here as described in the docs
>
>
>
> [1]http://www.dhis2.org/doc/snapshot/en/user/html/ch25s06.html
>
>
> On Wed, Dec 11, 2013 at 6:42 AM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> Hi Maimoona,
>> I think there are two approaches. The best way would be to transmit the
>> completeness information through the WebAPI as detailed 
>> here
>> .
>>
>> We had a similar situation when importing data from DHIS 1.4. In this
>> case, no completeness information was transmitted, so we developed some
>> scripts to automatically populate the "completedatasetregistration" table
>> based on the presence of some compulsory data elements. It was assumed that
>> if the compulsory data elements existed, then the record was complete.
>> Records were then created and inserted into the
>> "completedatasetregistration" so that the completeness analysis would make
>> sense for these imported records. But of course, some assumptions had to be
>> made in this case, like "Was the record really complete?". Also determining
>> the date of submission would need to be considered. In this case, we just
>> set it to 15 days past the end of the period, but there could be other ways
>> of doing this.
>>
>> Best regards,
>> Jason
>>
>>
>>
>> On Tue, Dec 10, 2013 at 10:57 PM, Maimoona Kausar <
>> maimoona.kau...@irdinformatics.org> wrote:
>>
>>> But we are not using any data entry forms. Our data comes into the
>>> system via dhisreport module for OpenMRS. This module saves data into
>>> table datavalue of dhis directly. I tried finding completeddataset via 
>>> 'Reporting
>>> Rate Summary' but it appears that it has 0 'Actual Reports' for all months
>>> (data in table datavalue exists though). Our reports are dataSet centric
>>> and a report is comprised of a dataSet.
>>> Is there some important consideration we have not taken into account in
>>> using dhis?
>>> A quick solution could be finding all members for a dataSet and add
>>> those in dimension dynamically, but is there some other better way of
>>> achieving the goal?
>>>
>>>
>>> On Wed, Dec 11, 2013 at 12:39 AM, Lars Helge Øverland <
>>> larshe...@gmail.com> wrote:
>>>
 Hi Maimoona,

 "data sets" refers to data set reporting dates. It calculates the
 reporting rates based on the number of complete data set registrations
 (people clicking complete in data entry that is). The table name for your
 reference is "completedatasetregistration".

 regards,

 Lars


 On Tue, Dec 10, 2013 at 10:42 AM, Maimoona Kausar <
 maimoona.kau...@irdinformatics.org> wrote:

> Hi Team,
>
> I am working with DHIS Standard HTML Reports.
>
> I am trying to access json data via following:
>
> ../api/analytics?skipMeta=true&dimension=pe:201312&dimension=dx:x(dataSet
> id) .
>
> It doesnot return any row for the query. However by eliminating 'dx',
> it returns 1 row as expected.
> The dataSet exists and in datavalue table it also contains values for
> some of the elements of specified dataSet in given timePeriod.
>
> Does it perform an inner join on all members of the dataSet?
> Giving Ids of individual dataElements as dx also returns expected
> values. Is it possible to specify a dataSet/any group of elements that
> could return data for all members existing in datavalue table.
>
> I have also tried using dataElementGroupSet as follows
>
> api/analytics?skipMeta=true&dimension=pe:201312&dimension=mA8swNR1Vwi:CyAumtaciAg
>  but it doesnot work too.
>
> Many thanks,
> Maimoona
>
> ___
> 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-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] CSV import not working

2013-12-11 Thread Maimoona Kausar

Hi all,

I am trying use data import feature of DHIS. It seems not working. Whenever
I try importing a CSV/XML file it says successful import but data is never
updated.

For ex:

I exported a dataSet using DHIS export so that file with correct format
could be used. In that file I left everything unchanged except values.
means that in those files I changed values of each and every dataElement.
On importing that CSV/XML file it says rows updated but in real datavalue
table doesnot reflect updated data. Plz let me know if I am looking into
wrong table.

Many thanks,
Maimoona
___
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] Analytics data querying problem

2013-12-11 Thread Maimoona Kausar

java -Xmx6000m -Xms3000m -XX:MaxPermSize=500m -XX:PermSize=300m -jar
dhis-live.jar

I used above parameters in startup.sh, but it still gives me PermGen
Space error.

Is there some way I could download Html Standard Report as pdf?

I tried doing something like
'api/reports/rRehCvkn5mV/data.pdf?ou=uVvDS7yf79Y&pe=201312', but it
didnot work.




On Wed, Dec 11, 2013 at 12:21 PM, Knut Staring  wrote:

> https://www.google.la/search?q=java_opts+dhis2
>
>
> On Wed, Dec 11, 2013 at 8:18 AM, Maimoona Kausar <
> maimoona.kau...@irdinformatics.org> wrote:
>
>> No I didnot, and unfortunately I donot have any idea of how to do it :(
>>
>>
>> On Wed, Dec 11, 2013 at 12:13 PM, Knut Staring  wrote:
>>
>>> Did you set your JAVA_OPTS?
>>>
>>>
>>> On Wed, Dec 11, 2013 at 7:18 AM, Maimoona Kausar <
>>> maimoona.kau...@irdinformatics.org> wrote:
>>>
 Thanks I would start working on it.

 I have another question. For standard html reports, is there any way to
 get/download report as pdf. Also in trying working with jrxml reports it
 throws PermGen Space error. I am using dhis-live on a 4 GB machine.


 On Wed, Dec 11, 2013 at 9:54 AM, Jason Pickering <
 jason.p.picker...@gmail.com> wrote:

> Sorry, gave you the wrong link to how to send the completeness
> information. It should be [1]
>
> You can see it here as described in the docs
>
>
>
> [1]http://www.dhis2.org/doc/snapshot/en/user/html/ch25s06.html
>
>
> On Wed, Dec 11, 2013 at 6:42 AM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> Hi Maimoona,
>> I think there are two approaches. The best way would be to transmit
>> the completeness information through the WebAPI as detailed 
>> here
>> .
>>
>> We had a similar situation when importing data from DHIS 1.4. In this
>> case, no completeness information was transmitted, so we developed some
>> scripts to automatically populate the "completedatasetregistration" table
>> based on the presence of some compulsory data elements. It was assumed 
>> that
>> if the compulsory data elements existed, then the record was complete.
>> Records were then created and inserted into the
>> "completedatasetregistration" so that the completeness analysis would 
>> make
>> sense for these imported records. But of course, some assumptions had to 
>> be
>> made in this case, like "Was the record really complete?". Also 
>> determining
>> the date of submission would need to be considered. In this case, we just
>> set it to 15 days past the end of the period, but there could be other 
>> ways
>> of doing this.
>>
>> Best regards,
>> Jason
>>
>>
>>
>> On Tue, Dec 10, 2013 at 10:57 PM, Maimoona Kausar <
>> maimoona.kau...@irdinformatics.org> wrote:
>>
>>> But we are not using any data entry forms. Our data comes into the
>>> system via dhisreport module for OpenMRS. This module saves data
>>> into table datavalue of dhis directly. I tried finding completeddataset 
>>> via
>>> 'Reporting Rate Summary' but it appears that it has 0 'Actual
>>> Reports' for all months (data in table datavalue exists though). Our
>>> reports are dataSet centric and a report is comprised of a dataSet.
>>> Is there some important consideration we have not taken into account
>>> in using dhis?
>>> A quick solution could be finding all members for a dataSet and add
>>> those in dimension dynamically, but is there some other better way of
>>> achieving the goal?
>>>
>>>
>>> On Wed, Dec 11, 2013 at 12:39 AM, Lars Helge Øverland <
>>> larshe...@gmail.com> wrote:
>>>
 Hi Maimoona,

 "data sets" refers to data set reporting dates. It calculates the
 reporting rates based on the number of complete data set registrations
 (people clicking complete in data entry that is). The table name for 
 your
 reference is "completedatasetregistration".

 regards,

 Lars


 On Tue, Dec 10, 2013 at 10:42 AM, Maimoona Kausar <
 maimoona.kau...@irdinformatics.org> wrote:

> Hi Team,
>
> I am working with DHIS Standard HTML Reports.
>
> I am trying to access json data via following:
>
> ../api/analytics?skipMeta=true&dimension=pe:201312&dimension=dx:x(dataSet
> id) .
>
> It doesnot return any row for the query. However by eliminating
> 'dx', it returns 1 row as expected.
> The dataSet exists and in datavalue table it also contains values
> for some of the elements of specified dataSet in given timePeriod.
>
> Does it perform an inner join on all members of the dataSet?
> Giving Ids

[Dhis2-devs] Analytics data querying problem

2013-12-11 Thread Maimoona Kausar

Hi Team,

I am working with DHIS Standard HTML Reports.

I am trying to access json data via following:

../api/analytics?skipMeta=true&dimension=pe:201312&dimension=dx:x(dataSet
id) .

It doesnot return any row for the query. However by eliminating 'dx', it
returns 1 row as expected.
The dataSet exists and in datavalue table it also contains values for some
of the elements of specified dataSet in given timePeriod.

Does it perform an inner join on all members of the dataSet?
Giving Ids of individual dataElements as dx also returns expected values.
Is it possible to specify a dataSet/any group of elements that could return
data for all members existing in datavalue table.

I have also tried using dataElementGroupSet as follows
api/analytics?skipMeta=true&dimension=pe:201312&dimension=mA8swNR1Vwi:CyAumtaciAg
 but it doesnot work too.

Many thanks,
Maimoona
___
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] Analytics data querying problem

2013-12-11 Thread Maimoona Kausar

No I didnot, and unfortunately I donot have any idea of how to do it :(


On Wed, Dec 11, 2013 at 12:13 PM, Knut Staring  wrote:

> Did you set your JAVA_OPTS?
>
>
> On Wed, Dec 11, 2013 at 7:18 AM, Maimoona Kausar <
> maimoona.kau...@irdinformatics.org> wrote:
>
>> Thanks I would start working on it.
>>
>> I have another question. For standard html reports, is there any way to
>> get/download report as pdf. Also in trying working with jrxml reports it
>> throws PermGen Space error. I am using dhis-live on a 4 GB machine.
>>
>>
>> On Wed, Dec 11, 2013 at 9:54 AM, Jason Pickering <
>> jason.p.picker...@gmail.com> wrote:
>>
>>> Sorry, gave you the wrong link to how to send the completeness
>>> information. It should be [1]
>>>
>>> You can see it here as described in the docs
>>>
>>>
>>>
>>> [1]http://www.dhis2.org/doc/snapshot/en/user/html/ch25s06.html
>>>
>>>
>>> On Wed, Dec 11, 2013 at 6:42 AM, Jason Pickering <
>>> jason.p.picker...@gmail.com> wrote:
>>>
 Hi Maimoona,
 I think there are two approaches. The best way would be to transmit the
 completeness information through the WebAPI as detailed 
 here
 .

 We had a similar situation when importing data from DHIS 1.4. In this
 case, no completeness information was transmitted, so we developed some
 scripts to automatically populate the "completedatasetregistration" table
 based on the presence of some compulsory data elements. It was assumed that
 if the compulsory data elements existed, then the record was complete.
 Records were then created and inserted into the
 "completedatasetregistration" so that the completeness analysis would make
 sense for these imported records. But of course, some assumptions had to be
 made in this case, like "Was the record really complete?". Also determining
 the date of submission would need to be considered. In this case, we just
 set it to 15 days past the end of the period, but there could be other ways
 of doing this.

 Best regards,
 Jason



 On Tue, Dec 10, 2013 at 10:57 PM, Maimoona Kausar <
 maimoona.kau...@irdinformatics.org> wrote:

> But we are not using any data entry forms. Our data comes into the
> system via dhisreport module for OpenMRS. This module saves data into
> table datavalue of dhis directly. I tried finding completeddataset via 
> 'Reporting
> Rate Summary' but it appears that it has 0 'Actual Reports' for all months
> (data in table datavalue exists though). Our reports are dataSet centric
> and a report is comprised of a dataSet.
> Is there some important consideration we have not taken into account
> in using dhis?
> A quick solution could be finding all members for a dataSet and add
> those in dimension dynamically, but is there some other better way of
> achieving the goal?
>
>
> On Wed, Dec 11, 2013 at 12:39 AM, Lars Helge Øverland <
> larshe...@gmail.com> wrote:
>
>> Hi Maimoona,
>>
>> "data sets" refers to data set reporting dates. It calculates the
>> reporting rates based on the number of complete data set registrations
>> (people clicking complete in data entry that is). The table name for your
>> reference is "completedatasetregistration".
>>
>> regards,
>>
>> Lars
>>
>>
>> On Tue, Dec 10, 2013 at 10:42 AM, Maimoona Kausar <
>> maimoona.kau...@irdinformatics.org> wrote:
>>
>>> Hi Team,
>>>
>>> I am working with DHIS Standard HTML Reports.
>>>
>>> I am trying to access json data via following:
>>>
>>> ../api/analytics?skipMeta=true&dimension=pe:201312&dimension=dx:x(dataSet
>>> id) .
>>>
>>> It doesnot return any row for the query. However by eliminating
>>> 'dx', it returns 1 row as expected.
>>> The dataSet exists and in datavalue table it also contains values
>>> for some of the elements of specified dataSet in given timePeriod.
>>>
>>> Does it perform an inner join on all members of the dataSet?
>>> Giving Ids of individual dataElements as dx also returns expected
>>> values. Is it possible to specify a dataSet/any group of elements that
>>> could return data for all members existing in datavalue table.
>>>
>>> I have also tried using dataElementGroupSet as follows
>>>
>>> api/analytics?skipMeta=true&dimension=pe:201312&dimension=mA8swNR1Vwi:CyAumtaciAg
>>>  but it doesnot work too.
>>>
>>> Many thanks,
>>> Maimoona
>>>
>>> ___
>>> 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
>>>
>>>
>>
>
> __

Re: [Dhis2-devs] [Dhis2-users] Analytics data querying problem

2013-12-11 Thread Maimoona Kausar

But we are not using any data entry forms. Our data comes into the system
via dhisreport module for OpenMRS. This module saves data into table
datavalue of dhis directly. I tried finding completeddataset via 'Reporting
Rate Summary' but it appears that it has 0 'Actual Reports' for all months
(data in table datavalue exists though). Our reports are dataSet centric
and a report is comprised of a dataSet.
Is there some important consideration we have not taken into account in
using dhis?
A quick solution could be finding all members for a dataSet and add those
in dimension dynamically, but is there some other better way of achieving
the goal?


On Wed, Dec 11, 2013 at 12:39 AM, Lars Helge Øverland
wrote:

> Hi Maimoona,
>
> "data sets" refers to data set reporting dates. It calculates the
> reporting rates based on the number of complete data set registrations
> (people clicking complete in data entry that is). The table name for your
> reference is "completedatasetregistration".
>
> regards,
>
> Lars
>
>
> On Tue, Dec 10, 2013 at 10:42 AM, Maimoona Kausar <
> maimoona.kau...@irdinformatics.org> wrote:
>
>> Hi Team,
>>
>> I am working with DHIS Standard HTML Reports.
>>
>> I am trying to access json data via following:
>>
>> ../api/analytics?skipMeta=true&dimension=pe:201312&dimension=dx:x(dataSet
>> id) .
>>
>> It doesnot return any row for the query. However by eliminating 'dx', it
>> returns 1 row as expected.
>> The dataSet exists and in datavalue table it also contains values for
>> some of the elements of specified dataSet in given timePeriod.
>>
>> Does it perform an inner join on all members of the dataSet?
>> Giving Ids of individual dataElements as dx also returns expected values.
>> Is it possible to specify a dataSet/any group of elements that could return
>> data for all members existing in datavalue table.
>>
>> I have also tried using dataElementGroupSet as follows
>>
>> api/analytics?skipMeta=true&dimension=pe:201312&dimension=mA8swNR1Vwi:CyAumtaciAg
>>  but it doesnot work too.
>>
>> Many thanks,
>> Maimoona
>>
>> ___
>> 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 13200: PBF Functionality

2013-12-11 Thread noreply


revno: 13200
committer: Samta Bajpayee
branch nick: dhis2
timestamp: Wed 2013-12-11 12:08:01 +
message:
  PBF Functionality
modified:
  
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java
  
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.java
  
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java
  
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java
  local/in/dhis-web-maintenance-pbf/src/main/resources/META-INF/dhis/beans.xml
  
local/in/dhis-web-maintenance-pbf/src/main/resources/org/hisp/dhis/pbf/i18n_module.properties
  local/in/dhis-web-maintenance-pbf/src/main/resources/struts.xml
  
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm
  
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadTariffData.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 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java	2013-12-11 09:01:17 +
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java	2013-12-11 12:08:01 +
@@ -1,7 +1,9 @@
 package org.hisp.dhis.pbf.action;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -72,38 +74,28 @@
 	private String endDate;
 	
 	private String dataElementId;
-	private String orgUnitId;
+	private String orgUnitUid;
 	
 	public void setDataElementId(String dataElementId) {
 		this.dataElementId = dataElementId;
 	}
 
-
-
-	public void setOrgUnitId(String orgUnitId) {
-		this.orgUnitId = orgUnitId;
+	public void setOrgUnitUid(String orgUnitUid) {
+		this.orgUnitUid = orgUnitUid;
 	}
 
-
-
 	public void setPbfType(String pbfType) {
 		this.pbfType = pbfType;
 	}
 
-
-
 	public void setTariff(String tariff) {
 		this.tariff = tariff;
 	}
 
-
-
 	public void setStartDate(String startDate) {
 		this.startDate = startDate;
 	}
 
-
-
 	public void setEndDate(String endDate) {
 		this.endDate = endDate;
 	}
@@ -122,12 +114,14 @@
 		
 		DataElement dataElement = dataElementService.getDataElement(Integer.parseInt(dataElementId));
 		
-		OrganisationUnit orgUnit = organisationUnitService.getOrganisationUnit(Integer.parseInt(orgUnitId));
+		List orgUids = new ArrayList();
+		orgUids.add(orgUnitUid);
+		List organisationUnits = organisationUnitService.getOrganisationUnitsByUid(orgUids);
 		
 		OrganisationUnitGroup orgUnitGrp = organisationUnitGroupService.getOrganisationUnitGroup(Integer.parseInt(pbfType));
 		DataElementCategoryOptionCombo optionCombo = categoryService.getDefaultDataElementCategoryOptionCombo();
 		
-		TariffDataValue tariffDataValue = tariffDataValueService.getTariffDataValue(orgUnit, dataElement, optionCombo, orgUnitGrp, sDate, eDate);
+		TariffDataValue tariffDataValue = tariffDataValueService.getTariffDataValue(organisationUnits.get(0), dataElement, optionCombo, orgUnitGrp, sDate, eDate);
 		
 		TariffDataValue tariffDataValue1;
 		
@@ -137,7 +131,7 @@
 		}
 		else
 		{
-			tariffDataValue1 = tariffDataValueService.getTariffDataValue(orgUnit, dataElement, optionCombo, orgUnitGrp, sDate, eDate);
+			tariffDataValue1 = tariffDataValueService.getTariffDataValue(organisationUnits.get(0), dataElement, optionCombo, orgUnitGrp, sDate, eDate);
 		}
 		
 		tariffDataValue1.setValue(Double.parseDouble(tariff));
@@ -148,7 +142,7 @@
 		tariffDataValue1.setDataElement(dataElement);
 		tariffDataValue1.setOptionCombo(optionCombo);
 		tariffDataValue1.setOrganisationUnitGroup(orgUnitGrp);
-		tariffDataValue1.setOrganisationUnit(orgUnit);
+		tariffDataValue1.setOrganisationUnit(organisationUnits.get(0));
 		
 		if(tariffDataValue == null)
 		{

=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.java'
--- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.java	2013-12-11 09:01:17 +
+++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.java	2013-12-11 12:08:01 +
@@ -3,6 +3,14 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.dataelement.DataElementCategor

Re: [Dhis2-devs] Support for comma delimited identifiers in the API?

2013-12-11 Thread Lars Helge Øverland

Hi Jason,

thanks for the suggestion. No doubt there is a need for a compact format
for items.

Only problem is that the "," character is defined as "reserved" in the URL
"spec":

http://www.ietf.org/rfc/rfc1738.txt p2.2

and causes e.g. spring mvc to split the value into multiple query params.

For analytics we use ";" for delimiting, which is also reserved, but is at
least not causing trouble with spring mvc.

Would ";" be okay? If so please write a blueprint.

Lars






On Wed, Dec 11, 2013 at 5:49 AM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> Hi there.
>
>  I have been working with another REST API recently and one of the
> features is the support for comma delimited lists as part of a API request.
> From this example from the docs..
>
> curl 
> "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I&orgUnit=vWbkYPRmKyS&children=true";
>  -H "Accept:application/xml" -u admin:district -v
>
>
> It would be useful to support this request as well..
>
> curl 
> "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I,vWbkYPRmKyS&children=true";
>  -H "Accept:application/xml" -u admin:district -v
>
> In some cases, we have many dozens or hundreds of orgunit UIDs in the
> requests, and it might be just a bit simpler to have these delimited.
>
> Thoughts?
>
> Regards,
> Jason
>
>
>
>
>
>
> ___
> 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
>
>
___
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] Support for comma delimited identifiers in the API?

2013-12-11 Thread Saptarshi Purkayastha

Infact the , (comma) is meant to be used for this, as is mentioned here:
http://tools.ietf.org/html/rfc3986#section-3.3 . See last paragraph, last 5
sentences.
Also Spring docs suggest using commas -
http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/mvc.html#mvc-ann-matrix-variables

---
Regards,
Saptarshi PURKAYASTHA


On 11 December 2013 13:13, Lars Helge Øverland  wrote:

> Hi Jason,
>
> thanks for the suggestion. No doubt there is a need for a compact format
> for items.
>
> Only problem is that the "," character is defined as "reserved" in the URL
> "spec":
>
> http://www.ietf.org/rfc/rfc1738.txt p2.2
>
> and causes e.g. spring mvc to split the value into multiple query params.
>
> For analytics we use ";" for delimiting, which is also reserved, but is at
> least not causing trouble with spring mvc.
>
> Would ";" be okay? If so please write a blueprint.
>
> Lars
>
>
>
>
>
>
> On Wed, Dec 11, 2013 at 5:49 AM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> Hi there.
>>
>>  I have been working with another REST API recently and one of the
>> features is the support for comma delimited lists as part of a API request.
>> From this example from the docs..
>>
>> curl 
>> "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I&orgUnit=vWbkYPRmKyS&children=true";
>>  -H "Accept:application/xml" -u admin:district -v
>>
>>
>> It would be useful to support this request as well..
>>
>> curl 
>> "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I,vWbkYPRmKyS&children=true";
>>  -H "Accept:application/xml" -u admin:district -v
>>
>> In some cases, we have many dozens or hundreds of orgunit UIDs in the
>> requests, and it might be just a bit simpler to have these delimited.
>>
>> Thoughts?
>>
>> Regards,
>> Jason
>>
>>
>>
>>
>>
>>
>>
>> ___
>> 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
>>
>>
>
> ___
> 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
>
>
___
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 13201: Implemented option for turning off preheating object-bridge cache maps. Can be turned off with /a...

2013-12-11 Thread noreply


revno: 13201
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Wed 2013-12-11 13:28:53 +0100
message:
  Implemented option for turning off preheating object-bridge cache maps. Can 
be turned off with /api/metaData?preheatCache=false, should only be used for 
imports where the number of objects is small (a performance boost of 50x-100x 
can be expected).
added:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/timer/
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/timer/SystemNanoTimer.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/timer/Timer.java
modified:
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportOptions.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ObjectBridge.java
  
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/PDFFormController.java
  
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ImportDataValueAction.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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java	2013-10-14 14:38:11 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java	2013-12-11 12:28:53 +
@@ -33,6 +33,8 @@
 import org.hibernate.SessionFactory;
 import org.hisp.dhis.cache.HibernateCacheManager;
 import org.hisp.dhis.common.IdentifiableObject;
+import org.hisp.dhis.dxf2.timer.SystemNanoTimer;
+import org.hisp.dhis.dxf2.timer.Timer;
 import org.hisp.dhis.scheduling.TaskId;
 import org.hisp.dhis.system.notification.NotificationLevel;
 import org.hisp.dhis.system.notification.Notifier;
@@ -41,7 +43,6 @@
 import org.hisp.dhis.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
@@ -67,7 +68,7 @@
 // Dependencies
 //---
 
-@Autowired( required = false )
+@Autowired(required = false)
 private Set importerClasses = new HashSet();
 
 @Autowired
@@ -116,16 +117,15 @@
 log.info( "User '" + username + "' started import at " + new Date() );
 
 notifier.clear( taskId ).notify( taskId, "Importing meta-data" );
+Timer timer = new SystemNanoTimer();
+timer.start();
 
 ImportSummary importSummary = new ImportSummary();
 
+objectBridge.setWriteEnabled( !importOptions.isDryRun() );
+objectBridge.setPreheatCache( importOptions.isPreheatCache() );
 objectBridge.init();
 
-if ( importOptions.isDryRun() )
-{
-objectBridge.setWriteEnabled( false );
-}
-
 for ( Map.Entry, String> entry : ExchangeClasses.getImportMap().entrySet() )
 {
 Object value = ReflectionUtils.invokeGetterMethod( entry.getValue(), metaData );
@@ -177,14 +177,16 @@
 cacheManager.clearCache();
 objectBridge.destroy();
 
+timer.stop();
+
 if ( taskId != null )
 {
-notifier.notify( taskId, NotificationLevel.INFO, "Import done", true ).
+notifier.notify( taskId, NotificationLevel.INFO, "Import done. Completed in " + timer.toString() + ".", true ).
 addTaskSummary( taskId, importSummary );
 }
 else
 {
-log.info( "Import done." );
+log.info( "Import done. Completed in " + timer.toString() + "." );
 }
 
 return importSummary;

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java	2013-10-14 14:38:11 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java	2013-12-11 12:28:53 +
@@ -32,6 +32,8 @@
 import org.apache.commons.log

Re: [Dhis2-devs] Support for comma delimited identifiers in the API?

2013-12-11 Thread Jim Grace

Looks reasonable to me.



On Wed, Dec 11, 2013 at 4:18 AM, Saptarshi Purkayastha wrote:

> Spring calls these Matrix Variables and is very easy to support using
> Spring MVC.
>
> http://docs.spring.io/spring/docs/current/spring-framework-reference/html/mvc.htm
>
> I like the idea.
>
> ---
> Regards,
> Saptarshi PURKAYASTHA
>
> On 11 December 2013 05:49, Jason Pickering wrote:
>
>> Hi there.
>>
>>  I have been working with another REST API recently and one of the
>> features is the support for comma delimited lists as part of a API request.
>> From this example from the docs..
>>
>> curl 
>> "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I&orgUnit=vWbkYPRmKyS&children=true";
>>  -H "Accept:application/xml" -u admin:district -v
>>
>>
>> It would be useful to support this request as well..
>>
>>
>> curl 
>> "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I,vWbkYPRmKyS&children=true";
>>  -H "Accept:application/xml" -u admin:district -v
>>
>> In some cases, we have many dozens or hundreds of orgunit UIDs in the
>> requests, and it might be just a bit simpler to have these delimited.
>>
>> Thoughts?
>>
>> Regards,
>> Jason
>>
>>
>>
>>
>>
>>
>>
>>
>> ___
>> 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
>>
>>
>
> ___
> 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
>
>
___
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] Support for comma delimited identifiers in the API?

2013-12-11 Thread Jason Pickering

I have no preference one way or the other.

I will write up a blueprint with all of the info on this thread though so
we do not forget it :)

Regards,
Jason

Infact the , (comma) is meant to be used for this, as is mentioned here:
http://tools.ietf.org/html/rfc3986#section-3.3 . See last paragraph, last 5
sentences.
Also Spring docs suggest using commas -
http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/mvc.html#mvc-ann-matrix-variables

---
Regards,
Saptarshi PURKAYASTHA


On 11 December 2013 13:13, Lars Helge Øverland  wrote:

> Hi Jason,
>
> thanks for the suggestion. No doubt there is a need for a compact format
> for items.
>
> Only problem is that the "," character is defined as "reserved" in the URL
> "spec":
>
> http://www.ietf.org/rfc/rfc1738.txt p2.2
>
> and causes e.g. spring mvc to split the value into multiple query params.
>
> For analytics we use ";" for delimiting, which is also reserved, but is at
> least not causing trouble with spring mvc.
>
> Would ";" be okay? If so please write a blueprint.
>
> Lars
>
>
>
>
>
>
> On Wed, Dec 11, 2013 at 5:49 AM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> Hi there.
>>
>>  I have been working with another REST API recently and one of the
>> features is the support for comma delimited lists as part of a API request.
>> From this example from the docs..
>>
>> curl 
>> "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I&orgUnit=vWbkYPRmKyS&children=true";
>>  -H "Accept:application/xml" -u admin:district -v
>>
>>
>> It would be useful to support this request as well..
>>
>>
>> curl 
>> "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I,vWbkYPRmKyS&children=true";
>>  -H "Accept:application/xml" -u admin:district -v
>>
>> In some cases, we have many dozens or hundreds of orgunit UIDs in the
>> requests, and it might be just a bit simpler to have these delimited.
>>
>> Thoughts?
>>
>> Regards,
>> Jason
>>
>>
>>
>>
>>
>>
>>
>>
>> ___
>> 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
>>
>>
>
> ___
> 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
>
>
___
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] Compound Data Element

2013-12-11 Thread Edwin Mulwa

Hi,

I would like to create a data element that is a calculation involving
multiple data elements. For example, if I have data elements A, B, C and D,
I would like data element D to be a calculation as follows: D = A + B - C.

How can I do this in DHIS?

Regards,

Edwin
___
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] Support for comma delimited identifiers in the API?

2013-12-11 Thread Lars Helge Øverland

OK cool, wasn't aware of matrix URIs.


On Wed, Dec 11, 2013 at 1:51 PM, Jason Pickering <
jason.p.picker...@gmail.com> wrote:

> I have no preference one way or the other.
>
> I will write up a blueprint with all of the info on this thread though so
> we do not forget it :)
>
> Regards,
> Jason
>
> Infact the , (comma) is meant to be used for this, as is mentioned here:
> http://tools.ietf.org/html/rfc3986#section-3.3 . See last paragraph, last
> 5 sentences.
> Also Spring docs suggest using commas -
> http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/mvc.html#mvc-ann-matrix-variables
>
> ---
> Regards,
> Saptarshi PURKAYASTHA
>
>
> On 11 December 2013 13:13, Lars Helge Øverland wrote:
>
>> Hi Jason,
>>
>> thanks for the suggestion. No doubt there is a need for a compact format
>> for items.
>>
>> Only problem is that the "," character is defined as "reserved" in the
>> URL "spec":
>>
>> http://www.ietf.org/rfc/rfc1738.txt p2.2
>>
>> and causes e.g. spring mvc to split the value into multiple query params.
>>
>> For analytics we use ";" for delimiting, which is also reserved, but is
>> at least not causing trouble with spring mvc.
>>
>> Would ";" be okay? If so please write a blueprint.
>>
>> Lars
>>
>>
>>
>>
>>
>>
>> On Wed, Dec 11, 2013 at 5:49 AM, Jason Pickering <
>> jason.p.picker...@gmail.com> wrote:
>>
>>> Hi there.
>>>
>>>  I have been working with another REST API recently and one of the
>>> features is the support for comma delimited lists as part of a API request.
>>> From this example from the docs..
>>>
>>> curl 
>>> "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I&orgUnit=vWbkYPRmKyS&children=true";
>>>  -H "Accept:application/xml" -u admin:district -v
>>>
>>>
>>> It would be useful to support this request as well..
>>>
>>>
>>> curl 
>>> "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I,vWbkYPRmKyS&children=true";
>>>  -H "Accept:application/xml" -u admin:district -v
>>>
>>> In some cases, we have many dozens or hundreds of orgunit UIDs in the
>>> requests, and it might be just a bit simpler to have these delimited.
>>>
>>> Thoughts?
>>>
>>> Regards,
>>> Jason
>>>
>>>
>>>
>>>
>>>
>>>
>>>
>>>
>>>
>>> ___
>>> 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
>>>
>>>
>>
>> ___
>> 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
>>
>>
>
___
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 13202: (Translations) Adding initial Lao translations from community.

2013-12-11 Thread noreply


revno: 13202
committer: Jason Pickering 
branch nick: dhis2
timestamp: Wed 2013-12-11 13:39:15 +
message:
  (Translations) Adding initial Lao translations from community.
added:
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/org/hisp/dhis/web/mobile/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_lo.properties
  
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_lo.properties
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_lo.properties
The size of the diff (5177 lines) is larger than your specified limit of 5000 
lines

--
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

___
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] Support for comma delimited identifiers in the API?

2013-12-11 Thread Jason Pickering

Blueprint registered here

https://blueprints.launchpad.net/dhis2/+spec/support-delimited-paramater-values-in-webapi

Regards,
Jason



On Wed, Dec 11, 2013 at 3:28 PM, Lars Helge Øverland wrote:

> OK cool, wasn't aware of matrix URIs.
>
>
> On Wed, Dec 11, 2013 at 1:51 PM, Jason Pickering <
> jason.p.picker...@gmail.com> wrote:
>
>> I have no preference one way or the other.
>>
>> I will write up a blueprint with all of the info on this thread though so
>> we do not forget it :)
>>
>> Regards,
>> Jason
>>
>> Infact the , (comma) is meant to be used for this, as is mentioned here:
>> http://tools.ietf.org/html/rfc3986#section-3.3 . See last paragraph,
>> last 5 sentences.
>> Also Spring docs suggest using commas -
>> http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/mvc.html#mvc-ann-matrix-variables
>>
>> ---
>> Regards,
>> Saptarshi PURKAYASTHA
>>
>>
>> On 11 December 2013 13:13, Lars Helge Øverland wrote:
>>
>>> Hi Jason,
>>>
>>> thanks for the suggestion. No doubt there is a need for a compact format
>>> for items.
>>>
>>> Only problem is that the "," character is defined as "reserved" in the
>>> URL "spec":
>>>
>>> http://www.ietf.org/rfc/rfc1738.txt p2.2
>>>
>>> and causes e.g. spring mvc to split the value into multiple query
>>> params.
>>>
>>> For analytics we use ";" for delimiting, which is also reserved, but is
>>> at least not causing trouble with spring mvc.
>>>
>>> Would ";" be okay? If so please write a blueprint.
>>>
>>> Lars
>>>
>>>
>>>
>>>
>>>
>>>
>>> On Wed, Dec 11, 2013 at 5:49 AM, Jason Pickering <
>>> jason.p.picker...@gmail.com> wrote:
>>>
 Hi there.

  I have been working with another REST API recently and one of the
 features is the support for comma delimited lists as part of a API request.
 From this example from the docs..

 curl 
 "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I&orgUnit=vWbkYPRmKyS&children=true";
  -H "Accept:application/xml" -u admin:district -v


 It would be useful to support this request as well..


 curl 
 "http://apps.dhis2.org/dev/api/completeDataSetRegistrations?dataSet=pBOMPrpg1QX&dataSet=BfMAe6Itzgt&startDate=2013-01-01&endDate=2013-01-31&orgUnit=YuQRtpLP10I,vWbkYPRmKyS&children=true";
  -H "Accept:application/xml" -u admin:district -v

 In some cases, we have many dozens or hundreds of orgunit UIDs in the
 requests, and it might be just a bit simpler to have these delimited.

 Thoughts?

 Regards,
 Jason










 ___
 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


>>>
>>> ___
>>> 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
>>>
>>>
>>
>
___
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] Compound Data Element

2013-12-11 Thread Jason Pickering

In DHIS2 terminology, this is referred to as an indicator. You can find
them documented in the documentation, such as here

http://www.dhis2.org/doc/snapshot/en/user/html/ch12.html#indicator

Regards,
Jason



On Wed, Dec 11, 2013 at 3:19 PM, Edwin Mulwa  wrote:

> Hi,
>
> I would like to create a data element that is a calculation involving
> multiple data elements. For example, if I have data elements A, B, C and D,
> I would like data element D to be a calculation as follows: D = A + B - C.
>
> How can I do this in DHIS?
>
> Regards,
>
> Edwin
>
> ___
> 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
>
>
___
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 13203: change direction of context-menu if it overflows current browser window

2013-12-11 Thread noreply


revno: 13203
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Wed 2013-12-11 15:39:02 +0100
message:
  change direction of context-menu if it overflows current browser window
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js


--
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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js	2013-12-04 14:39:36 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js	2013-12-11 14:39:02 +
@@ -60,7 +60,7 @@
   var config = dhis2.contextmenu.config;
 
   var $list = $('#' + config.listId);
-  var $menu = $('#' + config.menuId);
+  window.$menu = $('#' + config.menuId);
   var $menuItems = $menu.find('ul');
 
   // make sure that all old event handler are removed (with .context namespace)
@@ -111,8 +111,25 @@
   }
 });
 
+var menuHeight = $menu.height();
+var menuWidth = $menu.width();
+var winHeight = $(window).height();
+var winWidth = $(window).width();
+
+var pageX = e.pageX;
+var pageY = e.pageY;
+
 $menu.show();
-$menu.css({left: e.pageX, top: e.pageY});
+
+if( (menuWidth + pageX) > winWidth ) {
+  pageX -= menuWidth;
+}
+
+if( (menuHeight + pageY) > winHeight ) {
+  pageY -= menuHeight;
+}
+
+$menu.css({left: pageX, top: pageY});
 
 return false;
   });

___
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 13204: Centralized some css

2013-12-11 Thread noreply


revno: 13204
committer: Lars Helge Øverland 
branch nick: dhis2
timestamp: Wed 2013-12-11 18:24:13 +0100
message:
  Centralized some css
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css


--
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-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2013-09-10 18:29:50 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2013-12-11 17:24:13 +
@@ -540,12 +540,18 @@
   margin-bottom: 15px;
 }
 
-.setting input[type=text],input[type=password],select
+.setting input[type=text], 
+.setting input[type=password], 
+.setting select,
+.inputForm input[type=text], 
+.inputForm input[type=password], 
+.inputForm select
 {
   width: 25em;
 }
 
-.setting textarea
+.setting textarea,
+.inputForm textarea
 {
   width: 25em;
   height: 8em;
@@ -662,21 +668,6 @@
 }
 
 /**/
-/* Forms  */
-/**/
-
-.inputForm input[type=text],select
-{
-  width: 25em;
-}
-
-.inputForm textarea
-{
-  width: 25em;
-  height: 8em;
-}
-
-/**/
 /* Buttons*/
 /**/
 
@@ -834,4 +825,3 @@
 {
 	color: #777;
 }
-

___
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 13205: Edit data element screen, moved clone button to bottom

2013-12-11 Thread noreply


revno: 13205
committer: Lars Helge Øverland 
branch nick: dhis2
timestamp: Wed 2013-12-11 18:40:07 +0100
message:
  Edit data element screen, moved clone button to bottom
modified:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.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-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm	2013-10-10 15:32:40 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm	2013-12-11 17:40:07 +
@@ -43,12 +43,6 @@
 #end
 
 #if( $update )
-
-
-
-#end
-
-#if( $update )
 
 
 #else
@@ -288,6 +282,9 @@
 
 #end
 	
+	#if( $update )
+	
+	#end
 
 
 

___
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 13206: CSS, removing background color from table header in input forms

2013-12-11 Thread noreply


revno: 13206
committer: Lars Helge Øverland 
branch nick: dhis2
timestamp: Wed 2013-12-11 19:21:30 +0100
message:
  CSS, removing background color from table header in input forms
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsPublisher.java
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
  
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css


--
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/sms/SmsPublisher.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsPublisher.java	2013-12-10 08:37:23 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsPublisher.java	2013-12-11 18:21:30 +
@@ -29,11 +29,11 @@
  */
 
 import java.util.List;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hisp.dhis.sms.incoming.IncomingSms;
 import org.hisp.dhis.sms.incoming.IncomingSmsListener;
-import org.hisp.dhis.sms.incoming.IncomingSmsService;
 import org.hisp.dhis.sms.incoming.SmsMessageStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-12-09 14:56:07 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-12-11 18:21:30 +
@@ -426,14 +426,14 @@
 
 .page th
 {
-  background-color: #cbddeb;
   text-align: left;
   color: #39547d;
-  padding: 3px 0 2px 6px;
+  padding: 3px 0 3px 1px;
   font-family: LiberationSansBold, arial;
   font-size: 13px;
   font-weight: normal;
   border-collapse: collapse;
+  border-bottom: 1px solid #cad5e5;
   min-height: 28px;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-12-09 14:56:07 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-12-11 18:21:30 +
@@ -426,14 +426,14 @@
 
 .page th
 {
-  background-color: #cbddeb;
   text-align: left;
   color: #39547d;
-  padding: 3px 0 2px 6px;
+  padding: 3px 0 3px 1px;
   font-family: LiberationSansBold, arial;
   font-size: 13px;
   font-weight: normal;
   border-collapse: collapse;
+  border-bottom: 1px solid #cad5e5;
   min-height: 28px;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2013-07-18 10:10:22 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2013-12-11 18:21:30 +
@@ -83,6 +83,8 @@
 {
   text-align: center;
   min-width: 46px;
+  background-color: #CBDDEB;
+  border: 1px solid #CBDDEB;
 }
 
 .sectionFilter

___
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 13207: Styling of input forms

2013-12-11 Thread noreply


revno: 13207
committer: Lars Helge Øverland 
branch nick: dhis2
timestamp: Wed 2013-12-11 21:15:40 +0100
message:
  Styling of input forms
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css


--
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-commons-resources/src/main/webapp/dhis-web-commons/css/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2013-11-13 20:18:15 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2013-12-11 20:15:40 +
@@ -94,6 +94,7 @@
   padding: 6px 6px;
   margin: 4px 0;
   border-radius: 3px;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.18);
 }
 
 #loginMessage

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2013-12-11 17:24:13 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2013-12-11 20:15:40 +
@@ -542,18 +542,31 @@
 
 .setting input[type=text], 
 .setting input[type=password], 
+.inputForm input[type=text], 
+.inputForm input[type=password],
+.setting textarea,
+.inputForm textarea
+{
+  width: 25em;
+  border: 1px solid #aaa;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  border-radius: 3px;
+  padding: 6px 5px;
+  margin: 3px 0;
+  color: #555;
+}
+
 .setting select,
-.inputForm input[type=text], 
-.inputForm input[type=password], 
 .inputForm select
 {
-  width: 25em;
+  width: 26em;
+  padding: 2px 3px;
+  margin: 3px 0;
 }
 
 .setting textarea,
 .inputForm textarea
 {
-  width: 25em;
   height: 8em;
 }
 
@@ -795,7 +808,7 @@
 margin-bottom: 8px;
 }
 
-.message-info 
+.message-info
 {
 background-color: #f3f3f3;
 	color: #222;
@@ -825,3 +838,4 @@
 {
 	color: #777;
 }
+

___
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] API for pulling Multilingual Labels?

2013-12-11 Thread Rodolfo Melia

I can see that you are thinking about the whole metadata model - nice.
All we seek to get back is the label on the current user locale, and we
only need Categories, Data Elements and Data Set Sections labels at this
stage.

Also, when you are in a custom form - how can you know what language is the
current user set to?
I imagine needing to add some extra text, which will need multiple
translations. We can embed such text on the HTML of the page, as long as we
know what's the current language, and then display accordingly.

R

*Rodolfo Meliá*
*Principal  |  *rme...@knowming.com
Skype: rod.melia  |  +44 777 576 4090  |  +1 708 872 7636
www.knowming.com


On Mon, Dec 9, 2013 at 6:47 PM, Lars Helge Øverland wrote:

> Hi Rodolfo,
>
> will try to get this done for 2.14. Its a bit tricky - will have to ponder
> a bit how to solve it since it affects the whole api. I think we simply
> returns the regular objects translated depending on the currently
> authenticated user - no extra feature/resource.
>
> https://blueprints.launchpad.net/dhis2/+spec/i18n-in-web-api
>
> cheers
>
> Lars
>
>
>
> On Fri, Dec 6, 2013 at 5:45 PM, Rodolfo Melia  wrote:
>
>> Hi Morten. We just need the labels to be returned in the user language.
>> If James can do this, please assign it to him.
>>
>> Rodolfo Meliá
>> +44 777 576 4090 | +1 708 872-7636 <+1%20708%20872-7636>
>>
>> Please ignore any typos on this email sent from my mobile, probably
>> written while I was at the park with the kids, at the airport walking to
>> the gate, or sleepless (although exhausted). Grammatical faults? I'm sorry-
>> I do my best
>>
>> On 6 Dec 2013, at 15:35, Morten Olav Hansen  wrote:
>>
>> Hi Rodolfo,
>>
>> We already have a blueprint for this (for 2.14, but it has not been
>> assigned yet). You can see it at [1].
>>
>> Do you need multiple translation for a single user, or is it enough that
>> data-element names etc returned are in the users db-locale?
>>
>> [1] https://blueprints.launchpad.net/dhis2/+spec/i18n-in-web-api
>>
>>  --
>> Morten
>>
>>
>> On Fri, Dec 6, 2013 at 12:55 PM, Rodolfo Melia wrote:
>>
>>> Hi - as part of some of the apps that we are coding, as well as 7
>>> complex custom forms that we are about to build (they will have some
>>> JScript for logic), we will need both (apps and forms) in 3 languages
>>> (total 21 forms if we use the current way of doing things).
>>>
>>> Does the current metadata API has a function to retrieve multilingual
>>> values?
>>> What we are looking is the possibility to retrieve the Name, Form Name
>>> or Short Name of a DataElement, Category or Option Set  in the current-user
>>> language by passing the UID or Code.
>>>
>>> If this functionality doesn't exist at the moment:
>>> - Should it be added to the metadata api?
>>> - Should it be part of the Categories/ Data Elements/ api?
>>>
>>> PSI will be happy to contribute on the development of this under your
>>> guidance.
>>>
>>> Rodolfo
>>>
>>> ___
>>> 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
>>>
>>>
>>
>> ___
>> 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
>>
>>
>
___
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] API for pulling Multilingual Labels?

2013-12-11 Thread Lars Helge Øverland

On Thu, Dec 12, 2013 at 12:32 AM, Rodolfo Melia  wrote:

> I can see that you are thinking about the whole metadata model - nice.
>

That's the idea - thanks.


> All we seek to get back is the label on the current user locale, and we
> only need Categories, Data Elements and Data Set Sections labels at this
> stage.
>

Okay. We plan to make this generic so it applies to all objects which
current support translations.


>
> Also, when you are in a custom form - how can you know what language is
> the current user set to?
>
I imagine needing to add some extra text, which will need multiple
> translations. We can embed such text on the HTML of the page, as long as we
> know what's the current language, and then display accordingly.
>
>
Good point. That and other user settings should be easily available in the
web api, probably at /api/me. Will try to fix that shortly.

cheers

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

[Dhis2-devs] Meta-data not importing

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13198: PBF Functionality

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13199: PBF Functionality

Re: [Dhis2-devs] Support for comma delimited identifiers in the API?

Re: [Dhis2-devs] [Dhis2-users] Meta-data not importing

Re: [Dhis2-devs] [Dhis2-users] Meta-data not importing

Re: [Dhis2-devs] [Dhis2-users] Meta-data not importing

Re: [Dhis2-devs] [Dhis2-users] Meta-data not importing

[Dhis2-devs] Organisaitonunit Tree error in IE8

Re: [Dhis2-devs] Organisaitonunit Tree error in IE8

Re: [Dhis2-devs] [Dhis2-users] Analytics data querying problem

[Dhis2-devs] CSV import not working

Re: [Dhis2-devs] [Dhis2-users] Analytics data querying problem

[Dhis2-devs] Analytics data querying problem

Re: [Dhis2-devs] [Dhis2-users] Analytics data querying problem

Re: [Dhis2-devs] [Dhis2-users] Analytics data querying problem

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13200: PBF Functionality

Re: [Dhis2-devs] Support for comma delimited identifiers in the API?

Re: [Dhis2-devs] Support for comma delimited identifiers in the API?

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13201: Implemented option for turning off preheating object-bridge cache maps. Can be turned off with /a...

Re: [Dhis2-devs] Support for comma delimited identifiers in the API?

Re: [Dhis2-devs] Support for comma delimited identifiers in the API?

[Dhis2-devs] Compound Data Element

Re: [Dhis2-devs] Support for comma delimited identifiers in the API?

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13202: (Translations) Adding initial Lao translations from community.

Re: [Dhis2-devs] Support for comma delimited identifiers in the API?

Re: [Dhis2-devs] Compound Data Element

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13203: change direction of context-menu if it overflows current browser window

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13204: Centralized some css

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13205: Edit data element screen, moved clone button to bottom

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13206: CSS, removing background color from table header in input forms

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13207: Styling of input forms

Re: [Dhis2-devs] API for pulling Multilingual Labels?

Re: [Dhis2-devs] API for pulling Multilingual Labels?

34 matches

Site Navigation

Mail list logo

Footer information