Skip to content

B
business-java
Commit 3dbb235d authored by prumde's avatar prumde
Browse files
Options

Updated for CustomMenuImageServlet path added in Img tag 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@185508 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cd25b030
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 21 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActual.java
View file @ 3dbb235d
......@@ -115,9 +115,12 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
docName = rs.getString("DoctorName");
// Update by Prajyot R on 24/05/2018 Start
//docNamewithImage = getImageStrfromName(docName);
String fldValue = rs.getString("SALES_PERS");
String customImageSrc = e12GenericUtility.getCustomImageURL("SALES_PERS", "SalesPers", fldValue, docName, "Icon");
docNamewithImage = docName+"~<img class='defaultIconImage' src='"+ customImageSrc +"'/>";
//String fldValue = rs.getString("SALES_PERS");
//String customImageSrc = e12GenericUtility.getCustomImageURL("SALES_PERS", "SalesPers", fldValue, docName, "Icon");
//docNamewithImage = docName+"~<img class='defaultIconImage' src='"+ customImageSrc +"'/>";
String scCode = rs.getString("STRG_CODE");
String customImageSrc = e12GenericUtility.getCustomImageURL("STRG_CUSTOMER", "StrgCustomer", scCode, docName, "Icon");
docNamewithImage = "<img class='userAvatar' src='"+ customImageSrc +"'/><span class='userAvatarText'>" + docName + "</span>";
// Update by Prajyot R on 24/05/2018 End
locality = rs.getString("LOCALITY");
......@@ -154,7 +157,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
docList = new ArrayList<String>();
/*----------Planned doctors not visited-----Missed-------*/
//sql="(select to_char(SPH.PLAN_DATE,'dd-mm-yy') 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 between '06-AUG-16' and '16-AUG-16' AND SPRS_CODE__PLAN='M00005') MINUS (select to_char(sm.event_date,'dd-mm-yy') 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 between '06-AUG-16' and '16-AUG-16' AND SM.SALES_PERS='M00005' and sp.sales_pers in (select emp_code from employee start with emp_code = (select emp_code from users where code='M00001') connect by prior emp_code = report_to) and sp.sales_pers in ('M00005') )";
sql = "(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 BETWEEN '"+fromDate+"' AND '"+toDate+"'"+appendSQL+" MINUS (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 BETWEEN '"+fromDate+"' AND '"+toDate+"'"+appendSQL+"";
sql = "(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 BETWEEN '"+fromDate+"' AND '"+toDate+"'"+appendSQL+" MINUS (SELECT TO_CHAR(SM.EVENT_DATE,'DD-MON-YYYY') AS EVENTDATE ,SP.SALES_PERS , SP.SP_NAME ,SM.STRG_CODE AS 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 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 BETWEEN '"+fromDate+"' AND '"+toDate+"'"+appendSQL+"";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
......@@ -164,9 +167,12 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
docName = rs.getString("DoctorName");
// Update by Prajyot R on 24/05/2018 Start
//docNamewithImage = getImageStrfromName(docName);
String fldValue = rs.getString("SALES_PERS");
String customImageSrc = e12GenericUtility.getCustomImageURL("SALES_PERS", "SalesPers", fldValue, docName, "Icon");
docNamewithImage = docName+"~<img class='defaultIconImage' src='"+ customImageSrc +"'/>";
//String fldValue = rs.getString("SALES_PERS");
//String customImageSrc = e12GenericUtility.getCustomImageURL("SALES_PERS", "SalesPers", fldValue, docName, "Icon");
//docNamewithImage = docName+"~<img class='defaultIconImage' src='"+ customImageSrc +"'/>";
String scCode = rs.getString("SC_CODE");
String customImageSrc = e12GenericUtility.getCustomImageURL("STRG_CUSTOMER", "StrgCustomer", scCode, docName, "Icon");
docNamewithImage = "<img class='userAvatar' src='"+ customImageSrc +"'/><span class='userAvatarText'>" + docName + "</span>";
// Update by Prajyot R on 24/05/2018 End
locality = rs.getString("LOCALITY");
......@@ -215,9 +221,12 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
docName = rs.getString("DoctorName");
// Update by Prajyot R on 24/05/2018 Start
//docNamewithImage = getImageStrfromName(docName);
String fldValue = rs.getString("SALES_PERS");
String customImageSrc = e12GenericUtility.getCustomImageURL("SALES_PERS", "SalesPers", fldValue, docName, "Icon");
docNamewithImage = docName+"~<img class='defaultIconImage' src='"+ customImageSrc +"'/>";
//String fldValue = rs.getString("SALES_PERS");
//String customImageSrc = e12GenericUtility.getCustomImageURL("SALES_PERS", "SalesPers", fldValue, docName, "Icon");
//docNamewithImage = docName+"~<img class='defaultIconImage' src='"+ customImageSrc +"'/>";
String scCode = rs.getString("STRG_CODE");
String customImageSrc = e12GenericUtility.getCustomImageURL("STRG_CUSTOMER", "StrgCustomer", scCode, docName, "Icon");
docNamewithImage = "<img class='userAvatar' src='"+ customImageSrc +"'/><span class='userAvatarText'>" + docName + "</span>";
// Update by Prajyot R on 24/05/2018 End
locality = rs.getString("LOCALITY");
......@@ -420,8 +429,11 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
}
*/
// Added by Prajyot R on 24/05/2018 Start
String defaultStrgCustImg = e12GenUtility.getCustomImageURL("STRG_CUSTOMER", "StrgCustomer", scCode, spName, "Icon");
spName_image = "<img class='defaultIconImage' src='"+defaultStrgCustImg+"'/>";
//String defaultStrgCustImg = e12GenUtility.getCustomImageURL("STRG_CUSTOMER", "StrgCustomer", scCode, spName, "Icon");
//spName_image = "<img class='defaultIconImage' src='"+defaultStrgCustImg+"'/>";
String salesPersCode = checkNull(rs.getString("SALES_PERS"));
String defaultStrgCustImg = e12GenUtility.getCustomImageURL("SALES_PERS", "SalesPers", salesPersCode, spName, "Icon");
spName_image = "<img class='userAvatar' src='"+defaultStrgCustImg+"'/>";
// Added by Prajyot R on 24/05/2018 End
if(!spName.equalsIgnoreCase(prvspName))
......@@ -463,7 +475,8 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
*/
// Added by Prajyot R on 24/05/2018 Start
String defaultUserImg = e12GenUtility.getCustomImageURL("STRG_CUSTOMER", "StrgCustomer", scCode, doctorName, "Icon");
String doctor_image = "<img class='defaultIconImage' src='"+defaultUserImg+"'/>";
//String doctor_image = "<img class='defaultIconImage' src='"+defaultUserImg+"'/>";
String doctor_image = "<img class='userAvatar' src='"+defaultUserImg+"'/>";
rawJson.put("doctor_image", doctor_image);
// Added by Prajyot R on 24/05/2018 End
......@@ -974,10 +987,13 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
// Update by Prajyot R on 24/05/2018 Start
//String object = "images"+ File.separator + "users";
//plannedDocImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
plannedDocImagePath = e12GenUtility.getCustomImageURL("SALES_PERS", "SalesPers", salesPersonCode, salesPersonName, "Icon");
//plannedDocImagePath = e12GenUtility.getCustomImageURL("SALES_PERS", "SalesPers", salesPersonCode, salesPersonName, "Icon");
customerCode = checkNull(rs.getString("SC_CODE"));
plannedDocImagePath = e12GenUtility.getCustomImageURL("STRG_CUSTOMER", "StrgCustomer", customerCode, customerName, "Icon");
salesPerson_image = "<img class='userAvatar' src='"+plannedDocImagePath+"'/>";
// Update by Prajyot R on 24/05/2018 End
salesPerson_image = "<img class='cardProdImg2' src='"+plannedDocImagePath+"'/>";
//salesPerson_image = "<img class='cardProdImg2' src='"+plannedDocImagePath+"'/>";
//added by vishal pathare on 8.2.18 for[feed data for links implementation]Start
JSONObject feedDataJson = new JSONObject();
feedDataJson.put( "tran_id", salesPersonTranId );
......@@ -1061,10 +1077,13 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
// Update by Prajyot R on 24/05/2018 Start
//String object = "images"+ File.separator + "users";
//unplannedDocImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
unplannedDocImagePath = e12GenUtility.getCustomImageURL("SALES_PERS", "SalesPers", salesPersonCode, salesPersonName, "Icon");
//unplannedDocImagePath = e12GenUtility.getCustomImageURL("SALES_PERS", "SalesPers", salesPersonCode, salesPersonName, "Icon");
customerCode = checkNull(rs.getString("STRG_CODE"));
unplannedDocImagePath = e12GenUtility.getCustomImageURL("STRG_CUSTOMER", "StrgCustomer", customerCode, customerName, "Icon");
salesPerson_image = "<img class='userAvatar' src='"+unplannedDocImagePath+"'/>";
// Update by Prajyot R on 24/05/2018 End
salesPerson_image = "<img class='cardProdImg2' src='"+unplannedDocImagePath+"'/>";
//salesPerson_image = "<img class='cardProdImg2' src='"+unplannedDocImagePath+"'/>";
//added by vishal pathare on 8.2.18 for[feed data for links implementation]Start
JSONObject feedDataJson = new JSONObject();
feedDataJson.put( "tran_id", salesPersonTranId );
......@@ -1127,10 +1146,12 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
// Update by Prajyot R on 24/05/2018 Start
//String object = "images"+ File.separator + "users";
//listedDocImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+customerCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+customerName;
listedDocImagePath = e12GenUtility.getCustomImageURL("STRG_CUSTOMER", "StrgCustomer", customerCode, customerName, "Icon");
//listedDocImagePath = e12GenUtility.getCustomImageURL("STRG_CUSTOMER", "StrgCustomer", customerCode, customerName, "Icon");
listedDocImagePath = e12GenUtility.getCustomImageURL("STRG_CUSTOMER", "StrgCustomer", customerCode, customerName, "Icon");
customer_Image = "<img class='userAvatar' src='"+listedDocImagePath+"'/>";
// Update by Prajyot R on 24/05/2018 End
customer_Image = "<img class='cardProdImg2' src='"+listedDocImagePath+"'/>";
//customer_Image = "<img class='cardProdImg2' src='"+listedDocImagePath+"'/>";
//added by vishal pathare on 8.2.18 for[feed data for links implementation]Start
JSONObject feedDataJson = new JSONObject();
feedDataJson.put( "tran_id", salesPersonTranId );
......@@ -1190,8 +1211,11 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
// Update by Prajyot R on 24/05/2018 Start
//String object = "images"+ File.separator + "users";
//unlistedDocImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
unlistedDocImagePath = e12GenUtility.getCustomImageURL("SALES_PERS", "SalesPers", salesPersonCode, salesPersonName, "Icon");
salesPerson_image = "<img class='cardProdImg2' src='"+unlistedDocImagePath+"'/>";
//unlistedDocImagePath = e12GenUtility.getCustomImageURL("SALES_PERS", "SalesPers", salesPersonCode, salesPersonName, "Icon");
//salesPerson_image = "<img class='cardProdImg2' src='"+unlistedDocImagePath+"'/>";
customerCode = checkNull(rs.getString("STRG_CODE")) ;
unlistedDocImagePath = e12GenUtility.getCustomImageURL("STRG_CUSTOMER", "StrgCustomer", customerCode, customerName, "Icon");
salesPerson_image = "<img class='userAvatar' src='"+unlistedDocImagePath+"'/>";
// Update by Prajyot R on 24/05/2018 End
//added by vishal pathare on 8.2.18 for[feed data for links implementation]Start
......
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