dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9148
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-11-29 00:09:45 +0700
message:
  local vn - Fixed previewing in entry form.
modified:
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/GenerateExcelReportGeneric.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateExcelReportFlowAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/RollbackImportingAction.java
  local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/preview.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 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/GenerateExcelReportGeneric.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/GenerateExcelReportGeneric.java	2012-11-28 10:16:05 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/GenerateExcelReportGeneric.java	2012-11-28 17:09:45 +0000
@@ -275,7 +275,7 @@
         return inputStream;
     }
 
-    public boolean getGenerateByDataSet()
+    public boolean isGenerateByDataSet()
     {
         return generateByDataSet;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateExcelReportFlowAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateExcelReportFlowAction.java	2012-11-28 10:16:05 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GenerateExcelReportFlowAction.java	2012-11-28 17:09:45 +0000
@@ -82,7 +82,7 @@
 
     private Boolean generateByDataSet;
 
-    public boolean getGenerateByDataSet()
+    public boolean isGenerateByDataSet()
     {
         return (generateByDataSet == null) ? false : generateByDataSet;
     }

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/RollbackImportingAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/RollbackImportingAction.java	2012-11-27 06:33:42 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/importing/action/RollbackImportingAction.java	2012-11-28 17:09:45 +0000
@@ -57,7 +57,7 @@
     public String execute()
     {
         message = "";
-        
+
         Set<DataValue> oldDataValues = selectionManager.getOldDataValueList();
         Set<DataValue> newDataValues = selectionManager.getNewDataValueList();
 
@@ -71,7 +71,7 @@
 
                 i++;
             }
-            
+
             selectionManager.setOldDataValueList( new HashSet<DataValue>() );
 
             message = i18n.getString( "old_value" ) + ": " + i + "/" + oldDataValues.size() + " "
@@ -90,11 +90,11 @@
             }
 
             selectionManager.setNewDataValueList( new HashSet<DataValue>() );
-            
-            message = i18n.getString( "new_value" ) + ": " + i + "/" + oldDataValues.size() + " "
+
+            message += i18n.getString( "new_value" ) + ": " + i + "/" + newDataValues.size() + " "
                 + i18n.getString( "deleted" );
         }
-        
+
         oldDataValues = null;
         newDataValues = null;
 

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/preview.js'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/preview.js	2012-11-28 07:09:29 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/preview.js	2012-11-28 17:09:45 +0000
@@ -5,6 +5,7 @@
 spreadsheetTreePath = '../dhis-web-spreadsheet-reporting/';
  
 isImport = false;
+generateByDataSet = false;
 idTemp = null;
 importlist = null;
 importItemIds = new Array();
@@ -87,7 +88,7 @@
 	jQuery.get( spreadsheetTreePath + "previewExportReport.action",
 	{
 		showSubItem: !isChecked( 'showSubItem' ),
-		generateByDefault: getFieldValue( 'generateByDefault' )
+		generateByDataSet: generateByDataSet
 	}, previewExportReportReceived );
 }