Skip to content

B
business-java
Commit cf98e1fb authored by ssalve's avatar ssalve
Browse files
Options

Sarita : Updated AttendanceDaily Code on 05-09-2019 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@206896 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 02e257e4
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 29 deletions
webitm-adm/src/ibase/webitm/ejb/adm/AttendanceDailyIC.java
View file @ cf98e1fb
...@@ -110,6 +110,44 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -110,6 +110,44 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
valueXmlString = new StringBuffer("<?xml version=\"1.0\"?><Root><header><editFlag>"); valueXmlString = new StringBuffer("<?xml version=\"1.0\"?><Root><header><editFlag>");
valueXmlString.append(editFlag).append("</editFlag></header>"); valueXmlString.append(editFlag).append("</editFlag></header>");
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010].Start
String shiftProtFlag = "1";
loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
profileId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "profileId"));
objName = "attd_daily";
sql = "select usr_lev from users where code = ? ";
pstmt= conn.prepareStatement(sql);
pstmt.setString(1, loginCode);
rs = pstmt.executeQuery();
if(rs.next())
{
userLevel = rs.getInt("usr_lev");
}
close(rs, pstmt);
if(userLevel == 0)
{
rightsChar = "*";
}
else
{
sql = "select rights from user_rights where obj_name = ? and profile_id = ? ";
pstmt= conn.prepareStatement(sql);
pstmt.setString(1, objName);
pstmt.setString(2, profileId);
rs = pstmt.executeQuery();
if(rs.next())
{
rightsChar = checkNull(rs.getString("rights"));
}
close(rs, pstmt);
}
if(rightsChar.indexOf("*") > -1 || rightsChar.indexOf("W") > -1 )
{
shiftProtFlag = "0";
}
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].End
switch (currentFormNo) switch (currentFormNo)
{ {
...@@ -160,7 +198,10 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -160,7 +198,10 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
valueXmlString.append("<attd_date protect=\"0\">").append("<![CDATA[]]>").append("</attd_date>\r\n"); valueXmlString.append("<attd_date protect=\"0\">").append("<![CDATA[]]>").append("</attd_date>\r\n");
valueXmlString.append("<prev_in_time>").append("<![CDATA[]]>").append("</prev_in_time>\r\n"); valueXmlString.append("<prev_in_time>").append("<![CDATA[]]>").append("</prev_in_time>\r\n");
valueXmlString.append("<prev_out_time>").append("<![CDATA[]]>").append("</prev_out_time>\r\n"); valueXmlString.append("<prev_out_time>").append("<![CDATA[]]>").append("</prev_out_time>\r\n");
valueXmlString.append("<shift protect=\"1\">").append("<![CDATA[]]>").append("</shift>\r\n"); // Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].Start
// valueXmlString.append("<shift protect=\"1\">").append("<![CDATA[]]>").append("</shift>\r\n");
valueXmlString.append("<shift protect=\"" + shiftProtFlag + "\">").append("<![CDATA[]]>").append("</shift>\r\n");
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].End
} }
else if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit")) else if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
{ {
...@@ -169,6 +210,8 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -169,6 +210,8 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
lsWorkShift = checkNull(genericUtility.getColumnValue("shift", dom)); lsWorkShift = checkNull(genericUtility.getColumnValue("shift", dom));
valueXmlString.append("<attd_date protect=\"1\">").append("<![CDATA["+attdDateStr+"]]>").append("</attd_date>\r\n"); valueXmlString.append("<attd_date protect=\"1\">").append("<![CDATA["+attdDateStr+"]]>").append("</attd_date>\r\n");
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].Start
/*
//Modified by Azhar K. on[22-July-2019][Shift Change in ERP based on Rights change][Start] //Modified by Azhar K. on[22-July-2019][Shift Change in ERP based on Rights change][Start]
loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode")); loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
profileId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "profileId")); profileId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "profileId"));
...@@ -210,11 +253,16 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -210,11 +253,16 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
{ {
valueXmlString.append("<shift protect=\"1\">").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>\r\n"); valueXmlString.append("<shift protect=\"1\">").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>\r\n");
} }
*/
valueXmlString.append("<shift protect=\"" + shiftProtFlag + "\">").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>\r\n");
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].End
} }
else if(currentColumn.trim().equalsIgnoreCase("emp_code")) else if(currentColumn.trim().equalsIgnoreCase("emp_code"))
{ {
System.out.println("Inside emp_code itemChange::::"); System.out.println("Inside emp_code itemChange::::");
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].Start
/*
//Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][Start] //Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][Start]
loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode")); loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
profileId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "profileId")); profileId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "profileId"));
...@@ -257,6 +305,8 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -257,6 +305,8 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
{ {
valueXmlString.append("<shift protect=\"1\">").append("<![CDATA[]]>").append("</shift>\r\n"); valueXmlString.append("<shift protect=\"1\">").append("<![CDATA[]]>").append("</shift>\r\n");
} }
*/
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].End
if((runMode == null || !("B".equalsIgnoreCase(runMode))) && !("E".equalsIgnoreCase(editFlag))) if((runMode == null || !("B".equalsIgnoreCase(runMode))) && !("E".equalsIgnoreCase(editFlag)))
{ {
empCode = checkNull(genericUtility.getColumnValue("emp_code", dom)); empCode = checkNull(genericUtility.getColumnValue("emp_code", dom));
...@@ -301,6 +351,8 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -301,6 +351,8 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
{ {
lsWorkShift = lsWorkshift; lsWorkShift = lsWorkshift;
} }
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].Start
/*
//Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][Start] //Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][Start]
//valueXmlString.append("<shift>").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>"); //valueXmlString.append("<shift>").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>");
if("E".equalsIgnoreCase(editFlag) && (rightsChar.indexOf("*") > -1 || rightsChar.indexOf("W") > -1)) if("E".equalsIgnoreCase(editFlag) && (rightsChar.indexOf("*") > -1 || rightsChar.indexOf("W") > -1))
...@@ -312,6 +364,9 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -312,6 +364,9 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
valueXmlString.append("<shift protect=\"1\">").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>\r\n"); valueXmlString.append("<shift protect=\"1\">").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>\r\n");
} }
//Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][End] //Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][End]
*/
valueXmlString.append("<shift protect=\"" + shiftProtFlag + "\">").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>\r\n");
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].End
sql = "select in_time,out_time, lunch_time from workshft where day_no = ? and shift = ? "; sql = "select in_time,out_time, lunch_time from workshft where day_no = ? and shift = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -337,6 +392,8 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -337,6 +392,8 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
else if(currentColumn.trim().equalsIgnoreCase("attd_date")) else if(currentColumn.trim().equalsIgnoreCase("attd_date"))
{ {
System.out.println("Inside attd_date itemChange::::"); System.out.println("Inside attd_date itemChange::::");
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].Start
/*
//Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][Start] //Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][Start]
loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode")); loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
profileId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "profileId")); profileId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "profileId"));
...@@ -378,6 +435,8 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -378,6 +435,8 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
valueXmlString.append("<shift protect=\"1\">").append("<![CDATA[]]>").append("</shift>\r\n"); valueXmlString.append("<shift protect=\"1\">").append("<![CDATA[]]>").append("</shift>\r\n");
} }
//Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][End] //Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][End]
*/
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].Start
attdDateStr= checkNull(genericUtility.getColumnValue("attd_date", dom)); attdDateStr= checkNull(genericUtility.getColumnValue("attd_date", dom));
if(attdDateStr != null && attdDateStr.trim().length() > 0) if(attdDateStr != null && attdDateStr.trim().length() > 0)
...@@ -416,6 +475,8 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -416,6 +475,8 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
{ {
lsWorkShift = lsWorkshift; lsWorkShift = lsWorkshift;
} }
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].Start
/*
//Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][Start] //Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][Start]
//valueXmlString.append("<shift>").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>"); //valueXmlString.append("<shift>").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>");
if("E".equalsIgnoreCase(editFlag) && (rightsChar.indexOf("*") > -1 || rightsChar.indexOf("W") > -1)) if("E".equalsIgnoreCase(editFlag) && (rightsChar.indexOf("*") > -1 || rightsChar.indexOf("W") > -1))
...@@ -427,6 +488,10 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -427,6 +488,10 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
valueXmlString.append("<shift protect=\"1\">").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>\r\n"); valueXmlString.append("<shift protect=\"1\">").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>\r\n");
} }
//Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][End] //Modified by Azhar K. on[16-Aug-2019][Shift Change in ERP based on Rights change][End]
*/
valueXmlString.append("<shift protect=\"" + shiftProtFlag + "\">").append("<![CDATA["+lsWorkShift+"]]>").append("</shift>\r\n");
// Modified by Piyush on 05/09/2019 [To allow shift changes on right bases - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].End
sql = "select in_time,out_time, lunch_time from workshft where day_no = ? and shift = ? "; sql = "select in_time,out_time, lunch_time from workshft where day_no = ? and shift = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1048,38 +1113,66 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC ...@@ -1048,38 +1113,66 @@ public class AttendanceDailyIC extends ValidatorEJB implements AttendanceDailyIC
break; break;
} }
sql = "select ddf_hr_status(?,?,?) AS WORK_SITE from dual"; // Modified by Piyush on 05/09/2019 [Site code validation to be done only if site is changed - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].Start
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,mVal1);
pstmt.setTimestamp(2,mattdDate);
pstmt.setString(3,"S");
System.out.println("strSQlQuery::>>ddf_hr_status(?,?,?)"+sql);
rs = pstmt.executeQuery();
if(rs.next())
{
empSiteCode=checkNull(rs.getString("WORK_SITE"));
}
System.out.println("@vinay::value of empSiteCode>>"+empSiteCode);
close(rs, pstmt);
sql = "Select COUNT(*) AS CNT From Workshft Where shift=? AND Day_No=? AND SITE_CODE=? AND STATUS=? "; String prevShift = "*";
pstmt = conn.prepareStatement(sql); int attdCnt = 0;
pstmt.setString(1,mVal); if(editFlag != null && editFlag.equalsIgnoreCase("E"))
pstmt.setString(2,dayNo);
pstmt.setString(3,empSiteCode);
pstmt.setString(4,"A");
rs = pstmt.executeQuery();
if(rs.next())
{ {
cnt = rs.getInt("CNT"); sql = "select shift from attendance_day where emp_code = ? and attd_date = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,mVal1);
pstmt.setTimestamp(2,mattdDate);
System.out.println("strSQlQuery::>>ddf_hr_status(?,?,?)"+sql);
rs = pstmt.executeQuery();
if(rs.next())
{
attdCnt = 1;
prevShift=checkNull(rs.getString("shift"));
if(prevShift.trim().length() == 0)
{
prevShift = "*";
}
}
System.out.println("Attendance count>>"+attdCnt);
close(rs, pstmt);
} }
System.out.println("value of CNT >>"+cnt); if(!prevShift.trim().equals(mVal.trim()))
close(rs, pstmt);
if(cnt == 0)
{ {
errCode = itmDBAccessEJB.getErrorString("", "VTSHIFTCOM", userId, "", conn); // Modified by Piyush on 05/09/2019 [Site code validation to be done only if site is changed - Sun CCF No.: IT2019-109 - Request ID: A18LSUN010]].End
break; sql = "select ddf_hr_status(?,?,?) AS WORK_SITE from dual";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,mVal1);
pstmt.setTimestamp(2,mattdDate);
pstmt.setString(3,"S");
System.out.println("strSQlQuery::>>ddf_hr_status(?,?,?)"+sql);
rs = pstmt.executeQuery();
if(rs.next())
{
empSiteCode=checkNull(rs.getString("WORK_SITE"));
}
System.out.println("@vinay::value of empSiteCode>>"+empSiteCode);
close(rs, pstmt);
sql = "Select COUNT(*) AS CNT From Workshft Where shift=? AND Day_No=? AND SITE_CODE=? AND STATUS=? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,mVal);
pstmt.setString(2,dayNo);
pstmt.setString(3,empSiteCode);
pstmt.setString(4,"A");
rs = pstmt.executeQuery();
if(rs.next())
{
cnt = rs.getInt("CNT");
}
System.out.println("value of CNT >>"+cnt);
close(rs, pstmt);
if(cnt == 0)
{
errCode = itmDBAccessEJB.getErrorString("", "VTSHIFTCOM", userId, "", conn);
break;
}
} }
//Modified by Azhar K. on [13-Aug-2019][To validate shift if not valid or blank][End] //Modified by Azhar K. on [13-Aug-2019][To validate shift if not valid or blank][End]
} }
......
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