dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17112: Fixed bug - Before and after template messsage is missing and doing the opposite of expected.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Tue, 14 Oct 2014 14:07:27 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 17112
committer: Tran Chau<tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-10-14 21:04:11 +0700
message:
  Fixed bug - Before and after template messsage is missing and doing the opposite of expected.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.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-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm	2014-08-06 15:20:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm	2014-10-14 14:04:11 +0000
@@ -62,8 +62,8 @@
 				onkeyup='setRealDays();' style="width:100px;" />
 				$i18n.getString('days')
 				<select id='time' name='time' onchange='setRealDays();' style="width:100px;">
-					<option value='1' >$i18n.getString('before')</option>
-					<option value='-1' >$i18n.getString('after')</option>
+					<option value='-1' >$i18n.getString('before')</option>
+					<option value='1' >$i18n.getString('after')</option>
 				</select>
 				$i18n.getString('scheduled_date')
 				<input type="hidden" id="daysAllowedSendMessage" name="daysAllowedSendMessage" />

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm	2014-08-06 15:20:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm	2014-10-14 14:04:11 +0000
@@ -52,8 +52,8 @@
 				onkeyup='setRealDays();' style="width:100px;"/>
 				$i18n.getString('days')
 				<select id='time' name='time' onchange='setRealDays();' style="width:100px;">
-					<option value='1' >$i18n.getString('before')</option>
-					<option value='-1' >$i18n.getString('after')</option>
+					<option value='-1' >$i18n.getString('before')</option>
+					<option value='1' >$i18n.getString('after')</option>
 				</select>
 				$i18n.getString('scheduled_date')
 				<input type="hidden" id="daysAllowedSendMessage" name="daysAllowedSendMessage" />

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm	2014-08-06 15:20:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm	2014-10-14 14:04:11 +0000
@@ -102,8 +102,8 @@
 				$i18n.getString('days')
 				<select id='time' name='time' onchange='setRealDays();' style="width:100px;"
 					#if($!reminder.whenToSend==1 || $!reminder.whenToSend==3 ) disabled #end  >
-					<option value='1' #if($time=='1') selected #end >$i18n.getString('before')</option>
-					<option value='-1' #if($time=='-1') selected #end  >$i18n.getString('after')</option>
+					<option value='-1' #if($time=='-1') selected #end >$i18n.getString('before')</option>
+					<option value='1' #if($time=='1') selected #end  >$i18n.getString('after')</option>
 				</select>
 				$i18n.getString('scheduled_date')
 				<input type="hidden" id="daysAllowedSendMessage" name="daysAllowedSendMessage" value="$!reminder.daysAllowedSendMessage" />

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm	2014-08-07 13:25:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm	2014-10-14 14:04:11 +0000
@@ -65,8 +65,8 @@
 				$i18n.getString('days')
 				<select id='time' name='time' onchange='setRealDays();' style="width:100px;"
 					#if($!reminder.whenToSend==1 || $!reminder.whenToSend==3 ) disabled #end  >
-					<option value='1' #if($time=='1') selected #end >$i18n.getString('before')</option>
-					<option value='-1' #if($time=='-1') selected #end  >$i18n.getString('after')</option>
+					<option value='-1' #if($time=='-1') selected #end >$i18n.getString('before')</option>
+					<option value='1' #if($time=='1') selected #end  >$i18n.getString('after')</option>
 				</select>
 				$i18n.getString('scheduled_date')
 				<input type="hidden" id="daysAllowedSendMessage" name="daysAllowedSendMessage" value="$!reminder.daysAllowedSendMessage" />