dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #06828
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1889: merging with trunk
Merge authors:
Lars <larshelg@larshelg-laptop>
------------------------------------------------------------
revno: 1889 [merge]
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: cbhis-mobile
timestamp: Wed 2010-08-04 11:21:15 +0200
message:
merging with trunk
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
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js
--
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>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm 2010-07-05 23:45:39 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm 2010-08-04 08:54:59 +0000
@@ -1,7 +1,5 @@
-#if ( $!reportParams.isSet() )
- <h3>$i18n.getString( "report_table_parameters" )</h3>
-#end
+<h3>$i18n.getString( "report_table_parameters" )</h3>
<input type="hidden" id="id" name="id" value="$!id">
<input type="hidden" id="mode" name="mode" value="$!mode">
@@ -10,20 +8,12 @@
<script type="text/javascript">
getTableStatus();
</script>
-#end
-
-#if ( $mode == "table" && $!reportParams.isSet() == false ) <!-- Create table, nothing to ask -->
- <script type="text/javascript">
- createTable( '$id' );
- </script>
-#end
+#else <!-- Show input params -->
<table>
<!-- Data source -->
- #if ( $mode == "report" )
-
<tr>
<th>$i18n.getString( "data_source" )</th>
</tr>
@@ -39,8 +29,6 @@
<td colspan="4" style="height:10px"></td>
</tr>
- #end
-
<!-- Reporting month -->
#if ( $!reportParams.isParamReportingMonth() )
@@ -111,7 +99,7 @@
<tr>
<td>
- #if ( $mode == "table" || $mode == "status" )
+ #if ( $mode == "table" )
<input type="button" value="$i18n.getString( 'ok' )" onclick="createTable( '$id' )" style="width:120px">
<input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayManageTableForm.action'" style="width:120px">
#end
@@ -124,6 +112,8 @@
</table>
+#end
+
<span id="message"></span>
<script type="text/javascript">
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js 2010-07-05 21:54:20 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js 2010-08-04 08:54:59 +0000
@@ -18,7 +18,7 @@
function createTable( tableId )
{
- var url = "createTable.action?id=" + tableId + "&mode=table";
+ var url = "createTable.action?id=" + tableId + "&doDataMart=" + getListValue( "doDataMart" ) + "&mode=table";
if ( document.getElementById( "reportingPeriod" ) != null )
{
