dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8564
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-10-18 10:43:05 +0700
message:
  Display provided-elsewhere column in section entry form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programInstanceHistory.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css


--
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/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-10-16 08:33:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-10-18 03:43:05 +0000
@@ -107,7 +107,7 @@
 		<input type="button" onclick="doComplete()" value="$i18n.getString('complete')" id="completeBtn">
 		<input type="button" onclick="doUnComplete()" value="$i18n.getString('incomplete')" id="uncompleteBtn" >
 		<input type="button" value="$i18n.getString('run_validation')" onClick="javascript: runValidation();">
-		<input type="button" onclick="completedAndAddNewEvent()" value="$i18n.getString('complete_and_add_new_event')" id="completeAndAddNewBtn">
+		<input type="button" onclick="completedAndAddNewEvent()" value="$i18n.getString('complete_and_add_new_event')" id="completeAndAddNewBtn" style="width:150px;">
 	</div>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-10-17 07:23:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-10-18 03:43:05 +0000
@@ -199,9 +199,8 @@
 			</table>
 		</div>
 	</div>
-
 </div>
-
+<br>
 <div id='programEnrollmentDiv' class='hidden'></div>
 <div id='dataEntryFormDiv'></div>
 <div id='dashboardHistoryDiv' class="dashboard-history" style="display:none;">

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programInstanceHistory.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programInstanceHistory.vm	2012-10-06 15:26:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programInstanceHistory.vm	2012-10-18 03:43:05 +0000
@@ -1,8 +1,12 @@
-<table class="listTable">
+<table class="contentProviderTable" width="100%;">
+	<colgroup>
+		<col width="40%">
+		<col width="60%">
+	</colgroup>
 	<thead>
 		<tr>
 		#foreach( $header in $grid.getVisibleHeaders() )
-			<th #if( $header.meta )style="text-align:left"#end>$!encoder.htmlEncode( $header.name )</th>
+			<th>$!encoder.htmlEncode( $header.name )</th>
 		#end
 		</tr>
 	</thead>
@@ -15,7 +19,7 @@
 				#foreach( $col in $row )
 					#set( $index = ( $velocityCount - 1 ) )
 					#if( $grid.getVisibleHeaders().get( $index ).meta )
-						<td >$!encoder.htmlEncode( $col )</td>
+						<td>$!encoder.htmlEncode( $col )</td>
 					#else 
 						<td>$!col</td>
 					#end

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm	2012-10-12 02:52:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm	2012-10-18 03:43:05 +0000
@@ -12,7 +12,7 @@
 						<colgroup>
 							<col id="deCol">
 							<col id="entryCol">
-							#if( $programStage.program.isRegistration() == 'true')
+							#if( $programStage.program.displayProvidedOtherFacility=='true')
 							<col width="18%" />
 							#end
 						</colgroup>
@@ -20,7 +20,7 @@
 						<tr>
 							<th>$i18n.getString( "data_element" )</th>                   
 							<th>$i18n.getString( "entry" )</th>
-							#if( $programStage.program.isRegistration() == 'true')
+							#if( $programStage.program.displayProvidedOtherFacility=='true')
 							<th>$i18n.getString( "provided_elsewhere" )</th>
 							#end
 						</tr>
@@ -78,7 +78,7 @@
 										onkeypress="return keyPress(event, this)" tabindex="$tabIndex"/>
 								#end
 							</td> 
-							#if( $programStage.program.isRegistration() == 'true' )
+							#if( $programStage.program.displayProvidedOtherFacility=='true' )
 							<td style='width:20px;' align='center'>
 								#set( $id = $programStageDataElement.programStage.id + '_' + $programStageDataElement.dataElement.id + '_facility' )
 								#if( $programStageDataElement.allowProvidedElsewhere == 'true')

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-10-17 07:23:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-10-18 03:43:05 +0000
@@ -215,7 +215,7 @@
   font-family: LiberationSansBold,arial;
 }
 
-td.link-area
+table.link-area
 {
   border:1px solid #d0d0d0;
   padding-top:1px;