dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1962
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2010-10-26 12:02:30 +0200
message:
  Quickly fixed
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.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-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java	2010-08-31 05:47:11 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java	2010-10-26 10:02:30 +0000
@@ -315,7 +315,7 @@
         catch ( Exception ex )
         {
             log.info( ex );
-            throw new ImportException( "DHIS14 import failed" );
+            throw new ImportException( "DHIS14 import failed", ex );
         }
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2010-10-22 07:50:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2010-10-26 10:02:30 +0000
@@ -75,16 +75,6 @@
 }
 
 /**
- * Opens a help popup window.
- * 
- * @param id the key of the help property content.
- */
-function openHelpForm( id )
-{
-    window.open( "../dhis-web-commons-help/viewDynamicHelp.action?id=" + id, "_blank", "width=800,height=600,scrollbars=yes" );
-}   
-
-/**
  * Returns the value of the selected option in the list with the given identifier.
  * 
  * @param listId the list identifier.
@@ -132,7 +122,6 @@
 	return jQuery.trim( string );
 }
 
-
 /**
  * Returns true if the element with the given identifier is checked, false if not
  * or if it does not exist.
@@ -388,6 +377,7 @@
 {
     return jQuery("#" + fieldId).val();
 }
+
 /**
  * get value of input radio with name
  * 
@@ -403,6 +393,7 @@
 	
 	return result;
 }
+
 /**
  * set value for input radio with name 
  * @param radioName name of input radio 
@@ -801,8 +792,6 @@
 	if( s.val()=='' ) s.val( getCurrentDate() );		
 }
 
-
-
 /**
  * Create jQuery datepicker for input text with id * * 
  * @param id the id of input filed which you want enter date *
@@ -831,7 +820,6 @@
 	}
 }
 
-
 /**
  * Create jQuery datepicker for start date and end ate text with id * * 
  * @param startdate the id of input filed which you want enter start date *
@@ -871,9 +859,6 @@
 		constrainInput: true
 		
 	});
-	
-	
-
 }
 
 function getCurrentDate()
@@ -948,9 +933,11 @@
 
 	setCaretToPos( inputArea, inputArea.value.length );
 }
-//=================================================================================
+
+//==============================================================================
 //	FORM VALIDATION
-//=================================================================================
+//==============================================================================
+
 /**
  * Create validator for fileds in form  * 
  */
@@ -973,6 +960,7 @@
 	
 	return validator;
 }
+
 /**
  * Add validation rule remote for input field
 * @param inputId is id for input field
@@ -1027,6 +1015,7 @@
 {
 	jQuery(input).rules("add",rules );
 }
+
 /**
 * Remove validator Rules for input
 * @param inputId is id for input field
@@ -1056,9 +1045,10 @@
 	});
 }
 
-//=================================================================================
+//==============================================================================
 //	MESSAGE
-//=================================================================================
+//==============================================================================
+
 /**
 * Show message at the top-right of screen, this message will hide automatic after 3 second if you don't set time
 * @param message is message
@@ -1068,6 +1058,7 @@
 {
 	jQuery.growlUI( i18n_error, message, 'error', time ); 	
 }
+
 /**
 * Show message at the top-right of screen, this message will hide automatic after 3 second if you don't set time
 * @param message is message
@@ -1077,6 +1068,7 @@
 {
 	jQuery.growlUI( i18n_success, message, 'success', time ); 	
 }
+
 /**
 * Show message at the top-right of screen, this message will hide automatic after 3 second if you don't set time
 * @param message is message
@@ -1176,6 +1168,7 @@
 	hideById( id );
 	unLockScreen();
 }
+
 /**
 * load All Data Element Groups into select combo box
 * @param selectorJQueryString is String fo jQuery selector, this string is anything but it must valid with jQuery format. This component will contain list of result* 
@@ -1185,6 +1178,7 @@
 {
 	DataDictionary.loadDataElementGroups( jQuery( selectorJQueryString ) );
 }
+
 /**
 * load data elements by data element group
 * @param selectorJQueryString is String fo jQuery selector, this string is anything but it must valid with jQuery format. This component will contain list of result* 
@@ -1194,6 +1188,7 @@
 {
 	DataDictionary.loadDataElementsByGroup( id, jQuery( selectorJQueryString ) );
 }
+
 /**
 * load All Data Elements into select combo box
 * @param selectorJQueryString is String fo jQuery selector, this string is anything but it must valid with jQuery format. This component will contain list of result* 
@@ -1202,6 +1197,7 @@
 {
 	DataDictionary.loadAllDataElements( jQuery( selectorJQueryString ) );
 }
+
 /**
 * load Category Option Combo of data element
 * @param selectorJQueryString is String fo jQuery selector, this string is anything but it must valid with jQuery format. This component will contain list of result* 
@@ -1211,6 +1207,7 @@
 {
 	DataDictionary.loadCategoryOptionComboByDE( id, jQuery( selectorJQueryString ) );
 }
+
 /**
 * load all indicator groups into select combo box
 * @param selectorJQueryString is String fo jQuery selector, this string is anything but it must valid with jQuery format. This component will contain list of result* 
@@ -1219,6 +1216,7 @@
 {
 	DataDictionary.loadIndicatorGroups( jQuery( selectorJQueryString ) );
 }
+
 /**
 * load indicators by group
 * @param selectorJQueryString is String fo jQuery selector, this string is anything but it must valid with jQuery format. This component will contain list of result* 
@@ -1228,6 +1226,7 @@
 {
 	DataDictionary.loadIndicatorsByGroup( id, jQuery( selectorJQueryString ));
 }
+
 /**
 * load all indicator into select combo box
 * @param selectorJQueryString is String fo jQuery selector, this string is anything but it must valid with jQuery format. This component will contain list of result* 
@@ -1236,6 +1235,7 @@
 {
 	DataDictionary.loadAllIndicators( jQuery( selectorJQueryString ) );
 }
+
 /**
 * load Operands
 * @param selectorJQueryString is String fo jQuery selector, this string is anything but it must valid with jQuery format. This component will contain list of result* 
@@ -1246,7 +1246,6 @@
 	DataDictionary.loadOperands( jQuery( selectorJQueryString ), params);
 }
 
-
 /**
  * Removes the opacity div from the document.
 function deleteDivEffect()