[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 11169: Merge categoryoptioncombo into dataelement column in Manual person aggregation.
revno: 11169 committer: Tran Chau branch nick: dhis2 timestamp: Fri 2013-06-07 15:22:37 +0700 message: Merge categoryoptioncombo into dataelement column in Manual person aggregation. modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2013-05-14 09:24:09 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2013-06-07 08:22:37 + @@ -23,7 +23,9 @@ #foreach( $header in $grid.getVisibleHeaders() ) -$!encoder.htmlEncode( $header.name ) + #if($velocityCount!=2) + $!encoder.htmlEncode( $header.name ) + #end #end $i18n.getString('operator') @@ -50,7 +52,13 @@ #foreach( $col in $row ) - #if($velocityCount>6) $col #end + #if($velocityCount == 7) + $col + #elseif($velocityCount==8) + $col + #elseif( $velocityCount > 8 ) + $col + #end #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 11168: Fix bug - Don't run aggregate formulas with many periods.
revno: 11168 committer: Tran Chau branch nick: dhis2 timestamp: Fri 2013-06-07 15:15:22 +0700 message: Fix bug - Don't run aggregate formulas with many periods. modified: dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.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-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java 2013-05-29 08:36:29 + +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java 2013-06-07 08:15:22 + @@ -160,9 +160,9 @@ { Collection _orgunitIds = getServiceOrgunit( DateUtils.getMediumDateString( period.getStartDate() ), DateUtils.getMediumDateString( period.getEndDate() ) ); -orgunitIds.retainAll( _orgunitIds ); +_orgunitIds.retainAll( orgunitIds ); -if ( orgunitIds.size() > 0 ) +if ( _orgunitIds.size() > 0 ) { Grid grid = new ListGrid(); grid.setTitle( caseAggregationCondition.getDisplayName() ); @@ -184,11 +184,11 @@ caseAggregationCondition.getOperator(), caseAggregationCondition.getAggregationDataElement().getId(), caseAggregationCondition.getAggregationDataElement().getDisplayName(), caseAggregationCondition .getOptionCombo().getId(), caseAggregationCondition.getOptionCombo().getDisplayName(), deSumId, -orgunitIds, period ); +_orgunitIds, period ); SqlRowSet rs = jdbcTemplate.queryForRowSet( sql ); grid.addRows( rs ); - + return grid; } @@ -369,7 +369,7 @@ } sql = sql.replaceAll( "COMBINE", "" ); - + return sql; } @@ -967,7 +967,7 @@ sql += " UNION "; sql += "( select distinct organisationunitid from patient where registrationdate>='" + startDate + "' and registrationdate<='" + endDate + "')"; - + Collection orgunitIds = new HashSet(); orgunitIds = jdbcTemplate.query( sql, new RowMapper() { === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java 2013-05-14 09:24:09 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java 2013-06-07 08:15:22 + @@ -30,20 +30,15 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import org.hisp.dhis.caseaggregation.CaseAggregationCondition; import org.hisp.dhis.caseaggregation.CaseAggregationConditionService; import org.hisp.dhis.common.Grid; -import org.hisp.dhis.dataelement.DataElement; -import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; -import org.hisp.dhis.datavalue.DataValue; import org.hisp.dhis.datavalue.DataValueService; import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.i18n.I18nFormat; @@ -59,13 +54,7 @@ public class CaseAggregationResultAction implements Action { -private String ADD_STATUS = "add"; - -private String UPDATE_STATUS = "update"; - -private String DELETE_STATUS = "delete"; - -// - + // - // Dependencies // - ___ 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 11170: Cleanup code.
revno: 11170 committer: Tran Chau branch nick: dhis2 timestamp: Fri 2013-06-07 15:28:04 +0700 message: Cleanup code. modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultDetailsAction.java dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetDataRecordsAction.java dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java 2013-06-07 08:15:22 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java 2013-06-07 08:28:04 + @@ -39,7 +39,6 @@ import org.hisp.dhis.common.Grid; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; -import org.hisp.dhis.datavalue.DataValueService; import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.organisationunit.OrganisationUnit; @@ -54,7 +53,7 @@ public class CaseAggregationResultAction implements Action { - // - +// - // Dependencies // - @@ -79,13 +78,6 @@ this.aggregationConditionService = aggregationConditionService; } -private DataValueService dataValueService; - -public void setDataValueService( DataValueService dataValueService ) -{ -this.dataValueService = dataValueService; -} - private OrganisationUnitService organisationUnitService; public void setOrganisationUnitService( OrganisationUnitService organisationUnitService ) === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultDetailsAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultDetailsAction.java 2013-05-14 09:49:51 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultDetailsAction.java 2013-06-07 08:28:04 + @@ -27,27 +27,15 @@ package org.hisp.dhis.caseentry.action.caseaggregation; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; - -import org.apache.camel.component.dataset.DataSet; import org.hisp.dhis.caseaggregation.CaseAggregationCondition; import org.hisp.dhis.caseaggregation.CaseAggregationConditionService; import org.hisp.dhis.common.Grid; -import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; -import org.hisp.dhis.patient.Patient; -import org.hisp.dhis.patientdatavalue.PatientDataValue; -import org.hisp.dhis.patientdatavalue.PatientDataValueService; import org.hisp.dhis.period.Period; -import org.hisp.dhis.period.PeriodService; import org.hisp.dhis.period.PeriodType; -import org.hisp.dhis.program.ProgramStageInstance; import com.opensymphony.xwork2.Action; @@ -64,12 +52,8 @@ private OrganisationUnitService organisationUnitService; -private PeriodService periodService; - private CaseAggregationConditionService aggregationConditionService; -private PatientDataValueService patientDataValueService; - private I18nFormat format; private I18n i18n; @@ -105,26 +89,16 @@ this.isoPeriod = isoPeriod; } -public void setPatientDataValueService( PatientDataValueService patientDataValueService ) -{ -this.patientDataValueService = patientDataValueService; -} - public void setAggregationConditionService( CaseAggregationConditionService aggregationConditionService ) { this.aggregationConditionService = aggregationConditionService; } -public void setPeriodService( PeriodService periodService ) -{ -
[Dhis2-devs] Regarding DataMart Query
Dear Lars, I Have one query regarding dataMart. Datamart is done for all dataElements indicators or it is dataset's dataelememnt and indicators because there is no option for selecting datasets in viewDataMartForm. So for which dataelements/indiactors or dataset Datamart done default. -- Thanks and Regards Mithilesh Kumar Thakur ___ 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 11171: Fix for data elements in 1.4 xml import
revno: 11171 committer: Lars Helge Ă˜verland branch nick: dhis2 timestamp: Fri 2013-06-07 11:26:28 +0200 message: Fix for data elements in 1.4 xml import modified: dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.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-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java 2012-10-18 13:04:28 + +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java 2013-06-07 09:26:28 + @@ -180,10 +180,13 @@ element.setShortName( values.get( FIELD_SHORT_NAME ) ); element.setDescription( Dhis14ParsingUtils.removeNewLine( values.get( FIELD_DESCRIPTION ) ) ); element.setActive( true ); +element.setDomainType( DataElement.DOMAIN_TYPE_AGGREGATE ); +element.setZeroIsSignificant( false ); element.setType( Dhis14ObjectMappingUtil.getDataElementTypeMap().get(Integer.parseInt( values.get( FIELD_DATA_TYPE ) ) ) ); element.setAggregationOperator( convertAggregationOperatorFromDhis14( values.get( FIELD_AGGREGATION_OPERATOR ) ) ); element.setSortOrder( parseInt( values.get( FIELD_SORT_ORDER ) ) ); element.setLastUpdated( Dhis14DateUtil.getDate( values.get( FIELD_LAST_UPDATED ) ) ); + if ( values.get( FIELD_CALCULATED ).equals( "0" ) ) //Ignore calculated data elements { importObject( element, params ); ___ 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-documenters/dhis2/dhis2-docbook-docs] Rev 757: Minor
revno: 757 committer: Lars Helge Ă˜verland branch nick: dhis2-docbook-docs timestamp: Fri 2013-06-07 11:34:02 +0200 message: Minor modified: src/docbkx/en/dhis2_implementation_guide_support.xml -- lp:~dhis2-documenters/dhis2/dhis2-docbook-docs https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription === modified file 'src/docbkx/en/dhis2_implementation_guide_support.xml' --- src/docbkx/en/dhis2_implementation_guide_support.xml 2013-04-16 11:48:21 + +++ src/docbkx/en/dhis2_implementation_guide_support.xml 2013-06-07 09:34:02 + @@ -34,6 +34,8 @@ and click Clear cache. +If you believe you have found a bug you can report it either to the developer mailing + lists or to the bug tracker at https://bugs.launchpad.net/dhis2 . For the developers to be able to help you need to provide as much useful information as possible: ___ 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] [Bug 1188646] [NEW] web api has invlalid URLS
Public bug reported: I am running version 2.10 build 9124. The URLs for the web api are incorrect. They all are of the form: http://localhost:8080/api/BLAH instead of using the base URL for the DHIS2 install. ** Affects: dhis2 Importance: Undecided Status: New -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1188646 Title: web api has invlalid URLS Status in DHIS 2 - District Health Information Software: New Bug description: I am running version 2.10 build 9124. The URLs for the web api are incorrect. They all are of the form: http://localhost:8080/api/BLAH instead of using the base URL for the DHIS2 install. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1188646/+subscriptions ___ 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] [Bug 1188646] [NEW] web api has invlalid URLS
Seems more like a container issue to me. Are you using Tomcat or Jetty? On Fri, Jun 7, 2013 at 4:53 PM, Carl Leitner wrote: > Public bug reported: > > I am running version 2.10 build 9124. > > The URLs for the web api are incorrect. They all are of the form: >http://localhost:8080/api/BLAH > instead of using the base URL for the DHIS2 install. > > ** Affects: dhis2 > Importance: Undecided > Status: New > > -- > You received this bug notification because you are a member of DHIS 2 > developers, which is subscribed to DHIS. > https://bugs.launchpad.net/bugs/1188646 > > Title: > web api has invlalid URLS > > Status in DHIS 2 - District Health Information Software: > New > > Bug description: > I am running version 2.10 build 9124. > > The URLs for the web api are incorrect. They all are of the form: > http://localhost:8080/api/BLAH > instead of using the base URL for the DHIS2 install. > > To manage notifications about this bug go to: > https://bugs.launchpad.net/dhis2/+bug/1188646/+subscriptions > > ___ > 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] [Bug 1188646] [NEW] web api has invlalid URLS
Are you using nginx or some other proxy? They will give the wrong header often.. so it seems that the request is coming from localhost On 7 Jun 2013 23:29, "Jason Pickering" wrote: > Seems more like a container issue to me. Are you using Tomcat or Jetty? > > > On Fri, Jun 7, 2013 at 4:53 PM, Carl Leitner wrote: > >> Public bug reported: >> >> I am running version 2.10 build 9124. >> >> The URLs for the web api are incorrect. They all are of the form: >>http://localhost:8080/api/BLAH >> instead of using the base URL for the DHIS2 install. >> >> ** Affects: dhis2 >> Importance: Undecided >> Status: New >> >> -- >> You received this bug notification because you are a member of DHIS 2 >> developers, which is subscribed to DHIS. >> https://bugs.launchpad.net/bugs/1188646 >> >> Title: >> web api has invlalid URLS >> >> Status in DHIS 2 - District Health Information Software: >> New >> >> Bug description: >> I am running version 2.10 build 9124. >> >> The URLs for the web api are incorrect. They all are of the form: >> http://localhost:8080/api/BLAH >> instead of using the base URL for the DHIS2 install. >> >> To manage notifications about this bug go to: >> https://bugs.launchpad.net/dhis2/+bug/1188646/+subscriptions >> >> ___ >> 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] [Bug 1188646] [NEW] web api has invlalid URLS
We saw the same behavior, the solution was to make sure the hostname for the server was set properly. The instructions for how to do this vary by OS and distribution. Dan Cocos BAO Systems On Jun 7, 2013, at 12:28 PM, Jason Pickering wrote: > Seems more like a container issue to me. Are you using Tomcat or Jetty? > > > On Fri, Jun 7, 2013 at 4:53 PM, Carl Leitner wrote: > Public bug reported: > > I am running version 2.10 build 9124. > > The URLs for the web api are incorrect. They all are of the form: >http://localhost:8080/api/BLAH > instead of using the base URL for the DHIS2 install. > > ** Affects: dhis2 > Importance: Undecided > Status: New > > -- > You received this bug notification because you are a member of DHIS 2 > developers, which is subscribed to DHIS. > https://bugs.launchpad.net/bugs/1188646 > > Title: > web api has invlalid URLS > > Status in DHIS 2 - District Health Information Software: > New > > Bug description: > I am running version 2.10 build 9124. > > The URLs for the web api are incorrect. They all are of the form: > http://localhost:8080/api/BLAH > instead of using the base URL for the DHIS2 install. > > To manage notifications about this bug go to: > https://bugs.launchpad.net/dhis2/+bug/1188646/+subscriptions > > ___ > 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