dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4725
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-09-28 10:05:50 +0700
message:
  Don't show patient details in multi-dataentry 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-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.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	2011-09-27 08:33:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2011-09-28 03:05:50 +0000
@@ -426,4 +426,5 @@
 identifiers														= Identifiers
 relationship_type												= Relationship Type
 identifier_type													= Beneficiary Identifier Type
-choose_this_person												= Choose this person
\ No newline at end of file
+choose_this_person												= Choose this person
+format_date														= Format Date	
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2011-07-27 04:18:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2011-09-28 03:05:50 +0000
@@ -1,3 +1,7 @@
+
+<div id="detailsArea" style="display:none;overflow:auto;height:250px;width:250px; padding-left:2em; vertical-align:top;margin-left:10em">
+</div>
+
 <table class="mainPageTable">
     <tr>
         <td style="vertical-align:top">    
@@ -53,24 +57,25 @@
                     #end 
                 #end    
             </tbody>
+			<tr>
+				#set( $size=$program.programStages.size() + 2 )
+				<td colspan="$size">
+					<p></p>
+					<div class="paging-container">
+							#parse( "/dhis-web-commons/paging/paging.vm" )
+					</div>
+				</td>
+				<td></td>
+			</tr>
         </table>
         </td>
+		<!-- <td style="vertical-align:top">
+			<div id="detailsArea" style="display:none;overflow:auto;height:250px;width:250px">
+			</div>
+		</td> -->
     </tr>
 </table>
 
-<div class="paging-container">
-	#parse( "/dhis-web-commons/paging/paging.vm" )
-</div>
-
-<div id="detailsArea" style="display:none;overflow:auto; height:250px;width:250px">
-	<div style="float:right">
-		<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
-	</div>
-	<p><label><strong>$i18n.getString( "common_info" ):</strong></label><br><span id="commonInfoField"></span></p>	
-	<p><label><strong>$i18n.getString( "identifier" ):</strong></label><br><span id="identifierField"></span></p>
-	<p><label><strong>$i18n.getString( "attributes" ):</strong></label><br><span id="attributeField"></span></p>
-	<p><label><strong>$i18n.getString( "enrolled_in_program" ):</strong></label><br><span id="programField"></span></p>
-</div>
 
 <script>
 	jQuery(document).ready(function(){