Pophelp system entries is added in SQL and bug changes is made in EJB,Servlet and Metadata.

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

webitm-dashboard/ibase/dashboard/crm/ejb/ContactCommDashboardLocal.java

@@ -11,6 +11,6 @@ import org.json.simple.JSONObject;
 @Local
 public interface ContactCommDashboardLocal 
 {
-	public JSONObject getCommunicationSchedule(String dataSourceName,String loginCode) throws RemoteException, ITMException;
+	public JSONObject getCommunicationSchedule(String dataSourceName,String loginCode, String empCode) throws RemoteException, ITMException;
 
 }

webitm-dashboard/ibase/dashboard/crm/ejb/ContactCommDashboardRemote.java

@@ -11,6 +11,6 @@ import org.json.simple.JSONObject;
 @Remote
 public interface ContactCommDashboardRemote 
 {
-	public JSONObject getCommunicationSchedule(String dataSourceName,String loginCode) throws RemoteException, ITMException;
+	public JSONObject getCommunicationSchedule(String dataSourceName,String loginCode, String empCode) throws RemoteException, ITMException;
 	
 }

webitm-dashboard/ibase/dashboard/crm/ejb/OpportunityStageInfoLocal.java

@@ -10,6 +10,6 @@ import org.json.simple.JSONObject;
 
 @Local
 public interface OpportunityStageInfoLocal {
-	public JSONObject getOpportunityStage(String dataSourceName,String loginCode)
+	public JSONObject getOpportunityStage(String dataSourceName,String loginCode,String empCode)
 			throws RemoteException, ITMException;
 }

webitm-dashboard/ibase/dashboard/crm/ejb/OpportunityStageInfoRemote.java

@@ -10,7 +10,7 @@ import org.json.simple.JSONObject;
 
 @Remote
 public interface OpportunityStageInfoRemote {
-	public JSONObject getOpportunityStage(String dataSourceName,String loginCode)
+	public JSONObject getOpportunityStage(String dataSourceName,String loginCode,String empCode)
 			throws RemoteException, ITMException;
 
 }

webitm-dashboard/ibase/dashboard/crm/ejb/OpportunityStageSummaryLocal.java

@@ -6,9 +6,9 @@ import org.json.simple.JSONObject;
 
 @Local
 public interface OpportunityStageSummaryLocal {
-	public JSONObject getOpportunityStageSummary(String dataSourceName, String loginCode,String oppStageDescr);
-	public JSONObject getOpportunityStageCount(String dataSourceName, String loginCode);
-	public JSONObject getOpportunityStageValue(String dataSourceName, String loginCode);
+	public JSONObject getOpportunityStageSummary(String dataSourceName, String loginCode,String oppStageDescr, String empCode);
+	public JSONObject getOpportunityStageCount(String dataSourceName, String loginCode, String empCode);
+	public JSONObject getOpportunityStageValue(String dataSourceName, String loginCode, String empCode);
 	public JSONObject getOrganizationStageCount(String dataSourceName, String loginCode);
 	public JSONObject getOrganizationStageValue(String dataSourceName, String loginCode);
 }

webitm-dashboard/ibase/dashboard/crm/ejb/OpportunityStageSummaryRemote.java

@@ -6,9 +6,9 @@ import org.json.simple.JSONObject;
 
 @Remote
 public interface OpportunityStageSummaryRemote {
-	public JSONObject getOpportunityStageSummary(String dataSourceName, String loginCode,String oppStageDescr);
-	public JSONObject getOpportunityStageCount(String dataSourceName, String loginCode);
-	public JSONObject getOpportunityStageValue(String dataSourceName, String loginCode);
+	public JSONObject getOpportunityStageSummary(String dataSourceName, String loginCode,String oppStageDescr,String empCode);
+	public JSONObject getOpportunityStageCount(String dataSourceName, String loginCode, String empCode);
+	public JSONObject getOpportunityStageValue(String dataSourceName, String loginCode, String empCode);
 	public JSONObject getOrganizationStageCount(String dataSourceName, String loginCode);
 	public JSONObject getOrganizationStageValue(String dataSourceName, String loginCode);
 }

