dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11117
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-05-30 13:20:45 +0200
message:
  PDF form, better error handling
modified:
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.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-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java	2013-05-30 11:00:42 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java	2013-05-30 11:20:45 +0000
@@ -27,6 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -170,7 +171,6 @@
     }
 
     public static DataValueSet getDataValueSet( InputStream in )
-        throws RuntimeException
     {
         PdfReader reader = null;
 
@@ -180,7 +180,7 @@
 
         try
         {
-            reader = new PdfReader( in ); // new PdfReader(in, null);
+            reader = new PdfReader( in );
 
             AcroFields form = reader.getAcroFields();
 
@@ -197,13 +197,10 @@
 
                 for ( String fldName : fldNames )
                 {
-
                     if ( fldName.startsWith( PdfDataEntryFormUtil.LABELCODE_DATAENTRYTEXTFIELD ) )
                     {
-
                         String[] strArrFldName = fldName.split( "_" );
 
-                        // Create DataValues to be put in a DataValueSet
                         org.hisp.dhis.dxf2.datavalue.DataValue dataValue = new org.hisp.dhis.dxf2.datavalue.DataValue();
 
                         dataValue.setDataElement( strArrFldName[1] );
@@ -227,13 +224,12 @@
             }
             else
             {
-                throw new RuntimeException( "Could not generate PDF AcroFields form from the file." );
+                throw new RuntimeException( "Could not generate PDF AcroFields form from input" );
             }
-
         }
-        catch ( Exception e )
+        catch ( IOException ex )
         {
-            throw new RuntimeException( e.getMessage() );
+            throw new RuntimeException( ex );
         }
         finally
         {

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2013-05-23 04:30:18 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2013-05-30 11:20:45 +0000
@@ -291,6 +291,7 @@
 export_as_csv=Export as CSV
 csv=CSV
 xml=XML
+pdf=PDF
 xml_data_import=XML Data Import
 csv_data_import=CSV Data Import
 pdf_data_import=PDF Data Import

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties	2013-05-30 04:16:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties	2013-05-30 11:20:45 +0000
@@ -10,7 +10,7 @@
 filter=Filter
 selected_patient_attributes=Selected Patient Attributes
 intro_mobile_dataset=Define and sort the data sets which are available for facility reporting on the mobile client.
-mobile_dataset=Dataset for Mobile
+mobile_dataset=Data Set for Mobile
 available_datasets=Available DataSets
 mobile_configuration=Mobile Configuration
 sms_service_configuration=SMS Service Configuration
@@ -40,7 +40,7 @@
 type=Type
 gateway_configuration=Gateway Configuration
 gateway_name=Gateway Name
-username=Username
+username=User name
 password=Password
 port=Port
 baudrate=BaudRate
@@ -101,26 +101,23 @@
 processing=Processing
 mark_as_default=Mark as default
 view_sent_sms=View Sent SMS
-receipient=Receipient
+receipient=Recipient
 action=Action
 incoming=Incoming
 processed=Processed
 failed=Failed
 unhandled=Unhandled
 reimport_confirm=Are you sure you want to re-import this SMS?
-# ------------------------------------------------------------------------------
-# SMS COMMAND LOCALIZATION 
-# ------------------------------------------------------------------------------
 edit_command=Edit SMS command
 data_element_category_combination=Data Element Category Combination
 sms_command_validation_alert=Fix validation problems before you save
 command_management=Command management
 code=Code
 name=Name:
-dataset=Dataset:
+dataset=Data set:
 parser=Parser:
 userGroup= User Group:
-selected_dataset=Selected dataset
+selected_dataset=Selected data set
 code_value_separator=Code and value Separator
 no_codes_message=Reply message if no codes are sent (only the command):
 validation_error_space=*White space not allowed