Change made in ContactCommDashboard.java

Change made in OpportunityStageInfo.java

Change made in PendingCommunicationDashboard.java

Change made in CRMDashboard.xml(Heading change of Pie Chart)


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

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

@@ -78,8 +78,8 @@ public class ContactCommDashboard implements ContactCommDashboardLocal, ContactC
 							" 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 "+
-							" INNER JOIN STRG_ORG STRO ON STRO.SORG_CODE = STR.SORG_CODE "+
-							" WHERE COMM_DATE >= TRUNC(SYSDATE) "; 
+							" LEFT OUTER JOIN STRG_ORG STRO ON STRO.SORG_CODE = STR.SORG_CODE "+
+							" WHERE COM.COMM_DATE > SYSDATE "; 
 
 					dataSourceSql = new StringBuffer(sql);
 

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

@@ -164,16 +164,16 @@ public class OpportunityStageInfo implements OpportunityStageInfoLocal,Opportuni
 
 				xmlString.append("<tr> <td class= 'cardHtmlTableBodyAlignLft' rowspan='5' style='text-align: center;'>" + spName+ "</td>"
 						+ "<td class= 'cardHtmlTableBodyAlignLft'>" + contactName + "</td> "
-						+ "<td class= 'cardHtmlTableBodyAlignLft'> Date:" + newOppDate + "</td>"
+						+ "<td class= 'cardHtmlTableBodyAlignLft'>Date: " + newOppDate + "</td>"
 						+ "<td class= 'cardHtmlTableBodyAlignLft'>As on: " + newAsDate + "</td> </tr> <tr>"
 						+ "<td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'><img src='../webitm/images/Standard/tele-1-1.ico' style='width:10px;height:10px;'> " + mobileNo + "</td> "
-						+ "<td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Name:" + opprName + "</td>"
-						+ "<td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Stage:" + stageDescr + "</td> </tr> <tr> "
+						+ "<td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Name: " + opprName + "</td>"
+						+ "<td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Stage: " + stageDescr + "</td> </tr> <tr> "
 						+ "<td class= 'cardHtmlTableBodyAlignLft' rowspan='3' style='vertical-align:top;border-top: 1px solid transparent;'>" + emailAddr + "</td>"
-						+ "<td class= 'cardHtmlTableBodyAlignLft' rowspan='3' style='vertical-align:top;border-top: 1px solid transparent;'>Detail:" + opprDescr + "</td>"
-						+ "<td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Forecast Close Date:" + newForecastCloserDate + "</td> </tr>"
-						+ "<tr> <td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Value:" + opprValue + "</td> </tr>"
-						+ "<tr> <td cddlass= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Probabilty Percentage:" + prodPerc + "</td>" + "</tr>");
+						+ "<td class= 'cardHtmlTableBodyAlignLft' rowspan='3' style='vertical-align:top;border-top: 1px solid transparent;'>Detail: " + opprDescr + "</td>"
+						+ "<td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Forecast Close Date: " + newForecastCloserDate + "</td> </tr>"
+						+ "<tr> <td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Value: " + opprValue + "</td> </tr>"
+						+ "<tr> <td cddlass= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Probabilty Percentage: " + prodPerc + "</td>" + "</tr>");
 
 			}
 			if (rs != null) {

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

@@ -55,15 +55,15 @@ PendingCommunicationDashboardLocal, PendingCommunicationDashboardRemote {
 					"  cp.comm_date,trim(sa.descr) AS activity_descr,"+
 					"  CASE CP.CONTACT_TYPE"+
 					"    WHEN '1'"+
-					"    THEN 'an activity to call'"+
+					"    THEN 'Call'"+
 					"    WHEN '2'"+
-					"    THEN 'an activity of sending mail'"+
+					"    THEN 'Mail'"+
 					"    WHEN '3'"+
-					"    THEN 'an activity to meet'"+
+					"    THEN 'Meeting'"+
 					"    WHEN '4'"+
-					"    THEN 'an activity of video conferenc call'"+
+					"    THEN 'Video Conference Call'"+
 					"    WHEN '5'"+
-					"    THEN 'an activity'  END AS DESCR ,"+
+					"    THEN 'Other'  END AS DESCR ,"+
 					" (sc.first_name  ||' '   ||   CASE"+
 					"    WHEN sc.last_name IS NULL"+
 					"    OR LENGTH(trim(sc.last_name)) = 0"+
@@ -86,12 +86,12 @@ PendingCommunicationDashboardLocal, PendingCommunicationDashboardRemote {
 			pstmtDSInput = "";
 			if(empCode.equalsIgnoreCase("TEAM"))
 			{
-				dataSourceSql.append(" WHERE SP.EMP_CODE IN (SELECT EMP_CODE FROM EMPLOYEE START WITH EMP_CODE = ? CONNECT BY PRIOR EMP_CODE = REPORT_TO)  AND CP.COMM_ID  IS NULL  AND CP.COMM_DATE < SYSDATE  ORDER BY CP.COMM_DATE, CP.START_TIME");
+				dataSourceSql.append(" WHERE SP.EMP_CODE IN (SELECT EMP_CODE FROM EMPLOYEE START WITH EMP_CODE = ? CONNECT BY PRIOR EMP_CODE = REPORT_TO)  AND CP.COMM_ID  IS NULL  AND CP.COMM_DATE <= trunc(SYSDATE)  ORDER BY CP.COMM_DATE desc, CP.START_TIME");
 				pstmtDSInput = loginCode;
 			}
 			else
 			{
-				dataSourceSql.append(" WHERE SP.EMP_CODE = ?  AND CP.COMM_ID  IS NULL  AND CP.COMM_DATE < SYSDATE  ORDER BY CP.COMM_DATE, CP.START_TIME ");
+				dataSourceSql.append(" WHERE SP.EMP_CODE = ?  AND CP.COMM_ID  IS NULL  AND CP.COMM_DATE <= trunc(SYSDATE)  ORDER BY CP.COMM_DATE desc, CP.START_TIME ");
 				pstmtDSInput = empCode;
 			}
 			
@@ -110,7 +110,7 @@ PendingCommunicationDashboardLocal, PendingCommunicationDashboardRemote {
 								+ "<th class='mtBackgroundWhite' style='width: 2%;'>Sales Person</th>"
 								+ "<th class='mtBackgroundWhite' style='width: 1%;'>Date</th>" 
 								+"<th class='mtBackgroundWhite' style='width: 3%;'>Contact Person</th>"
-								+"<th class='mtBackgroundWhite' style='width: 3%;'>Contact mode</th>"
+								+"<th class='mtBackgroundWhite' style='width: 3%;'>Contact Mode</th>"
 								+"<th class='mtBackgroundWhite' style='width: 2%;'>Activity Description</th>"
 								+"</tr>");
 					}
@@ -119,7 +119,7 @@ PendingCommunicationDashboardLocal, PendingCommunicationDashboardRemote {
 						xmlString = new StringBuffer("<table class='mtBackgroundWhite' border='' style='width: 100%;'><tbody><tr>"
 								+ "<th class='mtBackgroundWhite' style='width: 1%;'>Date</th>" 
 								+"<th class='mtBackgroundWhite' style='width: 3%;'>Contact Person</th>"
-								+"<th class='mtBackgroundWhite' style='width: 3%;'>Contact mode</th>"
+								+"<th class='mtBackgroundWhite' style='width: 3%;'>Contact Mode</th>"
 								+"<th class='mtBackgroundWhite' style='width: 2%;'>Activity Description</th>"
 								+"</tr>");
 					}

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

@@ -56,7 +56,7 @@
 	    </component>
 
     <component datasource='4' id='4' type='G'>
-		    <ComponentTitle><![CDATA[Opportunity stage wise value]]></ComponentTitle>
+		    <ComponentTitle><![CDATA[Opportunity Stage Wise Value]]></ComponentTitle>
 		  <component_css><![CDATA[outerChartContainerPos1of1]]></component_css>
 		  <component_icon><![CDATA[reportswht.png]]></component_icon>
 		    <chart_properties>