Added the EJB and Servlet files of Pending Communication and new metadata...

Added the EJB and Servlet files of Pending Communication and new metadata files of CRM with a latest system entries.


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

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

@@ -6,7 +6,6 @@ import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import javax.ejb.Stateless;
@@ -23,8 +22,7 @@ public class ContactCommDashboard implements ContactCommDashboardLocal, ContactC
 
 	}
 
-	@SuppressWarnings("unchecked")
-	@Override
+	@SuppressWarnings({ "unchecked", "unused" })
 	/*Modified by Anjali Rawankar on[10/05/2017][Start]
 	 * [Purpose : Modify method declaration]
 	 */
@@ -166,7 +164,7 @@ public class ContactCommDashboard implements ContactCommDashboardLocal, ContactC
 							+ "<th class='mtBackgroundWhite' style='width: 4%;'>Sales Person</th>" 
 							+"<th class='mtBackgroundWhite' colspan='2' style='width: 4%;'> Date </th>"
 							+"<th class='mtBackgroundWhite' colspan='' style='width: 4%;'> Contact Person</th>"
-							+"<th class='mtBackgroundWhite' style='width: 4%;'>Orgnization</th>"
+							+"<th class='mtBackgroundWhite' style='width: 4%;'>Organization</th>"
 							+"<th class='mtBackgroundWhite' style='width: 4%;'>Plan Detail</th>"
 							+"</tr>");
 				}

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

@@ -4,8 +4,11 @@ import ibase.webitm.utility.ITMException;
 
 import java.rmi.RemoteException;
 
+import javax.ejb.Local;
+
 import org.json.simple.JSONObject;
 
