dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8551
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-17 14:46:19 +0700
message:
  Make data entry in multi entry form is smaller.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.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/webapp/dhis-web-caseentry/javascript/multiDataEntry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js	2012-10-06 14:57:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js	2012-10-17 07:46:19 +0000
@@ -76,7 +76,7 @@
 			closable:true,
 			modal:false,
 			overlay:{background:'#000000', opacity:0.1},
-			width:1000,
+			width:850,
 			height:500
 		});
 }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2012-09-21 07:44:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2012-10-17 07:46:19 +0000
@@ -1,54 +1,39 @@
 <div id='patientInforTB'>
-	<table> 
+	<table>
 		#if( $patient )
-		<tr>            
-			<td>
-				<span class='bold'>$i18n.getString( "full_name" ):</span>
-			</td>
-			<td>
-				$encoder.htmlEncode( $patient.getFullName() )
-			</td>
-			<td class='bold text-column' style="vertical-align:top">$i18n.getString('program'): </td>
-			<td style="vertical-align:right">$program.name</td>
-		</tr>
-		<tr>
-			<td>
-				<span class='bold'>$i18n.getString( "gender" ):</span>
-			</td>
-			<td>
-				$i18n.getString( "$patient.gender" )
-			</td>
-			<td class='bold text-column' style="vertical-align:top">$i18n.getString('program_stage'): </td>
-			<td style="vertical-align:right">$programStageInstance.programStage.name</td>
-		</tr>
-		<tr>
-			<td>
-				<span class='bold'>$i18n.getString( "date_of_birth" ):</span>
-			</td>
-			<td>
-				$format.formatDate( $patient.birthDate )
-			</td>
-		<tr>
-			<td>
-				<span class='bold'>$i18n.getString( "age" ):</span>
-			</td>
-			<td>
-				$encoder.htmlEncode( $patient.getAge() )
-			</td>
-		</tr>
-		<tr><td>&nbsp;</td></tr>
+			<tr>            
+				<td>
+					<span class='bold'>$i18n.getString( "full_name" ):</span>
+				</td>
+				<td>
+					$encoder.htmlEncode( $patient.getFullName() ) ( $i18n.getString( "$patient.gender" ) )
+				</td>
+				<td class='bold text-column' style="vertical-align:top">$i18n.getString('program'): </td>
+				<td style="vertical-align:right">$program.name</td>
+			</tr>
+			<tr>
+				<td>
+					<span class='bold'>$i18n.getString( "date_of_birth" ):</span>
+				</td>
+				<td>
+					$format.formatDate( $patient.birthDate ) ( $encoder.htmlEncode( $patient.getAge() ) )
+				</td>
+				<td class='bold text-column' style="vertical-align:top">$i18n.getString('program_stage'): </td>
+				<td style="vertical-align:right">$programStageInstance.programStage.name</td>
+			</tr>
+			<tr><td>&nbsp;</td></tr>
 		#end
 		
 		#if( $programStageInstance )
-		<tr>
-			<th><label for="executionDate">$programStageInstance.programStage.reportDateDescription &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></th>
-			<th><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" onchange="saveExecutionDate( $programStageInstance.id, $programStageInstance.id, byId('executionDate') )" >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-				<script type="text/javascript">
-				   datePickerValid( 'executionDate', false );
-				</script>  
-			<th><label for="dueDate"> $i18n.getString( "due_date" ) &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></th>
-			<th><input type="text" id="dueDate" name="dueDate" value="$!format.formatDate( $programStageInstance.dueDate )" disabled="disabled">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-		</tr>
+			<tr>
+				<th><label for="executionDate">$programStageInstance.programStage.reportDateDescription &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></th>
+				<th><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" onchange="saveExecutionDate( $programStageInstance.id, $programStageInstance.id, byId('executionDate') )" >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
+					<script type="text/javascript">
+					   datePickerValid( 'executionDate', false );
+					</script>  
+				<th><label for="dueDate"> $i18n.getString( "due_date" ) &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label></th>
+				<th><input type="text" id="dueDate" name="dueDate" value="$!format.formatDate( $programStageInstance.dueDate )" disabled="disabled">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
+			</tr>
 		#end
 	</table>
 </div>