dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11071
committer: Long <Long@Long-Laptop>
branch nick: dhis2
timestamp: Wed 2013-05-29 14:41:44 +0700
message:
  support yes-only data type for tracking in light module
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/anonymous/anonymousProgramForm.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/completedProgramStageForm.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventForm.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/webapp/dhis-web-light/anonymous/anonymousProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/anonymous/anonymousProgramForm.vm	2013-03-20 07:14:26 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/anonymous/anonymousProgramForm.vm	2013-05-29 07:41:44 +0000
@@ -55,7 +55,12 @@
 							#end
 							> $userName.getUsername() </option>
 						#end
-					</select>	
+					</select>
+			#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>			
 			#else
 				<input type="text" name="$key" value="$!prevDataValues.get($key)" />
 			#end	

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/completedProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/completedProgramStageForm.vm	2012-11-15 06:17:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/completedProgramStageForm.vm	2013-05-29 07:41:44 +0000
@@ -45,6 +45,11 @@
 							<option #if( $prevDataValues.get( $key ) == "true" ) selected="selected" #end value="true">$i18n.getString("yes")</option>
 							<option #if( $prevDataValues.get( $key ) == "false" ) selected="selected" #end value="false">$i18n.getString("no")</option>
 						</select>
+					#elseif($dataElement.type=="trueOnly")
+						<select name="$key" DISABLED>
+							<option value="">$i18n.getString("please_select")</option>
+							<option #if( $prevDataValues.get( $key ) == "true" ) selected="selected" #end value="true">$i18n.getString("yes")</option>
+						</select>	
 					#else
 						<input type=
 						#if($dataElement.type=="string") 

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.vm	2013-04-22 03:11:28 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.vm	2013-05-29 07:41:44 +0000
@@ -76,10 +76,15 @@
 							> $userName.getUsername() </option>
 						#end
 					</select>
+				#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>		
 				#else
 					<input type="text" name="$key" value="$!prevDataValues.get($key)" />
 				#end
-	
+			
 			#elseif ($dataElement.getOptionSet())
 				#set( $options = $dataElement.getOptionSet().getOptions() )
 				<select type="text" name="$key" />

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventForm.vm	2013-03-20 07:14:26 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventForm.vm	2013-05-29 07:41:44 +0000
@@ -41,7 +41,12 @@
 						#end
 						> $userName.getUsername() </option>
 					#end
-				</select>	
+				</select>
+			#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>		
 			#else
 				<input type="text" name="$key" value="$!prevDataValues.get($key)" />
 			#end