Updated account activity dao

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

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

@@ -105,35 +105,75 @@ public class AccountActivityDao
 			System.out.println("minMaxBatteryStatus >>>>>"+minMaxBatteryStatus);
 			
 			List<JSONObject> fileDataList= getUserActivityFileData(userDataList, today);
+			System.out.println("fileDataList AFTER>>>"+fileDataList);
 			
-			JSONObject selfActivityData = null;
+			JSONObject selfActivityData = new JSONObject();
+			JSONObject teamMemberActivityData = new JSONObject();
 			JSONArray teamActivityData = new JSONArray();
 			
 			System.out.println("userDataList AFTER>>>"+userDataList);
+			System.out.println("userDataList.size AFTER>>>"+userDataList.size());
+			if(fileDataList.isEmpty()){
+				selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,loginCode);
+				System.out.println("selfActivityData after:::"+selfActivityData);
+				userDataList.remove(loginCode);
+				System.out.println("userDataList in if:::"+userDataList);
+				if(userDataList != null){
+					for(String usersId : userDataList){
+						teamMemberActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId);
+						teamActivityData.put(teamMemberActivityData);
+					}
+					if(teamActivityData.length()>0){
+						selfActivityData.put("TEAM", teamActivityData);				
+					}
+				}
+				activityDataFinal.put(selfActivityData);
+				System.out.println("activityDataFinal for if"+activityDataFinal);
+				
+			}
+			else
+			{
+				List<String> fileUsersList = new ArrayList<String>();
 				for(JSONObject fileDataObj : fileDataList )
 				{
+					System.out.println("Inside file else:::"+userDataList);
 					String userId = fileDataObj.optString("userId");
 					String activityDate = fileDataObj.optString("activityDate");
 					String fileContents = fileDataObj.optString("fileContents");
 					System.out.println("fileName::::::::: ["+userId+"]["+activityDate+"]");
-
-				if( userId.equalsIgnoreCase(loginCode) )
+					fileUsersList.add(userId);
+					System.out.println("fileList:::"+fileUsersList);
+						if( userId.equalsIgnoreCase(loginCode))
 						{
 							selfActivityData = createActivityData(userId, fileContents);
-					selfActivityData = updateMinMaxTime(selfActivityData, minMaxTimeList.get(userId)) ;
+							selfActivityData = checkUserForMinMaxTime(selfActivityData, minMaxTimeList,userId) ;
 							selfActivityData = checkUserForBatteryStatus(selfActivityData, minMaxBatteryStatus,userId) ;					
-
 						}
 						else
 						{
-					JSONObject teamMemberActivityData = createActivityData(userId, fileContents);
-					teamMemberActivityData = updateMinMaxTime(teamMemberActivityData,minMaxTimeList.get(userId)) ;
+							teamMemberActivityData = createActivityData(userId, fileContents);
+							teamMemberActivityData = checkUserForMinMaxTime(teamMemberActivityData,minMaxTimeList,userId) ;
 							teamMemberActivityData = checkUserForBatteryStatus(teamMemberActivityData, minMaxBatteryStatus,userId) ;					
-
 							teamActivityData.put(teamMemberActivityData);
 						}
+					System.out.println("fileUsersList in else::::::::: ["+fileUsersList+"]");
 					System.out.println("selfActivityData::::::::: ["+selfActivityData+"]");
 				}
+				userDataList.removeAll(fileUsersList);
+				System.out.println("userDataList after:::"+userDataList);
+				for(String usersId  : userDataList)
+				{
+					if( usersId.equalsIgnoreCase(loginCode))
+					{
+						selfActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId);
+						System.out.println("selfActivityData after:::"+selfActivityData);
+					}
+					else {
+						teamMemberActivityData=fileNotFoundUsers(selfActivityData,minMaxTimeList,minMaxBatteryStatus,usersId);
+						teamActivityData.put(teamMemberActivityData);
+						System.out.println("teamActivityData after:::"+teamActivityData);
+					}
+				}
 				if(fileDataList != null && fileDataList.size() > 0 )
 				{
 					if( selfActivityData == null )
@@ -141,13 +181,13 @@ public class AccountActivityDao
 						selfActivityData = getUserDetail(new JSONObject(), loginCode);
 						selfActivityData = updateMinMaxTime(selfActivityData, minMaxTimeList.get(loginCode)) ;
 						selfActivityData = checkUserForBatteryStatus(selfActivityData, minMaxBatteryStatus,loginCode) ;					
-
 					}
 					if(teamActivityData.length()>0){
 						selfActivityData.put("TEAM", teamActivityData);				
 					}
 					activityDataFinal.put(selfActivityData);
 				}
+			}
 			
 			activityDataFinal = prepareTeamUsersData(activityDataFinal);
 		}
@@ -156,6 +196,13 @@ public class AccountActivityDao
 		return activityDataFinal.toString();
 	}
 
+	private JSONObject fileNotFoundUsers(JSONObject selfActivityData,HashMap<String, JSONObject> minMaxTimeList,HashMap<String, JSONObject> minMaxBatteryStatus,String usersId) throws JSONException {
+				selfActivityData = getUserDetail(new JSONObject(), usersId);
+				selfActivityData = checkUserForMinMaxTime(selfActivityData, minMaxTimeList,usersId) ;
+				selfActivityData = checkUserForBatteryStatus(selfActivityData, minMaxBatteryStatus,usersId) ;					
+			 return selfActivityData;
+	}
+	
 	private JSONArray prepareAllUsersData(JSONArray activityDataFinal) {
 		System.out.println("Inside prepareAllUsersData ");
 		
@@ -171,11 +218,39 @@ public class AccountActivityDao
 	}
 
 	private JSONObject updateMinMaxTime(JSONObject activityData, JSONObject minMaxTimeObj) throws JSONException
+	{
+		if(minMaxTimeObj !=null)
 		{
 	    	activityData.put("LOGIN_TIME", checkNull(minMaxTimeObj.opt("loginTime")));
 	    	activityData.put("LOGOUT_TIME", checkNull(minMaxTimeObj.opt("logoutTime")));
 			System.out.println("minMaxTimeList query result:::::::"+minMaxTimeObj);
 			return activityData;
+		}
+		{
+	    	activityData.put("LOGIN_TIME", "NA");
+	    	activityData.put("LOGOUT_TIME", "NA");
+			System.out.println("minMaxTimeList query result:::::::"+minMaxTimeObj);
+			return activityData;
+			
+		}
+
+	}
+	
+	private JSONObject checkUserForMinMaxTime(JSONObject activityData,HashMap<String, JSONObject> minMaxTimeObj,String userId) throws JSONException 
+	{
+		System.out.println("checkUserForMinMaxTime activity data::::"+activityData);
+		System.out.println("checkUser checkUserForMinMaxTime:::::::userId ["+userId+"] minMaxTimeObj"+minMaxTimeObj);
+		if(minMaxTimeObj.get(userId) != null)
+		{
+			activityData = updateMinMaxTime(activityData, minMaxTimeObj.get(userId)) ;	
+			return activityData;
+		}
+		else
+		{
+			activityData = updateMinMaxTime(activityData, null) ;	
+
+			return activityData;
+		}
 		
 	}