dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12994
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4082: Fixed bug: Only show dataelements with Patient domain into add/update program-stage.
------------------------------------------------------------
revno: 4082
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-07-07 12:00:40 +0700
message:
Fixed bug: Only show dataelements with Patient domain into add/update program-stage.
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/ShowAddProgramStageFormAction.java
modified:
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.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/src/main/java/org/hisp/dhis/commons/action/GetDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementsAction.java 2011-05-28 21:04:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementsAction.java 2011-07-07 05:00:40 +0000
@@ -162,6 +162,13 @@
return dataElements;
}
+ public String domain;
+
+ public void setDomain( String domain )
+ {
+ this.domain = domain;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -184,8 +191,8 @@
if ( categoryCombo != null )
{
- dataElements = new ArrayList<DataElement>(
- dataElementService.getDataElementByCategoryCombo( categoryCombo ) );
+ dataElements = new ArrayList<DataElement>( dataElementService
+ .getDataElementByCategoryCombo( categoryCombo ) );
}
}
else if ( dataSetId != null )
@@ -206,6 +213,11 @@
dataElements = new ArrayList<DataElement>( dataElementService.getDataElementsByPeriodType( periodType ) );
}
}
+ else if ( domain != null )
+ {
+ dataElements = new ArrayList<DataElement>( dataElementService
+ .getDataElementsByDomainType( DataElement.DOMAIN_TYPE_PATIENT ) );
+ }
else
{
dataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageAction.java 2011-07-05 03:06:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageAction.java 2011-07-07 05:00:40 +0000
@@ -61,35 +61,6 @@
this.programStageService = programStageService;
}
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- // -------------------------------------------------------------------------
- // Comparator
- // -------------------------------------------------------------------------
-
- private Comparator<DataElement> dataElementComparator;
-
- public void setDataElementComparator( Comparator<DataElement> dataElementComparator )
- {
- this.dataElementComparator = dataElementComparator;
- }
-
- // -------------------------------------------------------------------------
- // DisplayPropertyHandler
- // -------------------------------------------------------------------------
-
- private DisplayPropertyHandler displayPropertyHandler;
-
- public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
- {
- this.displayPropertyHandler = displayPropertyHandler;
- }
-
// -------------------------------------------------------------------------
// Input/Output
// -------------------------------------------------------------------------
@@ -120,13 +91,6 @@
return programStageDataElements;
}
- private List<DataElement> dataElements;
-
- public List<DataElement> getDataElements()
- {
- return dataElements;
- }
-
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -138,22 +102,6 @@
programStageDataElements = programStage.getProgramStageDataElements();
- dataElements = new ArrayList<DataElement>( dataElementService
- .getDataElementsByDomainType( DataElement.DOMAIN_TYPE_PATIENT ) );
-
- for ( ProgramStageDataElement psde : programStageDataElements )
- {
- dataElements.remove( psde.getDataElement() );
- }
-
- // ---------------------------------------------------------------------
- // Sorted available dataelements
- // ---------------------------------------------------------------------
-
- Collections.sort( dataElements, dataElementComparator );
-
- displayPropertyHandler.handle( dataElements );
-
return SUCCESS;
}
}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/ShowAddProgramStageFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/ShowAddProgramStageFormAction.java 2011-07-05 03:06:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/ShowAddProgramStageFormAction.java 1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-package org.hisp.dhis.patient.action.programstage;
-
-/*
- * Copyright (c) 2004-2009, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
-import org.hisp.dhis.program.Program;
-import org.hisp.dhis.program.ProgramService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Abyot Asalefew Gizaw
- * @modified Tran Thanh Tri
- * @version $Id$
- */
-public class ShowAddProgramStageFormAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private ProgramService programService;
-
- public void setProgramService( ProgramService programService )
- {
- this.programService = programService;
- }
-
- // -------------------------------------------------------------------------
- // Comparator
- // -------------------------------------------------------------------------
-
- private Comparator<DataElement> dataElementComparator;
-
- public void setDataElementComparator( Comparator<DataElement> dataElementComparator )
- {
- this.dataElementComparator = dataElementComparator;
- }
-
- // -------------------------------------------------------------------------
- // DisplayPropertyHandler
- // -------------------------------------------------------------------------
-
- private DisplayPropertyHandler displayPropertyHandler;
-
- public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
- {
- this.displayPropertyHandler = displayPropertyHandler;
- }
-
- // -------------------------------------------------------------------------
- // Input/Output
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public Integer getId()
- {
- return id;
- }
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- private Program program;
-
- public Program getProgram()
- {
- return program;
- }
-
- public void setProgram( Program program )
- {
- this.program = program;
- }
-
- private List<DataElement> dataElements;
-
- public List<DataElement> getDataElements()
- {
- return dataElements;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- program = programService.getProgram( id.intValue() );
-
- dataElements = new ArrayList<DataElement>( dataElementService
- .getDataElementsByDomainType( DataElement.DOMAIN_TYPE_PATIENT ) );
-
- Collections.sort( dataElements, dataElementComparator );
-
- displayPropertyHandler.handle( dataElements );
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2011-07-05 05:23:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2011-07-07 05:00:40 +0000
@@ -737,7 +737,6 @@
class="org.hisp.dhis.patient.action.programstage.GetProgramStageAction"
scope="prototype">
<property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
</bean>
<bean
@@ -764,14 +763,6 @@
</bean>
<bean
- id="org.hisp.dhis.patient.action.programstage.ShowAddProgramStageFormAction"
- class="org.hisp.dhis.patient.action.programstage.ShowAddProgramStageFormAction"
- scope="prototype">
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- </bean>
-
- <bean
id="org.hisp.dhis.patient.action.programstage.UpdateProgramStageAction"
class="org.hisp.dhis.patient.action.programstage.UpdateProgramStageAction"
scope="prototype">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2011-07-05 05:23:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2011-07-07 05:00:40 +0000
@@ -691,7 +691,7 @@
</action>
<action name="showAddProgramStageForm"
- class="org.hisp.dhis.patient.action.programstage.ShowAddProgramStageFormAction">
+ class="org.hisp.dhis.patient.action.program.GetProgramAction">
<result name="input" type="velocity-xml">
/dhis-web-commons/ajax/xmlResponseInput.vm</result>
<result name="success" type="velocity">/main.vm</result>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2011-07-05 03:55:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2011-07-07 05:00:40 +0000
@@ -2,7 +2,7 @@
<script type="text/javascript">
jQuery(function() {
jQuery("#availableList").dhisAjaxSelect({
- source: "../dhis-web-commons-ajax-json/getDataElements.action",
+ source: "../dhis-web-commons-ajax-json/getDataElements.action?domain=patient",
iterator: "dataElements",
connectedTo: 'selectedDataElementsValidator',
handler: function(item) {
@@ -71,9 +71,6 @@
<tr>
<td>
<select size="15" id="availableList" name='availableList' multiple="multiple" style="width:30em;height:20em" ondblclick="selectDataElements()">
- #foreach ( $dataElement in $dataElements )
- <option value="$dataElement.id">$encoder.htmlEncode( $dataElement.name )</option>
- #end
</select>
</td>
<td valign="top" align="center">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2011-07-05 03:55:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2011-07-07 05:00:40 +0000
@@ -2,15 +2,24 @@
<script type="text/javascript">
jQuery(function() {
jQuery("#availableList").dhisAjaxSelect({
- source: "../dhis-web-commons-ajax-json/getDataElements.action",
+ source: "../dhis-web-commons-ajax-json/getDataElements.action?domain=patient",
iterator: "dataElements",
connectedTo: 'selectedDataElementsValidator',
handler: function(item) {
var option = jQuery("<option />");
option.text( item.name );
option.attr( "value", item.id );
-
- return option;
+
+ var flag = false;
+ jQuery("#selectedList").find("tr").each( function( k, selectedItem ){
+ if(selectedItem.id == item.id )
+ {
+ flag = true;
+ return;
+ }
+ });
+
+ if(!flag) return option;
}
});
});
@@ -78,9 +87,6 @@
<tr>
<td>
<select size="15" id="availableList" multiple="multiple" style="width:30em;height:20em" ondblclick="selectDataElements( )">
- #foreach ( $dataElement in $dataElements )
- <option value="$dataElement.id">$encoder.htmlEncode( $dataElement.name )</option>
- #end
</select>
</td>
<td valign="top" align="center">
