Skip to content

B
business-java
Commit 08fca456 authored by prumde's avatar prumde
Browse files
Options

Updated attendanceCompliance and planvsactual class for image url 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@185421 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 50df4010
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 20 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/AttendanceCompliance.java
View file @ 08fca456
package ibase.dashboard.sfa.ejb;
import ibase.system.config.ConnDriver;
import ibase.utility.E12GenericUtility;
import ibase.utility.CommonConstants;
import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.GenericUtility;
......@@ -54,6 +55,10 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
String salesPersCode = "", salesPersName = "", userImagePath = "", tran_image = "";
String state = "", reportHead = "", notReportingDays = "", mobileNo = "";
viewOptionSelectd = "JNJ";
// Added by Prajyot R on 24/05/2018 Start
E12GenericUtility e12GenUtil = new E12GenericUtility();
// Added by Prajyot R on 24/05/2018 End
try
{
SimpleDateFormat convertToDbDate =new SimpleDateFormat(new GenericUtility().getDBDateFormat());
......@@ -113,12 +118,15 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
{
salesPersCode = checkNull(rs.getString("SALES_PERS"));
salesPersName = checkNull(rs.getString("SP_NAME"));
String object = "images"+ File.separator + "users";
//String object = "images"+ File.separator + "users";
state = checkNull(rs.getString("STATE"));
reportHead = checkNull(rs.getString("EMP_NAME"));
notReportingDays = checkNull(rs.getString("NOT_REPORTED_DAYS"));
mobileNo = checkNull(rs.getString("MOBILE_NO"));
userImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+salesPersCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersName;
// Update by Prajyot R on 24/05/2018 Start
//userImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+salesPersCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersName;
userImagePath = e12GenUtil.getCustomImageURL("SALES_PERS", "SalesPers", salesPersCode, salesPersName, "Icon");
// Update by Prajyot R on 24/05/2018 End
tran_image = "<img class='cardProdImg2' src='"+userImagePath+"' style='margin-top:-15px;'/>";
String devisonWiseRegion = checkNull(rs.getString("DIVISION"))+" "+checkNull(rs.getString("REGION"));
//added by vishal pathare on 8.2.18 for[feed data for links implementation]Start
......
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActual.java
View file @ 08fca456
......@@ -2,7 +2,7 @@ package ibase.dashboard.sfa.ejb;
import ibase.dashboard.Report.Utility.DashboardUtility;
import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants;
//import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException;
......@@ -65,7 +65,10 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
String appendSQL = "";
DashboardUtility dashboardUtility = null;
SimpleDateFormat formatter = null;
E12GenericUtility e12GenericUtility = null;
// Added by Prajyot R on 24/05/2018 Start
E12GenericUtility e12GenericUtility = new E12GenericUtility();
// Added by Prajyot R on 24/05/2018 End
try
{
fromDate = fromDate == null ? "": fromDate.trim();
......@@ -92,7 +95,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
}
else {
appendSQL = " AND sp.sales_pers in("+salePersons+")) ";
e12GenericUtility = new E12GenericUtility();
//e12GenericUtility = new E12GenericUtility();
fromDate = e12GenericUtility.getValidDateString(fromDate, "dd/MM/yyyy", "dd-MMM-yy");
toDate = e12GenericUtility.getValidDateString(toDate, "dd/MM/yyyy", "dd-MMM-yy");
}
......@@ -110,7 +113,13 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
{
eventDate = rs.getString("eventdate");
docName = rs.getString("DoctorName");
docNamewithImage = getImageStrfromName(docName);
// 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 +"'/>";
// Update by Prajyot R on 24/05/2018 End
locality = rs.getString("LOCALITY");
speciality = rs.getString("SPECIALITY");
planHashMap = new HashMap<String, ArrayList<String>>();
......@@ -153,7 +162,13 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
{
eventDate = rs.getString("eventdate");
docName = rs.getString("DoctorName");
docNamewithImage = getImageStrfromName(docName);
// 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 +"'/>";
// Update by Prajyot R on 24/05/2018 End
locality = rs.getString("LOCALITY");
speciality = rs.getString("SPECIALITY");
......@@ -198,7 +213,13 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
{
eventDate = rs.getString("eventdate");
docName = rs.getString("DoctorName");
docNamewithImage = getImageStrfromName(docName);
// 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 +"'/>";
// Update by Prajyot R on 24/05/2018 End
locality = rs.getString("LOCALITY");
speciality = rs.getString("SPECIALITY");
planHashMap = new HashMap<String, ArrayList<String>>();
......@@ -280,7 +301,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
}
return rawDataPlanDtlJson;
}
/*
private String getImageStrfromName(String doctorName) {
String userImagePath = CommonConstants.JBOSSHOME + File.separator +"server"+File.separator +"default"+File.separator +"deploy"+File.separator +"ibase.ear"+File.separator + "ibase.war" +File.separator + "resource" + File.separator + "images"+ File.separator + "users"+File.separator;
File file = new File(userImagePath+doctorName+".png");
......@@ -309,7 +330,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
retString = doctorName+"~"+retString;
return retString;
}
*/
/*----------Method for getting Todays Agenda--------*/
@SuppressWarnings("unchecked")
public JSONObject getTodayAgenda(String dataSourceName,String loginId,String salePersons) throws ITMException{
......@@ -326,6 +347,10 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
String fromDate ="",toDate = "",locality = "",prvlocality = "",doctorName = "", spName = "", prvspName = "";
String spName_image = "";
ArrayList<String> strgCodeList = null;
// Added by Prajyot R on 24/05/2018 Start
E12GenericUtility e12GenUtility = new E12GenericUtility();
// Added by Prajyot R on 24/05/2018 End
try
{
salePersons = salePersons == null ? "": salePersons.trim();
......@@ -349,7 +374,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
int count = 0;
String userImagePath = CommonConstants.JBOSSHOME + File.separator +"server"+File.separator +"default"+File.separator +"deploy"+File.separator +"ibase.ear"+File.separator + "ibase.war" +File.separator + "resource" + File.separator + "images"+ File.separator + "users"+File.separator;
//String userImagePath = CommonConstants.JBOSSHOME + File.separator +"server"+File.separator +"default"+File.separator +"deploy"+File.separator +"ibase.ear"+File.separator + "ibase.war" +File.separator + "resource" + File.separator + "images"+ File.separator + "users"+File.separator;
strgCodeList = getStrgCodeList(dataSourceName, loginId, salePersons);
while(rs.next())
......@@ -371,6 +396,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
rawJson.put("locality", "");
}
/*
File file = new File(userImagePath+spName+".png");
if(file.exists())
{
......@@ -392,6 +418,12 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
spName_image = "<div class='defaultIconImage'> "+defaultUserImg+" </div>";
}
*/
// 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+"'/>";
// Added by Prajyot R on 24/05/2018 End
if(!spName.equalsIgnoreCase(prvspName))
{
rawJson.put("spName", "<table border='0' width='100%'>" +
......@@ -406,6 +438,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
{
rawJson.put("spName", "");
}
/*
file = new File(userImagePath+doctorName+".png");
if(file.exists())
{
......@@ -427,6 +460,13 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
rawJson.put("doctor_image", "<div class='defaultIconImage'> "+defaultUserImg+" </div>");
}
*/
// 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+"'/>";
rawJson.put("doctor_image", doctor_image);
// Added by Prajyot R on 24/05/2018 End
//doctorName = "<div class='defaultIconTitle'> "+doctorName+" </div>";
String speciality = "<div class='defaultIconSubTitle'> "+rs.getString("SPECIALITY")+" </div>";
......@@ -841,6 +881,9 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
DashboardUtility dashboardUtility = null;
// Added by Prajyot R on 24/05/2018 Start
E12GenericUtility e12GenUtility = new E12GenericUtility();
// Added by Prajyot R on 24/05/2018 End
int count = 0;
......@@ -928,8 +971,12 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
salesPersonCode = checkNull(rs.getString("SPRS_CODE__PLAN"));
salesPersonName = checkNull(rs.getString("SP_NAME"));
customerName = checkNull(rs.getString("NAME"));
String object = "images"+ File.separator + "users";
plannedDocImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
// 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");
// Update by Prajyot R on 24/05/2018 End
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();
......@@ -1011,8 +1058,12 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
salesPersonCode = checkNull(rs.getString("SALES_PERS"));
salesPersonName = checkNull(rs.getString("SP_NAME"));
customerName = checkNull(rs.getString("NAME"));
String object = "images"+ File.separator + "users";
unplannedDocImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
// 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");
// Update by Prajyot R on 24/05/2018 End
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();
......@@ -1073,8 +1124,12 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
salesPersonTranId = checkNull(rs.getString("TRAN_ID"));
customerCode = checkNull(rs.getString("STRG_CODE"));
customerName = checkNull(rs.getString("NAME"));
String object = "images"+ File.separator + "users";
listedDocImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+customerCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+customerName;
// 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");
// Update by Prajyot R on 24/05/2018 End
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();
......@@ -1132,9 +1187,13 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
salesPersonCode = checkNull(rs.getString("SALES_PERS")) ;
customerName = checkNull(rs.getString("NAME"));
salesPersonName = checkNull(rs.getString("SP_NAME")) ;
String object = "images"+ File.separator + "users";
unlistedDocImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
// 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+"'/>";
// Update by Prajyot R on 24/05/2018 End
//added by vishal pathare on 8.2.18 for[feed data for links implementation]Start
JSONObject feedDataJson = new JSONObject();
feedDataJson.put( "tran_id", salesPersonTranId );
......
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