webitm-dashboard/ibase/dashboard/crm/ejb/PendingCommunicationDashboardLocal.java

@@ -6,5 +6,5 @@ import org.json.simple.JSONObject;
 
 @Local
 public interface PendingCommunicationDashboardLocal {
-	public JSONObject getPendingCommunicationDashboard(String dataSourceName,String loginCode);
+	public JSONObject getPendingCommunicationDashboard(String dataSourceName,String loginCode, String empCode);
 }

webitm-dashboard/ibase/dashboard/crm/ejb/PendingCommunicationDashboardRemote.java

@@ -6,5 +6,5 @@ import org.json.simple.JSONObject;
 
 @Remote
 public interface PendingCommunicationDashboardRemote {
-	public JSONObject getPendingCommunicationDashboard(String dataSourceName,String loginCode);
+	public JSONObject getPendingCommunicationDashboard(String dataSourceName,String loginCode, String empCode);
 }

webitm-dashboard/ibase/dashboard/crm/module-resource/crm/dashboard-sql/crm-dashboard.sql

@@ -9,7 +9,18 @@ values ('MKTG',1,1,'CRM','/ibase/dwh/GwtDashboardPage.html?metadataname=CRMDashb
 Insert into dashboard_pages (USER_ID,PAGE_ID,TITLE,URI,IMAGE_URI,PAGE_TYPE,ENTITY_TYPE,ENTITY_CODE,COMP_TYPE,CHG_USER,CHG_TERM,CHG_DATE) 
 values ('MKTG',1,'CRM','/ibase/dwh/GwtDashboardPage.html?metadataname=CRMDashboard',null,'T','F','MKTG','DBR','Base','Base',to_date('11-05-17','DD-MM-RR'));
 
-COMMIT;
-
 --- Dashboard Name: CRM Dashboard.End ---
 --- 30/05/2017.End ---
+
+
+--- 09/05/2017 .Start ---
+--- Dashboard POPHELP ---
+
+Insert into POPHELP (FIELD_NAME,MOD_NAME,SQL_STR,MSG_TITLE,WIDTH,HEIGHT,CHG_DATE,CHG_USER,CHG_TERM,DIST_OPT,SQL_INPUT) 
+values ('EMP_CODE','W_CRMDASHBOARD','SELECT A.EMP_CODE AS CODE , A.EMP_FNAME||'' ''||A.EMP_LNAME AS EMP_NAME FROM EMPLOYEE A, SALES_PERS B WHERE A.EMP_CODE = B.EMP_CODE AND A.RELIEVE_DATE  IS NULL START WITH A.EMP_CODE = ''?'' CONNECT BY PRIOR A.EMP_CODE = A.REPORT_TO UNION ALL SELECT ''TEAM'' AS CODE,''TEAM SUMMARY'' AS EMP_NAME FROM DUAL','EMPLOYEE CODE',0,0,sysdate,'BASE','BASE','0',':EMP_CODE');
+
+--- 09/05/2017.End ---
+
+COMMIT;
+
+

webitm-dashboard/ibase/dashboard/crm/module-resource/crm/metadata/CRMDashboard.xml

-    <?xml version='1.0'?>
-    <Root>
+<?xml version='1.0'?>
+<Root>
+<filters display='N'>    
+	<filter type='5'>
+	    <default_value><![CDATA[]]></default_value>
+	    <col_name><![CDATA[EMP_CODE]]></col_name>
+	    <col_descr><![CDATA[Sales Persons]]></col_descr>
+	    <col_id><![CDATA[EMP_CODE]]></col_id>          
+	    <field_name><![CDATA[EMP_CODE]]></field_name>
+	    <mod_name><![CDATA[CRMDASHBOARD]]></mod_name>
+	    <show_ontitle><![CDATA[0]]></show_ontitle>
+	    <mandatory><![CDATA[N]]></mandatory>                            
+	</filter>
+	
+</filters>
+
     <page_title><![CDATA[CRM]]></page_title>	
     <datasource  id ='1' driverName='DriverITM'><![CDATA[PendingCommunicationDashboardServlet]]></datasource>
     <datasource  id ='2' driverName='DriverITM'><![CDATA[ContactCommDashboardServlet]]></datasource>
     <datasource  id ='3' driverName='DriverITM'><![CDATA[OpportunityStageInfoServlet]]></datasource>
     <datasource  id ='4' driverName='DriverITM'><![CDATA[OpportunityStageValueServlet]]></datasource>
-    
-    
-	    
+       
     <view id='1' name='Order'>	
       
        <component datasource='1' id='1' type='CARD'>

webitm-dashboard/ibase/dashboard/crm/module-resource/crm/metadata/OpportunityStageSummaryDetail.xml

- 
 <?xml version='1.0'?>
 <Root>
   <filters display='N'>       
@@ -12,6 +11,17 @@
 	    <show_ontitle><![CDATA[1]]></show_ontitle>
 	    <mandatory><![CDATA[N]]></mandatory>                            
 	</filter>
+	
+	<filter type='5'>
+	    <default_value><![CDATA[]]></default_value>
+	    <col_name><![CDATA[EMP_CODE]]></col_name>
+	    <col_descr><![CDATA[Sales Persons]]></col_descr>
+	    <col_id><![CDATA[EMP_CODE]]></col_id>          
+	    <field_name><![CDATA[EMP_CODE]]></field_name>
+	    <mod_name><![CDATA[CRMDASHBOARD]]></mod_name>
+	    <show_ontitle><![CDATA[0]]></show_ontitle>
+	    <mandatory><![CDATA[N]]></mandatory>                            
+	</filter>
 </filters>
 
 <page_title><![CDATA[CRM]]></page_title>	

webitm-dashboard/ibase/dashboard/crm/servlet/ContactCommDashboardServlet.java

@@ -29,6 +29,7 @@ public class ContactCommDashboardServlet extends HttpServlet {
 			throws IOException, ServletException {
 		String dataSourceName = "";
 		String loginCode = "";// Modified by Anjali Rawankar on[10/05/2017][Start]
+		String empCode = "";
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		ContactCommDashboardRemote contactCommDashboardRemote = null;
@@ -37,6 +38,8 @@ public class ContactCommDashboardServlet extends HttpServlet {
 			response.setContentType("application/xml");
 			dataSourceName = request.getParameter("dataSourceName");
 
+			empCode = request.getParameter("EMP_CODE");
+			
 			/*
 			 * Modified by Anjali Rawankar on[10/05/2017][Start]
 			 * [Purpose : To get logincode ]
@@ -69,7 +72,7 @@ public class ContactCommDashboardServlet extends HttpServlet {
 			 */
 			// JSONObject jsonObjData = (JSONObject)
 			// contactCommDashboardRemote.getCommunicationSchedule(dataSourceName);
-			JSONObject jsonObjData = (JSONObject) contactCommDashboardRemote.getCommunicationSchedule(dataSourceName, loginCode);
+			JSONObject jsonObjData = (JSONObject) contactCommDashboardRemote.getCommunicationSchedule(dataSourceName, loginCode, empCode);
 			/*
 			 * [Purpose : Add parametere logincode in getcommunicationSchedule()]
 			 * Modified by Anjali Rawankar on[10/05/2017][End]

webitm-dashboard/ibase/dashboard/crm/servlet/OpportunityStageCountServlet.java

@@ -32,6 +32,7 @@ public class OpportunityStageCountServlet extends HttpServlet {
 
 		String dataSourceName = "";
 		String loginCode = "";
+		String empCode = "";
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		OpportunityStageSummaryRemote opportunityStageSummaryRemote = null;  
@@ -39,6 +40,8 @@ public class OpportunityStageCountServlet extends HttpServlet {
 		try {
 			response.setContentType("application/xml");
 			dataSourceName = request.getParameter("dataSourceName");
+			
+			empCode = request.getParameter("EMP_CODE");
 
 			HttpSession session = request.getSession(true);
 			UserInfoBean userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
@@ -48,7 +51,7 @@ public class OpportunityStageCountServlet extends HttpServlet {
 
 			context = new InitialContext(appConnectParm.getProperty());
 			opportunityStageSummaryRemote = (OpportunityStageSummaryRemote) context.lookup("ibase/OpportunityStageSummary/remote");
-			JSONObject jsonObjData = (JSONObject) opportunityStageSummaryRemote.getOpportunityStageCount(dataSourceName, loginCode);
+			JSONObject jsonObjData = (JSONObject) opportunityStageSummaryRemote.getOpportunityStageCount(dataSourceName, loginCode, empCode);
 			ServletOutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/crm/servlet/OpportunityStageInfoServlet.java

@@ -30,8 +30,7 @@ public class OpportunityStageInfoServlet extends HttpServlet {
 	public void doPost(HttpServletRequest request, HttpServletResponse response)
 			throws IOException, ServletException {
 
-		String dataSourceName = "";
-		String loginCode = "";
+		String dataSourceName = "", loginCode = "", empCode = "";
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		OpportunityStageInfoRemote opportunityStageInfoRemote = null;
@@ -40,6 +39,8 @@ public class OpportunityStageInfoServlet extends HttpServlet {
 			response.setContentType("application/xml");
 			dataSourceName = request.getParameter("dataSourceName");
 
+			empCode =  request.getParameter("EMP_CODE");
+
 			HttpSession session = request.getSession(true);
 			UserInfoBean userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
 			loginCode = userInfo.getEmpCode();
@@ -48,7 +49,7 @@ public class OpportunityStageInfoServlet extends HttpServlet {
 
 			context = new InitialContext(appConnectParm.getProperty());
 			opportunityStageInfoRemote = (OpportunityStageInfoRemote) context.lookup("ibase/OpportunityStageInfo/remote");
-			JSONObject jsonObjData = (JSONObject) opportunityStageInfoRemote.getOpportunityStage(dataSourceName, loginCode);
+			JSONObject jsonObjData = (JSONObject) opportunityStageInfoRemote.getOpportunityStage(dataSourceName, loginCode, empCode);
 			ServletOutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/crm/servlet/OpportunityStageSummaryServlet.java

@@ -30,8 +30,8 @@ public class OpportunityStageSummaryServlet extends HttpServlet{
 	public void doPost(HttpServletRequest request, HttpServletResponse response)
 			throws IOException, ServletException {
 
-		String dataSourceName = "",oppStageDescr = "";
-		String loginCode = "";
+		String dataSourceName = "", oppStageDescr = "";
+		String loginCode = "", empCode = "";
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		OpportunityStageSummaryRemote opportunityStageSummaryRemote = null;  
@@ -39,20 +39,21 @@ public class OpportunityStageSummaryServlet extends HttpServlet{
 		try {
 			response.setContentType("application/xml");
 			dataSourceName = request.getParameter("dataSourceName");
- 
-            oppStageDescr = request.getParameter("stage_descr"); 
 			
-            System.out.println("SERVLET Stage Code ::: "+oppStageDescr);
+            oppStageDescr = request.getParameter("stage_descr"); 
+            System.out.println("STAGE DESC :: "+oppStageDescr);
+            empCode =  request.getParameter("EMP_CODE");
+            System.out.println("EMP CODE :: "+empCode);
             
 			HttpSession session = request.getSession(true);
 			UserInfoBean userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
 			loginCode = userInfo.getEmpCode();
 
-			System.out.println("Login Code ::::[ " + loginCode + " ]");
+			System.out.println("Login Code [ " + loginCode + " ]");
 
 			context = new InitialContext(appConnectParm.getProperty());
 			opportunityStageSummaryRemote = (OpportunityStageSummaryRemote) context.lookup("ibase/OpportunityStageSummary/remote");
-			JSONObject jsonObjData = (JSONObject) opportunityStageSummaryRemote.getOpportunityStageSummary(dataSourceName, loginCode,oppStageDescr);
+			JSONObject jsonObjData = (JSONObject) opportunityStageSummaryRemote.getOpportunityStageSummary(dataSourceName, loginCode, oppStageDescr, empCode);
 			ServletOutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/crm/servlet/OpportunityStageValueServlet.java

@@ -30,8 +30,7 @@ public class OpportunityStageValueServlet extends HttpServlet{
 	public void doPost(HttpServletRequest request, HttpServletResponse response)
 			throws IOException, ServletException {
 
-		String dataSourceName = "";
-		String loginCode = "";
+		String dataSourceName = "",loginCode = "", empCode = "";
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		OpportunityStageSummaryRemote opportunityStageSummaryRemote = null;  
@@ -40,6 +39,9 @@ public class OpportunityStageValueServlet extends HttpServlet{
 			response.setContentType("application/xml");
 			dataSourceName = request.getParameter("dataSourceName");
 
+			empCode =  request.getParameter("EMP_CODE");
+			System.out.println("SERVLET ::[ " + empCode + " ]");
+			
 			HttpSession session = request.getSession(true);
 			UserInfoBean userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
 			loginCode = userInfo.getEmpCode();
@@ -48,7 +50,7 @@ public class OpportunityStageValueServlet extends HttpServlet{
 
 			context = new InitialContext(appConnectParm.getProperty());
 			opportunityStageSummaryRemote = (OpportunityStageSummaryRemote) context.lookup("ibase/OpportunityStageSummary/remote");
-			JSONObject jsonObjData = (JSONObject) opportunityStageSummaryRemote.getOpportunityStageValue(dataSourceName, loginCode);
+			JSONObject jsonObjData = (JSONObject) opportunityStageSummaryRemote.getOpportunityStageValue(dataSourceName, loginCode, empCode);
 			ServletOutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();

webitm-dashboard/ibase/dashboard/crm/servlet/OrganizationStageValueServlet.java

@@ -30,8 +30,7 @@ public class OrganizationStageValueServlet extends HttpServlet{
 	public void doPost(HttpServletRequest request, HttpServletResponse response)
 			throws IOException, ServletException {
 
-		String dataSourceName = "";
-		String loginCode = "";
+		String dataSourceName = "", loginCode = "";
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		OpportunityStageSummaryRemote opportunityStageSummaryRemote = null;  

webitm-dashboard/ibase/dashboard/crm/servlet/PendingCommunicationDashboardServlet.java

@@ -30,8 +30,7 @@ public class PendingCommunicationDashboardServlet extends HttpServlet {
 	public void doPost(HttpServletRequest request, HttpServletResponse response)
 			throws IOException, ServletException {
 
-		String dataSourceName = "";
-		String loginCode = "";
+		String dataSourceName = "", loginCode = "", empCode = "";
 		InitialContext context = null;
 		AppConnectParm appConnectParm = new AppConnectParm();
 		PendingCommunicationDashboardRemote pendingCommunicationDashboardRemote = null;  
@@ -40,6 +39,8 @@ public class PendingCommunicationDashboardServlet extends HttpServlet {
 			response.setContentType("application/xml");
 			dataSourceName = request.getParameter("dataSourceName");
 
+			empCode = request.getParameter("EMP_CODE");
+			
 			HttpSession session = request.getSession(true);
 			UserInfoBean userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
 			loginCode = userInfo.getEmpCode();
@@ -48,7 +49,7 @@ public class PendingCommunicationDashboardServlet extends HttpServlet {
 
 			context = new InitialContext(appConnectParm.getProperty());
 			pendingCommunicationDashboardRemote = (PendingCommunicationDashboardRemote) context.lookup("ibase/PendingCommunicationDashboard/remote");
-			JSONObject jsonObjData = (JSONObject) pendingCommunicationDashboardRemote.getPendingCommunicationDashboard(dataSourceName, loginCode);
+			JSONObject jsonObjData = (JSONObject) pendingCommunicationDashboardRemote.getPendingCommunicationDashboard(dataSourceName, loginCode, empCode);
 			ServletOutputStream outputStream = response.getOutputStream();
 			outputStream.write(jsonObjData.toString().getBytes());
 			outputStream.flush();