Changes made in OpportunityStageInfo.java

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

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

@@ -12,7 +12,7 @@ public class OpportunityStageInfo implements OpportunityStageInfoLocal,Opportuni
 	public OpportunityStageInfo() {
 
 	}
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "unused" })
 	public JSONObject getOpportunityStage(String dataSourceName,String loginCode) {
 		JSONObject rowDataBasicJsn = new JSONObject();
 		JSONObject rowData = null;
@@ -34,7 +34,8 @@ public class OpportunityStageInfo implements OpportunityStageInfoLocal,Opportuni
 		try {
 			conn = connection.getConnectDB(dataSourceName);
 
-			sql = "SELECT opp.oppr_name,"
+			sql = "SELECT opp.oppr_id," 
+					+ "opp.oppr_name,"
 					+ "opp.oppr_type,"
 					+ "to_char(opp.oppr_date,'dd-MM-yyyy') as new_oppr_date,"
 					+ "opp.scon_code,"
@@ -49,11 +50,9 @@ public class OpportunityStageInfo implements OpportunityStageInfoLocal,Opportuni
 					+ "opp.sales_person_assign,"
 					+ "opp.prob_perc_start,"
 					+ "opp.prob_volume_current,"
-					+ "opass.stage_code,"
+					+ "opp.stage_code,"
 					+ "to_char(opass.ass_date,'dd-MM-yyyy') as new_ass_date,"
-					+ "opass.comm_id,"
-					+ "opass.sales_pers,"
-					+ "opass.oppr_id,"
+					+ "opass.comm_id,"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
 					+ "opass.prod_perc,"
 					+ "opass.volume,"
 					+ "opass.req_type,"
@@ -72,7 +71,7 @@ public class OpportunityStageInfo implements OpportunityStageInfoLocal,Opportuni
 					+ "INNER JOIN sales_pers sales "
 					+ "ON sales.sales_pers = opass.sales_pers "
 					+ "INNER JOIN sales_stage stage "
-					+ "ON stage.stage_code = opass.stage_code "
+					+ "ON stage.stage_code = opp.stage_code "
 					+ "INNER JOIN strg_contact contact "
 					+ "ON contact.scon_code = opp.scon_code "
 					+ "INNER JOIN strg_org org "
@@ -97,6 +96,7 @@ public class OpportunityStageInfo implements OpportunityStageInfoLocal,Opportuni
 									+ "<th class='mtBackgroundWhite' style='width: 25%;'>Stage Detail</th>"
 									+ "</tr>");
 				}
+				
 				opprId = checkNull(rs.getString("oppr_id"));
 				opprName = checkNull(rs.getString("oppr_name"));
 				opprType = checkNull(rs.getString("oppr_type"));
@@ -116,7 +116,6 @@ public class OpportunityStageInfo implements OpportunityStageInfoLocal,Opportuni
 				stageCode = checkNull(rs.getString("stage_code"));
 				assDate = checkNull(rs.getString("new_ass_date"));
 				commId = checkNull(rs.getString("comm_id"));
-				salesPers = checkNull(rs.getString("sales_pers"));
 				prodPerc = checkNull(rs.getString("prod_perc"));
 				volume = checkNull(rs.getString("volume"));
 				reqType = checkNull(rs.getString("req_type"));
@@ -129,8 +128,8 @@ public class OpportunityStageInfo implements OpportunityStageInfoLocal,Opportuni
 				mobileNo = checkNull(rs.getString("mobile_no"));
 				emailAddr = checkNull(rs.getString("email_addr"));
 				sorgName = checkNull(rs.getString("sorg_name"));
-
-				xmlString.append("<tr> <td class= 'cardHtmlTableBodyAlignLft' rowspan='5' style='border-top: 1px solid transparent;'>" + spName+ "</td>"
+				// Modified by Vishal Thakur[22/05/2017][Change the inline CSS][START]
+				/*xmlString.append("<tr> <td class= 'cardHtmlTableBodyAlignLft' rowspan='5' style='border-top: 1px solid transparent;'>" + spName+ "</td>"
 						+ "<td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>" + contactName + "</td> "
 						+ "<td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Opportunity Date:" + opprDate + "</td>"
 						+ "<td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>As on: " + assDate + "</td> </tr> <tr>"
@@ -141,16 +140,29 @@ public class OpportunityStageInfo implements OpportunityStageInfoLocal,Opportuni
 						+ "<td class= 'cardHtmlTableBodyAlignLft' rowspan='3' style='vertical-align:top;border-top: 1px solid transparent;'>Opportunity Detail:" + opprDescr + "</td>"
 						+ "<td class= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Forecast Close Date:" + forecastCloseDate + "</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>");
+						+ "<tr> <td cddlass= 'cardHtmlTableBodyAlignLft' style='border-top: 1px solid transparent;'>Probabilty Percentage:" + prodPerc + "</td>" + "</tr>");*/
 
+				xmlString.append("<tr> <td class= 'cardHtmlTableBodyAlignLft' rowspan='5' style='text-align: center;'>" + spName+ "</td>"
+						+ "<td class= 'cardHtmlTableBodyAlignLft'>" + contactName + "</td> "
+						+ "<td class= 'cardHtmlTableBodyAlignLft'> Date:" + opprDate + "</td>"
+						+ "<td class= 'cardHtmlTableBodyAlignLft'>As on: " + assDate + "</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' 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:" + forecastCloseDate + "</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>");
+				
+				// Modified by Vishal Thakur[22/05/2017][Change the inline CSS][END]
 			}if(count == 0){
 				xmlString = new StringBuffer("<table  id='htmlTable' cellpadding='2'"
-						+"align='center'><tr><td align = 'center' class='gwt-ScrollTable'>" 
-						+"NO Data Found</td></tr></table>");
+						+"align='center'><tbody><tr><td align = 'center' class='gwt-ScrollTable'>" 
+						+"NO Data Found</td></tr>");
 				noScrollRequired = true;
 			}
 			xmlString.append("</tbody></table>");
-			System.out.println("xmlString :::[ " + xmlString.toString() + " ]");
 			rowData = new JSONObject();
 			rowData.put("xmlString", xmlString.toString());
 			rowDataBasicJsn.put(0, rowData);