dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18326
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7683: Allow to select many orgunit in tabular report.
------------------------------------------------------------
revno: 7683
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-07-24 14:37:03 +0700
message:
Allow to select many orgunit in tabular report.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java 2012-07-13 02:11:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java 2012-07-24 07:37:03 +0000
@@ -290,6 +290,7 @@
}
else
{
+ organisationUnits.addAll( orgunitIds );
for ( Integer orgunitId : orgunitIds )
{
OrganisationUnit selectedOrgunit = organisationUnitService.getOrganisationUnit( orgunitId );
@@ -300,7 +301,7 @@
}
else
{
- organisationUnits = organisationUnitService.getOrganisationUnitHierarchy().getChildren( orgunitId );
+ organisationUnits.addAll( organisationUnitService.getOrganisationUnitHierarchy().getChildren( orgunitId ));
}
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-07-21 14:59:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-07-24 07:37:03 +0000
@@ -306,6 +306,7 @@
et_no_data = No data returned from server
et_no_dataelement = Please select at least one data element.
em_no_orgunits = Please select an organisation unit.
+em_no_program_stage = Please select a program stage.
reset = Reset
no = No
options = Options
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2012-07-24 06:37:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2012-07-24 07:37:03 +0000
@@ -1058,6 +1058,11 @@
return false;
}
+ if (Ext.getCmp('programStageCombobox').getValue() == '') {
+ TR.util.notification.error(TR.i18n.em_no_program_stage, TR.i18n.em_no_program_stage);
+ return false;
+ }
+
return true;
},
response: function(r) {
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm 2012-07-12 09:01:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm 2012-07-24 07:37:03 +0000
@@ -91,4 +91,5 @@
false_value:'$encoder.jsEscape($i18n.getString( 'false_value' ) , "'")',
value_is_invalid:'$encoder.jsEscape($i18n.getString( 'value_is_invalid' ) , "'")',
value_is_valid:'$encoder.jsEscape($i18n.getString( 'value_is_valid' ) , "'")',
+em_no_program_stage: '$encoder.jsEscape($i18n.getString( 'em_no_program_stage' ) , "'")'
};
\ No newline at end of file
=== 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 2012-07-12 02:49:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-07-24 07:37:03 +0000
@@ -248,6 +248,6 @@
sort_by_scheduled_days = Sort by scheduled days
assign_program_to_orgunits_for_registering = Assign program to orgunits for registering
visited_program_stage = Visited program stage
-number_of_patients = Number of patients
+number_of_patients = Number of persons
number_of_visits = Number of visits
insert = Insert