------------------------------------------------------------
revno: 11615
committer: Hong Em <em.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Thu 2013-08-08 19:00:17 +0700
message:
update yes only check box
modified:
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntrySection.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-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java 2013-04-04 18:06:19 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java 2013-08-08 12:00:17 +0000
@@ -293,8 +293,7 @@
storedBy = "[unknown]";
}
- HttpServletRequest request = (HttpServletRequest) ActionContext.getContext().get(
- StrutsStatics.HTTP_REQUEST );
+ HttpServletRequest request = (HttpServletRequest) ActionContext.getContext().get( StrutsStatics.HTTP_REQUEST );
Map<String, String> parameterMap = ContextUtils.getParameterMap( request );
for ( String key : parameterMap.keySet() )
@@ -331,7 +330,8 @@
if ( !valueIsEmpty && !FormUtils.isBoolean( value ) )
{
correctType = false;
- typeViolations.put( key, "\"" + value + "\"" + " " + i18n.getString( "is_invalid_boolean" ) );
+ typeViolations
+ .put( key, "\"" + value + "\"" + " " + i18n.getString( "is_invalid_boolean" ) );
}
}
else if ( type.equals( DataElement.VALUE_TYPE_DATE ) )
@@ -357,7 +357,8 @@
if ( !FormUtils.isInteger( value ) )
{
correctType = false;
- typeViolations.put( key, "\"" + value + "\"" + " " + i18n.getString( "is_invalid_integer" ) );
+ typeViolations
+ .put( key, "\"" + value + "\"" + " " + i18n.getString( "is_invalid_integer" ) );
}
}
else if ( type.equals( DataElement.VALUE_TYPE_INT )
@@ -366,7 +367,8 @@
if ( !FormUtils.isPositiveInteger( value ) )
{
correctType = false;
- typeViolations.put( key, "\"" + value + "\"" + " " + i18n.getString( "is_invalid_positive_integer" ) );
+ typeViolations.put( key,
+ "\"" + value + "\"" + " " + i18n.getString( "is_invalid_positive_integer" ) );
}
}
else if ( type.equals( DataElement.VALUE_TYPE_INT )
@@ -375,7 +377,8 @@
if ( !FormUtils.isNegativeInteger( value ) )
{
correctType = false;
- typeViolations.put( key, "\"" + value + "\"" + " " + i18n.getString( "is_invalid_negative_integer" ) );
+ typeViolations.put( key,
+ "\"" + value + "\"" + " " + i18n.getString( "is_invalid_negative_integer" ) );
}
}
}
@@ -413,6 +416,7 @@
}
}
}
+
}
}
@@ -464,8 +468,7 @@
validationViolations = formUtils.getValidationViolations( organisationUnit, dataElements, period );
- if ( needsValidation
- && (!validationViolations.isEmpty() || !typeViolations.isEmpty()) )
+ if ( needsValidation && (!validationViolations.isEmpty() || !typeViolations.isEmpty()) )
{
return ERROR;
}
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntrySection.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntrySection.vm 2013-07-16 07:21:12 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntrySection.vm 2013-08-08 12:00:17 +0000
@@ -85,10 +85,7 @@
#elseif( $dataElement.type == "int" && $dataElement.numberType == "negativeNumber" )
<input type="text" maxlength="255" size="24" name="$key" value="$!dataValues.get($key)" />
#elseif($dataElement.type=="trueOnly")
- <select name="$key">
- <option value="">$i18n.getString("please_select")</option>
- <option #if( $prevDataValues.get( $key ) == "true" ) selected="selected" #end value="true">$i18n.getString("yes")</option>
- </select>
+ <input name="$key" type="checkbox" #if($!dataValues.get($key) == "on" ) checked #end/>
#end
#end
#end
_______________________________________________
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
