dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7353
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-06-22 18:46:42 +0200
message:
  Minor
modified:
  dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/DefaultIntegrationService.java
  dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/SDMXDataIn.java
  dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/XMLDataIn.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.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-integration/src/main/java/org/hisp/dhis/integration/DefaultIntegrationService.java'
--- dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/DefaultIntegrationService.java	2012-06-02 15:42:02 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/DefaultIntegrationService.java	2012-06-22 16:46:42 +0000
@@ -36,19 +36,17 @@
 import org.hisp.dhis.integration.routes.XMLDataIn;
 
 /**
- *
  * @author bobj
  */
-public class DefaultIntegrationService implements IntegrationService
-{
-    
+public class DefaultIntegrationService 
+    implements IntegrationService
+{    
     @EndpointInject(uri = XMLDataIn.XMLDATA_IN)
     private ProducerTemplate xmlIn;
 
     @EndpointInject(uri = SDMXDataIn.SDMXDATA_IN)
     private ProducerTemplate sdmxIn;
 
-
     @Override
     public ImportSummary importXMLDataValueSet( InputStream in, ImportOptions importOptions )
     {
@@ -59,6 +57,5 @@
     public ImportSummary importSDMXDataValueSet( InputStream in, ImportOptions importOptions )
     {
        return (ImportSummary) sdmxIn.requestBodyAndHeader( in, IMPORT_OPTIONS_HDR, importOptions);
-    }
-    
+    }   
 }

=== modified file 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/SDMXDataIn.java'
--- dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/SDMXDataIn.java	2012-06-01 21:56:18 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/SDMXDataIn.java	2012-06-22 16:46:42 +0000
@@ -36,9 +36,9 @@
  * 
  * @author bobj
  */
-public class SDMXDataIn extends RouteBuilder
-{
- 
+public class SDMXDataIn 
+    extends RouteBuilder
+{ 
     // DataInput endpoint
 
     public static final String SDMXDATA_IN = "direct:sdmxDataIn";

=== modified file 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/XMLDataIn.java'
--- dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/XMLDataIn.java	2012-06-01 21:56:18 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/XMLDataIn.java	2012-06-22 16:46:42 +0000
@@ -37,9 +37,9 @@
  * 
  * @author bobj
  */
-public class XMLDataIn extends RouteBuilder
+public class XMLDataIn 
+    extends RouteBuilder
 {
-
     // DataInput endpoint
     
     public static final String XMLDATA_IN = "direct:xmlDataIn"; 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm	2012-06-14 02:31:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm	2012-06-22 16:46:42 +0000
@@ -4,13 +4,7 @@
 <input type='hidden' id='id' name='id' value='$program.id'>
 
 <table class="mainPageTable">
-	<col>
-	<col>     
-	<col> 	
-	<col style="width:22em;">
 	<tr>
-		<td></td>
-		<td></td>
 		<td style="text-align:right">
 			#if( $program.type=='1' )
 				<input type="button" value="$i18n.getString( 'add_new' )" onclick="javascript:addProgramStage()" style="width:150px"><br>
@@ -18,6 +12,7 @@
 			#end
 			<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='program.action'" style="width:150px">
 		</td>
+		<td style="width:264px"></td>
 	</tr>
 </table>