Changes made in ContactCommDashboard.java

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

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

@@ -64,8 +64,8 @@ public class ContactCommDashboard implements ContactCommDashboardLocal, ContactC
 			/*[Purpose : xmlString initialize inside while loop]
 			 *Modified by Anjali Rawankar on [10/05/2017][End] 
 			 */
-			
-			
+
+
 			/*Modified by Anjali Rawankar on[10/05/2017][Start]
 			 * [Purpose : Added where clause for sales_pers]
 			 */
@@ -91,7 +91,10 @@ public class ContactCommDashboard implements ContactCommDashboardLocal, ContactC
 						" INNER JOIN STRG_CONTACT STR ON COM.SCON_CODE=STR.SCON_CODE  " +
 						" INNER JOIN SALES_PERS SP ON  COM.SALES_PERS=SP.SALES_PERS "+
 						" WHERE COMM_DATE >= SYSDATE ORDER BY SP.SP_NAME,NEW_COMM_DATE";*/
-			sql = "SELECT (STR.FIRST_NAME||' '||STR.LAST_NAME) AS CONTACT_PERSON,"+
+			/*Modified by Anjali Rawankar on[12/05/2017][Start]
+			 * [Purpose : Chnage sql statement]
+			 */
+			/*sql = "SELECT (STR.FIRST_NAME||' '||STR.LAST_NAME) AS CONTACT_PERSON,"+
 					" STR.SORG_CODE, "+
 					" STR.EMAIL_ADDR, "+
 					" STR.MOBILE_NO, "+
@@ -113,7 +116,37 @@ public class ContactCommDashboard implements ContactCommDashboardLocal, ContactC
 					" INNER JOIN STRG_CONTACT STR ON COM.SCON_CODE=STR.SCON_CODE  " +
 					" INNER JOIN SALES_PERS SP ON  COM.SALES_PERS=SP.SALES_PERS "+
 					" WHERE COMM_DATE >= SYSDATE AND  COM.SALES_PERS = ? "+
+					" ORDER BY SP.SP_NAME,NEW_COMM_DATE";*/
+
+			sql = "SELECT (STR.FIRST_NAME||' '||STR.LAST_NAME) AS CONTACT_PERSON,"+
+					" STR.SORG_CODE, "+
+					" STR.EMAIL_ADDR, "+
+					" STR.MOBILE_NO, "+
+					" SP.SP_NAME, "+
+					" COM.COMM_PLAN_ID, "+
+					" COM.PLAN_DATE, "+
+					" COM.ACTIVITY_CODE, "+
+					" COM.COMM_ID, "+
+					" COM.RESULT_FLAG, "+
+					" COM.SALES_PERS, "+
+					" COM.SCON_CODE, "+
+					" TO_CHAR(COM.COMM_DATE,'DD-MM-YYYY')AS NEW_COMM_DATE, "+
+					" CASE COM.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," +
+					" COM.PLAN_DETAIL," +
+					" COM.START_TIME," +
+					" COM.END_TIME ," +
+					" COM.START_DATE," +
+					" COM.END_DATE , " +
+					" COM.REMARKS "+ 
+					" FROM CONTACT_COMM_PLAN COM " +
+					" INNER JOIN STRG_CONTACT STR ON COM.SCON_CODE=STR.SCON_CODE  " +
+					" INNER JOIN SALES_PERS SP ON  COM.SALES_PERS=SP.SALES_PERS "+
+					" WHERE COMM_DATE >= TRUNC(SYSDATE) AND  COM.SALES_PERS = (select sales_pers from sales_pers where emp_code = ?) "+
 					" ORDER BY SP.SP_NAME,NEW_COMM_DATE";
+			/*[Purpose : Chnage sql statement]
+			 * Modified by Anjali Rawankar on[12/05/2017][End]
+			 */
 
 			/*[Purpose : Added where clause for sales_pers]
 			 * Modified by Anjali Rawankar on[10/05/2017][End]
@@ -185,15 +218,25 @@ public class ContactCommDashboard implements ContactCommDashboardLocal, ContactC
 				xmlString.append("<td class= 'cardHtmlTableBodyAlignLft' style='width: 4%;border-top: 1px solid transparent;'>"+emailAddr+"</td></tr>");
 				xmlString.append("<tr><td class= 'cardHtmlTableBodyAlignLft' style='width: 4%;border-top: 1px solid transparent;'><img src='../webitm/images/Standard/tele-1-1.ico' style='width:10px;height:10px;'>"+mobileNo+"</td></tr>");
 			}
-			
+
 			/*Modified by Anjali Rawankar on[10/05/2017][Start]
 			 *[Purpose : else condition for table definition in case of data not available]
 			 */
 			if(count == 0)
 			{
-				xmlString = new StringBuffer("<table  id='htmlTable' cellpadding='2'"+
+				/*Modified by Anjali Rawankar on[12/05/2017][Start]
+				 *[Purpose : Changed table definition]
+				 */
+				/*xmlString = new StringBuffer("<table  id='htmlTable' cellpadding='2'"+
 						"align='center'><tr><td align = 'center' class='gwt-ScrollTable'>No "+
-						"Data Found</td></tr></table>");
+						"Data Found</td></tr></table>");*/
+				xmlString = new StringBuffer("<table  id='htmlTable' cellpadding='2'"+
+						"align='center'><tbody><tr><td align = 'center' class='gwt-ScrollTable'>No "+
+						"Data Found</td></tr>");
+				/*[Purpose : Changed table definition]
+				 * Modified by Anjali Rawankar on[12/05/2017][End]
+				 *
+				 */
 			}
 			/*[Purpose : else condition for table definition in case of data not available]
 			 *Modified by Anjali Rawankar on[10/05/2017][End]