Updated account activity dao

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@178966 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/common/hibernate/dao/AccountActivityDao.java

 package ibase.dashboard.common.hibernate.dao;
 
 import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -15,6 +17,7 @@ import java.util.List;
 import org.apache.commons.io.FileUtils;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
+import org.hibernate.hql.ast.origin.hql.parse.HQLParser.new_key_return;
 import org.hibernate.query.Query;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -47,16 +50,17 @@ public class AccountActivityDao
 		if( "ADMIN".equalsIgnoreCase(profileId) || "ADM".equalsIgnoreCase(profileId) )
 		{
 			List<JSONObject> fileDataList= getUserActivityFileData(null, "", "");
-			for(JSONObject fileDataObj : fileDataList )
-			{
-				String userId = fileDataObj.optString("userId");
-				String activityDate = fileDataObj.optString("activityDate");
-				String fileContents = fileDataObj.optString("fileContents");
-				System.out.println("fileName::::::::: ["+userId+"]["+activityDate+"]");
-
-				JSONObject activityData = createActivityData(userId, fileContents);
-				activityDataFinal.put(activityData);
-			}
+			System.out.println("getUserActivityData>>>"+ fileDataList);
+				for(JSONObject fileDataObj : fileDataList )
+				{
+					String userId = fileDataObj.optString("userId");
+					String activityDate = fileDataObj.optString("activityDate");
+					String fileContents = fileDataObj.optString("fileContents");
+					System.out.println("fileName::::::::: ["+userId+"]["+activityDate+"]");
+	
+					JSONObject activityData = createActivityData(userId, fileContents);
+					activityDataFinal.put(activityData);
+				}
 		}
 		else
 		{
@@ -64,7 +68,7 @@ public class AccountActivityDao
 			
 			List<JSONObject> fileDataList= getUserActivityFileData(userDataList, "", "");
 			
-			JSONObject selfActivityData = new JSONObject();
+			JSONObject selfActivityData = null;
 			JSONArray teamActivityData = new JSONArray();
 			
 			System.out.println("userDataList AFTER>>>"+userDataList);
@@ -85,8 +89,17 @@ public class AccountActivityDao
 					teamActivityData.put(teamMemberActivityData);
 				}
 			}
-			selfActivityData.put("TEAM", teamActivityData);
-			activityDataFinal.put(selfActivityData);
+			if(fileDataList != null && fileDataList.size() > 0 )
+			{
+				if( selfActivityData == null )
+				{
+					selfActivityData = getUserDetail(new JSONObject(), loginCode);
+				}
+				if(teamActivityData.length()>0){
+					selfActivityData.put("TEAM", teamActivityData);				
+				}
+				activityDataFinal.put(selfActivityData);
+			}
 			
 		}
 		
@@ -94,6 +107,17 @@ public class AccountActivityDao
 		return activityDataFinal.toString();
 	}
 
+	private JSONObject getUserDetail(JSONObject activityData, String userCode) throws JSONException
+	{
+		List<Employee> employeeDataList = getUserDesignation(userCode);
+		for( Employee employee : employeeDataList )
+		{
+			activityData.put("NAME", employee.getEmpFname());
+			activityData.put("DESIGNATION", employee.getDesignation());
+			activityData.put("USER_ID", userCode);
+		}
+		return activityData;
+	}
 	
 	private JSONObject createActivityData(String userCode, String activityLogXml)
 	{
@@ -269,14 +293,9 @@ public class AccountActivityDao
 			}
 			activityData.put("SESSIONS", allSeesionArray);
 			activityData.put("TEAM", new JSONArray());
-			List<Employee> employeeDataList = getUserDesignation(userCode);
-			 
-			for( Employee employee : employeeDataList )
-			{
-				activityData.put("NAME", employee.getEmpFname());
-				activityData.put("DESIGNATION", employee.getDesignation());
-				activityData.put("USER_ID", userCode);
-			}
+			
+			activityData = getUserDetail(activityData, userCode);
+			
 			System.out.println("activity data " + activityData.toString());
 		}
 		catch (Exception e)