dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10855
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-05-16 13:34:18 +0700
message:
  Fix bug - Fitler data elements in other stages not working in Design case entry form.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseSelDataElementList.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.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-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js	2013-05-16 06:09:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/viewDataEntryForm.js	2013-05-16 06:34:18 +0000
@@ -330,9 +330,10 @@
 
 function validateDataEntryForm()
 {
-	if( getFieldValue('name').length==0 )
+	var name = getFieldValue('name');
+	if( name.length==0 || name.length < 4 || name.length > 150 )
 	{
-		setHeaderDelayMessage( i18n_name_exists );
+		setHeaderDelayMessage( i18n_enter_a_name );
 		return;
 	}
 	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseSelDataElementList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseSelDataElementList.vm	2013-01-17 15:58:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseSelDataElementList.vm	2013-05-16 06:34:18 +0000
@@ -5,7 +5,7 @@
 		<dataElement>
 			<id>$dataElement.id</id>
 			<name>$encoder.xmlEncode( $dataElement.name )</name>
-			<code>$encoder.xmlEncode( $dataElement.code )</code>
+			<code>$!encoder.xmlEncode( $dataElement.code )</code>
 			<shortName>$encoder.xmlEncode( $dataElement.shortName )</shortName>
 			<type>$dataElement.type</type>
 			#set($deJSON = '{' + '"id"' + ":" + $dataElement.id + "," + '"name"' + ':"' + "$dataElement.name" + '",' + '"shortName"' + ':"' + "$dataElement.shortName" + '",' + '"type"' + ':"' + "$dataElement.getDetailedTextType()"  + '"}' );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm	2013-05-16 06:09:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm	2013-05-16 06:34:18 +0000
@@ -206,13 +206,13 @@
 			<td>$i18n.getString( "dataelement" )</td>
 			<td>
 				<input type="text" id='otherDataElementFilter' style="width:260px;" onkeyup="filterDataElements( this.value, '#otherProgramStageDataElements', '#dataElementIds')"/>
-				<input type='button' value="$i18n.getString('clear')" style="width:80px;" onclick="setFieldValue('otherDataElementFilter','');">
+				<input type='button' value="$i18n.getString('clear')" style="width:80px;" onclick="setFieldValue('otherDataElementFilter','');filterDataElements('', '#otherProgramStageDataElements', '#dataElementIds')">
 			</td>
 		</tr>
 		<tr>
 			<td colspan='2'>
-				<select id="dataElementIds" name="dataElementIds" style="min-width:400; width:100%; height:210px;" multiple="multiple" size="10" ondblclick="insertDataElement( '#otherProgramStageDataElements', jQuery('#programStageIds option:selected').attr('uid') )"/>
-				<select id="dataElementIdsStore" style="min-width:300px;display:none" multiple="multiple" size="10"/>
+				<select id="dataElementIds" name="dataElementIds" style="min-width:400; width:100%; height:210px;" multiple="multiple" size="10" ondblclick="insertDataElement( '#otherProgramStageDataElements', jQuery('#programStageIds option:selected').attr('uid') )"></select>
+				<select id="dataElementIdsStore" name="dataElementIdsStore" style="min-width:300px;display:none" multiple="multiple" size="10"></select>
 			</td>
 		</tr>
 		<tr>
@@ -275,5 +275,5 @@
 
 <script>
 	var i18n_delete_program_data_entry_confirm = '$encoder.jsEscape( $i18n.getString( "delete_program_data_entry_confirm" ) , "'" )';
-	var i18n_name_exists = '$encoder.jsEscape( $i18n.getString( "name_exists" ) , "'" )';
+	var i18n_enter_a_name = '$encoder.jsEscape( $i18n.getString( "enter_a_name" ) , "'" )';
 </script>