Skip to content

B
business-java
Commit 745e08ad authored by vbhosale's avatar vbhosale
Browse files
Options

changes for image and code in image icon 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@177863 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4d44c594
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 67 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActual.java
View file @ 745e08ad
...@@ -816,30 +816,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan ...@@ -816,30 +816,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
/*----------Planned doctors visited-----Planned--------*/ /*----------Planned doctors visited-----Planned--------*/
/*sql = "(SELECT TO_CHAR(SM.EVENT_DATE,'DD-MON-YYYY') AS EVENTDATE , " +
"SP.SALES_PERS ,SP.SP_NAME ,SM.STRG_CODE ," +
"INITCAP(SC.FIRST_NAME||' '||SC.MIDDLE_NAME||' '||SC.LAST_NAME )" +
"AS DOCTORNAME ,L.DESCR AS LOCALITY ,SPL.DESCR AS SPECIALITY " +
"FROM SALES_PERS SP INNER JOIN STRG_MEET SM " +
"ON SP.SALES_PERS=SM.SALES_PERS INNER JOIN STRG_CUSTOMER SC " +
"ON SC.SC_CODE=SM.STRG_CODE INNER JOIN LOCALITY L " +
"ON L.LOCALITY_CODE=SC.LOCALITY_CODE INNER JOIN STRG_SERIES SS " +
"ON SS.SC_CODE=SC.SC_CODE INNER JOIN SPECIALITY SPL " +
"ON SPL.SPL_CODE=SS.SPL_CODE " +
"WHERE SM.EVENT_DATE <= sysdate) INTERSECT " +
"(SELECT TO_CHAR(SPH.PLAN_DATE,'DD-MON-YYYY') AS EVENTDATE , " +
"SP.SALES_PERS , SP.SP_NAME ,SPC.SC_CODE ," +
"INITCAP(SC.FIRST_NAME||' '||SC.MIDDLE_NAME||' '||SC.LAST_NAME )" +
"AS DOCTORNAME , L.DESCR AS LOCALITY ,SPL.DESCR AS " +
"SPECIALITY FROM SALES_PERS SP INNER JOIN SPRS_PLAN_HDR SPH " +
"ON SP.SALES_PERS=SPH.SPRS_CODE__PLAN INNER JOIN " +
"SPRS_PLAN_CUST SPC ON SPH.PLAN_ID=SPC.PLAN_ID INNER JOIN " +
"STRG_CUSTOMER SC ON SC.SC_CODE=SPC.SC_CODE INNER JOIN " +
"LOCALITY L ON L.LOCALITY_CODE=SC.LOCALITY_CODE INNER JOIN " +
"STRG_SERIES SS ON SS.SC_CODE=SC.SC_CODE INNER JOIN " +
"SPECIALITY SPL ON SPL.SPL_CODE=SS.SPL_CODE " +
"WHERE SPH.PLAN_DATE <= sysdate "+localSQL+")";*/
// new sql query provided by sagar // new sql query provided by sagar
sql ="SELECT SM.EVENT_DATE, SM.SALES_PERS, SP.SP_NAME, SM.STRG_CODE, (SC.FIRST_NAME ||' '||SC.LAST_NAME)AS NAME " sql ="SELECT SM.EVENT_DATE, SM.SALES_PERS, SP.SP_NAME, SM.STRG_CODE, (SC.FIRST_NAME ||' '||SC.LAST_NAME)AS NAME "
+ " FROM STRG_MEET SM INNER JOIN SALES_PERS SP ON SP.SALES_PERS = SM.SALES_PERS INNER JOIN STRG_CUSTOMER SC ON SC.SC_CODE=SM.STRG_CODE " + " FROM STRG_MEET SM INNER JOIN SALES_PERS SP ON SP.SALES_PERS = SM.SALES_PERS INNER JOIN STRG_CUSTOMER SC ON SC.SC_CODE=SM.STRG_CODE "
...@@ -864,16 +841,17 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan ...@@ -864,16 +841,17 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
rowBuffer.append("<table cellspacing='0' cellpadding='0' width='100%' ><tr rowspan='2'><td class='defaultTitle'>Planned</td></tr>"); rowBuffer.append("<table cellspacing='0' cellpadding='0' width='100%' ><tr rowspan='2'><td class='defaultTitle'>Planned</td></tr>");
while(rs.next()) while(rs.next())
{ {
salesPersonCode = checkNull(rs.getString("SALES_PERS")); salesPersonCode = checkNull(rs.getString("SC_CODE"));
salesPersonName = checkNull(rs.getString("SP_NAME")); salesPersonName = checkNull(rs.getString("NAME"));
String object = "images"+ File.separator + "users"; String object = "images"+ File.separator + "users";
plannedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName; plannedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
salesPerson_image = "<img class='cardProdImg2' src='"+plannedDocImagePath+"'/>"; salesPerson_image = "<img class='cardProdImg2' src='"+plannedDocImagePath+"'/>";
rowBuffer.append("<tr><td><table cellspacing='0' cellpadding='0' " + rowBuffer.append("<tr><td><table cellspacing='0' cellpadding='0' " +
"style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" + "style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" +
"<td width='2%'>"+salesPerson_image+"</td>" + "<td width='2%'>"+salesPerson_image+"</td>" +
"<td>"+salesPersonName.toUpperCase()+"</td></tr></table></td></tr>"); "<td style = 'width:80%;' id='"+salesPersonCode+"' onclick='getRowWisePkValue(this.id)' >"+salesPersonName.toUpperCase()+"</td>" +
} "<td class = 'dashboardEditImg'></td>" +
"</tr></table></td></tr>"); }
rowBuffer.append("</table>"); rowBuffer.append("</table>");
} }
rs.close(); rs.close();
...@@ -881,34 +859,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan ...@@ -881,34 +859,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
/*----------Unplanned doctors visited.--*/
/*sql = "(SELECT TO_CHAR(SM.EVENT_DATE,'DD-MON-YYYY') AS EVENTDATE , " +
"SP.SALES_PERS ,SP.SP_NAME ,SM.STRG_CODE ," +
"INITCAP(SC.FIRST_NAME||' '||SC.MIDDLE_NAME||' '||SC.LAST_NAME )" +
"AS DOCTORNAME ,L.DESCR AS LOCALITY ,SPL.DESCR AS SPECIALITY " +
"FROM SALES_PERS SP INNER JOIN STRG_MEET SM " +
"ON SP.SALES_PERS=SM.SALES_PERS INNER JOIN STRG_CUSTOMER SC " +
"ON SC.SC_CODE=SM.STRG_CODE INNER JOIN LOCALITY L " +
"ON L.LOCALITY_CODE=SC.LOCALITY_CODE INNER JOIN STRG_SERIES SS " +
"ON SS.SC_CODE=SC.SC_CODE INNER JOIN SPECIALITY SPL " +
"ON SPL.SPL_CODE=SS.SPL_CODE " +
"WHERE SM.EVENT_DATE <= sysdate) INTERSECT " +
"(SELECT TO_CHAR(SPH.PLAN_DATE,'DD-MON-YYYY') AS EVENTDATE , " +
"SP.SALES_PERS , SP.SP_NAME ,SPC.SC_CODE ," +
"INITCAP(SC.FIRST_NAME||' '||SC.MIDDLE_NAME||' '||SC.LAST_NAME )" +
"AS DOCTORNAME , L.DESCR AS LOCALITY ,SPL.DESCR AS " +
"SPECIALITY FROM SALES_PERS SP INNER JOIN SPRS_PLAN_HDR SPH " +
"ON SP.SALES_PERS=SPH.SPRS_CODE__PLAN INNER JOIN " +
"SPRS_PLAN_CUST SPC ON SPH.PLAN_ID=SPC.PLAN_ID INNER JOIN " +
"STRG_CUSTOMER SC ON SC.SC_CODE=SPC.SC_CODE INNER JOIN " +
"LOCALITY L ON L.LOCALITY_CODE=SC.LOCALITY_CODE INNER JOIN " +
"STRG_SERIES SS ON SS.SC_CODE=SC.SC_CODE INNER JOIN " +
"SPECIALITY SPL ON SPL.SPL_CODE=SS.SPL_CODE " +
"WHERE SPH.PLAN_DATE <= sysdate "+localSQL+")";*/
// sql for unplanned by sagar // sql for unplanned by sagar
sql = " SELECT SM.EVENT_DATE, SM.SALES_PERS, SP.SP_NAME, SM.STRG_CODE, (SC.FIRST_NAME ||' '||SC.LAST_NAME)AS NAME " sql = " SELECT SM.EVENT_DATE, SM.SALES_PERS, SP.SP_NAME, SM.STRG_CODE, (SC.FIRST_NAME ||' '||SC.LAST_NAME)AS NAME "
+ " FROM STRG_MEET SM INNER JOIN SALES_PERS SP ON SP.SALES_PERS = SM.SALES_PERS INNER JOIN STRG_CUSTOMER SC ON SC.SC_CODE=SM.STRG_CODE INNER JOIN SPRS_PLAN_HDR SPH ON SPH.SPRS_CODE__PLAN = SM.SALES_PERS AND SPH.PLAN_DATE=SM.EVENT_DATE " + " FROM STRG_MEET SM INNER JOIN SALES_PERS SP ON SP.SALES_PERS = SM.SALES_PERS INNER JOIN STRG_CUSTOMER SC ON SC.SC_CODE=SM.STRG_CODE INNER JOIN SPRS_PLAN_HDR SPH ON SPH.SPRS_CODE__PLAN = SM.SALES_PERS AND SPH.PLAN_DATE=SM.EVENT_DATE "
...@@ -927,15 +878,17 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan ...@@ -927,15 +878,17 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
rowBuffer.append("<table cellspacing='0' cellpadding='0' width='100%' ><tr rowspan='2'><td class='defaultTitle'>Unplanned</td></tr>"); rowBuffer.append("<table cellspacing='0' cellpadding='0' width='100%' ><tr rowspan='2'><td class='defaultTitle'>Unplanned</td></tr>");
while(rs.next()) while(rs.next())
{ {
salesPersonCode = checkNull(rs.getString("SALES_PERS")); salesPersonCode = checkNull(rs.getString("STRG_CODE"));
salesPersonName = checkNull(rs.getString("SP_NAME")); salesPersonName = checkNull(rs.getString("NAME"));
String object = "images"+ File.separator + "users"; String object = "images"+ File.separator + "users";
unplannedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName; unplannedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
salesPerson_image = "<img class='cardProdImg2' src='"+unplannedDocImagePath+"'/>"; salesPerson_image = "<img class='cardProdImg2' src='"+unplannedDocImagePath+"'/>";
rowBuffer.append("<tr><td><table cellspacing='0' cellpadding='0' " + rowBuffer.append("<tr><td><table cellspacing='0' cellpadding='0' " +
"style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" + "style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" +
"<td width='2%'>"+salesPerson_image+"</td>" + "<td width='2%'>"+salesPerson_image+"</td>" +
"<td>"+salesPersonName.toUpperCase()+"</td></tr></table></td></tr>"); "<td style = 'width:80%;' id='"+salesPersonCode+"' onclick='getRowWisePkValue(this.id)' >"+salesPersonName.toUpperCase()+"</td>" +
"<td class = 'dashboardEditImg'></td>" +
"</tr></table></td></tr>");
} }
rowBuffer.append("</table>"); rowBuffer.append("</table>");
} }
...@@ -981,7 +934,9 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan ...@@ -981,7 +934,9 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
listedBuffer.append("<tr><td><table cellspacing='0' cellpadding='0' " + listedBuffer.append("<tr><td><table cellspacing='0' cellpadding='0' " +
"style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" + "style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" +
"<td width='2%'>"+customer_Image+"</td>" + "<td width='2%'>"+customer_Image+"</td>" +
"<td>"+customerName.toUpperCase()+"</td></tr></table></td></tr>"); "<td style = 'width:80%;' id='"+customerCode+"' onclick='getRowWisePkValue(this.id) >"+customerName.toUpperCase()+"</td>" +
"<td class = 'dashboardEditImg'></td>" +
"</tr></table></td></tr>");
} }
listedBuffer.append("</table>"); listedBuffer.append("</table>");
} }
...@@ -1016,15 +971,17 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan ...@@ -1016,15 +971,17 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
listedBuffer.append("<table cellspacing='0' cellpadding='0' width='100%' ><tr rowspan='2'><td class='defaultTitle'>Unlisted</td></tr>"); listedBuffer.append("<table cellspacing='0' cellpadding='0' width='100%' ><tr rowspan='2'><td class='defaultTitle'>Unlisted</td></tr>");
while(rs.next()) while(rs.next())
{ {
salesPersonCode = checkNull(rs.getString("SALES_PERS")) ; salesPersonCode = checkNull(rs.getString("STRG_CODE")) ;
salesPersonName = checkNull(rs.getString("SP_NAME")) ; salesPersonName = checkNull(rs.getString("NAME")) ;
String object = "images"+ File.separator + "users"; String object = "images"+ File.separator + "users";
unlistedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName; unlistedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
salesPerson_image = "<img class='cardProdImg2' src='"+unlistedDocImagePath+"'/>"; salesPerson_image = "<img class='cardProdImg2' src='"+unlistedDocImagePath+"'/>";
listedBuffer.append("<tr><td><table cellspacing='0' cellpadding='0' " + listedBuffer.append("<tr><td><table cellspacing='0' cellpadding='0' " +
"style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" + "style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" +
"<td width='2%'>"+salesPerson_image+"</td>" + "<td width='2%'>"+salesPerson_image+"</td>" +
"<td>"+salesPersonName.toUpperCase()+"</td></tr></table></td></tr>"); "<td style = 'width:80%;' id='"+salesPersonCode+"' onclick='getRowWisePkValue(this.id) >"+salesPersonName.toUpperCase()+"</td>" +
"<td class = 'dashboardEditImg'></td>" +
"</tr></table></td></tr>");
} }
listedBuffer.append("</table>"); listedBuffer.append("</table>");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment