dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11549
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-08-01 10:36:44 +0700
message:
  Minor fix for Add/Update programstage form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addProgramStageForm.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.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-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-08-01 03:02:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-08-01 03:36:44 +0000
@@ -668,4 +668,5 @@
 use_orgunits_from_level = Use organisation units from level
 message = Message
 add_patient = Add person
-confirmation_delete_message =  Are you sure you want to delete this message ?
\ No newline at end of file
+confirmation_delete_message =  Are you sure you want to delete this message ?
+recipients = Recipients
\ 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/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2013-07-31 06:51:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2013-08-01 03:36:44 +0000
@@ -1,20 +1,11 @@
+<script type="text/javascript" src="javascript/addProgramStageForm.js"></script>
 <script>
 	var program_stage_SMS_reminder_form ="<select type='text' id='userGroup$index' name='userGroup$index' class='userGroup'>";
 	#foreach( $group in $userGroups )
 		program_stage_SMS_reminder_form += "<option value='$group.id'>$i18n.getString($group.name)</option>";
 	#end
 	program_stage_SMS_reminder_form +="</select>";
-
-	function onchangeUserGroup( id )
-	{
-		var value = document.getElementById( 'sendTo'+id ).value;
-		hideById( 'tr'+id );
-		if ( value == 5) {
-			showById( 'tr'+id );
-		}
-	};
 </script>
-<script type="text/javascript" src="javascript/addProgramStageForm.js"></script>
 
 <h3>$i18n.getString( "create_new_program_stage" )</h3>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addProgramStageForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addProgramStageForm.js	2013-07-26 09:32:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addProgramStageForm.js	2013-08-01 03:36:44 +0000
@@ -102,3 +102,12 @@
 		
 	checkValueIsExist( "name", "validateProgramStage.action",{id: getFieldValue('programId')});	
 });
+
+function onchangeUserGroup( id )
+{
+	var value = document.getElementById( 'sendTo'+id ).value;
+	hideById( 'tr'+id );
+	if ( value == 5) {
+		showById( 'tr'+id );
+	}
+};
\ 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/javascript/updateProgramStageForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js	2013-07-29 09:28:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js	2013-08-01 03:36:44 +0000
@@ -121,4 +121,13 @@
 		else
 			hideById ( 'tr'+numb );
 	});
-}
\ No newline at end of file
+}
+
+function onchangeUserGroup( id )
+{
+	var value = document.getElementById( 'sendTo'+id ).value;
+	hideById( 'tr'+id );
+	if ( value == 5) {
+		showById( 'tr'+id );
+	}
+};
\ 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/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2013-07-31 06:51:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2013-08-01 03:36:44 +0000
@@ -1,20 +1,12 @@
+<script type="text/javascript" src="javascript/updateProgramStageForm.js"></script>
 <script>
 	var program_stage_SMS_reminder_form ="<select type='text' id='userGroup$index' name='userGroup$index' class='userGroup'>";
 	#foreach( $group in $userGroups )
 		program_stage_SMS_reminder_form += "<option value='$group.id'>$i18n.getString($group.name)</option>";
 	#end
 	program_stage_SMS_reminder_form +="</select>";
-
-	function onchangeUserGroup( id )
-	{
-		var value = document.getElementById( 'sendTo'+id ).value;
-		hideById( 'tr'+id );
-		if ( value == 5) {
-			showById( 'tr'+id );
-		}
-	};
 </script>
-<script type="text/javascript" src="javascript/updateProgramStageForm.js"></script>
+
 <h3>$i18n.getString( "edit_program_stage" )</h3>
 
 <h4>$programStage.program.displayName</h4>