dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1899
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Wed 2010-08-04 09:02:13 +0200
message:
  Minor fix
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveValueAction.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/SaveValueAction.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.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-dataentry/src/main/java/org/hisp/dhis/de/action/SaveValueAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveValueAction.java	2010-04-29 04:33:47 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveValueAction.java	2010-08-04 07:02:13 +0000
@@ -47,14 +47,12 @@
 import com.opensymphony.xwork2.Action;
 
 /**
- * TODO Replace this with StatefulDataValueSaver
  * @author Torgeir Lorange Ostby
- * @version $Id: SaveValueAction.java 5652 2008-09-06 13:24:34Z larshelg $
  */
 public class SaveValueAction
     implements Action
 {
-    private static final Log LOG = LogFactory.getLog( SaveValueAction.class );    
+    private static final Log log = LogFactory.getLog( SaveValueAction.class );    
 
     // -------------------------------------------------------------------------
     // Dependencies
@@ -88,7 +86,6 @@
         this.dataValueAuditService = dataValueAuditService;
     }
     
-    
     private SelectedStateManager selectedStateManager;
 
     public void setSelectedStateManager( SelectedStateManager selectedStateManager )
@@ -188,7 +185,7 @@
         {
             if ( value != null )
             {
-                LOG.debug( "Adding DataValue, value added" );
+                log.debug( "Adding DataValue" );
 
                 dataValue = new DataValue( dataElement, period, organisationUnit, value, storedBy, new Date(), null, defaultOptionCombo );
 
@@ -197,7 +194,7 @@
         }
         else
         {
-            LOG.debug( "Updating DataValue, value added/changed" );
+            log.debug( "Updating DataValue" );
             
             DataValueAudit audit = new DataValueAudit(dataValue, dataValue.getValue(), storedBy, new Date(), "");
             
@@ -207,9 +204,9 @@
 
             dataValueService.updateDataValue( dataValue );
             
-            // ---------------------------------------------------------------------
+            // -----------------------------------------------------------------
             // Add DataValueAudit
-            // ---------------------------------------------------------------------
+            // -----------------------------------------------------------------
             
             if ( value != null )
             {

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/SaveValueAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/SaveValueAction.java	2010-06-27 15:47:33 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/SaveValueAction.java	2010-08-04 07:02:13 +0000
@@ -169,10 +169,7 @@
         OrganisationUnit organisationUnit = selectedStateManager.getSelectedOrganisationUnit();
 
         Period period = selectedStateManager.getSelectedPeriod();
-                
-        /*dataElementId = Integer.parseInt( inputId.substring( 0, inputId.indexOf( ":" ) ) );
-        optionComboId = Integer.parseInt( inputId.substring( inputId.indexOf( ":" )+1, inputId.length() ) );*/
-                
+        
         DataElement dataElement = dataElementService.getDataElement( dataElementId );        
 
         storedBy = currentUserService.getCurrentUsername();        
@@ -204,7 +201,7 @@
         {
             if ( value != null )
             {
-                LOG.debug( "Adding DataValue, value added" );
+                LOG.debug( "Adding DataValue" );
 
                 dataValue = new DataValue( dataElement, period, organisationUnit, value, storedBy, new Date(), null, optionCombo );
                 dataValueService.addDataValue( dataValue );
@@ -212,7 +209,7 @@
         }
         else
         {
-            LOG.debug( "Updating DataValue, value added/changed" );
+            LOG.debug( "Updating DataValue" );
 
             dataValue.setValue( value );
             dataValue.setTimestamp( new Date() );

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2010-07-31 10:27:45 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2010-08-04 07:02:13 +0000
@@ -7,8 +7,6 @@
 	<span id="currentOptionCombo">$i18n.getString( "no_option_selected" )</span>	
 </div>
 
-<br>
-
 <form id="selectForm" name="selectForm" method="post" action="select.action">
 
 <div id="actions" style="width:200px text-align:right">
@@ -44,7 +42,7 @@
            checked="checked" 
        #end       
        onclick="document.getElementById( 'selectForm' ).submit();">    
-    <label for="displayModeDefault">$i18n.getString( "use_default_form" )</label><br>
+    <label for="displayModeDefault">$i18n.getString( "use_default_form" )</label><br><br>
 
 </div>