[Dhis2-devs] [Bug 540793] Re: Translation for Excel Reporting
** Changed in: dhis2 Status: New => Confirmed ** Description changed: - After I translated the reports ' names in Excel Reporting module, I set - the Database language to the language which I have just translated, some - of reports' names haven't been changed. + After translated the excel reports' name in Excel Reporting module, I + set the Database language to the language which I have just translated, + some of reports' name haven't been changed yet. -- Translation for Excel Reporting https://bugs.launchpad.net/bugs/540793 You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. Status in DHIS 2 - District Health Information Software: Confirmed Bug description: After translated the excel reports' name in Excel Reporting module, I set the Database language to the language which I have just translated, some of reports' name haven't been changed yet. ___ 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 540793] Re: Translation for Excel Reporting
** Visibility changed to: Public ** This bug is no longer flagged as a security vulnerability -- Translation for Excel Reporting https://bugs.launchpad.net/bugs/540793 You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. Status in DHIS 2 - District Health Information Software: New Bug description: After I translated the reports ' names in Excel Reporting module, I set the Database language to the language which I have just translated, some of reports' names haven't been changed. ___ 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 1671: Integrity check only displays one of two identical indicator definitions.
revno: 1671
committer: Tran Chau
branch nick: trunk
timestamp: Fri 2010-03-19 11:15:47 +0700
message:
Integrity check only displays one of two identical indicator definitions.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/DataIntegrityService.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java
dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/dataintegrity/DataIntegrityServiceTest.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataintegrity/GetDataIntegrityAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataIntegrity.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/dataintegrity/DataIntegrityService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/DataIntegrityService.java 2009-12-02 15:08:11 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/DataIntegrityService.java 2010-03-19 04:15:47 +
@@ -85,7 +85,7 @@
/**
* Gets all indicators with identical numerator and denominator.
*/
-Collection getIndicatorsWithIdenticalFormulas();
+Collection> getIndicatorsWithIdenticalFormulas();
/**
* Gets all indicators which are not assigned to any groups.
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java 2010-03-18 09:31:22 +
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java 2010-03-19 04:15:47 +
@@ -61,14 +61,15 @@
/**
* @author Lars Helge Overland
- * @version $Id: DefaultDataIntegrityService.java 2010-03-18 11:52:20Z Chau Thu Tran $
+ * @version $Id: DefaultDataIntegrityService.java 2010-03-18 11:52:20Z Chau Thu
+ * Tran $
*/
@Transactional
public class DefaultDataIntegrityService
implements DataIntegrityService
{
private static final String FORMULA_SEPARATOR = "#";
-
+
// -
// Dependencies
// -
@@ -100,21 +101,21 @@
{
this.organisationUnitService = organisationUnitService;
}
-
+
private OrganisationUnitGroupService organisationUnitGroupService;
public void setOrganisationUnitGroupService( OrganisationUnitGroupService organisationUnitGroupService )
{
this.organisationUnitGroupService = organisationUnitGroupService;
}
-
+
private ValidationRuleService validationRuleService;
public void setValidationRuleService( ValidationRuleService validationRuleService )
{
this.validationRuleService = validationRuleService;
}
-
+
private ExpressionService expressionService;
public void setExpressionService( ExpressionService expressionService )
@@ -137,22 +138,22 @@
public Collection getDataElementsWithoutGroups()
{
-return dataElementService.getDataElementsWithoutGroups();
+return dataElementService.getDataElementsWithoutGroups();
}
-
+
public Map> getDataElementsAssignedToDataSetsWithDifferentPeriodTypes()
{
Collection dataElements = dataElementService.getAllDataElements();
-
+
Collection dataSets = dataSetService.getAllDataSets();
-
+
Map> targets = new HashMap>();
-
+
for ( DataElement element : dataElements )
{
final Set targetPeriodTypes = new HashSet();
final Collection targetDataSets = new HashSet();
-
+
for ( DataSet dataSet : dataSets )
{
if ( dataSet.getDataElements().contains( element ) )
@@ -161,13 +162,13 @@
targetDataSets.add( dataSet );
}
}
-
+
if ( targetPeriodTypes.size() > 1 )
{
targets.put( element, targetDataSets );
-}
+}
}
-
+
return targets;
}
@@ -178,25 +179,25 @@
public Collection getDataSetsNotAss
[Dhis2-devs] [Bug 540908] Re: Data Element Groups: both available and selected DE lists are empty in the edit data element group window
Fix committed in rev 1670 ** Changed in: dhis2 Status: Confirmed => Fix Committed -- Data Element Groups: both available and selected DE lists are empty in the edit data element group window https://bugs.launchpad.net/bugs/540908 You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. Status in DHIS 2 - District Health Information Software: Fix Committed Bug description: I've noticed that when editing existing data element groups (that have data elements assigned to them) both the available and selected data elements list are empty. If you look at the same groups in the Data Element Group Editor window (where you can traverse all groups in the same window) you can see that there are data elements in these groups. Is this somehow related to the newly introduced validation of group memberships? I've noticed the new dataelements_dataelementgroupsetmembers table. and the option to assign data element group sets to data elements in the add/edit Data Element window. When I tried to add a new data element and assigned it to a couple of group sets that data element still didn't show up under available data elements in the edit data element group window, so not sure what is happening. If you add a new data element group all the data elements are listed under available DE. ___ 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 540908] Re: Data Element Groups: both available and selected DE lists are empty in the edit data element group window
** Branch linked: lp:dhis2 -- Data Element Groups: both available and selected DE lists are empty in the edit data element group window https://bugs.launchpad.net/bugs/540908 You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. Status in DHIS 2 - District Health Information Software: Fix Committed Bug description: I've noticed that when editing existing data element groups (that have data elements assigned to them) both the available and selected data elements list are empty. If you look at the same groups in the Data Element Group Editor window (where you can traverse all groups in the same window) you can see that there are data elements in these groups. Is this somehow related to the newly introduced validation of group memberships? I've noticed the new dataelements_dataelementgroupsetmembers table. and the option to assign data element group sets to data elements in the add/edit Data Element window. When I tried to add a new data element and assigned it to a couple of group sets that data element still didn't show up under available data elements in the edit data element group window, so not sure what is happening. If you add a new data element group all the data elements are listed under available DE. ___ 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 1670: fixed typo in javascript and added lists filter to missing pages
revno: 1670
fixes bug(s): https://launchpad.net/bugs/540908
committer: Saptarshi
branch nick: trunk
timestamp: Fri 2010-03-19 00:56:19 +0100
message:
fixed typo in javascript and added lists filter to missing pages
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js 2010-03-12 14:29:20 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js 2010-03-18 23:56:19 +
@@ -115,7 +115,7 @@
for ( id in groupMembers )
{
-$("#groupMembers").append( $( "" ).attr( "value",id ).text( groupMember[id] )) ;
+$("#groupMembers").append( $( "" ).attr( "value",id ).text( groupMembers[id] )) ;
}
for ( id in availableDataElements )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js 2010-03-11 13:32:06 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView1.js 2010-03-18 23:56:19 +
@@ -29,7 +29,6 @@
//
function initAllList()
{
-var list = document.getElementById( 'dataElementGroups' );
var id;
for ( id in dataElementGroups )
@@ -38,10 +37,10 @@
option.onmousemove = function(e){
showToolTip( e, this.text);
}
-list.add( option, null );
+$("#dataElementGroups").append(option);
}
-list = document.getElementById( 'availableDataElements' );
+var list = document.getElementById( 'availableDataElements' );
for ( id in availableDataElements )
{
@@ -49,7 +48,7 @@
option.onmousemove = function(e){
showToolTip( e, this.text);
}
-list.add( option, null );
+$("#availableDataElements").append(option);
}
if(list.selectedIndex==-1)
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js 2010-03-11 13:32:06 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView2.js 2010-03-18 23:56:19 +
@@ -29,7 +29,6 @@
//
function initAllList()
{
-var list = document.getElementById( 'availableGroups' );
var id;
for ( id in availableGroups )
@@ -38,18 +37,16 @@
option.onmousemove = function(e){
showToolTip( e, this.text);
}
-list.add( option, null );
+$("#availableGroups").append(option);
}
-list = document.getElementById( 'availableDataElements' );
-
for ( id in availableDataElements )
{
var option = new Option( availableDataElements[id], id );
option.onmousemove = function(e){
showToolTip( e, this.text);
}
-list.add( option, null );
+$("#availableDataElements").append(option);
}
}
=== modified file 'dh
[Dhis2-devs] [Bug 540908] Re: Data Element Groups: both available and selected DE lists are empty in the edit data element group window
yea... bloody typo in that javascript. Missed a 's' from groupMembers variable name. ** Changed in: dhis2 Assignee: (unassigned) => Saptarshi (sunbiz) ** Changed in: dhis2 Importance: Undecided => Medium ** Changed in: dhis2 Status: New => Confirmed ** Changed in: dhis2 Milestone: None => 2.0.4 -- Data Element Groups: both available and selected DE lists are empty in the edit data element group window https://bugs.launchpad.net/bugs/540908 You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. Status in DHIS 2 - District Health Information Software: Confirmed Bug description: I've noticed that when editing existing data element groups (that have data elements assigned to them) both the available and selected data elements list are empty. If you look at the same groups in the Data Element Group Editor window (where you can traverse all groups in the same window) you can see that there are data elements in these groups. Is this somehow related to the newly introduced validation of group memberships? I've noticed the new dataelements_dataelementgroupsetmembers table. and the option to assign data element group sets to data elements in the add/edit Data Element window. When I tried to add a new data element and assigned it to a couple of group sets that data element still didn't show up under available data elements in the edit data element group window, so not sure what is happening. If you add a new data element group all the data elements are listed under available DE. ___ 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 136: Removed image files no longer in use.
revno: 136 committer: Ola Hodne Titlestad olati...@gmail.com branch nick: dhis2-docbook-docs timestamp: Fri 2010-03-19 00:20:27 +0100 message: Removed image files no longer in use. removed: src/docbkx/en/resources/images/data_dimensions/pivot1.jpg src/docbkx/en/resources/images/data_dimensions/pivot2.jpg src/docbkx/en/resources/images/data_dimensions/pivot3.jpg src/docbkx/en/resources/images/data_dimensions/pivot4.jpg src/docbkx/en/resources/images/data_dimensions/pivot5.jpg -- 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. === removed file 'src/docbkx/en/resources/images/data_dimensions/pivot1.jpg' Binary files src/docbkx/en/resources/images/data_dimensions/pivot1.jpg 2010-03-02 09:37:54 + and src/docbkx/en/resources/images/data_dimensions/pivot1.jpg 1970-01-01 00:00:00 + differ === removed file 'src/docbkx/en/resources/images/data_dimensions/pivot2.jpg' Binary files src/docbkx/en/resources/images/data_dimensions/pivot2.jpg 2010-03-02 09:37:54 + and src/docbkx/en/resources/images/data_dimensions/pivot2.jpg 1970-01-01 00:00:00 + differ === removed file 'src/docbkx/en/resources/images/data_dimensions/pivot3.jpg' Binary files src/docbkx/en/resources/images/data_dimensions/pivot3.jpg 2010-03-02 09:37:54 + and src/docbkx/en/resources/images/data_dimensions/pivot3.jpg 1970-01-01 00:00:00 + differ === removed file 'src/docbkx/en/resources/images/data_dimensions/pivot4.jpg' Binary files src/docbkx/en/resources/images/data_dimensions/pivot4.jpg 2010-03-02 09:37:54 + and src/docbkx/en/resources/images/data_dimensions/pivot4.jpg 1970-01-01 00:00:00 + differ === removed file 'src/docbkx/en/resources/images/data_dimensions/pivot5.jpg' Binary files src/docbkx/en/resources/images/data_dimensions/pivot5.jpg 2010-03-02 09:37:54 + and src/docbkx/en/resources/images/data_dimensions/pivot5.jpg 1970-01-01 00:00:00 + 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 135: Updated the DHIS data dimensions chapter. Work in progress on a paper form to multidimensional da...
revno: 135 committer: Ola Hodne Titlestad olati...@gmail.com branch nick: dhis2-docbook-docs timestamp: Fri 2010-03-19 00:18:50 +0100 message: Updated the DHIS data dimensions chapter. Work in progress on a paper form to multidimensional data set tutorial. Great if someone can fix the problem with two of the images here, they are just shown as tumbnails for some odd reason. added: src/docbkx/en/resources/images/data_dimensions/PHUF3.jpg src/docbkx/en/resources/images/data_dimensions/pivot_dataelements.jpg src/docbkx/en/resources/images/data_dimensions/pivot_dataelements_diagnoses.jpg src/docbkx/en/resources/images/data_dimensions/pivot_diagnoses.jpg src/docbkx/en/resources/images/data_dimensions/pivot_diagnoses_all.jpg src/docbkx/en/resources/images/data_dimensions/pivot_hiv_age.jpg src/docbkx/en/resources/images/data_dimensions/pivot_hiv_age_gender.jpg src/docbkx/en/resources/images/data_dimensions/pivot_morb_age.jpg src/docbkx/en/resources/images/data_dimensions/pivot_overview_1.jpg modified: src/docbkx/en/dhis2_user_man_data_dimensions.xml The size of the diff (1078 lines) is larger than your specified limit of 1000 lines -- 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. ___ 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 513789] Re: Program Stages History/Plan in Patient Module show "Complited" about partially entered data.
** Changed in: dhis2 Status: New => Fix Committed -- Program Stages History/Plan in Patient Module show "Complited" about partially entered data. https://bugs.launchpad.net/bugs/513789 You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. Status in DHIS 2 - District Health Information Software: Fix Committed Bug description: In Name-Based Data Records--> Data Entry, here we are selectiong specific organisation unit, Specific Programe and specific programe stage than it display the data entry screen for that. Now for example if a program stage has 5 attributes and only one is filled till now than programe stage history plan will show it Complited with date inspite of 4 attributes entry is still left. I think it should show complited only when all the entry get finished. ___ 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 540908] [NEW] Data Element Groups: both available and selected DE lists are empty in the edit data element group window
I think this was introduced after Saptarshi did the jquery sorting fix, but not sure. Its weird since some templates now have groupMembers array while others don't. Saptarshi, do you think you can have a look at this and make sure things are consistent across all lists..? Lars On Thu, Mar 18, 2010 at 2:15 PM, Ola Hodne Titlestad wrote: > Public bug reported: > > I've noticed that when editing existing data element groups (that have > data elements assigned to them) both the available and selected data > elements list are empty. > > If you look at the same groups in the Data Element Group Editor window > (where you can traverse all groups in the same window) you can see that > there are data elements in these groups. > > Is this somehow related to the newly introduced validation of group > memberships? I've noticed the new > dataelements_dataelementgroupsetmembers table. and the option to > assign data element group sets to data elements in the add/edit Data > Element window. > > When I tried to add a new data element and assigned it to a couple of > group sets that data element still didn't show up under available data > elements in the edit data element group window, so not sure what is > happening. > > If you add a new data element group all the data elements are listed > under available DE. > > ** Affects: dhis2 > Importance: Undecided > Status: New > > -- > Data Element Groups: both available and selected DE lists are empty in the > edit data element group window > https://bugs.launchpad.net/bugs/540908 > You received this bug notification because you are a member of DHIS 2 > coordinators, which is the registrant for DHIS. > > Status in DHIS 2 - District Health Information Software: New > > Bug description: > I've noticed that when editing existing data element groups (that have data > elements assigned to them) both the available and selected data elements > list are empty. > > If you look at the same groups in the Data Element Group Editor window > (where you can traverse all groups in the same window) you can see that > there are data elements in these groups. > > Is this somehow related to the newly introduced validation of group > memberships? I've noticed the new dataelements_dataelementgroupsetmembers > table. and the option to assign data element group sets to data elements > in the add/edit Data Element window. > > When I tried to add a new data element and assigned it to a couple of group > sets that data element still didn't show up under available data elements in > the edit data element group window, so not sure what is happening. > > If you add a new data element group all the data elements are listed under > available DE. > > > -- Data Element Groups: both available and selected DE lists are empty in the edit data element group window https://bugs.launchpad.net/bugs/540908 You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. Status in DHIS 2 - District Health Information Software: New Bug description: I've noticed that when editing existing data element groups (that have data elements assigned to them) both the available and selected data elements list are empty. If you look at the same groups in the Data Element Group Editor window (where you can traverse all groups in the same window) you can see that there are data elements in these groups. Is this somehow related to the newly introduced validation of group memberships? I've noticed the new dataelements_dataelementgroupsetmembers table. and the option to assign data element group sets to data elements in the add/edit Data Element window. When I tried to add a new data element and assigned it to a couple of group sets that data element still didn't show up under available data elements in the edit data element group window, so not sure what is happening. If you add a new data element group all the data elements are listed under available DE. ___ 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 1669: Renamed getAllOperands to getAllGeneratedOperands
revno: 1669
committer: Lars Helge Oeverland
branch nick: trunk
timestamp: Thu 2010-03-18 14:47:29 +0100
message:
Renamed getAllOperands to getAllGeneratedOperands
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.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/dataelement/DataElementService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java 2010-03-17 13:16:09 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java 2010-03-18 13:47:29 +
@@ -489,5 +489,5 @@
*
* @return a collection of all Operands.
*/
-Collection getAllOperands();
+Collection getAllGeneratedOperands();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java 2010-03-17 13:16:09 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java 2010-03-18 13:47:29 +
@@ -266,10 +266,10 @@
// -
/**
- * Returns all Operands. Requires the categoryoptioncomboname resource table
- * to be populated.
+ * Returns all generated permutations of Operands. Requires the
+ * categoryoptioncomboname resource table to be populated.
*
* @return a collection of all Operands.
*/
-Collection getAllOperands();
+Collection getAllGeneratedOperands();
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java 2010-03-17 13:16:09 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java 2010-03-18 13:47:29 +
@@ -613,8 +613,8 @@
// Operand
// -
-public Collection getAllOperands()
+public Collection getAllGeneratedOperands()
{
-return dataElementStore.getAllOperands();
+return dataElementStore.getAllGeneratedOperands();
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java 2010-03-17 13:16:09 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java 2010-03-18 13:47:29 +
@@ -418,7 +418,7 @@
// Operand
// -
-public Collection getAllOperands()
+public Collection getAllGeneratedOperands()
{
final ObjectMapper mapper = new ObjectMapper();
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java 2010-03-17 13:16:09 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java 2010-03-18 13:47:29 +
@@ -72,7 +72,7 @@
public String execute()
{
-operands = new ArrayList( dataElementService.getAllOperands() );
+operands = new ArrayList( dataElementService.getAllGeneratedOperands() );
Collections.sort( operands, new DataElementOperandNameComparator() );
___
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 513789] Re: Program Stages History/Plan in Patient Module show "Complited" about partially entered data.
Fixed this. One point to note here : A program stage can have some compulsory data elements. So this program stage can be completed after all the compulsory had data, and not compulsory data elements can be empty. -- Program Stages History/Plan in Patient Module show "Complited" about partially entered data. https://bugs.launchpad.net/bugs/513789 You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. Status in DHIS 2 - District Health Information Software: New Bug description: In Name-Based Data Records--> Data Entry, here we are selectiong specific organisation unit, Specific Programe and specific programe stage than it display the data entry screen for that. Now for example if a program stage has 5 attributes and only one is filled till now than programe stage history plan will show it Complited with date inspite of 4 attributes entry is still left. I think it should show complited only when all the entry get finished. ___ 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 540908] [NEW] Data Element Groups: both available and selected DE lists are empty in the edit data element group window
Public bug reported: I've noticed that when editing existing data element groups (that have data elements assigned to them) both the available and selected data elements list are empty. If you look at the same groups in the Data Element Group Editor window (where you can traverse all groups in the same window) you can see that there are data elements in these groups. Is this somehow related to the newly introduced validation of group memberships? I've noticed the new dataelements_dataelementgroupsetmembers table. and the option to assign data element group sets to data elements in the add/edit Data Element window. When I tried to add a new data element and assigned it to a couple of group sets that data element still didn't show up under available data elements in the edit data element group window, so not sure what is happening. If you add a new data element group all the data elements are listed under available DE. ** Affects: dhis2 Importance: Undecided Status: New -- Data Element Groups: both available and selected DE lists are empty in the edit data element group window https://bugs.launchpad.net/bugs/540908 You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. Status in DHIS 2 - District Health Information Software: New Bug description: I've noticed that when editing existing data element groups (that have data elements assigned to them) both the available and selected data elements list are empty. If you look at the same groups in the Data Element Group Editor window (where you can traverse all groups in the same window) you can see that there are data elements in these groups. Is this somehow related to the newly introduced validation of group memberships? I've noticed the new dataelements_dataelementgroupsetmembers table. and the option to assign data element group sets to data elements in the add/edit Data Element window. When I tried to add a new data element and assigned it to a couple of group sets that data element still didn't show up under available data elements in the edit data element group window, so not sure what is happening. If you add a new data element group all the data elements are listed under available DE. ___ 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 1668: Fix bug #513789 .
revno: 1668
committer: Viet
branch nick: trunk
timestamp: Thu 2010-03-18 18:36:11 +0530
message:
Fix bug #513789 .
modified:
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.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/program/DefaultProgramStageInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2009-11-20 07:45:12 +
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2010-03-18 13:06:11 +
@@ -99,7 +99,7 @@
for ( ProgramStageInstance programStageInstance : programStageInstances )
{
-if ( programStageInstance.getExecutionDate() != null )
+if ( programStageInstance.isCompleted() )
{
colorMap.put( programStageInstance.getId(), ProgramStageInstance.COLOR_GREEN );
}
___
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 1667: Added inline docs for translations
revno: 1667 committer: Lars Helge Oeverland branch nick: trunk timestamp: Thu 2010-03-18 11:55:32 +0100 message: Added inline docs for translations modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.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-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm 2010-03-09 08:30:08 + +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm 2010-03-18 10:55:32 + @@ -1,6 +1,6 @@ -$i18n.getString( "translation_translate" ) +$i18n.getString( "translation_translate" ) #openHelp( "translation" ) @@ -49,7 +49,7 @@ -$i18n.getString( "translation_addlocale") #openHelp( "dhis-web-commons.locale" ) +$i18n.getString( "translation_addlocale") Details ___ 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 383657] Re: Usability issues with static report web interface
** Changed in: dhis2 Status: Confirmed => Fix Committed -- Usability issues with static report web interface https://bugs.launchpad.net/bugs/383657 You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. Status in DHIS 2 - District Health Information Software: Fix Committed Bug description: Two small issues with the static report interface, which is used to upload files or present documents via URL. 1. when URL type is selected "http" is automatically prepended to the url string. This makes it impossible to link to https:// urls for example; 2. it is impossible to edit the static report (for example to fix the string above). The only options are "view", "place on dashboard" and "delete". Should also include "edit". ___ 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 1666: Added required field to concept name
revno: 1666 committer: Lars Helge Oeverland branch nick: trunk timestamp: Thu 2010-03-18 10:45:27 +0100 message: Added required field to concept name modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription. === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm 2010-02-11 14:26:44 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm 2010-03-18 09:45:27 + @@ -33,7 +33,7 @@ - $i18n.getString( "concept_name" ) + $i18n.getString( "concept_name" ) * === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm 2010-02-11 14:26:44 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm 2010-03-18 09:45:27 + @@ -36,7 +36,7 @@ - $i18n.getString( "concept_name" ) + $i18n.getString( "concept_name" ) * ___ 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 1665: Integrity check only displays one of two identical indicator definitions.
revno: 1665
committer: Tran Chau
branch nick: trunk
timestamp: Thu 2010-03-18 16:31:22 +0700
message:
Integrity check only displays one of two identical indicator definitions.
modified:
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOrganisationUnit.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOrganisationUnits.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/validate/jquery.validate.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-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java 2010-01-27 11:51:54 +
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java 2010-03-18 09:31:22 +
@@ -33,7 +33,7 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
+import java.util.Hashtable;
import java.util.Map;
import java.util.Set;
@@ -61,7 +61,7 @@
/**
* @author Lars Helge Overland
- * @version $Id$
+ * @version $Id: DefaultDataIntegrityService.java 2010-03-18 11:52:20Z Chau Thu Tran $
*/
@Transactional
public class DefaultDataIntegrityService
@@ -194,7 +194,7 @@
public Collection getIndicatorsWithIdenticalFormulas()
{
-List formulas = new ArrayList();
+Hashtable formulas = new Hashtable();
Set targets = new HashSet();
@@ -204,13 +204,14 @@
{
final String formula = indicator.getNumerator() + FORMULA_SEPARATOR + indicator.getDenominator();
-if ( formulas.contains( formula ) )
+if(formulas.containsKey( formula ))
{
+targets.add (formulas.get( formula ));
targets.add( indicator );
}
else
{
-formulas.add( formula );
+formulas.put( formula, indicator );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOrganisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOrganisationUnit.vm 2010-01-25 09:23:35 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOrganisationUnit.vm 2010-03-18 09:31:22 +
@@ -3,7 +3,7 @@
$organisationUnit.id
$!encoder.xmlEncode( $organisationUnit.name )
$!encoder.xmlEncode( $organisationUnit.shortName )
-$!encoder.xmlEncode( $organisationUnit.organisationUnitCode )
+$!encoder.xmlEncode( $organisationUnit.code )
$!format.formatPeriod( $organisationUnit.openingDate )
$!format.formatPeriod( $organisationUnit.closedDate )
$organisationUnit.active
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOrganisationUnits.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOrganisationUnits.vm 2010-01-25 09:23:35 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOrganisationUnits.vm 2010-03-18 09:31:22 +
@@ -5,7 +5,7 @@
$unit.id
$!encoder.xmlEncode( $unit.name )
$!encoder.xmlEncode( $unit.shortName )
- $!encoder.xmlEncode( $unit.organisationUnitCode )
+ $!encoder.xmlEncode( $unit.code )
#end
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/validate/jquery.validate.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/validate/jquery.validate.js 2010-03-16 03:34:03 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/validate/jquery.validate.js 2010-03-18 09:31:22 +
@@ -1002,8 +1002,8 @@
// http://docs.jquery.com/Plugins/Validation/Methods/dateISO
dateISO: function(value, element) {
- //return this.optional(element) || /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(value);
- return this.optional(element) || isDate(value, '-MM-dd');
+ return this.optional(element) || /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(value);
+ //return this.optional(element) || isDate(value, '-MM-dd');
},
___
Mailing list: https://launchpad
