Re: [Dhis2-devs] Using DHIS for a survey
IMHO, DHIS2 is not well suited for survey data. It depends on the nature of the survey really, but remember that you must know the nature of the organisational hierarchy (or beneficiaries in this case) before hand. Most surveys also have some type of skip-logic/validation which DHIS2 does not have at the moment. We considered using DHIS2 here in Zambia for a survey, but it sort of felt like trying to squeeze a square peg in a round hole. We ended up using PDAs for the primary data collection, which was then processed and cleaned in statistical software, and eventually, the aggregate data was transformed and imported into DHIS2. You may want to consider giving http://limesurvey.org/ a try. It is a very powerful tool, and has many more features which are suited to surveys than DHIS2. For paper based surveys, CSPro is a good choice. There are lots of PDA based mobile data collection tools as well. At the end of the day, it really depends on the nature of the survey. If you have a known orgunit hierarchy (or I guess in this case, a list of beneficiaries) it might work for your purposes, and their are obvious advantages to having the data directly in DHIS2, but you may want to consider other software (such as LimeSurvey, CSPro) for primary data collection, followed by statistical analysis and cleaning, and finally, export into the aggregate system. Just my two cents. Jason On Thu, Nov 3, 2011 at 8:30 AM, Orvalho Augusto wrote: > I am making part of group that will collect data all over the country from > a survey. There will be 3000 thousand HIV patients included on the sample. > > There are one big form with 10 pages and there is another for lab data. > The study will take 6 months. > > The questions: > > 1. Can I use DHIS for this? Can you provide recommendantions. > > The objective is to reduce time on database design and I could spread this > much more quickly and the madness of dealing with users DHIS would already > do for me. > > 2. If DHIS can be used how I do the pages separation? > > Thanks > Caveman > > > > ___ > 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] Using DHIS for a survey
I am making part of group that will collect data all over the country from a survey. There will be 3000 thousand HIV patients included on the sample. There are one big form with 10 pages and there is another for lab data. The study will take 6 months. The questions: 1. Can I use DHIS for this? Can you provide recommendantions. The objective is to reduce time on database design and I could spread this much more quickly and the madness of dealing with users DHIS would already do for me. 2. If DHIS can be used how I do the pages separation? Thanks Caveman ___ 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 5089: local vn - Fixed Preview functionality and put export-item-type FORMULA_EXCEL back to Category an...
revno: 5089
committer: Hieu
branch nick: dhis2
timestamp: Thu 2011-11-03 11:26:28 +0700
message:
local vn - Fixed Preview functionality and put export-item-type FORMULA_EXCEL
back to Category and Org-unit-listing report.
added:
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/NumberUtils.java
modified:
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportCategory.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportOganiztionGroupListing.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportPeriodColumnListing.java
local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/hibernate/HibernateExportReportStore.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/AbstractGenerateExcelReportSupport.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportCategoryAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportNormalAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportOrgGroupListingAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateReportPeriodColumnListingAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportCategoryAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/advance/action/GenerateAdvancedReportOrgGroupListingAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/ImportDataGeneric.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/orgunitgrouplisting/action/UpdateOrgUnitGroupAtLevelAction.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponse.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponseImport.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/ExcelUtils.java
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/utils/StringUtils.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/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportCategory.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportCategory.java 2011-07-28 09:50:39 +
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportCategory.java 2011-11-03 04:26:28 +
@@ -98,6 +98,7 @@
types.add( ExportItem.TYPE.DATAELEMENT );
types.add( ExportItem.TYPE.DATAELEMENT_CODE );
types.add( ExportItem.TYPE.DATAELEMENT_NAME );
+types.add( ExportItem.TYPE.FORMULA_EXCEL);
types.add( ExportItem.TYPE.SERIAL );
return types;
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportOganiztionGroupListing.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportOganiztionGroupListing.java 2011-07-28 09:50:39 +
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportOganiztionGroupListing.java 2011-11-03 04:26:28 +
@@ -115,6 +115,7 @@
types.add( ExportItem.TYPE.DATAELEMENT );
types.add( ExportItem.TYPE.ORGANISATION );
types.add( ExportItem.TYPE.INDICATOR );
+types.add( ExportItem.TYPE.FORMULA_EXCEL );
types.add( ExportItem.TYPE.SERIAL );
return types;
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportPeriodColumnListing.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportPeriodColumnListing.java 2011-08-04 08:39:55 +
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReportPeriodColumnListing.java 2011-11-03 04:26:28 +
@@ -105,8 +105,8 @@
public List getItemTypes()
{
List types = new ArrayList();
+types.add( ExportItem.TYPE.DATAELEMENT );
types.add( ExportItem.TYPE.INDICATOR );
-types.add( Expor
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5088: Fix bug: Build error, reversion 5087.
revno: 5088
committer: Tran Chau
branch nick: dhis2
timestamp: Thu 2011-11-03 10:10:49 +0700
message:
Fix bug: Build error, reversion 5087.
modified:
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetService.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/dxf2/service/DataValueSetService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetService.java 2011-09-05 11:56:56 +
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetService.java 2011-11-03 03:10:49 +
@@ -299,7 +299,7 @@
try
{
Date completeDate = format.parse( completeDateString );
-complete = new CompleteDataSetRegistration( dataSet, period, unit, completeDate );
+complete = new CompleteDataSetRegistration( dataSet, period, unit, completeDate, currentUserService.getCurrentUsername() );
}
catch ( ParseException e )
{
___
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] Build error, reversion 5087
Build error: http://pastebin.com/EpdakFb4 (in details), reversion 5087: [INFO] [INFO] Building DHIS Import-Export Service 2.6-SNAPSHOT [INFO] [INFO] [INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ dhis-service-importexport --- [INFO] Deleting E:\dhis2-code\dhis2\dhis-2\dhis-services\dhis-service-importexport\target [INFO] [INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ dhis-service-importexport --- [debug] execute contextualize [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 28 resources [INFO] [INFO] --- maven-compiler-plugin:2.3.2:compile (default-compile) @ dhis-service-importexport --- [INFO] Compiling 233 source files to E:\dhis2-code\dhis2\dhis-2\dhis-services\dhis-service-importexport\targ et\classes [INFO] - [ERROR] COMPILATION ERROR : [INFO] - [ERROR] \dhis2-code\dhis2\dhis-2\dhis-services\dhis-service-importexport\src\main\java\org\hisp\dhis\importe xport\dxf2\service\DataValueSetService.java:[302,23] cannot find symbol symbol : constructor CompleteDataSetRegistration(org.hisp.dhis.dataset.DataSet,org.hisp.dhis.period.Period, org.hisp.dhis.organisationunit.OrganisationUnit,java.util.Date) location: class org.hisp.dhis.dataset.CompleteDataSetRegistration [INFO] 1 error -- -- Best regards, Kim-Anh Vo ___ 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 5087: Deletionhandler ( Aggregation Query Builder ).
revno: 5087
committer: Tran Chau
branch nick: dhis2
timestamp: Thu 2011-11-03 09:20:41 +0700
message:
Deletionhandler ( Aggregation Query Builder ).
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionDeletionHandler.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/RemovePatientAttributeAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/RemoveProgramAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionService.java 2011-10-05 09:19:52 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionService.java 2011-11-03 02:20:41 +
@@ -33,8 +33,10 @@
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.patient.Patient;
+import org.hisp.dhis.patient.PatientAttribute;
import org.hisp.dhis.patientdatavalue.PatientDataValue;
import org.hisp.dhis.period.Period;
+import org.hisp.dhis.program.Program;
/**
* @author Chau Thu Tran
@@ -68,5 +70,9 @@
Collection getOptionCombosInCondition( String aggregationExpression );
+Collection getProgramsInCondition( String aggregationExpression );
+
+Collection getPatientAttributesInCondition( String aggregationExpression );
+
String getConditionDescription( String condition );
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionDeletionHandler.java 2011-09-29 07:41:04 +
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionDeletionHandler.java 2011-11-03 02:20:41 +
@@ -32,6 +32,8 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.patient.PatientAttribute;
+import org.hisp.dhis.program.Program;
import org.hisp.dhis.system.deletion.DeletionHandler;
/**
@@ -117,4 +119,44 @@
return null;
}
+@Override
+public String allowDeleteProgram( Program program )
+{
+Collection conditions = aggregationConditionService
+.getAllCaseAggregationCondition();
+
+for ( CaseAggregationCondition condition : conditions )
+{
+Collection programs = aggregationConditionService.getProgramsInCondition( condition
+.getAggregationExpression() );
+
+if ( programs != null && programs.contains( program ) )
+{
+return condition.getDescription();
+}
+}
+
+return null;
+}
+
+
+@Override
+public String allowDeletePatientAttribute( PatientAttribute patientAttribute )
+{
+Collection conditions = aggregationConditionService
+.getAllCaseAggregationCondition();
+
+for ( CaseAggregationCondition condition : conditions )
+{
+Collection patientAttributes = aggregationConditionService.getPatientAttributesInCondition( condition
+.getAggregationExpression() );
+
+if ( patientAttributes != null && patientAttributes.contains( patientAttribute ) )
+{
+return condition.getDescription();
+}
+}
+
+return null;
+}
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2011-11-02 07:04:50 +
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2011-11-03 02:20:41 +
@@ -410,7 +410,68 @@
[Dhis2-devs] [Bug 885371] Re: dynamic-attributes-do-not-appear-after-creation
** Changed in: dhis2 Assignee: (unassigned) => Morten Olav Hansen (mortenoh) ** Changed in: dhis2 Milestone: None => 2.6 ** Changed in: dhis2 Importance: Undecided => High -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/885371 Title: dynamic-attributes-do-not-appear-after-creation Status in DHIS 2 - District Health Information Software: New Bug description: After creating a dynamic attribtue, it fails to appear in the appropriate object.Version is the latest download from dhis2.org (2.5). To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/885371/+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
[Dhis2-devs] [Bug 885371] [NEW] dynamic-attributes-do-not-appear-after-creation
Public bug reported: After creating a dynamic attribtue, it fails to appear in the appropriate object.Version is the latest download from dhis2.org (2.5). ** 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/885371 Title: dynamic-attributes-do-not-appear-after-creation Status in DHIS 2 - District Health Information Software: New Bug description: After creating a dynamic attribtue, it fails to appear in the appropriate object.Version is the latest download from dhis2.org (2.5). To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/885371/+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
[Dhis2-devs] (no subject)
Hi Lars, Please when can we expect to see the definitive version 2.5 of DHIS 2 Live. The current version from the DHIS2 download site is the 2.5-SNAPSHOT version. I ask this in view of the modifications earlier announced as haven been effected in the DHIS 2 WAR-file version 2.5 since its release. Thank you. John.___ 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 5085: Data entry, now the user who marked a form as complete is displayed together with the date
Merge authors:
Lars Helge Øverland (larshelge)
revno: 5085 [merge]
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Wed 2011-11-02 18:11:39 +0100
message:
Data entry, now the user who marked a form as complete is displayed together
with the date
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStoreTest.java
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceExportTest.java
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataValuesForDataSetAction.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/RegisterCompleteDataSetAction.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDataValues.vm
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java 2011-05-05 21:14:56 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java 2011-11-02 17:11:00 +
@@ -53,7 +53,9 @@
private OrganisationUnit source;
private Date date;
-
+
+private String storedBy;
+
// -
// Constructors
// -
@@ -62,12 +64,13 @@
{
}
-public CompleteDataSetRegistration( DataSet dataSet, Period period, OrganisationUnit source, Date date )
+public CompleteDataSetRegistration( DataSet dataSet, Period period, OrganisationUnit source, Date date, String storedBy )
{
this.dataSet = dataSet;
this.period = period;
this.source = source;
this.date = date;
+this.storedBy = storedBy;
}
// -
@@ -203,4 +206,14 @@
{
this.date = date;
}
+
+public String getStoredBy()
+{
+return storedBy;
+}
+
+public void setStoredBy( String storedBy )
+{
+this.storedBy = storedBy;
+}
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml 2011-05-28 13:53:14 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml 2011-11-02 17:11:00 +
@@ -16,6 +16,7 @@
+
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java 2011-04-22 18:38:43 +
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java 2011-11-02 17:11:00 +
@@ -142,8 +142,8 @@
@Test
public void testSaveGet()
{
-registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, new Date() );
-registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, new Date() );
+registrationA = new CompleteDataSetRegistration( dataSetA, periodA, sourceA, new Date(), "" );
+registrationB = new CompleteDataSetRegistration( dataSetB, periodB, sourceA, new Date(), "" );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationA );
completeDataSetRegistrationService.saveCompleteDataSetRegistration( registrationB );
@@
[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 417: Updated data integrity section on exclusive group sets
revno: 417 committer: Olav Poppe branch nick: dhis2-docbook-docs timestamp: Wed 2011-11-02 14:59:57 + message: Updated data integrity section on exclusive group sets modified: src/docbkx/en/dhis2_user_man_data_administration.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_user_man_data_administration.xml' --- src/docbkx/en/dhis2_user_man_data_administration.xml 2011-11-02 14:41:50 + +++ src/docbkx/en/dhis2_user_man_data_administration.xml 2011-11-02 14:59:57 + @@ -92,6 +92,12 @@ Some Data Elements have been allocated to several Data Element Groups. This is currently not allowed, because it will result in duplication of linked data records in the PivotSource recordsets that `feed` the pivot tables. Go to Maintenance -> Data Element Groups to review each Data Element identified and remove the incorrect Group allocations. + Data elements violating exclusive group sets + + Some data elements have been allocated to several data element groups that are members of the same data element group set. All group sets in DHIS are defined as exclusive, which means that a data element can only be allocated to one data element group within that group set. Go to Maintenance -> Data elements and indicators ->Data element groups to review each data element identified in the integrity check. Either remove the data element from all groups except the one that it should be allocated to, or see if one of the groups should be placed in a different group set. + + + Data elements assigned to data sets with different period types Data Elements should not be assigned to two separate data sets whose period types differ. The recommended approach would be to create two separate data elements (for instance a monthly and yearly data element) and assign these to respective datasets. @@ -115,6 +121,12 @@ Invalid indicator denominators Violations of this rule may be caused by an incorrect reference to a deleted or modified data element. Review the indicator and make corrections to the denominator definition. + + Indicators violating exclusive group sets + + Some indicators have been allocated to several indicator groups that are members of the same indicator group set. All group sets in DHIS are defined as exclusive, which means that an indicator can only be allocated to one indicator group within that group set. Go to Maintenance -> Data elements and indicators ->Indicator groups to review each indicator identified in the integrity check. Either remove the indicator from all groups except the one that it should be allocated to, or see if one of the groups should be placed in a different group set. + + Organisation units with cyclic references Organisation units cannot be both parent and children of each other, directly nor indirectly. @@ -133,7 +145,7 @@ Organisation units violating exclusive group sets - Some organisation units have been allocated to several organisation unit groups that are members of the same exclusive organisation unit group set. When a group set is defined as exclusive, it means that an organisation unit can only be allocated to one organisation unit group within that Group Set. For instance, one organisation unit cannot normally belong to the both the 'Hospital' and 'Clinic' groups , but rather to only to one of them. Go to Maintenance -> organisation unit->Organisation unit groups to review each organisation unit identified in the integrity check. Remove the organisation unit from all groups except the one that it should be allocated to. + Some organisation units have been allocated to several organisation unit groups that are members of the same organisation unit group set. All group sets in DHIS are defined as exclusive, which means that an organisation unit can only be allocated to one organisation unit group within that Group Set. For instance, one organisation unit cannot normally belong to the both the 'Hospital' and 'Clinic' groups , but rather to only to one of them. Go to Maintenance -> organisation unit->Organisation unit groups to review each organisation unit identified in the integrity check. Remove the organisation unit from all groups except the one that it should be allocated to. Organisation unit groups without group sets ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpa
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 5084: Scheduling: Now exporting periods for last 12 months instead of just current year. Which period t...
Merge authors:
Lars Helge Øverland (larshelge)
revno: 5084 [merge]
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Wed 2011-11-02 15:51:40 +0100
message:
Scheduling: Now exporting periods for last 12 months instead of just current
year. Which period types to include in the export is now configurable.
Scheduling UI moved from reporting to data admin module.
removed:
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/scheduling/
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/scheduling/action/
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/scheduling/action/ScheduleTasksAction.java
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewScheduledTasks.vm
added:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/scheduling/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/scheduling/ScheduleTasksAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/options/SystemSettingManager.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/RelativePeriodTest.java
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/DataMartTask.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/DataSetCompletenessTask.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/options/SystemSettingManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/options/SystemSettingManager.java 2011-10-05 07:03:07 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/options/SystemSettingManager.java 2011-11-02 14:51:40 +
@@ -29,8 +29,13 @@
import java.io.Serializable;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
+import org.hisp.dhis.period.MonthlyPeriodType;
+import org.hisp.dhis.period.QuarterlyPeriodType;
+import org.hisp.dhis.period.YearlyPeriodType;
+
/**
* @author Stian Strandli
* @version $Id: SystemSettingManager.java 4910 2008-04-15 17:55:02Z larshelg $
@@ -60,6 +65,7 @@
final String KEY_EMAIL_HOST_NAME = "keyEmailHostName";
final String KEY_EMAIL_USERNAME = "keyEmailUsername";
final String KEY_EMAIL_PASSWORD = "keyEmailPassword";
+final String KEY_SCHEDULED_PERIOD_TYPES = "keyScheduledPeriodTypes";
final int DEFAULT_MAX_NUMBER_OF_ATTEMPTS = 20;
final int DEFAULT_TIMEFRAME_MINUTES = 1;
@@ -70,6 +76,11 @@
final String AGGREGATION_STRATEGY_BATCH = "batch";
final String DEFAULT_AGGREGATION_STRATEGY = AGGREGATION_STRATEGY_REAL_TIME;
final int DEFAULT_COMPLETENESS_OFFSET = 15;
+final HashSet DEFAULT_SCHEDULED_PERIOD_TYPES = new HashSet() { {
+add( MonthlyPeriodType.NAME );
+add( QuarterlyPeriodType.NAME );
+add( YearlyPeriodType.NAME );
+} };
void saveSystemSetting( String name, Serializable value );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java 2011-11-01 17:57:03 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java 2011-11-02 14:39:42 +
@@ -27,12 +27,16 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import static org.hisp.dhis.period.PeriodType.getPeriodTypeByName;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Calendar;
import
[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 416: Added section on dynamic attributes.
revno: 416 committer: Jason P. Pickering branch nick: dhis2-docbook-docs timestamp: Wed 2011-11-02 16:41:50 +0200 message: Added section on dynamic attributes. added: src/docbkx/en/resources/images/maintainence/add_new_dynamic_attribute.png modified: src/docbkx/en/dhis2_user_man_data_administration.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_user_man_data_administration.xml' --- src/docbkx/en/dhis2_user_man_data_administration.xml 2011-09-12 18:35:42 + +++ src/docbkx/en/dhis2_user_man_data_administration.xml 2011-11-02 14:41:50 + @@ -326,4 +326,17 @@ Cache Statistics This option is for system administrators only to use. The cache statistics shows the status of the application level cache. The application level cache refers to the objects and query results that the application is caching in order to speed up performance. If the database has been modified directly the application cache needs to be cleared for it to take effect. + +Dynamic attributes +Dynamic attributes can be used to add additional information to certain objects (namely data elements, indicators, organisation units and users). In addition to the standard attributes each of these objects have, it may be required in certain installations to have additional attributes, such as a fax number which is associated with an organisation unit. To add a new dynamic attribute to an object, select "Maintenance->Data administration" from the main menue, then "Attribute" from the left side panel, and press the "Add new" button. + + + + + + + +To create a new attribute, assign it a name. Each attribute should have a unique name. Check the tick-box "Mandatory" if the object should always have the dynamic attribute. Next, select which object (or objects) the attribute should be assigned to. Lastly, select the value type. You can choose from "Text", "Yes/No", "Date", "Number", "Integer", "Positive integer" and "Negative integer". If the value supplied for the attribute does not match the value type, an error will result. Finally, click "Save" to save the attribute. +The dynamic attribute will now be present in the object which you assigned it to in the respective "Edit" screen of each the object. + === added file 'src/docbkx/en/resources/images/maintainence/add_new_dynamic_attribute.png' Binary files src/docbkx/en/resources/images/maintainence/add_new_dynamic_attribute.png 1970-01-01 00:00:00 + and src/docbkx/en/resources/images/maintainence/add_new_dynamic_attribute.png 2011-11-02 14:41:50 + differ ___ 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 415: Fixed an error in the section on having param_org_unit at the bottom of the tables in standard re...
revno: 415 committer: Olav Poppe branch nick: dhis2-docbook-docs timestamp: Wed 2011-11-02 13:34:10 + message: Fixed an error in the section on having param_org_unit at the bottom of the tables in standard reports/ireport modified: src/docbkx/en/dhis2_user_man_creating_reporting.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_user_man_creating_reporting.xml' --- src/docbkx/en/dhis2_user_man_creating_reporting.xml 2011-11-02 12:04:31 + +++ src/docbkx/en/dhis2_user_man_creating_reporting.xml 2011-11-02 13:34:10 + @@ -636,7 +636,7 @@ In the default table exported from DHIS 2, there are some rows that it might be better to leave out of the table, and some that it would be preferable to have at the end. For example, when making a table based on a report table with the «parent organisation unit» parameter, the default table might have a row with the national level somewhere in between all the regions. In iReport, this can be changed so that the «parent organisation unit» appears at the bottom of the table. This involves two steps that will be explained below. Note that this will not work where there is only one organisation units, and it is therefore most useful when using the «parent organisation unit» or «grand parent organisation unit» parameters in the report table. Hiding the «parameter organisation unit» from the table - First, we must make sure that the row with the parent organisation unit (for example the national level) is left out of the regular table. We do this by using a property specific to the Details band called Print when expression. To set a Print when expression, start by selecting the Detail band in the Report inspector, then edit the Print when expression in the properties panel. + We exclude the "paramter organisation unit" from the table by using a property in the Details band called "Print when expression". To set a Print when expression, start by selecting the Detail band in the Report inspector, then edit the Print when expression in the properties panel. Select Detail 1 in the Report Inspector @@ -666,6 +666,11 @@ + Putting the "param organisation unit" at the bottom of the table + Instead of removing the "param organisation unit" from the table entirely, it is also possible to put it at the bottom (or top) of the table. This is done by using the sort functionality explained in the next section, and choosing to sort first by "organisation_unit_is_parent". Other sorting options can be added in addition to this, for example to make a list where the param organisation unit is at the bottom of the table, with the other organisation units listed alphabetically above it. + + + Hiding other rows Using the expression editor it is also possible to exclude other rows from the table, in addition to the parent organisation unit as was explained above. In Ghana, for example, all regions have a «fake district» which is the name of the region in square brackets. This can also be excluded from the table using the Print when expression that was introduced above. To to this, follow the instructions above to bring up the Expression editor window. Then, we use Java expressions to test whether or not the row should be hidden. @@ -685,61 +690,6 @@ - - Showing the parameter organisation unit at the end of the table - We have now made sure that the parameter organisation unit is not included in the table as a regular row. However, we often want to include it somewhere in the report. A good way to do this is to add it in the summary band so that it will appear below the table. The easiest way to do this is to copy all the text fields from the Detail band into the summary band, and then just edit the expression for the first column. - - - Select all the fields in the detail band and choose - - - Copy from the Edit menu - - - Click once on the Summary area - - - Choose Paste from the Edit menu - - - Position the new fields correctly - - - -Select fields in the details band and copy them - - - - - - - -Past fields in
[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 414: Removed section on limitation of the number of data elements/indicators in data mart exports, in ...
revno: 414 committer: Olav Poppe branch nick: dhis2-docbook-docs timestamp: Wed 2011-11-02 12:04:31 + message: Removed section on limitation of the number of data elements/indicators in data mart exports, in the french and english versions modified: src/docbkx/en/dhis2_user_man_creating_reporting.xml src/docbkx/fr/dhis2_user_man_reporting.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_user_man_creating_reporting.xml' --- src/docbkx/en/dhis2_user_man_creating_reporting.xml 2011-09-19 18:59:06 + +++ src/docbkx/en/dhis2_user_man_creating_reporting.xml 2011-11-02 12:04:31 + @@ -150,10 +150,6 @@ Each data value for a data element has a reference to a category option combo, which is a combination of the disaggregations for the data value, e.g. (male,<5y) or (In PHU, <1y). These disaggregations are exported as they are to the data mart, and no aggregation is done on this dimension. See the data elements section for more on data element categories and the resource tables section for more information on how to do aggregation on these categories. - Limitation to the number of data elements per export - Due to the limitation in number of columns per table in the database there is a limit to how many data elements that can be selected per data mart export. In postgres this limit is 255 (need to verify this number) data elements. If you need to export more than this number of data elements you have to split it up into multiple data mart exports and run them one by one. - - Adding new data to an existing data mart When you add new data to an existing data mart the new values will be appended to the existing so that the data mart grows for each new process if new selections (such as new periods) have been made. If any of the selected values are already in the data mart, then the old will be replaced by the newly generated values. === modified file 'src/docbkx/fr/dhis2_user_man_reporting.xml' --- src/docbkx/fr/dhis2_user_man_reporting.xml 2010-09-03 16:36:42 + +++ src/docbkx/fr/dhis2_user_man_reporting.xml 2011-11-02 12:04:31 + @@ -150,10 +150,6 @@ Chaque valeur de données pour un élément de données est une référence à un combo option catégorie, qui est une combinaison de la ventilation de la valeur des données, par exemple, (Homme, <5a) ou (PHU, <1a). Ces ventilations sont exportés comme ils sont à l'entrepôt de données, et pas de l'agrégation se fait sur cette dimension. Voir la section des données pour plus d'éléments sur les catégories d'éléments de données et la section des ressources tableaux pour plus d'informations sur la façon de faire l'agrégation de ces catégories. - Limitation du nombre d'éléments de données par exportation - En raison de la limitation dans le nombre de colonnes par table dans la base de données il ya une limite au nombre des éléments de données qui peuvent être sélectionnés par Mart données sur les exportations. Dans ce limot postgres est 255 (besoin de vérifier ce nombre) des éléments de données. Si vous avez besoin d'exporter plus que ce nombre d'éléments de données que vous avez à le diviser en plusieurs exporte les données Mart et de les exécuter un par un. - - ajout de nouvelles données à un Mart données existantes Lorsque vous ajoutez de nouvelles données à un entrepôt de données existantes que les nouvelles valeurs seront ajoutées à l'existant de sorte que le data mart croît pour chaque nouveau processus, si de nouvelles sélections (tels que les nouvelles périodes) ont été faites. Si l'une des valeurs sélectionnées sont déjà dans les dépôts de données, puis les anciens seront remplacés par les valeurs nouvellement créées. ___ 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] shifting hibernate hbm.xml files
On 2 November 2011 05:09, Saptarshi Purkayastha wrote: > But I'm 7.1 dev builds, so if that bug you linked is correct... the > thing might be fixed in the build I'm using > Although I still don't remember committing the .hbm.xml files ever > because of the changes I am still using 6.9.1. Its only been happening in the last month or three but I now realize it is definitely netbeans which is doing this. Currently editing files in emacs while wondering whether to upgrade to 7.1 or make the switch to that "other" ide. I wish I could figure out exactly what I do which triggers the reformatting of the files. The bug report refers to working on swing components which is not what I am doing. > > --- > Regards, > Saptarshi PURKAYASTHA > > My Tech Blog: http://sunnytalkstech.blogspot.com > You Live by CHOICE, Not by CHANCE > > > > On 2 November 2011 10:34, Saptarshi Purkayastha wrote: >> I dont see them changing... >> atleast when i tried to commit through bzr nothing showed up in >> changed files for me >> >> --- >> Regards, >> Saptarshi PURKAYASTHA >> >> My Tech Blog: http://sunnytalkstech.blogspot.com >> You Live by CHOICE, Not by CHANCE >> >> >> >> On 2 November 2011 05:50, Bob Jolliffe wrote: >>> OK. That will have confused most of you. But it seems I am not crazy >>> either. Looks like a netbeans bug related to this one: >>> http://netbeans.org/bugzilla/show_bug.cgi?id=161628 >>> >>> Now what exactly triggers the rewrite is not clear. Its certainly not >>> to do with swing forms. But it has messed up my day. >>> >>> Saptarshi have you seen anything like this? >>> >>> Bob >>> >>> On 1 November 2011 23:21, Bob Jolliffe wrote: Can anybody tell me what is modifying the hibernate configuration files? I (perhaps naively) thought that the developer writes these and keeps under version control. Every now again I see that they have changed - usually just formatting changes. Like they are being read and then written back out again by "something". What on earth can be doing this? Have noticed this for a while now but this has caused me some grief today as I have included a couple of XML ENTITY declarations which after compiling and installing seem to have disappeared again. Baffled. Bob >>> >>> ___ >>> 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 5081: Minor fix.
revno: 5081 committer: Tran Chau branch nick: dhis2 timestamp: Wed 2011-11-02 15:12:17 +0700 message: Minor fix. modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RegisterIrregularEncounterAction.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-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RegisterIrregularEncounterAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RegisterIrregularEncounterAction.java 2011-10-27 05:51:06 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RegisterIrregularEncounterAction.java 2011-11-02 08:12:17 + @@ -74,7 +74,7 @@ ProgramStageInstance programStageInstance = new ProgramStageInstance(); programStageInstance.setProgramInstance( currentStageInstance.getProgramInstance() ); programStageInstance.setProgramStage( currentStageInstance.getProgramStage() ); -programStageInstance.setStageInProgram( currentStageInstance.getStageInProgram() + 1 ); +programStageInstance.setStageInProgram( currentStageInstance.getStageInProgram() ); programStageInstance.setDueDate( new Date() ); programStageInstance.setExecutionDate( new Date() ); ___ 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 5080: Remove unused js-methods/css (Patient module).
revno: 5080
committer: Tran Chau
branch nick: dhis2
timestamp: Wed 2011-11-02 14:37:12 +0700
message:
Remove unused js-methods/css (Patient module).
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.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-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm 2011-10-03 09:40:38 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeGroupForm.vm 2011-11-02 07:37:12 +
@@ -33,7 +33,7 @@
$i18n.getString( "create_new_patient_attribute_group" )
-
+
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js 2011-10-02 09:53:57 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js 2011-11-02 07:37:12 +
@@ -23,50 +23,4 @@
function removePatientAttributeGroup( patientAttributeGroupId, name )
{
removeItem( patientAttributeGroupId, name, i18n_confirm_delete, 'removePatientAttributeGroup.action' );
-}
-
-// -
-// Show and Hide tooltip
-// -
-
-function patientAttributeGroupAssociation()
-{
- selectAllById('selectedAttributeGroups');
-
-var form = document.getElementById( 'patientAttributeGroupAssociationForm' );
-
-form.submit();
-}
-
-// -
-// Show and Hide tooltip
-// -
-
-function showToolTip( e, value){
-
- var tooltipDiv = byId('tooltip');
- tooltipDiv.style.display = 'block';
-
- var posx = 0;
-var posy = 0;
-
-if (!e) var e = window.event;
-if (e.pageX || e.pageY)
-{
-posx = e.pageX;
-posy = e.pageY;
-}
-else if (e.clientX || e.clientY)
-{
-posx = e.clientX;
-posy = e.clientY;
-}
-
- tooltipDiv.style.left= posx + 8 + 'px';
- tooltipDiv.style.top = posy + 8 + 'px';
- tooltipDiv.innerHTML = " " + value;
-}
-
-function hideToolTip(){
- byId('tooltip').style.display = 'none';
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css 2011-07-05 03:55:54 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/style/basic.css 2011-11-02 07:37:12 +
@@ -1,18 +1,4 @@
-#tooltip {
-color:#000; font-size:11px; line-height:1.2;
-background-color:#CC; border:1px solid #667295;
-width:210px; padding:4px;
- z-index: 10;
- display: none;
- position:absolute;
-}
-
.heading-column { width : 30.5em;}
td.input-column { width : 30.5em;}
td.input-column input, td.input-column select { width: 28.5em;}
-td.error {padding-left:1em}
-
-.warnmessage {
- color: red;
- font-style: italic;
-}
\ No newline at end of file
+td.error {padding-left:1em}
\ No newline at end of file
___
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 5079: The Value-type values into Add Identifer Type form is different from Update form ( Patient module ).
revno: 5079 committer: Tran Chau branch nick: dhis2 timestamp: Wed 2011-11-02 14:29:58 +0700 message: The Value-type values into Add Identifer Type form is different from Update form ( Patient module ). modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2011-11-02 07:04:50 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2011-11-02 07:29:58 + @@ -375,7 +375,6 @@ male = Male female = Female transgender = Transgender -alphabet = Alphabet verified = Verified declared = Declared approximated = Approximated === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2011-10-04 08:53:41 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm 2011-11-02 07:29:58 + @@ -70,9 +70,9 @@ $i18n.getString( "type" )* - $i18n.getString( "string" ) + $i18n.getString( "text" ) $i18n.getString( "number" ) - $i18n.getString( "alphabet" ) + $i18n.getString( "letter" ) ___ 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 5078: Add a formula for the number of visits ( Aggregation Query Build module)
revno: 5078
committer: Tran Chau
branch nick: dhis2
timestamp: Wed 2011-11-02 14:04:50 +0700
message:
Add a formula for the number of visits ( Aggregation Query Build module)
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStore.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionStore.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResultDetails.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStore.java 2011-06-24 07:55:22 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStore.java 2011-11-02 07:04:50 +
@@ -28,6 +28,7 @@
package org.hisp.dhis.caseaggregation;
import java.util.Collection;
+import java.util.List;
import org.hisp.dhis.common.GenericStore;
import org.hisp.dhis.dataelement.DataElement;
@@ -47,5 +48,5 @@
Collection get( DataElement dataElement );
-Collection executeSQL( String sql );
+List executeSQL( String sql );
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2011-10-26 03:40:58 +
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2011-11-02 07:04:50 +
@@ -85,7 +85,7 @@
private final String INVALID_CONDITION = "Invalid condition";
-private final String NUMBER_PATIENTS_REGISTERED = "The number of beneficiaries registered";
+private final String NUMBER_PATIENTS_REGISTERED = "Registered Beneficiaries No";
// -
// Dependencies
@@ -221,7 +221,8 @@
{
Collection result = new HashSet();
-String sql = createSQL( aggregationCondition.getAggregationExpression(), orgunit, period );
+String sql = createSQL( aggregationCondition.getAggregationExpression(), aggregationCondition.getOperator(),
+orgunit, period );
Collection dataElements = getDataElementsInCondition( aggregationCondition
.getAggregationExpression() );
@@ -248,7 +249,8 @@
{
Collection result = new HashSet();
-String sql = createSQL( aggregationCondition.getAggregationExpression(), orgunit, period );
+String sql = createSQL( aggregationCondition.getAggregationExpression(), aggregationCondition.getOperator(),
+orgunit, period );
Collection patientIds = aggregationConditionStore.executeSQL( sql );
@@ -417,7 +419,7 @@
Period period )
{
// Get operators between ( )
-Pattern patternOperator = Pattern.compile( "(\\)\\s*(OR|AND))" );
+Pattern patternOperator = Pattern.compile( "(\\)\\s*(OR|AND)\\s*\\( )" );
Matcher matcherOperator = patternOperator.matcher( aggregationCondition.getAggregationExpression() );
@@ -430,26 +432,21 @@
List subSQL = new ArrayList();
-String[] conditions = aggregationCondition.getAggregationExpression().split( "(\\)\\s*(OR|AND))" );
-
+String[] conditions = aggregationCondition.getAggregationExpression().split( "(\\)\\s*(OR|AND)\\s*\\()" );
+
// Create SQL statement for the first condition
-String condition = conditions[0];
-
-String sql = createSQL( condition, orgunit, period );
-
-if ( operators.size() > 0 )
-{
-sql = "SELECT distinct(p.patientid) FROM patient as p where p.patientid in " + sql + ")";
-}
-
+String condition = conditions[0].replace( "(", "" ).replace( ")", "" );
+
+String sql = createSQL( condition, aggregationCondition.getOperator(), orgunit, period );
+
