dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2837
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-02-11 11:53:00 +0100
message:
  Added link to ireport under about - software
modified:
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/software.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties


--
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-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java	2011-02-11 08:42:39 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataprune/jdbc/JdbcDataPruneStore.java	2011-02-11 10:53:00 +0000
@@ -72,12 +72,12 @@
     // DataPruneService implementation
     // -------------------------------------------------------------------------
 
-    public int deleteMultiOrganisationUnit(List<OrganisationUnit> orgUnits) {
-        
-        try{
-            
-            String orgUnitIds = TextUtils.getCommaDelimitedString( ConversionUtils.getIdentifiers( OrganisationUnit.class, orgUnits )) ;
-            
+    public int deleteMultiOrganisationUnit( List<OrganisationUnit> orgUnits )
+    {
+        try
+        {
+            String orgUnitIds = TextUtils.getCommaDelimitedString( ConversionUtils.getIdentifiers( OrganisationUnit.class, orgUnits ) );
+
             // delete values into datasetlocksource table
             String sql = "delete from datasetlocksource where sourceid in (" + orgUnitIds + ");";
             jdbcTemplate.execute( sql );
@@ -282,8 +282,7 @@
             
             log.info( "Deleting " + orgUnits.size() + " organisations units successfully" );
 
-            return 0;
-            
+            return 0;            
         }
         catch (Exception ex) 
         {
@@ -311,24 +310,23 @@
         {
             holder.close();
         }
-
     }
     
-    private void deleteRepresentative( String orgUnitIds ){
-        
+    private void deleteRepresentative( String orgUnitIds )
+    {        
         StatementHolder holder = statementManager.getHolder();
         
         try
         {
             Statement statement = holder.getStatement();
             
-            ResultSet patient = statement
-                .executeQuery( "select patientid from patient where organisationunitid in ( " + orgUnitIds + ")" );
+            ResultSet patient = statement.executeQuery( "select patientid from patient where organisationunitid in ( " + orgUnitIds + ")" );
 
             String patientIds = "0";
+            
             while ( patient.next() )
             {
-                patientIds+= "," + patient.getInt( 1 );
+                patientIds += "," + patient.getInt( 1 );
             }
             
             jdbcTemplate.execute( "UPDATE patient SET representativeid=null WHERE representativeid in ( " + patientIds + " );" );
@@ -340,8 +338,7 @@
         finally
         {
             holder.close();
-        }
-        
+        }        
     }
     
     public void deleteOrganisation(String orgUnitIds )
@@ -356,9 +353,10 @@
                 .executeQuery( "select organisationunitid from organisationunit where organisationunitid in  ( " + orgUnitIds + ")" );
 
             String parentIds = "0";
+            
             while ( parent.next() )
             {
-                parentIds+= "," + parent.getInt( 1 );
+                parentIds += "," + parent.getInt( 1 );
             }
             
             jdbcTemplate.execute( "UPDATE organisationunit SET parentid=null WHERE parentid in ( " + parentIds + " );" );

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/software.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/software.vm	2011-01-31 08:47:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/software.vm	2011-02-11 10:53:00 +0000
@@ -7,6 +7,9 @@
 	
 	<dt>$i18n.getString( "pdf_reader" )</dt>
 	<dd><a href="http://www.foxitsoftware.com/pdf/reader/addons.php"; target="blank">Foxit Reader</a> - $i18n.getString( "foxit_description" )</dd>
+	
+	<dt>$i18n.getString( "report_designer" )</dt>
+	<dd><a href="http://jasperforge.org/projects/ireport"; target="blank">iReport</a> - $i18n.getString( "ireport_description" )</dd>
 </dl>
 
 <div><input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='$!backUrl'" style="width:140px"/></div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-01-31 08:47:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-02-11 10:53:00 +0000
@@ -263,6 +263,8 @@
 foxit_description = Free and simple PDF reader for Windows
 web_browser = Web browser
 pdf_reader = PDF reader
+ireport_description = Report designer for standard reports
+report_designer = Report designer
 
 #-- Change Log------------------------------------------------------------------#
 
@@ -478,4 +480,3 @@
 greater_than_or_equal_to            = >=
 less_than                           = <
 less_than_or_equal_to               = <=
-