dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7364
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-06-24 14:54:56 +0200
message:
  Made template more compact
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserStore.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.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-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserStore.java	2012-06-05 15:36:07 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserStore.java	2012-06-24 12:54:56 +0000
@@ -41,7 +41,6 @@
 
 /**
  * @author Nguyen Hong Duc
- * @version $Id: HibernateUserStore.java 6530 2008-11-28 15:02:47Z eivindwa $
  */
 public class HibernateUserStore
     implements UserStore
@@ -101,6 +100,7 @@
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public Collection<User> getAllUsersBetween( int first, int max )
     {
         Session session = sessionFactory.getCurrentSession();
@@ -113,6 +113,7 @@
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public Collection<User> getUsersByLastUpdated( Date lastUpdated )
     {
         Session session = sessionFactory.getCurrentSession();

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm	2012-06-23 15:48:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstancesList.vm	2012-06-24 12:54:56 +0000
@@ -1,78 +1,72 @@
 <table>
-	<tr>
-		<td class='text-column' >$i18n.getString( "search_result_matching_the_search_criteria" ):</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td id='searchInforTD'></td>
-	</tr>	
-	
-	<tr>
-		<td class='text-column'>$i18n.getString( "total_result" )</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>$!total</td>
-	</tr>
+  <tr>
+	<td class='text-column' >$i18n.getString( "search_result_matching_the_search_criteria" ):</td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+	<td id='searchInforTD'></td>
+  </tr>	
+  <tr>
+	<td class='text-column'>$i18n.getString( "total_result" )</td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+	<td>$!total</td>
+  </tr>
 </table>
 
 <table class="mainPageTable">
-	<tr>
-    <td>  
-		<table class="listTable">
-			<thead>
-				<tr>
-					<th>#</th>
-					#set($index = 0)
-					#foreach( $col in $grid.getHeaders() )
-						#if( $index > 0 )
-							<th>$col.name</th>
-						#end
-						#set($index = $index + 1)
-					#end
-					<th>$i18n.getString( "operations" )</th>
-				</tr>
-			</thead>
-	
-			<tbody id="list">
-				#set($noCols = $grid.getHeaders().size())
-				#foreach( $row in $grid.getRows() )
-					#set($index = 0)
-					<tr id="row"  #alternate( $mark )>
-						<td>
-							#set( $nr = ( ( $paging.getCurrentPage() - 1  ) * $paging.pageSize ) + $velocityCount )
-							$nr
-						</td>
-						
-						#foreach( $col in $row )
-							#if( $index == 0 )
-								#set($psid = $col)
-							#elseif( $index < $noCols ) 
-								<td>$!col</td>
-							#end
-							#set($index = $index + 1)
-						#end
-						
-						<td>
-							<a href="javascript:showUpdateEvent( $psid )" title='$i18n.getString( "edit_profile" )'><img src="../images/edit.png" alt='$i18n.getString( "edit_profile" )'></a>
-							<a href="javascript:removeEvent( $psid )" title='$i18n.getString( "remove" )'><img src="../images/delete.png" alt='$i18n.getString( "remove" )'></a>
-						</td>
-					#set( $mark = !$mark)
-					<script>
-						jQuery('#row').attr('id','tr' + "$psid");
-					</script>
-					</tr>	
-				#end
-			</tbody>
-	 </table>
-    </td>
+<tr>
+  <td>  
+  <table class="listTable">
+  <thead>
+    <tr>
+    <th>#</th>
+    #set($index = 0)
+    #foreach( $col in $grid.getHeaders() )
+    #if( $index > 0 )
+	  <th>$col.name</th>
+    #end
+    #set($index = $index + 1)
+    #end
+    <th>$i18n.getString( "operations" )</th>
   </tr>
-  <tr>
-  	#set( $noCol = $grid.getHeaders().size() + 3 )
-	<td colspan="$noCol">
-		<p></p>
-  		<div class="paging-container">
-			#parse( "/dhis-web-commons/paging/paging.vm" )
-		</div>
+  </thead>
+  
+  <tbody id="list">
+    #set($noCols = $grid.getHeaders().size())
+    #foreach( $row in $grid.getRows() )
+    #set($index = 0)
+    <tr id="row"  #alternate( $mark )>
+    <td>
+    #set( $nr = ( ( $paging.getCurrentPage() - 1  ) * $paging.pageSize ) + $velocityCount )${nr}</td>
+      #foreach( $col in $row )
+      #if( $index == 0 )
+      #set($psid = $col)
+	  #elseif( $index < $noCols )
+	  <td>$!col</td>
+	  #end
+	  #set($index = $index + 1)
+	  #end
+	<td>
+	<a href="javascript:showUpdateEvent( $psid )" title='$i18n.getString( "edit_profile" )'><img src="../images/edit.png" alt='$i18n.getString( "edit_profile" )'></a>
+	<a href="javascript:removeEvent( $psid )" title='$i18n.getString( "remove" )'><img src="../images/delete.png" alt='$i18n.getString( "remove" )'></a>
 	</td>
-  	<td></td>
-  </tr>
+	#set( $mark = !$mark)
+	<script>jQuery('#row').attr('id','tr' + "$psid");</script>
+	</tr>
+	#end
+  </tbody>
+  </table>
+  </td>
+</tr>
+
+<tr>
+  #set( $noCol = $grid.getHeaders().size() + 3 )
+  <td colspan="$noCol">
+  <p></p>
+  <div class="paging-container">
+  #parse( "/dhis-web-commons/paging/paging.vm" )
+  </div>
+  </td>
+  <td></td>
+</tr>
 </table>