=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2014-04-18 17:56:57 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2014-04-23 11:57:39 +0000
@@ -148,36 +148,41 @@
                 if( angular.isObject( $scope.dhis2Events ) ) {
 
                     for(var i=0; i < $scope.dhis2Events.length; i++){  
+                        
                         //check if event is empty
-                        if(!angular.isUndefined($scope.dhis2Events[i].dataValues)){
-                            $scope.dhis2Events[i].dataValues = orderByFilter($scope.dhis2Events[i].dataValues, '-dataElement');
+                        if(!angular.isUndefined($scope.dhis2Events[i].dataValues)){                            
+                            
                             angular.forEach($scope.dhis2Events[i].dataValues, function(dataValue){
 
                                 //converting event.datavalues[i].datavalue.dataelement = value to
-                                //event[dataElement] = value for easier grid display.
-                                var dataElement = $scope.programStageDataElements[dataValue.dataElement].dataElement;
-                                if(angular.isObject(dataElement)){                               
-                                    
-                                    //converting int string value to integer for proper sorting.
-                                    if(dataElement.type == 'int'){
-                                        if( !isNaN(parseInt(dataValue.value)) ){
-                                            dataValue.value = parseInt(dataValue.value);
-                                        }
-                                        else{
-                                            dataValue.value = '';
-                                        }                                        
-                                    }
-                                    else if( dataElement.type == 'trueOnly'){
-                                        if(dataValue.value == 'true'){
-                                            dataValue.value = true;
-                                        }
-                                        else{
-                                            dataValue.value = false;
-                                        }
-                                    }
-                                    
-                                    $scope.dhis2Events[i][dataValue.dataElement] = dataValue.value; 
-                                }                                
+                                //event[dataElement] = value for easier grid display.                                
+                                if($scope.programStageDataElements[dataValue.dataElement]){                                    
+                                    
+                                    var dataElement = $scope.programStageDataElements[dataValue.dataElement].dataElement;
+                                    
+                                    if(angular.isObject(dataElement)){                               
+
+                                        //converting int string value to integer for proper sorting.
+                                        if(dataElement.type == 'int'){
+                                            if( !isNaN(parseInt(dataValue.value)) ){
+                                                dataValue.value = parseInt(dataValue.value);
+                                            }
+                                            else{
+                                                dataValue.value = '';
+                                            }                                        
+                                        }
+                                        else if( dataElement.type == 'trueOnly'){
+                                            if(dataValue.value == 'true'){
+                                                dataValue.value = true;
+                                            }
+                                            else{
+                                                dataValue.value = false;
+                                            }
+                                        }                                    
+                                    }                                    
+                                }
+                                
+                                $scope.dhis2Events[i][dataValue.dataElement] = dataValue.value; 
                             });  
 
                             delete $scope.dhis2Events[i].dataValues;