dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14659
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-04-04 19:59:24 +0700
message:
  Fixed bug - Don't display the program template messages in template list.
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/javascript/programReminder.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programAssociations.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.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-03-24 09:02:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm	2014-04-04 12:59:24 +0000
@@ -90,7 +90,7 @@
 		<tr>
 			<td><label>$i18n.getString( "message_type" )</label></td>
 			<td>
-				<select type="text" id="messageType" name="messageType" #if($!reminder.sendTo==1 || $!reminder.sendTo==3) disabled #end class="messageType {validate:{required:true,number:true}}" >
+				<select type="text" id="messageType" name="messageType" disabled class="messageType {validate:{required:true,number:true}}" >
 					<option value="1">$i18n.getString("direct_sms")</option>
 					<option value="2">$i18n.getString("message")</option>
 					<option value="3">$i18n.getString("both")</option>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programReminder.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programReminder.js	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programReminder.js	2014-04-04 12:59:24 +0000
@@ -46,7 +46,8 @@
 function showReminderDetails( context ) {
  
   jQuery.getJSON("getReminder.action", {
-    id: context.id
+    id: context.id,
+	programId: getFieldValue('programId')
   }, function( json ) {
     setInnerHTML('nameField', json.reminder.name);
     setInnerHTML('daysAllowedSendMessageField', json.reminder.daysAllowedSendMessage);

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programAssociations.vm	2013-05-03 07:46:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programAssociations.vm	2014-04-04 12:59:24 +0000
@@ -25,6 +25,11 @@
 	</div>
 	<div id="tab-2">
 		<table>
+			<colgroup>
+				<col style='width:500px'/>
+				<col/>
+				<col style='width:500px'/>
+			</colgroup>
 			<thead>
 				<tr>
 					<th>$i18n.getString( "available" )</th>
@@ -34,7 +39,7 @@
 			</thead>
 			<tr>
 				<td>
-					<select multiple id='orgunitGroupAvailable' size='10' ondblclick="moveSelectedById( 'orgunitGroupAvailable', 'orgunitGroupIds' )">
+					<select multiple id='orgunitGroupAvailable' style="height: 200px; width: 100%;" ondblclick="moveSelectedById( 'orgunitGroupAvailable', 'orgunitGroupIds' )">
 					#foreach($group in $availableOrgunitGroups)
 						<option value='$group.id'>$encoder.htmlEncode($group.name)</option>
 					#end
@@ -47,7 +52,7 @@
 					<input type="button" style="width:40px" value="&lt;&lt;" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'orgunitGroupIds', 'orgunitGroupAvailable' )" />
 				</td>
 				<td>
-					<select multiple id='orgunitGroupIds' name='orgunitGroupIds' size='10' ondblclick="moveSelectedById( 'orgunitGroupIds', 'orgunitGroupAvailable' )">
+					<select multiple id='orgunitGroupIds' name='orgunitGroupIds' style="height: 200px; width: 100%;" ondblclick="moveSelectedById( 'orgunitGroupIds', 'orgunitGroupAvailable' )">
 					#foreach($group in $program.organisationUnitGroups)
 						<option value='$group.id'>$encoder.htmlEncode($group.name)</option>
 					#end

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm	2014-03-24 09:02:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm	2014-04-04 12:59:24 +0000
@@ -30,12 +30,12 @@
 			  </tr>
 			</thead>
 			<tbody id="list">
-          #foreach( $reminder in $program.reminders )
+          #foreach( $reminder in $program.instanceReminders )
             <tr id="tr${reminder.id}" 
 				data-id="$!reminder.id" 
 				data-type="reminder" 
 				data-name="$encoder.htmlEncode( $!reminder.name )">
-                <td>$encoder.htmlEncode( $!reminders.name )</td>
+                <td>$encoder.htmlEncode( $!reminder.name )</td>
             </tr>
           #end
       </tbody>