dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #21354
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10077: Fix bug - build fail.
------------------------------------------------------------
revno: 10077
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-03-08 20:27:22 +0700
message:
Fix bug - build fail.
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/GetCalPatientAttributeParamsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonCalPatientAttributeParams.vm
modified:
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/addPatientAttributeForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.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
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/GetCalPatientAttributeParamsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/GetCalPatientAttributeParamsAction.java 2012-12-21 09:23:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/GetCalPatientAttributeParamsAction.java 1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-/*
- * 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.
- */
-
-package org.hisp.dhis.patient.action.patientattribute;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.hisp.dhis.patient.PatientAttribute;
-import org.hisp.dhis.patient.PatientAttributeService;
-import org.hisp.dhis.program.Program;
-import org.hisp.dhis.program.ProgramService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version GetCalPatientAttributeParamsAction.java 2:35:22 PM Dec 21, 2012 $
- */
-public class GetCalPatientAttributeParamsAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependency
- // -------------------------------------------------------------------------
-
- private PatientAttributeService patientAttributeService;
-
- public void setPatientAttributeService( PatientAttributeService patientAttributeService )
- {
- this.patientAttributeService = patientAttributeService;
- }
-
- private ProgramService programService;
-
- public void setProgramService( ProgramService programService )
- {
- this.programService = programService;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private Collection<Program> programs = new ArrayList<Program>();
-
- public Collection<Program> getPrograms()
- {
- return programs;
- }
-
- private Collection<PatientAttribute> patientAttributes = new ArrayList<PatientAttribute>();
-
- public Collection<PatientAttribute> getPatientAttributes()
- {
- return patientAttributes;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- programs = programService.getAllPrograms();
- programs.removeAll( programService.getPrograms( Program.SINGLE_EVENT_WITHOUT_REGISTRATION ) );
-
- patientAttributes = patientAttributeService.getAllPatientAttributes();
- patientAttributes.removeAll( patientAttributeService
- .getPatientAttributesByValueType( PatientAttribute.TYPE_CALCULATED ) );
-
- 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 2013-03-06 14:00:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2013-03-08 13:27:22 +0000
@@ -152,15 +152,6 @@
<property name="programService" ref="org.hisp.dhis.program.ProgramService" />
</bean>
- <bean
- id="org.hisp.dhis.patient.action.patientattribute.GetCalPatientAttributeParamsAction"
- class="org.hisp.dhis.patient.action.patientattribute.GetCalPatientAttributeParamsAction"
- scope="prototype">
- <property name="patientAttributeService"
- ref="org.hisp.dhis.patient.PatientAttributeService" />
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- </bean>
-
<!-- Program -->
<bean id="org.hisp.dhis.patient.action.program.AddProgramAction"
=== 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 2013-03-07 20:07:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2013-03-08 13:27:22 +0000
@@ -191,14 +191,6 @@
<param name="requiredAuthorities">F_PATIENTATTRIBUTE_DELETE</param>
</action>
- <action name="getCalPatientAttributeParams"
- class="org.hisp.dhis.patient.action.patientattribute.GetCalPatientAttributeParamsAction">
- <result name="success" type="velocity-json">
- /dhis-web-maintenance-patient/jsonCalPatientAttributeParams.vm
- </result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
<!-- Program -->
<action name="program"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm 2013-03-08 09:15:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientAttributeForm.vm 2013-03-08 13:27:22 +0000
@@ -64,22 +64,6 @@
</td>
</tr>
- <tr id="operatorTR" class="hidden">
- <td></td>
- <td>
- <input type='button' class="small-button" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "+" );' value="+" />
- <input type='button' class="small-button" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "-" );' value="-" />
- <input type='button' class="small-button" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "*" );' value="*" />
- <input type='button' class="small-button" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "/" );' value="/" />
- </td>
- </tr>
-
- <tr id="expressionTR" class="hidden">
- <td>$i18n.getString( "expression" )</td>
- <td>
- <textarea id="expression" name="expression" style="width:320px;" onkeyup='getConditionDescription();'></textarea>
- </td>
- </tr>
<tr id="descriptionTR" class="hidden">
<td></td>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2013-03-08 09:15:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js 2013-03-08 13:27:22 +0000
@@ -34,8 +34,6 @@
if ( jQuery(this_).val() == "combo" )
{
hideById("calculatedAttrTR");
- hideById("expressionTR");
- hideById("operatorTR");
showById("attributeComboRow");
if( jQuery("#attrOptionContainer").find("input").length ==0 )
{
@@ -67,17 +65,11 @@
}
hideById("attributeComboRow");
showById("calculatedAttrTR");
- showById("operatorTR");
- showById("expressionTR");
- showById("descriptionTR");
}
else
{
hideById("attributeComboRow");
hideById("calculatedAttrTR");
- hideById("operatorTR");
- hideById("expressionTR");
- hideById("descriptionTR");
}
},
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonCalPatientAttributeParams.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonCalPatientAttributeParams.vm 2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonCalPatientAttributeParams.vm 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#set( $size = $!{patientAttributes.size()} )
-{ "patientAttributeParams": [
- #foreach( $patientAttribute in $!{patientAttributes} )
- {
- "id": "$patientAttribute.id",
- "name": "$!encoder.jsonEncode( ${patientAttribute.name} )"
- }#if( $velocityCount < $size ),#end
- #end
- ],
- #set( $size = $!{programs.size()} )
- "programs":[
- #foreach( $program in $programs )
- {
- "id": "$program.id",
- "name": "$!encoder.jsonEncode( ${program.displayName} )"
- }#if( $velocityCount < $size ),#end
- #end
- ]
-}
\ 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/updatePatientAttibuteForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm 2013-03-08 09:15:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm 2013-03-08 13:27:22 +0000
@@ -67,39 +67,6 @@
<td><span id="attrMessage" name="attrMessage" style="color:red;"></span></td>
</tr>
- <tr id="calculatedAttrTR">
- <td>$i18n.getString( "properties" )</td>
- <td>
- <select multiple id="availableAttribute" name="availableAttribute" ondblclick="insertTextCommon( 'expression', this.value);getConditionDescription();" ></select>
- </td>
- </tr>
-
- <tr id="operatorTR" class="hidden">
- <td></td>
- <td>
- <input type='button' class="small-button" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "+" );' value="+" />
- <input type='button' class="small-button" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "-" );' value="-" />
- <input type='button' class="small-button" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "*" );' value="*" />
- <input type='button' class="small-button" alt="$i18n.getString( 'plus' )" onclick='insertOperator( "/" );' value="/" />
- </td>
- </tr>
-
- <tr id="expressionTR" >
- <td>$i18n.getString( "expression" )</td>
- <td>
- <textarea id="expression" name="expression" onkeyup='getConditionDescription();' style="width:320px;" >$!patientAttribute.expression</textarea>
- </td>
- </tr>
-
- <tr id="descriptionTR">
- <td></td>
- <td>
- <fieldset>
- <legend>$i18n.getString( "description" )</legend>
- <div id='expDescription' style="width:320px;">$!description</div>
- </fieldset>
- </td>
- </tr>
</tbody>
<tr>
