[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18882: minor: removed active parameter from javadoc
revno: 18882 committer: Halvdan Hoem Grelland branch nick: dhis2 timestamp: Sat 2015-04-11 14:17:07 +0200 message: minor: removed active parameter from javadoc modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2015-04-03 07:59:52 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2015-04-11 12:17:07 + @@ -175,7 +175,6 @@ * @param shortName * @param openingDate * @param closedDate - * @param active * @param comment */ public OrganisationUnit( String name, String shortName, String code, Date openingDate, Date closedDate, @@ -195,7 +194,6 @@ * @param shortName * @param openingDate * @param closedDate - * @param active * @param comment */ public OrganisationUnit( String name, OrganisationUnit parent, String shortName, String code, Date openingDate, ___ 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 18883: Add UI for ProgramRule object.
revno: 18883
committer: Tran Chau
branch nick: dhis2
timestamp: Sat 2015-04-11 20:18:25 +0700
message:
Add UI for ProgramRule object.
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramRule.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programrule/
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programrule/GetProgramRuleAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programrule/GetProgramRuleListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programrule/ShowAddProgramRuleFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programrule/ValidateProgramRuleAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programRule.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programRule.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.vm
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleStore.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/programrule/DefaultProgramRuleService.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/programrule/hibernate/HibernateProgramRuleStore.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageSectionForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageSectionForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/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-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleService.java 2015-03-13 08:24:36 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleService.java 2015-04-11 13:18:25 +
@@ -70,6 +70,15 @@
ProgramRule getProgramRule( int id );
/**
+ * Returns a {@link ProgramRule}.
+ *
+ * @param name the name of the ProgramRule to return.
+ * @param program {@link Program}.
+ * @return the ProgramRule with the given name
+ */
+ProgramRule getProgramRuleByName( String name, Program program );
+
+/**
* Returns all {@link ProgramRule}.
*
* @return a collection of all ProgramRule, or an empty collection if
@@ -84,4 +93,13 @@
* @return ProgramRule list
*/
Collection getProgramRule( Program program );
+
+/**
+ * Get validation by {@link Program}
+ *
+ * @param program Program
+ * @param key Search Program Rule by key
+ * @return ProgramRule list
+ */
+Collection getProgramRules( Program program, String key );
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleStore.java 2015-03-13 08:24:36 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleStore.java 2015-04-11 13:18:25 +
@@ -48,4 +48,22 @@
* @return ProgramRuleVariable list
*/
Collection get( Program p
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 18884: minor
revno: 18884
committer: Halvdan Hoem Grelland
branch nick: dhis2
timestamp: Sat 2015-04-11 16:06:51 +0200
message:
minor
modified:
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataGmlTask.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-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataGmlTask.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataGmlTask.java 2015-04-09 14:51:07 +
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataGmlTask.java 2015-04-11 14:06:51 +
@@ -30,9 +30,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.hisp.dhis.dxf2.common.ImportOptions;
import org.hisp.dhis.dxf2.gml.GmlImportService;
-import org.hisp.dhis.dxf2.common.ImportOptions;
-
import org.hisp.dhis.scheduling.TaskId;
import javax.xml.transform.TransformerException;
@@ -91,6 +90,8 @@
catch ( IOException | TransformerException e )
{
log.error( "Unable to read GML data from input stream", e );
+
+throw new RuntimeException( "Failed to parse GML input stream", 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
Re: [Dhis2-devs] how to run aggregate query builder?
Hi Channara, You can find it in *Apps > Individual Records > Manual aggregation*. Hope this one is the function you are looking for. Best regards, Tran Chau. On Fri, Apr 10, 2015 at 10:08 AM, channara rin wrote: > Hi all, > How can i specific organisation unit to run aggregate querly builder only? > > > ___ > 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 18885: Minor fix.
revno: 18885 committer: Tran Chau branch nick: dhis2 timestamp: Sat 2015-04-11 21:34:49 +0700 message: Minor fix. modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.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-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2015-04-11 13:18:25 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2015-04-11 14:34:49 + @@ -537,4 +537,5 @@ add_more_action = Add more action source_type = Source type please_enter_action_description = Please enter action description -confirm_delete_program_rule = Are you sure you want to delete program rule? \ No newline at end of file +confirm_delete_program_rule = Are you sure you want to delete program rule? +edit_program_rule = Edit program rule \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm 2015-04-11 13:18:25 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm 2015-04-11 14:34:49 + @@ -38,6 +38,7 @@ $i18n.getString( "create_new_program_rule" ) +$encoder.htmlEncode($program.displayName) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.vm 2015-04-11 13:18:25 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.vm 2015-04-11 14:34:49 + @@ -37,8 +37,9 @@ var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_program_rule" ) , "'")'; -$i18n.getString( "create_new_program_rule" ) - +$i18n.getString( "edit_program_rule" ) +$encoder.htmlEncode($programRule.program.displayName) + ___ 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] Ofline data uploads
Hi Is there anyway to enforce upload offline data. Users have captured event data offline. When the Internet is restored the DHIS2 is not prompting for data uploads. How can we recover the data so captured? Regards Simon Muyambo ___ 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 18886: minor, comment
revno: 18886
committer: Halvdan Hoem Grelland
branch nick: dhis2
timestamp: Sat 2015-04-11 18:53:23 +0200
message:
minor, comment
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.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-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java 2015-03-19 13:04:23 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java 2015-04-11 16:53:23 +
@@ -131,8 +131,7 @@
TaskId taskId = new TaskId( taskCategory, currentUserService.getCurrentUser() );
-// TODO Support DataIntegrityReport (make task summary generic).
-// TODO Also avoid null pointer on fetching unfinished task
+// TODO Make task summary generic. (We use tasks for more than importing data).
if ( taskCategory.equals( TaskCategory.DATAINTEGRITY ) )
{
DataIntegrityReport dataIntegrityReport = (DataIntegrityReport) notifier.getTaskSummary( taskId );
___
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 18887: ER EV more 'this' relative periods added.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 18887 [merge]
committer: Jan Henrik Overland
branch nick: dhis2
timestamp: Sat 2015-04-11 20:00:20 +0200
message:
ER EV more 'this' relative periods added.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.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-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2015-04-01 15:34:05 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2015-04-11 17:59:06 +
@@ -193,3 +193,8 @@
user_sub_x2_units=User sub-x2-units
collapse_data_dimensions=Collapse data dimensions
hide_na_data=Hide n/a data
+this_week=This week
+this_quarter=This quarter
+this_month=This month
+this_sixmonth=This six-month
+this_bimonth=This bi-month
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-04-03 15:43:32 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-04-11 17:59:06 +
@@ -1525,15 +1525,7 @@
},
store: Ext.create('Ext.data.Store', {
fields: ['id', 'text'],
-data: [
- {id: 'COUNT', text: NS.i18n.count},
- {id: 'AVERAGE', text: NS.i18n.average},
- {id: 'SUM', text: NS.i18n.sum},
- {id: 'STDDEV', text: NS.i18n.stddev},
- {id: 'VARIANCE', text: NS.i18n.variance},
- {id: 'MIN', text: NS.i18n.min},
- {id: 'MAX', text: NS.i18n.max}
-]
+data: ns.core.conf.aggregationType.data
}),
resetData: function() {
this.setDisabled();
@@ -4769,6 +4761,11 @@
},
{
xtype: 'checkbox',
+relativePeriodId: rp[rp.push('THIS_WEEK') - 1],
+boxLabel: NS.i18n.this_week
+},
+{
+xtype: 'checkbox',
relativePeriodId: rp[rp.push('LAST_WEEK') - 1],
boxLabel: NS.i18n.last_week
},
@@ -4804,6 +4801,11 @@
},
{
xtype: 'checkbox',
+relativePeriodId: rp[rp.push('THIS_MONTH') - 1],
+boxLabel: NS.i18n.this_month
+},
+{
+xtype: 'checkbox',
relativePeriodId: rp[rp.push('LAST_MONTH') - 1],
boxLabel: NS.i18n.last_month
},
@@ -4840,6 +4842,11 @@
},
{
xtype: 'checkbox',
+relativePeriodId: rp[rp.push('THIS_BIMONTH') - 1],
+boxLabel: NS.i18n.this_bimonth
+},
+{
+xtype: 'checkbox',
relativePeriodId: rp[rp.push('LAST_BIMONTH') - 1],
boxLabel: NS.i18n.last_bimonth
},
@@ -4865,6 +4872,11 @@
},
{
xtype: 'checkbox',
+relativePeriodId: rp[rp.push('THIS_QUARTER') - 1],
+boxLabel: NS.i18n.this_quarter
+},
+{
+xtype: 'checkbox',
relativePeriodId: rp[rp.push('LAST_QUARTER') - 1],
boxLabel: NS.i18n.last_quarter
},
@@ -4890,6 +4902,11 @@
},
{
xtype: 'checkbox',
+relativePeriodId: rp[rp.push('THIS_SIX_MONTH') - 1],
+boxLabel: NS.i18n.this_sixmonth
+},
+{
+xtype: 'checkbox',
relativePeriodId: rp[rp.push('LAST_SIX_MONTH') - 1],
boxLabel: NS.i18n.last_sixmonth
},
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-we
Re: [Dhis2-devs] how to run aggregate query builder?
Thanks you tran. "Tran Chau (HISP Vietnam)" wrote: >Hi Channara, > > >You can find it in Apps > Individual Records > Manual aggregation. > >Hope this one is the function you are looking for. > > > > >Best regards, > >Tran Chau. > > >On Fri, Apr 10, 2015 at 10:08 AM, channara rin wrote: > >Hi all, > >How can i specific organisation unit to run aggregate querly builder only? > > > >___ >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
