Commit ab05b8b4 authored by sdhaul's avatar sdhaul

To set empcode as default value is set as EMP_CODE then replace same with...

To set empcode as default value is set as EMP_CODE then replace same with emp_code value from USER_INFO

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@198591 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0770f823
...@@ -63,6 +63,8 @@ public class DashboardUtil ...@@ -63,6 +63,8 @@ public class DashboardUtil
//To fetch siteCode of user //To fetch siteCode of user
private String userSite; private String userSite;
//To fetch empCode of user
private String empCode;
public JSONObject getDashboardConfig(String dashboardFileName,UserInfoBean userInfo) public JSONObject getDashboardConfig(String dashboardFileName,UserInfoBean userInfo)
{ {
...@@ -73,6 +75,7 @@ public class DashboardUtil ...@@ -73,6 +75,7 @@ public class DashboardUtil
if(userInfo != null) { if(userInfo != null) {
userTranDB =userInfo.getTransDB(); userTranDB =userInfo.getTransDB();
userSite =userInfo.getSiteCode(); userSite =userInfo.getSiteCode();
empCode = userInfo.getEmpCode();
} }
System.out.println("userTranDB =" + userTranDB); System.out.println("userTranDB =" + userTranDB);
CommonConstants.setIBASEHOME(); CommonConstants.setIBASEHOME();
...@@ -839,9 +842,14 @@ public class DashboardUtil ...@@ -839,9 +842,14 @@ public class DashboardUtil
} }
//TO FETCH SITECODE OF USER LOGGED IN //TO FETCH SITECODE OF USER LOGGED IN
else if(defaultValue !=null && "CURRENT_SITE".equalsIgnoreCase(defaultValue.toString())) { else if(defaultValue !=null && "CURRENT_SITE".equalsIgnoreCase(defaultValue.toString())) {
fil.put("default_value",userSite+","); fil.put("default_value",checkNull(userSite).trim()+",");
System.out.println("toget user site code => "+fil); System.out.println("toget user site code => "+fil);
} }
//TO FETCH EMPCODE OF USER LOGGED IN
else if(defaultValue !=null && "EMP_CODE".equalsIgnoreCase(defaultValue.toString())) {
fil.put("default_value",checkNull(empCode).trim()+",");
System.out.println("toget user emp_code => "+fil);
}
System.out.println("default value "+fil); System.out.println("default value "+fil);
System.out.println("Inside type processDashboardFilter>>>>>>"+type); System.out.println("Inside type processDashboardFilter>>>>>>"+type);
......
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