git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@182948...

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

webitm-dashboard/ibase/dashboard/sfa/servlet/BatteryUsageServlet.java

@@ -46,7 +46,11 @@ public class BatteryUsageServlet extends HttpServlet
 			String minBatteryStatus = request.getParameter("MinBatteryStatus");
 			
 			System.out.println("loginId["+loginId+"minBatteryStatus[ "+minBatteryStatus);
-			dataSourceName = request.getParameter("dataSourceName");
+			//dataSourceName = request.getParameter("dataSourceName");
+			if( userInfo != null && userInfo.getTransDB() != null )
+			{
+				dataSourceName = userInfo.getTransDB();
+			}
 			context = new InitialContext(appConnectParm.getProperty());
 			BatteryUsageEJBRemote batteryUsageEJBRemote = (BatteryUsageEJBRemote) context.lookup("ibase/BatteryUsageEJB/remote");
 			String jsonObjData = (String) batteryUsageEJBRemote.getBatteryUsageData(dataSourceName, minBatteryStatus);

webitm-dashboard/ibase/dashboard/sfa/servlet/EDetailingServlet.java

@@ -44,7 +44,11 @@ public class EDetailingServlet extends HttpServlet
 			String teamArgs = request.getParameter("my_team");
 			
 			System.out.println("loginId = "+loginId+"fromDate = "+fromDate+"toDate = "+toDate+"teamArgs = "+teamArgs);
-			dataSourceName = request.getParameter("dataSourceName");
+			//dataSourceName = request.getParameter("dataSourceName");
+			if( userInfo != null && userInfo.getTransDB() != null )
+			{
+				dataSourceName = userInfo.getTransDB();
+			}
 			
 			context = new InitialContext(appConnectParm.getProperty());
 			EDetailingReportEJBRemote eDetailingReportEJBRemote = (EDetailingReportEJBRemote) context.lookup("ibase/EDetailingReportEJB/remote");

webitm-dashboard/ibase/dashboard/sfa/servlet/MeetVarianceServlet.java

@@ -47,7 +47,11 @@ public class MeetVarianceServlet extends HttpServlet
 			userInfo      = (UserInfoBean) session.getAttribute("USER_INFO");
 			loginCode     = userInfo.getLoginCode();	
 			profileId = userInfo.getProfileId();
-			dataSourceName= request.getParameter("dataSourceName");
+			//dataSourceName = request.getParameter("dataSourceName");
+			if( userInfo != null && userInfo.getTransDB() != null )
+			{
+				dataSourceName = userInfo.getTransDB();
+			}
 			fromDate       = request.getParameter("from_date");
 			toDate         = request.getParameter("to_date");
 			dist         = request.getParameter("min_distance");