Skip to content

B
business-java
Commit 8c80d4c6 authored by vvengurlekar's avatar vvengurlekar
Browse files
Options

AttendanceCompliance.java, PlanVsActual.java - changes done as per prototype ... 

AttendanceCompliance.java, PlanVsActual.java - changes done as per prototype  for showing image in mobile also


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@179406 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ee193c60
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 16 deletions
webitm-dashboard/ibase/dashboard/sfa/ejb/AttendanceCompliance.java
View file @ 8c80d4c6
......@@ -107,7 +107,7 @@ public class AttendanceCompliance extends ValidatorEJB implements AttendanceComp
reportHead = checkNull(rs.getString("EMP_NAME"));
notReportingDays = checkNull(rs.getString("NOT_REPORTED_DAYS"));
mobileNo = checkNull(rs.getString("MOBILE_NO"));
userImagePath = "/ibase/CustomMenuImageServlet?fldValue="+salesPersCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersName;
userImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+salesPersCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersName;
tran_image = "<img class='cardProdImg2' src='"+userImagePath+"' style='margin-top:-15px;'/>";
String devisonWiseRegion = checkNull(rs.getString("DIVISION"))+" "+checkNull(rs.getString("REGION"));
......
webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActual.java
View file @ 8c80d4c6
......@@ -296,7 +296,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
String appendSQL = "";
DashboardUtility dashboardUtility = null;
SimpleDateFormat formatter = null;
String fromDate ="",toDate = "",locality = "",prvlocality = "",doctorName = "";
String fromDate ="",toDate = "",locality = "",prvlocality = "",doctorName = "", spName = "", prvspName = "";
ArrayList<String> strgCodeList = null;
try
{
......@@ -327,10 +327,11 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
while(rs.next())
{
rawJson = new JSONObject();
spName = rs.getString("SP_NAME");
locality = rs.getString("LOCALITY");
doctorName = rs.getString("DOCTORNAME").trim();
scCode = rs.getString("SC_CODE").trim();
if(!locality.equalsIgnoreCase(prvlocality))
{
rawJson.put("locality", locality);
......@@ -341,8 +342,39 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
{
rawJson.put("locality", "");
}
if(!spName.equalsIgnoreCase(prvspName))
{
rawJson.put("spName", spName);
System.out.println("spName :"+spName);
prvspName = spName;
}else
{
rawJson.put("spName", "");
}
File file = new File(userImagePath+spName+".png");
if(file.exists())
{
rawJson.put("spName_image", "<img class='defaultIconImage' src='"+CommonConstants.TOMCAT_HOME+"/ibase/resource/images/users/"+spName+".png'/>");
}else
{
spName = spName.trim();
String[] splited = spName.split(" ");
System.out.println("splited getTodayAgenda spName :"+splited[0].charAt(0));
String defaultUserImg = ""+splited[0].charAt(0);
if(splited.length>1)
{
String lastWord = spName.substring(spName.lastIndexOf(" ")+1);
System.out.println("lastWord getTodayAgenda :"+lastWord);
defaultUserImg = defaultUserImg + ""+lastWord.charAt(0);
}
System.out.println("defaultUserImg spName :"+defaultUserImg);
rawJson.put("spName_image", "<div class='defaultIconImage'> "+defaultUserImg+" </div>");
}
File file = new File(userImagePath+doctorName+".png");
file = new File(userImagePath+doctorName+".png");
if(file.exists())
{
rawJson.put("doctor_image", "<img class='defaultIconImage' src='"+CommonConstants.TOMCAT_HOME+"/ibase/resource/images/users/"+doctorName+".png'/>");
......@@ -350,7 +382,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
{
doctorName = doctorName.trim();
String[] splited = doctorName.split(" ");
System.out.println("splited getTodayAgenda :"+splited[0].charAt(0));
System.out.println("splited getTodayAgenda doctorName :"+splited[0].charAt(0));
String defaultUserImg = ""+splited[0].charAt(0);
if(splited.length>1)
......@@ -359,18 +391,17 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
System.out.println("lastWord getTodayAgenda :"+lastWord);
defaultUserImg = defaultUserImg + ""+lastWord.charAt(0);
}
System.out.println("defaultUserImg :"+defaultUserImg);
System.out.println("defaultUserImg doctorName :"+defaultUserImg);
rawJson.put("doctor_image", "<div class='defaultIconImage'> "+defaultUserImg+" </div>");
}
//doctorName = "<div class='defaultIconTitle'> "+doctorName+" </div>";
//String speciality = "<div class='defaultIconSubTitle'> "+rs.getString("SPECIALITY")+" </div>";
String speciality = "<div class='defaultIconSubTitle'> "+rs.getString("SPECIALITY")+" </div>";
rawJson.put("doctorName", doctorName);
rawJson.put("time", "10:00 am");
rawJson.put("doctorName", doctorName);
//rawJson.put("speciality", rs.getString("SPECIALITY"));
//rawJson.put("speciality", speciality);
rawJson.put("speciality", speciality);
if(strgCodeList.contains(scCode)){
rawJson.put("meet_status", "<img class='defaultIconImage' src='/ibase/dwh/FusionChart/images/Tick-mark.png'/>");
......@@ -864,7 +895,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
salesPersonCode = checkNull(rs.getString("SALES_PERS"));
salesPersonName = checkNull(rs.getString("SP_NAME"));
String object = "images"+ File.separator + "users";
plannedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
plannedDocImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
salesPerson_image = "<img class='cardProdImg2' src='"+plannedDocImagePath+"'/>";
rowBuffer.append("<tr class='row' id='"+salesPersonTranId+"' onclick='getRowWisePkValue(this.id)'><td><table cellspacing='0' cellpadding='0' " +
"style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" +
......@@ -934,7 +965,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
salesPersonCode = checkNull(rs.getString("SALES_PERS"));
salesPersonName = checkNull(rs.getString("SP_NAME"));
String object = "images"+ File.separator + "users";
unplannedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
unplannedDocImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
salesPerson_image = "<img class='cardProdImg2' src='"+unplannedDocImagePath+"'/>";
rowBuffer.append("<tr class='row' id='"+salesPersonTranId+"' onclick='getRowWisePkValue(this.id)'><td><table cellspacing='0' cellpadding='0' " +
"style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" +
......@@ -985,7 +1016,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
customerCode = checkNull(rs.getString("STRG_CODE"));
customerName = checkNull(rs.getString("NAME"));
String object = "images"+ File.separator + "users";
listedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+customerCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+customerName;
listedDocImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+customerCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+customerName;
customer_Image = "<img class='cardProdImg2' src='"+listedDocImagePath+"'/>";
listedBuffer.append("<tr class='row' id='"+salesPersonTranId+"' onclick='getRowWisePkValue(this.id)'><td><table cellspacing='0' cellpadding='0' " +
"style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" +
......@@ -1032,7 +1063,7 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
salesPersonCode = checkNull(rs.getString("SALES_PERS")) ;
salesPersonName = checkNull(rs.getString("SP_NAME")) ;
String object = "images"+ File.separator + "users";
unlistedDocImagePath = "/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
unlistedDocImagePath = CommonConstants.TOMCAT_HOME+"/ibase/CustomMenuImageServlet?fldValue="+salesPersonCode+"&object="+object+"&objName="+object+"&ALT_FLD_VALUE="+salesPersonName;
salesPerson_image = "<img class='cardProdImg2' src='"+unlistedDocImagePath+"'/>";
listedBuffer.append("<tr class='row' id='"+salesPersonTranId+"' onclick='getRowWisePkValue(this.id)'><td><table cellspacing='0' cellpadding='0' " +
"style='border-bottom:1px solid #E8E8E8;' width='100%'><tr>" +
......@@ -1072,8 +1103,8 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
double listedDashArray = (listed/totalCountListing)*280;
System.out.println("listedDashArray ====== : "+listedDashArray);
String planning = "<div style='display: inline-flex; padding: 6px;'> <label style='padding:5px 0px 5px 0px;'>Planned</label> <div class='color-box' style='position: absolute;margin-top:8px;background-color: #3BC806;width: 8px;height: 8px;margin-right: 5px;vertical-align: middle;border-radius: 8px;display:block;text-align: right;float: right;'></div> </div> <div style='display: inline-flex;padding: 6px;'> <label style='padding:5px 0px 5px 0px;'>Unplanned</label> <div class='color-box' style='position: absolute; margin-top:8px; background-color: #FFA200; width: 8px;height: 8px; margin-right: 5px; vertical-align: middle;border-radius: 8px; display:block;'></div> </div> <div> </div> <div> </div>";
String listing = "<div style='display: inline-flex; padding: 6px;'> <label style='padding:5px 0px 5px 0px;'>Listed</label> <div class='color-box' style='position: absolute;margin-top:8px;background-color: #2F9EFC;width: 8px;height: 8px;margin-right: 5px;vertical-align: middle;border-radius: 8px;display:block;text-align: right;float: right;'></div> </div> <div style='display: inline-flex;padding: 6px;'> <label style='padding:5px 0px 5px 0px;'>Unlisted</label> <div class='color-box' style='position: absolute; margin-top:8px; background-color: #FF6715; width: 8px;height: 8px; margin-right: 5px; vertical-align: middle;border-radius: 8px; display:block;'></div> </div> <div> </div> <div> </div>";
String planning = "<div style='display: inline-flex; padding: 6px;'> <label style='padding:5px 0px 5px 0px;'>Planned</label> <div class='color-box' style='margin-top:8px;background-color: #3BC806;width: 8px;height: 8px;margin-right: 5px;vertical-align: middle;border-radius: 8px;display:block;text-align: right;float: right;'></div> </div> <div style='display: inline-flex;padding: 6px;'> <label style='padding:5px 0px 5px 0px;'>Unplanned</label> <div class='color-box' style='margin-top:8px; background-color: #FFA200; width: 8px;height: 8px; margin-right: 5px; vertical-align: middle;border-radius: 8px; display:block;'></div> </div> <div> </div> <div> </div>";
String listing = "<div style='display: inline-flex; padding: 6px;'> <label style='padding:5px 0px 5px 0px;'>Listed</label> <div class='color-box' style='margin-top:8px;background-color: #2F9EFC;width: 8px;height: 8px;margin-right: 5px;vertical-align: middle;border-radius: 8px;display:block;text-align: right;float: right;'></div> </div> <div style='display: inline-flex;padding: 6px;'> <label style='padding:5px 0px 5px 0px;'>Unlisted</label> <div class='color-box' style='margin-top:8px; background-color: #FF6715; width: 8px;height: 8px; margin-right: 5px; vertical-align: middle;border-radius: 8px; display:block;'></div> </div> <div> </div> <div> </div>";
// display data according to planning and listing if planning data is available then only planned & unplanned data will be displayed or else listed & unlisted data will be displayed
......
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