+@Local
 public interface ContactCommDashboardLocal 
 {
 	public JSONObject getCommunicationSchedule(String dataSourceName,String loginCode) throws RemoteException, ITMException;

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

@@ -4,10 +4,11 @@ import ibase.webitm.utility.ITMException;
 
 import java.rmi.RemoteException;
 
+import javax.ejb.Remote;
 import javax.ejb.Stateless;
 
 import org.json.simple.JSONObject;
-@Stateless
+@Remote
 public interface ContactCommDashboardRemote 
 {
 	public JSONObject getCommunicationSchedule(String dataSourceName,String loginCode) throws RemoteException, ITMException;

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

@@ -19,11 +19,9 @@ OpportunityStageSummaryRemote {
 	public JSONObject getOpportunityStageSummary(String dataSourceName,
 			String loginCode,String oppStageDescr) 
 	{
-		getOpportunityStageValue(dataSourceName, loginCode);
 
 		JSONObject rowDataBasicJsn = new JSONObject();
 		JSONObject rowData = null;
-		JSONObject rowData1 = null;
 		String sql = "";
 		ResultSet rs = null;
 		PreparedStatement pstmt = null;
@@ -39,7 +37,6 @@ OpportunityStageSummaryRemote {
 		double valueStageCode = 0, oppValueStageCode = 0  ;
 		try {
 
-			System.out.println("OPP Stage CODE :::: "+oppStageDescr);
 			conn = connection.getConnectDB(dataSourceName);
 
 			sql = "SELECT opp.oppr_id,"

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

+package ibase.dashboard.crm.ejb;
+
+import ibase.system.config.ConnDriver;
+import ibase.webitm.utility.ITMException;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Date;
+
+import javax.ejb.Stateless;
+
+import org.json.simple.JSONObject;
+
+@Stateless
+public class PendingCommunicationDashboard implements
+PendingCommunicationDashboardLocal, PendingCommunicationDashboardRemote {
+
+	@SuppressWarnings({ "unchecked", "unused" })
+	public JSONObject getPendingCommunicationDashboard(String dataSourceName,
+			String loginCode) {
+
+		JSONObject rowDataBasicJsn = new JSONObject();
+		JSONObject rowData = null;
+		String sql = "", sql1 = "", sql2 = "";
+		ResultSet rs = null, rs1 = null, rs2 = null;
+		PreparedStatement pstmt = null, pstmt1 = null, pstmt2 = null;
+		Connection conn = null;
+		ConnDriver connection = new ConnDriver();
+		String salesPers = "", sconCode = "", commId = "" ;
+		Date commDate1 = null;
+		int count = 0;
+		long millis = 0;
+		try {
+			conn = connection.getConnectDB(dataSourceName);
+
+			sql = "SELECT scon_code FROM contact_comm_plan WHERE sales_pers = (select sales_pers from sales_pers where emp_code = ?)";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, loginCode);
+			rs = pstmt.executeQuery();
+			while (rs.next()) {
+				sconCode = rs.getString("scon_code");
+				sql1 = "SELECT to_char(MAX(cp.comm_date),'YYYY-MM-DD') as past_comm_date,cp.comm_id FROM contact_comm_plan cp inner join strg_contact sc on sc.scon_code = cp.scon_code WHERE cp.scon_code = ? "
+						+ " and cp.sales_pers = (select sales_pers from sales_pers where emp_code = ?) group by cp.comm_id" ;
+				pstmt1 = conn.prepareStatement(sql1);
+				pstmt1.setString(1, sconCode);
+				pstmt1.setString(2, loginCode);
+				rs1 = pstmt1.executeQuery();
+				while (rs1.next()) {
+					commDate1 = rs1.getDate("past_comm_date");
+					commId = checkNull(rs1.getString("comm_id"));
+					System.out.println("Comm Date :::: "+commDate1);
+
+					millis = System.currentTimeMillis();
+					java.sql.Date date = new java.sql.Date(millis);
+					System.out.println("Current date :::: "+ date);
+					
+					if(commId != null && commId.trim().length() > 0)
+					{
+						System.out.println("Inside CommId >>>>>>>>>>>>>");
+						if (commDate1.before(date)) {
+
+							sql2 = "select  trim(sa.descr) as activity_descr,"
+									+ " CASE CP.CONTACT_TYPE WHEN '1' THEN 'CALL' WHEN '2' THEN 'MAIL' WHEN '3' THEN 'MEETING' WHEN '4'"
+									+ " THEN 'VIDEOCONFERENCING'WHEN '5' THEN 'OTHERS'END AS descr ,"
+									+ "(sc.first_name||' '||case when sc.last_name is null or length(trim(sc.last_name)) = 0 then '' else trim(sc.last_name) end) as contact_name,"
+									+ " so.sorg_name "
+									+ " from contact_comm_plan cp"
+									+ " inner join strg_contact  sc"
+									+ " on sc.scon_code = cp.scon_code"
+									+ " inner join strg_org so"
+									+ " on so.sorg_code = sc.sorg_code"
+									+ " inner join sales_activity sa"
+									+ " on sa.activity_code = cp.activity_code"
+									+ " where sc.scon_code=? "
+									+ " and cp.sales_pers = (select sales_pers from sales_pers where emp_code = ?)" ;
+
+							pstmt2 = conn.prepareStatement(sql2);
+							pstmt2.setString(1, sconCode);
+							pstmt2.setString(2, loginCode);
+							rs2 = pstmt2.executeQuery();
+							while (rs2.next()) {
+								rowData = new JSONObject();
+
+								rowData.put("activity_descr",checkNull(rs2.getString("activity_descr")));
+								System.out.println("1 :: "+ checkNull(rs2.getString("activity_descr")));
+								rowData.put("descr",checkNull(rs2.getString("descr")));
+								System.out.println("2 :: "+ checkNull(rs2.getString("DESCR")));
+								rowData.put("contact_name",checkNull(rs2.getString("contact_name")));
+								System.out.println("3 :: "+ checkNull(rs2.getString("contact_name")));
+								rowData.put("sorg_name",checkNull(rs2.getString("sorg_name")));
+								System.out.println("4 :: "+ checkNull(rs2.getString("sorg_name")));
+								rowData.put("past_comm_date",checkNull(rs1.getString("past_comm_date")));
+								System.out.println("5 :: "+ checkNull(rs1.getString("past_comm_date")));
+
+								rowDataBasicJsn.put(count, rowData);
+								count++;
+							}
+
+						}
+					}
+				}
+
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			System.out.println("Exception in Pending Communication Dashboard :::: "+ e.getMessage());
+		} finally {
+			try {
+				if (rs != null) {
+					rs.close();
+					rs = null;
+				}
+
+				if (pstmt != null) {
+					pstmt.close();
+					pstmt = null;
+				}
+
+				if (rs1 != null) {
+					rs1.close();
+					rs1 = null;
+				}
+
+				if (pstmt1 != null) {
+					pstmt1.close();
+					pstmt1 = null;
+				}
+				if (rs2 != null) {
+					rs2.close();
+					rs2 = null;
+				}
+
+				if (pstmt2 != null) {
+					pstmt2.close();
+					pstmt2 = null;
+				}
+				if (conn != null) {
+					conn.close();
+					conn = null;
+				}
+				conn = null;
+
+			} catch (Exception d) {
+				d.printStackTrace();
+				try {
+					throw new ITMException(d);
+				} catch (ITMException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return rowDataBasicJsn;
+	}
+
+	private String checkNull(String str) {
+		if (str == null) {
+			return "";
+		} else {
+			return str.trim();
+		}
+	}
+}

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

+package ibase.dashboard.crm.ejb;
+
+import javax.ejb.Local;
+
+import org.json.simple.JSONObject;
+
+@Local
+public interface PendingCommunicationDashboardLocal {
+	public JSONObject getPendingCommunicationDashboard(String dataSourceName,String loginCode);
+}

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

+package ibase.dashboard.crm.ejb;
+
+import javax.ejb.Remote;
+
+import org.json.simple.JSONObject;
+
+@Remote
+public interface PendingCommunicationDashboardRemote {
+	public JSONObject getPendingCommunicationDashboard(String dataSourceName,String loginCode);
+}

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

 SET DEFINE OFF;
 
-
---- 09/05/2017.Start ---
---- Dashboard Name: Contact Communication schedule.Start ---
-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',4,'CRM','/ibase/dwh/GwtDashboardPage.html?metadataname=contactcommdashboard',null,'T','F','MKTG','DBR','Base','Base',SYSDATE);
-
-Insert into DASHBOARD_COMP (USER_ID,PAGE_ID,COMP_ID,TITLE,URI,WIDTH,HEIGHT,ROW_NO,COLUMN_NO,COMP_TYPE,COMP_NAME,ENTITY_TYPE,ENTITY_CODE,DBR_RESOURCE) values ('MKTG',4,1,'CRM','/ibase/dwh/GwtDashboardPage.html?metadataname=contactcommdashboard',350,0,0,1,null,null,'F','MKTG','contactcommdashboard');
-
-
-COMMIT;
-
---- Dashboard Name: Contact Communication schedule.End ---
---- 09/05/2017.End ---
-
---- 22/05/2017.Start ---
---- Dashboard Name: Opportunity Stage Info.Start --- 
-
-Insert into DASHBOARD_COMP (USER_ID,PAGE_ID,COMP_ID,TITLE,URI,WIDTH,HEIGHT,ROW_NO,COLUMN_NO,COMP_TYPE,COMP_NAME,ENTITY_TYPE,ENTITY_CODE,DBR_RESOURCE)
-values ('MKTG',5,1,'CRM','/ibase/dwh/GwtDashboardPage.html?metadataname=opportunitystageinfo',350,0,0,1,null,null,'F','MKTG','opportunitystageinfo');
-
-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',5,'CRM','/ibase/dwh/GwtDashboardPage.html?metadataname=opportunitystageinfo',null,'T','F','MKTG','DBR','Base','Base',SYSDATE);
-
-COMMIT;
-
---- Dashboard Name: Opportunity Stage Info.End ---
---- 22/05/2017.End ---
-
---- 22/05/2017.Start ---
---- Dashboard Name: Opportunity Stage Summary.Start ---  
+--- 30/05/2017.Start ---
+--- Dashboard Name: CRM Dashboard.Start ---
 
 Insert into dashboard_comp (USER_ID,PAGE_ID,COMP_ID,TITLE,URI,WIDTH,HEIGHT,ROW_NO,COLUMN_NO,COMP_TYPE,COMP_NAME,ENTITY_TYPE,ENTITY_CODE,DBR_RESOURCE)
-values ('MKTG',6,1,'CRM','/ibase/dwh/GwtDashboardPage.html?metadataname=OpportunityStageSummary',350,0,0,1,null,null,'F','MKTG','opportunityStageSummary');
+values ('MKTG',1,4,'CRM','/ibase/dwh/GwtDashboardPage.html?metadataname=CRMDashboard',350,0,0,1,null,null,'F','MKTG','CRMDashboard');
  
 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',6,'CRM ','/ibase/dwh/GwtDashboardPage.html?metadataname=OpportunityStageSummary',null,'T','F','MKTG','DBR','Base','Base',to_date('11-05-17','DD-MM-RR'));
+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: Opportunity Stage Summary.End ---
---- 22/05/2017.End ---
+--- Dashboard Name: CRM Dashboard.End ---
+--- 30/05/2017.End ---

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

+    <?xml version='1.0'?>
+    <Root>
+    <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='T'>
+	<component_type><![CDATA[DataGrid]]></component_type>
+	    <component_caption><![CDATA[]]></component_caption>
+	    <component_icon><![CDATA[reportswht.png]]></component_icon>
+	    <ComponentTitle><![CDATA[Pending Communication]]></ComponentTitle>
+	    <component_css><![CDATA[outerChartContainerPos1of1]]></component_css>
+	    <column_group id='sorg_name'>
+				    <col_group_title><![CDATA[Organization Name]]></col_group_title>
+				    <column_size><![CDATA[220]]></column_size>
+				    <column_alignment><![CDATA[left]]></column_alignment>
+				    <link_metadata><![CDATA[]]></link_metadata>
+				    <columns>
+					    <column id='sorg_name'><![CDATA[Organization Name]]></column>
+				    </columns>				
+			    </column_group>	
+			    <column_group id='contact_name'>
+				    <col_group_title><![CDATA[Contact Person]]></col_group_title>
+				    <column_size><![CDATA[180]]></column_size>
+				    <column_alignment><![CDATA[left]]></column_alignment>
+				    <link_metadata><![CDATA[]]></link_metadata>
+				    <columns>
+					    <column id='contact_name'><![CDATA[Contact Person]]></column>
+				    </columns>				
+			    </column_group>	
+			      <column_group id='activity_descr'>
+				    <col_group_title><![CDATA[Activity Description]]></col_group_title>
+				    <column_size><![CDATA[150]]></column_size>
+				    <column_alignment><![CDATA[left]]></column_alignment>
+				    <link_metadata><![CDATA[]]></link_metadata>
+				    <columns>
+					    <column id='activity_descr'><![CDATA[Activity Description]]></column>
+				    </columns>				
+			      </column_group>
+			      <column_group id='descr'>
+				    <col_group_title><![CDATA[Contact Mode]]></col_group_title>
+				    <column_size><![CDATA[180]]></column_size>
+				    <column_alignment><![CDATA[left]]></column_alignment>
+				    <link_metadata><![CDATA[]]></link_metadata>
+				    <columns>
+					    <column id='descr'><![CDATA[Contact Mode]]></column>
+				    </columns>				
+			      </column_group>
+			      
+			    <column_group id='past_comm_date'>
+				    <col_group_title><![CDATA[Communication Date]]></col_group_title>
+				    <column_size><![CDATA[180]]></column_size>
+				    <column_alignment><![CDATA[left]]></column_alignment>
+				    <link_metadata><![CDATA[]]></link_metadata>
+				    <columns>
+					    <column id='past_comm_date'><![CDATA[Communication Date]]></column>
+				    </columns>				
+			    </column_group>				
+	    </component>  
+	    		      
+	    <component datasource='2' id='2' type='CARD'>
+			    <ComponentTitle><![CDATA[Communication Schedule]]></ComponentTitle>
+			    <component_icon><![CDATA[reportswht.png]]></component_icon>
+			    <component_css><![CDATA[outerChartContainerPos1of1]]></component_css>
+			    <height><![CDATA[300]]></height>
+			    <width><![CDATA[100%]]></width>	
+			    <display_panel><![CDATA[]]></display_panel>  		   
+			    <layout> <html><![CDATA[<div>{xmlString}</div>]]>
+			    </html></layout>       
+		    </component>
+		    
+	    <component datasource='3' id='3' type='CARD'>
+	    <ComponentTitle><![CDATA[Opportunity List]]></ComponentTitle>
+	    <component_icon><![CDATA[reportswht.png]]></component_icon>
+			  <component_css><![CDATA[outerChartContainerPos1of1]]></component_css>
+			  <height><![CDATA[300]]></height>
+	    <width><![CDATA[100%]]></width>	
+	    <display_panel><![CDATA[]]></display_panel>  	   
+	    <layout> <html><![CDATA[<div>{xmlString}</div>]]>
+	      </html></layout>       
+	    </component>
+
+    <component datasource='4' id='4' type='G'>
+		    <ComponentTitle><![CDATA[Opportunity stage wise value]]></ComponentTitle>
+		  <component_css><![CDATA[outerChartContainerPos1of1]]></component_css>
+		  <component_icon><![CDATA[reportswht.png]]></component_icon>
+		    <chart_properties>
+		    <win_properties><![CDATA[]]></win_properties>
+		      <chart_type id='pie'><![CDATA[Pie2D]]></chart_type>
+			  <caption><![CDATA[]]></caption>                        
+			  <height><![CDATA[300]]></height>
+			  <width><![CDATA[100%]]></width>
+			    <bg_color><![CDATA[ffffff]]></bg_color>  
+			  <showborder><![CDATA[0]]></showborder>
+		  <showlegend><![CDATA[1]]></showlegend>        
+		  <useroundedges><![CDATA[1]]></useroundedges>
+		  <rotatevalues><![CDATA[0]]></rotatevalues>
+		  <decimals><![CDATA[2]]> </decimals>
+		  <showpercentvalues><![CDATA[0]]> </showpercentvalues>
+		  <formatnumberscale><![CDATA[1]]></formatnumberscale>
+		  <formatnumber><![CDATA[1]]></formatnumber>
+		    </chart_properties>                        
+			  <column_group id='x_axis'>
+				  <col_group_title><![CDATA[]]></col_group_title>
+				  <columns>
+					  <column id='stage_descr'><![CDATA[Description]]></column>
+				  </columns>
+			  </column_group>
+			  <column_group id='y_axis'>
+				  <col_group_title><![CDATA[]]></col_group_title>
+				  <columns>                                                      
+					  <column id='oppr_value' linktype='f'  linkedmetadata='OpportunityStageSummaryDetail' render='bar'  showvalue='1' color='#2F8C87' linevisibility='0' dotthickness='0' ><![CDATA[value]]></column>
+				  </columns>                          
+				  <left_yaxis_title><![CDATA[]]></left_yaxis_title>
+			      <right_yaxis_title><![CDATA[]]></right_yaxis_title>
+			  </column_group>
+			    
+		      </component>
+    </view>
+    </Root>
+    

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

-<?xml version='1.0'?>
-<Root>
-<page_title><![CDATA[CRM]]></page_title>	 
-<datasource  id ='1' driverName='DriverITM'><![CDATA[ContactCommDashboardServlet]]></datasource>
-         
-		<view id='1' name='Order'>		
-		<component datasource='1' id='1' type='CARD'>
-		<ComponentTitle><![CDATA[Schedule]]></ComponentTitle>
-		<component_icon><![CDATA[reportswht.png]]></component_icon>
-                <component_css><![CDATA[outerChartContainerPos1of1]]></component_css>
-                <height><![CDATA[300]]></height>
-		<width><![CDATA[100%]]></width>	
-		<display_panel><![CDATA[]]></display_panel>  		   
-		<layout> <html><![CDATA[<div>{xmlString}</div>]]>
-   		</html></layout>       
-	</component>
-	</view>
-</Root>
-
-
-

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

- <?xml version='1.0'?>
-<Root>
-<page_title><![CDATA[CRM]]></page_title>	
-<datasource  id ='1' driverName='DriverITM'><![CDATA[OpportunityStageInfoServlet]]></datasource>
-        
-<view id='1' name='Order'>	
-<component datasource='1' id='1' type='CARD'>
-<ComponentTitle><![CDATA[Opportunity Assesment]]></ComponentTitle>
-<component_icon><![CDATA[reportswht.png]]></component_icon>
-               <component_css><![CDATA[outerChartContainerPos1of1]]></component_css>
-               <height><![CDATA[300]]></height>
-<width><![CDATA[100%]]></width>	
-<display_panel><![CDATA[]]></display_panel>  	   
-<layout> <html><![CDATA[<div>{xmlString}</div>]]>
-  </html></layout>       
-</component>
-</view>
-</Root>

webitm-dashboard/ibase/dashboard/crm/module-resource/crm/servlet-mapping/crm-dashboard-servlet-mapping.xml

@@ -56,7 +56,7 @@
 		<servlet-name>OrganizationStageCountServlet</servlet-name>
 		<servlet-class>ibase.dashboard.crm.servlet.OrganizationStageCountServlet</servlet-class>
 	</servlet>
-	<servlet-mapping id="OrganizationStageCountServlet">
+	<servlet-mapping>
 		<servlet-name>OrganizationStageCountServlet</servlet-name>
 		<url-pattern>/OrganizationStageCountServlet</url-pattern>
 	</servlet-mapping>
@@ -65,9 +65,22 @@
 		<servlet-name>OrganizationStageValueServlet</servlet-name>
 		<servlet-class>ibase.dashboard.crm.servlet.OrganizationStageValueServlet</servlet-class>
 	</servlet>
-	<servlet-mapping id="OrganizationStageValueServlet">
+	<servlet-mapping>
 		<servlet-name>OrganizationStageValueServlet</servlet-name>
 		<url-pattern>/OrganizationStageValueServlet</url-pattern>
 	</servlet-mapping>
 	
-<!-- 22/05/2017 - CRM Dashboard for Opportunity Stage Summary.End -->
\ No newline at end of file
+<!-- 22/05/2017 - CRM Dashboard for Opportunity Stage Summary.End -->
+
+	
+<!-- 30/05/2017 - CRM Dashboard for Pending Communication.Start -->
+<servlet>
+		<servlet-name>PendingCommunicationDashboardServlet</servlet-name>
+		<servlet-class>ibase.dashboard.crm.servlet.PendingCommunicationDashboardServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>PendingCommunicationDashboardServlet</servlet-name>
+		<url-pattern>/PendingCommunicationDashboardServlet</url-pattern>
+	</servlet-mapping>
+	
+<!-- 30/05/2017 - CRM Dashboard for Pending Communication.End -->	
\ No newline at end of file

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

@@ -62,7 +62,7 @@ public class ContactCommDashboardServlet extends HttpServlet {
 			 */
 
 			context = new InitialContext(appConnectParm.getProperty());
-			contactCommDashboardRemote = (ContactCommDashboardRemote) context.lookup("ibase/ContactCommDashboard/remote");
+			contactCommDashboardRemote =  (ContactCommDashboardRemote) context.lookup("ibase/ContactCommDashboard/remote");
 
 			/* Modified by Anjali Rawankar on[10/05/2017][Start] 
 			 * [Purpose : Add parametere logincode in getcommunicationSchedule() ]

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

@@ -42,7 +42,7 @@ public class OpportunityStageInfoServlet extends HttpServlet {
 
 			HttpSession session = request.getSession(true);
 			UserInfoBean userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
-			loginCode = userInfo.getLoginCode();
+			loginCode = userInfo.getEmpCode();
 
 			System.out.println("Login Code ::::[ " + loginCode + " ]");
 

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

+package ibase.dashboard.crm.servlet;
+
+import ibase.dashboard.crm.ejb.PendingCommunicationDashboardRemote;
+import ibase.system.config.AppConnectParm;
+import ibase.utility.UserInfoBean;
+import ibase.webitm.utility.ITMException;
+
+import java.io.IOException;
+
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.json.simple.JSONObject;
+
+public class PendingCommunicationDashboardServlet extends HttpServlet {
+
+	private static final long serialVersionUID = 1L;
+
+	public void doGet(HttpServletRequest request, HttpServletResponse response)
+			throws IOException, ServletException {
+
+		doPost(request, response);
+	}
+
+	public void doPost(HttpServletRequest request, HttpServletResponse response)
+			throws IOException, ServletException {
+
+		String dataSourceName = "";
+		String loginCode = "";
+		InitialContext context = null;
+		AppConnectParm appConnectParm = new AppConnectParm();
+		PendingCommunicationDashboardRemote pendingCommunicationDashboardRemote = null;  
+		
+		try {
+			response.setContentType("application/xml");
+			dataSourceName = request.getParameter("dataSourceName");
+
+			HttpSession session = request.getSession(true);
+			UserInfoBean userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
+			loginCode = userInfo.getEmpCode();
+
+			System.out.println("Login Code ::::[ " + loginCode + " ]");
+
+			context = new InitialContext(appConnectParm.getProperty());
+			pendingCommunicationDashboardRemote = (PendingCommunicationDashboardRemote) context.lookup("ibase/PendingCommunicationDashboard/remote");
+			JSONObject jsonObjData = (JSONObject) pendingCommunicationDashboardRemote.getPendingCommunicationDashboard(dataSourceName, loginCode);
+			ServletOutputStream outputStream = response.getOutputStream();
+			outputStream.write(jsonObjData.toString().getBytes());
+			outputStream.flush();
+			outputStream.close();
+			System.out.println(" Final data set for PendingCommunicationDashboardServlet === " + jsonObjData);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			System.out.println("Exception : PendingCommunicationDashboardServlet :::: " + e);
+			try {
+				throw new ITMException(e);
+			} catch (ITMException e1) {
+				e1.printStackTrace();
+			}
+		}
+	}
+
+}