------------------------------------------------------------
revno: 14307
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Thu 2014-03-20 14:14:38 +0700
message:
Fixed error when to build
modified:
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.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-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java 2014-03-19 06:44:30 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java 2014-03-20 07:14:38 +0000
@@ -274,11 +274,12 @@
if ( value != null )
{
- if ( patientAttribute.isMandatory() && value.trim().equals( "" ) )
+ /* if ( patientAttribute.isMandatory() && value.trim().equals( "" ) )
{
this.validationMap.put( key, "is_mandatory" );
}
- else if ( value.trim().length() > 0
+ else */
+ if ( value.trim().length() > 0
&& patientAttribute.getValueType().equals( TrackedEntityAttribute.TYPE_INT )
&& !MathUtils.isInteger( value ) )
{
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java 2014-03-19 06:44:30 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java 2014-03-20 07:14:38 +0000
@@ -316,11 +316,12 @@
if ( value != null )
{
- if ( patientAttribute.isMandatory() && value.trim().equals( "" ) )
+ /* if ( patientAttribute.isMandatory() && value.trim().equals( "" ) )
{
this.validationMap.put( key, "is_mandatory" );
}
- else if ( value.trim().length() > 0
+ else */
+ if ( value.trim().length() > 0
&& patientAttribute.getValueType().equals( TrackedEntityAttribute.TYPE_INT )
&& !MathUtils.isInteger( value ) )
{
_______________________________________________
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
