Compare commits
No commits in common. "devqc" and "dev_chapal" have entirely different histories.
devqc
...
dev_chapal
|
|
@ -441,21 +441,20 @@ namespace HRM.BO
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//public bool OnlyManualInTime
|
public bool OnlyManualInTime
|
||||||
//{
|
{
|
||||||
// get {
|
get {
|
||||||
// return (this.IsManualEntry == true && this.ActualInTime != null) ? true : false;}
|
return (this.IsManualEntry == true && this.ActualInTime != null) ? true : false;}
|
||||||
|
|
||||||
|
}
|
||||||
|
public bool OnlyManualOutTime
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return (this.IsManualEntry == true && this.ActualOutTime != null) ? true : false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//}
|
|
||||||
//public bool OnlyManualOutTime
|
|
||||||
//{
|
|
||||||
// get
|
|
||||||
// {
|
|
||||||
// return (this.IsManualEntry == true && this.ActualOutTime != null) ? true : false;
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
public bool OnlyManualInTime { get; set; }
|
|
||||||
public bool OnlyManualOutTime { get; set; }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -3383,7 +3382,6 @@ namespace HRM.BO
|
||||||
DataTable getTopEmpAbsentData(Employee oEmp, EnumAttendanceType type);
|
DataTable getTopEmpAbsentData(Employee oEmp, EnumAttendanceType type);
|
||||||
DataTable getcorehrAbsentData(Employee oEmp, EnumAttendanceType type);
|
DataTable getcorehrAbsentData(Employee oEmp, EnumAttendanceType type);
|
||||||
DataSet AttnDaysSummaryForSalaryProcess(DateTime FromDate, DateTime ToDate);
|
DataSet AttnDaysSummaryForSalaryProcess(DateTime FromDate, DateTime ToDate);
|
||||||
List<DailyAttnProcess> GetByEmployees(DateTime attnDate, string employeeIDs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
using Ease.Core.Model;
|
using Ease.Core.Model;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Data;
|
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
@ -505,20 +504,6 @@ namespace HRM.BO
|
||||||
|
|
||||||
return isNullOrWhiteSpace;
|
return isNullOrWhiteSpace;
|
||||||
}
|
}
|
||||||
public static string[] GetDFSL(DataTable dt, string nDepartmentID)
|
|
||||||
{
|
|
||||||
string sDes = "";
|
|
||||||
foreach (DataRow dr in dt.Rows)
|
|
||||||
{
|
|
||||||
if (dr[0].ToString() == nDepartmentID)
|
|
||||||
{
|
|
||||||
sDes = dr[3].ToString();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
string[] values = sDes.Split(',');
|
|
||||||
return values;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class CustomException : Exception
|
public class CustomException : Exception
|
||||||
|
|
|
||||||
|
|
@ -370,8 +370,7 @@ namespace HRM.BO
|
||||||
List<SearchEmployee> FindCordinator(int? id, int? payrollTypeID);
|
List<SearchEmployee> FindCordinator(int? id, int? payrollTypeID);
|
||||||
List<SearchEmployee> FindEmpCodeName(int payrolltypeid, string code, string name);
|
List<SearchEmployee> FindEmpCodeName(int payrolltypeid, string code, string name);
|
||||||
List<SearchEmployee> FindEmpCodeNameForEmployeePicker(int userid, int payrolltypeid, string code, string name);
|
List<SearchEmployee> FindEmpCodeNameForEmployeePicker(int userid, int payrolltypeid, string code, string name);
|
||||||
List<SearchEmployee> FindEmpCodeNameForEmployeePickerNew(int userid, int payrolltypeid, string code, string name, bool isForLifeCycle);
|
SearchEmployee get(int empid);
|
||||||
SearchEmployee get(int empid);
|
|
||||||
List<SearchEmployee> GetEmployeeNotYetUser(int payrollTypeID);
|
List<SearchEmployee> GetEmployeeNotYetUser(int payrollTypeID);
|
||||||
List<SearchEmployee> GetTeam(int employeeid);
|
List<SearchEmployee> GetTeam(int employeeid);
|
||||||
List<SearchEmployee> GetTeam(int employeeid, EnumStatus enumStatus);
|
List<SearchEmployee> GetTeam(int employeeid, EnumStatus enumStatus);
|
||||||
|
|
|
||||||
|
|
@ -24,37 +24,19 @@ namespace HRM.DA
|
||||||
|
|
||||||
#region Insert function
|
#region Insert function
|
||||||
|
|
||||||
internal static void Insert(TransactionContext tc, DailyAttnProcess item)
|
//internal static void Insert(TransactionContext tc, DailyAttnProcess item)
|
||||||
{
|
//{
|
||||||
//tc.ExecuteNonQuery(
|
// tc.ExecuteNonQuery(
|
||||||
// "INSERT INTO DailyAttnProcess(DailyAttnProcessID, EmployeeID, AttnDate, ShiftID, InTime, OutTime,WorkDayType, AttenType, Comments,Reason, IsManualEntry,IsLate, LateHour, EarlyHour, OTHour, ReferenceID, CreatedBy, CreatedDate, OtRemarks, BenefitRemarks, TempShiftID, WFStatus, ApprovedOTHOUR, LMRemarks, DHRemarks, SalaryMonth, ActualInTime, ActualOutTime, CLAIMWFSTATUS)" +
|
// "INSERT INTO DailyAttnProcess(DailyAttnProcessID, EmployeeID, AttnDate, ShiftID, InTime, OutTime,WorkDayType, AttenType, Comments,Reason, IsManualEntry,IsLate, LateHour, EarlyHour, OTHour, ReferenceID, CreatedBy, CreatedDate, OtRemarks, BenefitRemarks, TempShiftID, WFStatus, ApprovedOTHOUR, LMRemarks, DHRemarks, SalaryMonth, ActualInTime, ActualOutTime, CLAIMWFSTATUS)" +
|
||||||
// " VALUES(%n, %n, %d, %n, %D, %D, %n, %n, %s,%s,%b, %b, %n, %n, %n, %n, %n, %d, %s, %s, %n,%n,%n, %s, %s, %d,%D,%D, %n)",
|
// " VALUES(%n, %n, %d, %n, %D, %D, %n, %n, %s,%s,%b, %b, %n, %n, %n, %n, %n, %d, %s, %s, %n,%n,%n, %s, %s, %d,%D,%D, %n)",
|
||||||
// item.ID, item.EmployeeID, item.AttnDate, DataReader.GetNullValue(item.ShiftID),
|
// item.ID, item.EmployeeID, item.AttnDate, DataReader.GetNullValue(item.ShiftID),
|
||||||
// DataReader.GetNullValue(item.EmpInTime), DataReader.GetNullValue(item.EmpOutTime), item.WorkDayType,
|
// DataReader.GetNullValue(item.EmpInTime), DataReader.GetNullValue(item.EmpOutTime), item.WorkDayType,
|
||||||
// item.AttenType, item.Comments, item.Reason, item.IsManualEntry, item.IsLate, item.LateHour,
|
// item.AttenType, item.Comments, item.Reason, item.IsManualEntry, item.IsLate, item.LateHour,
|
||||||
// item.EarlyHour, item.OTHour, DataReader.GetNullValue(item.ReferenceID, 0), item.CreatedBy,
|
// item.EarlyHour, item.OTHour, DataReader.GetNullValue(item.ReferenceID, 0), item.CreatedBy,
|
||||||
// item.CreatedDate, item.OtRemarks, item.BenefitRemarks, item.TempShiftID,
|
// item.CreatedDate, item.OtRemarks, item.BenefitRemarks, item.TempShiftID,
|
||||||
// item.WFStatus, item.ApprovedOTHour, item.LMRemarks, item.DHRemarks, item.SalaryMonth, item.ActualInTime,
|
// item.WFStatus, item.ApprovedOTHour, item.LMRemarks, item.DHRemarks, item.SalaryMonth, item.ActualInTime,
|
||||||
// item.ActualOutTime, (int)EnumClaimWFStatus.None);
|
// item.ActualOutTime, (int)EnumClaimWFStatus.None);
|
||||||
tc.ExecuteNonQuery(@"INSERT INTO DailyAttnProcess(DailyAttnProcessID, EmployeeID, AttnDate,
|
//}
|
||||||
ShiftID, InTime, OutTime,
|
|
||||||
WorkDayType, ATTENTYPE, Comments,
|
|
||||||
IsManualEntry,OnlyManualInTime,OnlyManualOutTime,
|
|
||||||
LateHour, EarlyHour, OTHour,
|
|
||||||
ReferenceID, CreatedBy, CreatedDate)
|
|
||||||
VALUES(%n, %n, %d,
|
|
||||||
%n, %D, %D,
|
|
||||||
%n, %n, %s,
|
|
||||||
%b, %b, %b,
|
|
||||||
%n, %n, %n,
|
|
||||||
%n, %n, %d)",
|
|
||||||
item.ID, item.EmployeeID, item.AttnDate,
|
|
||||||
DataReader.GetNullValue(item.ShiftID), DataReader.GetNullValue(item.InTime), DataReader.GetNullValue(item.OutTime),
|
|
||||||
item.WorkDayType, item.AttenType, item.Comments,
|
|
||||||
item.IsManualEntry, item.OnlyManualInTime, item.OnlyManualOutTime,
|
|
||||||
item.LateHour, item.EarlyHour, item.OTHour,
|
|
||||||
DataReader.GetNullValue(item.ReferenceID), item.CreatedBy, item.CreatedDate);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
@ -4110,11 +4092,6 @@ namespace HRM.DA
|
||||||
|
|
||||||
return ds.Tables[0];
|
return ds.Tables[0];
|
||||||
}
|
}
|
||||||
internal static IDataReader GetByEmployees(TransactionContext tc, DateTime attnDate, string employeeIDs)
|
|
||||||
{
|
|
||||||
return tc.ExecuteReader("SELECT * FROM DailyAttnProcess WHERE AttnDate=%d And employeeid in (%q)", attnDate, employeeIDs);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4150,85 +4150,6 @@ AND ea.EMPLOYEEID=emp.EMPLOYEEID AND ea.LASTLEVEL=1),'') LastAcademic ,
|
||||||
return tc.ExecuteDataTable(
|
return tc.ExecuteDataTable(
|
||||||
"SELECT e.employeeId as id, e.employeeNo, e.name FROM employee e WHERE e.payrolltypeid=%n", payrolltypeid);
|
"SELECT e.employeeId as id, e.employeeNo, e.name FROM employee e WHERE e.payrolltypeid=%n", payrolltypeid);
|
||||||
}
|
}
|
||||||
internal static DataSet GetEmpDetailsEcho(TransactionContext tc, string sEmpID)
|
|
||||||
{
|
|
||||||
DataSet oEmpDetails = new DataSet();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
string sql =
|
|
||||||
SQLParser.MakeSQL(
|
|
||||||
@"SELECT Emp.employeeID, Emp.EMPLOYEENO,Emp.Name,Emp.DepartmentID,Emp.BIRTHDATE,Emp.JOININGDATE,Emp.DATEOFCONFIRMATION,
|
|
||||||
Cat.Description as Category, Bangla.BanglaName, Bangla.BanglaDesignation, Bangla.DEPARTMENTBANGLA, Bangla.SectionBangla,
|
|
||||||
Emp.GENDER,Emp.MARITALSTATUSID,Emp.MOBILENO,Emp.EMAILADDRESS,Emp.ACCOUNTNO,Emp.OutPayAccountNo,
|
|
||||||
Emp.BASICSALARY,Emp.GrossSalary,Emp.VendorCode,Emp.TAXAMOUNT,Deg.NAME AS DegName,Dep.DESCRIPTION AS DepDes,
|
|
||||||
GD.DESCRIPTION AS GDDes,BK.NAME AS Bank,BR.NAME AS Branch,BKOUT.NAME AS OUTPayBank,BROUT.NAME As OUTPayBranch,
|
|
||||||
RG.NAME AS RegName,Loc.Description as Locdes,IsNull(ac.CardNumber,'') as CardNo,na.Description AS Nationality,
|
|
||||||
Emp.FATHERNAME,Emp.MOTHERNAME,eSpouse.Name AS Spouse,Emp.NationalID,Emp.BLOODGROUP,eContact.PARMANENTADDRESS AS PerVillage,
|
|
||||||
dis1.[NAME] AS PerDist,t1.[NAME] AS PerThana,eContact.PRESENTADDRESS AS TempVillage,eContact.PresentPO,eContact.PermanentPO,dis2.[NAME] AS TempDist,
|
|
||||||
t2.[NAME] AS TempThana,eContact.PERSONALTELEPHONE AS LANDPHONE,eContact.PARMANENTMOBILE AS OFFICEMOBILE
|
|
||||||
FROM EMPLOYEE AS Emp
|
|
||||||
LEFT Outer JOIN DESIGNATION AS Deg ON Emp.DESIGNATIONID=Deg.DESIGNATIONID
|
|
||||||
LEFT OUTER JOIN Department AS Dep ON Emp.DEPARTMENTID=Dep.DEPARTMENTID
|
|
||||||
LEFT OUTER JOIN Grades AS GD ON Emp.GRADEID=GD.GRADEID
|
|
||||||
LEFT OUTER JOIN Religion AS RG ON Emp.RELIGIONID=RG.RELIGIONID
|
|
||||||
LEFT OUTER JOIN Branches AS BR ON Emp.BRANCHID=BR.BRANCHID
|
|
||||||
LEFT OUTER JOIN BANKS AS BK ON BK.BANKID=BR.BANKID
|
|
||||||
LEFT OUTER JOIN Branches AS BROUT ON Emp.OUTPayBRANCHID=BROUT.BRANCHID
|
|
||||||
LEFT OUTER JOIN BANKS AS BKOUT ON BKOUT.BANKID=BROUT.BANKID
|
|
||||||
LEFT OUTER JOIN Location AS Loc ON Emp.LocationID=Loc.LocationID
|
|
||||||
LEFT OUTER JOIN AccessCard ac ON Emp.CardID = ac.AccessCardID
|
|
||||||
LEFT OUTER JOIN NATIONALITY na ON Emp.NationalityID = na.NATIONALITYID
|
|
||||||
LEFT OUTER JOIN EMPSPOUSE eSpouse ON Emp.EMPLOYEEID = eSpouse.EMPLOYEEID
|
|
||||||
LEFT OUTER JOIN EMPCONTACT eContact ON Emp.EMPLOYEEID = eContact.EMPLOYEEID
|
|
||||||
LEFT OUTER JOIN DISTRICT dis1 ON eContact.PARMANENTDISTRICTID = dis1.DISTRICTID
|
|
||||||
LEFT OUTER JOIN THANA t1 ON eContact.PARMANENTTHANAID = t1.THANAID
|
|
||||||
LEFT OUTER JOIN DISTRICT dis2 ON eContact.PRESENTDISTRICTID = dis2.DISTRICTID
|
|
||||||
LEFT OUTER JOIN Thana t2 ON eContact.PRESENTTHANAID = t2.THANAID
|
|
||||||
LEFT OUTER JOIN Category Cat on emp.categoryid = cat.categoryID
|
|
||||||
LEFT OUTER JOIN vw_EmployeeImportantInfo Bangla on Emp.EmployeeID = Bangla.EmployeeID
|
|
||||||
ORDER BY Emp.EMPLOYEENO");
|
|
||||||
// string sql =
|
|
||||||
// SQLParser.MakeSQL(
|
|
||||||
// @"SELECT Emp.EMPLOYEENO,Emp.Name,Emp.DepartmentID,Emp.BIRTHDATE,Emp.JOININGDATE,Emp.DATEOFCONFIRMATION,
|
|
||||||
// Cat.Description as Category, Bangla.BanglaName, Bangla.BanglaDesignation, Bangla.DEPARTMENTBANGLA, Bangla.SectionBangla,
|
|
||||||
//Emp.GENDER,Emp.MARITALSTATUSID,Emp.MOBILENO,Emp.EMAILADDRESS,Emp.ACCOUNTNO,Emp.OutPayAccountNo,
|
|
||||||
//Emp.BASICSALARY,Emp.GrossSalary,Emp.VendorCode,Emp.TAXAMOUNT,Deg.NAME AS DegName,Dep.DESCRIPTION AS DepDes,
|
|
||||||
//GD.DESCRIPTION AS GDDes,BK.NAME AS Bank,BR.NAME AS Branch,BKOUT.NAME AS OUTPayBank,BROUT.NAME As OUTPayBranch,
|
|
||||||
//RG.NAME AS RegName,Loc.Description as Locdes,IsNull(ac.CardNumber,'') as CardNo,na.Description AS Nationality,
|
|
||||||
//Emp.FATHERNAME,Emp.MOTHERNAME,eSpouse.Name AS Spouse,Emp.NationalID,Emp.BLOODGROUP,eContact.PARMANENTADDRESS AS PerVillage,
|
|
||||||
//dis1.[NAME] AS PerDist,t1.[NAME] AS PerThana,eContact.PRESENTADDRESS AS TempVillage,eContact.PresentPO,eContact.PermanentPO,dis2.[NAME] AS TempDist,
|
|
||||||
//t2.[NAME] AS TempThana,eContact.PERSONALTELEPHONE AS LANDPHONE,eContact.PARMANENTMOBILE AS OFFICEMOBILE
|
|
||||||
//FROM EMPLOYEE AS Emp
|
|
||||||
//LEFT Outer JOIN DESIGNATION AS Deg ON Emp.DESIGNATIONID=Deg.DESIGNATIONID
|
|
||||||
//LEFT OUTER JOIN Department AS Dep ON Emp.DEPARTMENTID=Dep.DEPARTMENTID
|
|
||||||
//LEFT OUTER JOIN Grades AS GD ON Emp.GRADEID=GD.GRADEID
|
|
||||||
//LEFT OUTER JOIN Religion AS RG ON Emp.RELIGIONID=RG.RELIGIONID
|
|
||||||
//LEFT OUTER JOIN Branches AS BR ON Emp.BRANCHID=BR.BRANCHID
|
|
||||||
//LEFT OUTER JOIN BANKS AS BK ON BK.BANKID=BR.BANKID
|
|
||||||
//LEFT OUTER JOIN Branches AS BROUT ON Emp.OUTPayBRANCHID=BROUT.BRANCHID
|
|
||||||
//LEFT OUTER JOIN BANKS AS BKOUT ON BKOUT.BANKID=BROUT.BANKID
|
|
||||||
//LEFT OUTER JOIN Location AS Loc ON Emp.LocationID=Loc.LocationID
|
|
||||||
//LEFT OUTER JOIN AccessCard ac ON Emp.CardID = ac.AccessCardID
|
|
||||||
//LEFT OUTER JOIN NATIONALITY na ON Emp.NationalityID = na.NATIONALITYID
|
|
||||||
//LEFT OUTER JOIN EMPSPOUSE eSpouse ON Emp.EMPLOYEEID = eSpouse.EMPLOYEEID
|
|
||||||
//LEFT OUTER JOIN EMPCONTACT eContact ON Emp.EMPLOYEEID = eContact.EMPLOYEEID
|
|
||||||
//LEFT OUTER JOIN DISTRICT dis1 ON eContact.PARMANENTDISTRICTID = dis1.DISTRICTID
|
|
||||||
//LEFT OUTER JOIN THANA t1 ON eContact.PARMANENTTHANAID = t1.THANAID
|
|
||||||
//LEFT OUTER JOIN DISTRICT dis2 ON eContact.PRESENTDISTRICTID = dis2.DISTRICTID
|
|
||||||
//LEFT OUTER JOIN Thana t2 ON eContact.PRESENTTHANAID = t2.THANAID
|
|
||||||
// LEFT OUTER JOIN Category Cat on emp.categoryid = cat.categoryID
|
|
||||||
// LEFT OUTER JOIN vw_EmployeeImportantInfo Bangla on Emp.EmployeeID = Bangla.EmployeeID
|
|
||||||
//WHERE Emp.EMPLOYEEID IN(%q) ORDER BY Emp.EMPLOYEENO", sEmpID);
|
|
||||||
|
|
||||||
oEmpDetails = tc.ExecuteDataSet(sql);
|
|
||||||
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
throw new Exception(ex.Message);
|
|
||||||
}
|
|
||||||
return oEmpDetails;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
|
||||||
|
|
@ -1095,31 +1095,6 @@ namespace HRM.DA
|
||||||
return ds;
|
return ds;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IDataReader GetAllEmpAcademics(TransactionContext tc)
|
|
||||||
{
|
|
||||||
return tc.ExecuteReader(@"SELECT [INSTITUTENAME]
|
|
||||||
,[EDUCATIONTYPEID]
|
|
||||||
,[ACADEMICID]
|
|
||||||
,[EMPLOYEEID]
|
|
||||||
,[EDUCATIONLEVELID]
|
|
||||||
,[EDUCATIONTYPEID]
|
|
||||||
,[DISCIPLINEID]
|
|
||||||
,[INSTITUTIONID]
|
|
||||||
,[PASSINGYEAR]
|
|
||||||
,[CLASSORDIVISION]
|
|
||||||
,[GPAORMARKS]
|
|
||||||
,[LASTLEVEL]
|
|
||||||
,[OUTOF]
|
|
||||||
,[RESULTTYPEID]
|
|
||||||
,[PHOTOPATH]
|
|
||||||
,[DOCSUBMISSIONDATE]
|
|
||||||
,[LastLevelNonTech]
|
|
||||||
,[ProfileStatus]
|
|
||||||
, iif(isnull(empfileuploadid, 0) > 0, 1, 0) HasAttachment
|
|
||||||
from[EMPACADEMIC] ea
|
|
||||||
left join empfileupload eu on eu.empid = ea.employeeid and
|
|
||||||
eu.referenceid = ea.ACADEMICID and eu.fileType = 10");
|
|
||||||
}
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region EmpAchievements Get
|
#region EmpAchievements Get
|
||||||
|
|
|
||||||
|
|
@ -400,170 +400,8 @@ END;";
|
||||||
return tc.ExecuteReader(finalSQl);
|
return tc.ExecuteReader(finalSQl);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static IDataReader SearchForEmployeePickerNew(TransactionContext tc, int userID, int payrollTypeID, string code, string name, bool isForLifeCycle)
|
#endregion
|
||||||
{
|
}
|
||||||
string orderby = "name";
|
|
||||||
string sqlClause = "";
|
|
||||||
string top = "";
|
|
||||||
|
|
||||||
string recurSqlClause = SQLParser.MakeSQL(@"
|
#endregion
|
||||||
DECLARE @userid INT = %n;
|
|
||||||
DECLARE @payrolltypeid INT = %n;
|
|
||||||
DECLARE @permissionstatus INT = %n;
|
|
||||||
WITH RecursiveCategory AS
|
|
||||||
(
|
|
||||||
SELECT
|
|
||||||
CATEGORYID
|
|
||||||
FROM
|
|
||||||
dbo.CATEGORY
|
|
||||||
WHERE
|
|
||||||
CATEGORYID IN (
|
|
||||||
SELECT REFERENCEID
|
|
||||||
FROM DATAPERMISSION
|
|
||||||
WHERE USERID = @userid
|
|
||||||
AND PAYROLLTYPEID = @payrolltypeid
|
|
||||||
AND PERMISSIONSTATUS = @permissionstatus
|
|
||||||
AND PERMISSIONTYPE = %n
|
|
||||||
)
|
|
||||||
),
|
|
||||||
RecursiveGrade AS
|
|
||||||
(
|
|
||||||
SELECT
|
|
||||||
GRADEID
|
|
||||||
FROM
|
|
||||||
dbo.GRADES
|
|
||||||
WHERE
|
|
||||||
GRADEID IN (
|
|
||||||
SELECT REFERENCEID
|
|
||||||
FROM DATAPERMISSION
|
|
||||||
WHERE USERID = @userid
|
|
||||||
AND PAYROLLTYPEID = @payrolltypeid
|
|
||||||
AND PERMISSIONSTATUS = @permissionstatus
|
|
||||||
AND PERMISSIONTYPE = %n
|
|
||||||
)
|
|
||||||
),
|
|
||||||
RecursiveDepartment AS
|
|
||||||
(
|
|
||||||
SELECT
|
|
||||||
DEPARTMENTID
|
|
||||||
FROM
|
|
||||||
dbo.DEPARTMENT
|
|
||||||
WHERE
|
|
||||||
DEPARTMENTID IN (
|
|
||||||
SELECT REFERENCEID
|
|
||||||
FROM DATAPERMISSION
|
|
||||||
WHERE USERID = @userid
|
|
||||||
AND PAYROLLTYPEID = @payrolltypeid
|
|
||||||
AND PERMISSIONSTATUS = @permissionstatus
|
|
||||||
AND PERMISSIONTYPE = %n
|
|
||||||
)
|
|
||||||
UNION ALL
|
|
||||||
SELECT
|
|
||||||
d.DEPARTMENTID
|
|
||||||
FROM
|
|
||||||
dbo.DEPARTMENT d
|
|
||||||
INNER JOIN
|
|
||||||
RecursiveDepartment rd
|
|
||||||
ON
|
|
||||||
d.PARENTID = rd.DEPARTMENTID
|
|
||||||
),
|
|
||||||
RecursiveLocation AS
|
|
||||||
(
|
|
||||||
SELECT
|
|
||||||
LOCATIONID
|
|
||||||
FROM
|
|
||||||
dbo.LOCATION
|
|
||||||
WHERE
|
|
||||||
LOCATIONID IN (
|
|
||||||
SELECT REFERENCEID
|
|
||||||
FROM DATAPERMISSION
|
|
||||||
WHERE USERID = @userid
|
|
||||||
AND PAYROLLTYPEID = @payrolltypeid
|
|
||||||
AND PERMISSIONSTATUS = @permissionstatus
|
|
||||||
AND PERMISSIONTYPE = %n
|
|
||||||
)
|
|
||||||
UNION ALL
|
|
||||||
SELECT
|
|
||||||
l.LOCATIONID
|
|
||||||
FROM
|
|
||||||
dbo.LOCATION l
|
|
||||||
INNER JOIN
|
|
||||||
RecursiveLocation rl
|
|
||||||
ON
|
|
||||||
l.PARENTID = rl.LOCATIONID
|
|
||||||
)", userID, payrollTypeID, EnumMenuPermissionStatus.Approved, EnumDataPermissionType.Cagtegory, EnumDataPermissionType.Grade, EnumDataPermissionType.Department, EnumDataPermissionType.Location);
|
|
||||||
string recurWhereClause = SQLParser.MakeSQL(@"
|
|
||||||
AND
|
|
||||||
(
|
|
||||||
(
|
|
||||||
EXISTS (SELECT 1 FROM RecursiveCategory)
|
|
||||||
AND CATEGORYID IN (SELECT CATEGORYID FROM RecursiveCategory)
|
|
||||||
)
|
|
||||||
OR
|
|
||||||
(
|
|
||||||
EXISTS (SELECT 1 FROM RecursiveGrade)
|
|
||||||
AND GRADEID IN (SELECT GRADEID FROM RecursiveGrade)
|
|
||||||
)
|
|
||||||
OR
|
|
||||||
(
|
|
||||||
EXISTS (SELECT 1 FROM RecursiveDepartment)
|
|
||||||
AND DEPARTMENTID IN (SELECT DEPARTMENTID FROM RecursiveDepartment)
|
|
||||||
)
|
|
||||||
OR
|
|
||||||
(
|
|
||||||
EXISTS (SELECT 1 FROM RecursiveLocation)
|
|
||||||
AND LOCATIONID IN (SELECT LOCATIONID FROM RecursiveLocation)
|
|
||||||
)
|
|
||||||
)");
|
|
||||||
|
|
||||||
//Previous Code For only Live Employee
|
|
||||||
//sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("PayrollTypeID =%n AND Status = %n", payrollTypeID, EnumStatus.Active);
|
|
||||||
|
|
||||||
//New Code For live And Waitiong for join Employee
|
|
||||||
if (isForLifeCycle == true)
|
|
||||||
{
|
|
||||||
sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("PayrollTypeID =%n ", payrollTypeID);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("PayrollTypeID =%n AND (Status = %n OR Status = %n)", payrollTypeID, EnumEmployeeStatus.Live, EnumEmployeeStatus.Waitingforjoin);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (code != string.Empty)
|
|
||||||
{
|
|
||||||
//Previous with suggestion
|
|
||||||
//sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("EmployeeNo LIKE %s", ("%" + code + "%"));
|
|
||||||
//orderby = "EmployeeNo";
|
|
||||||
|
|
||||||
//Using TOP
|
|
||||||
//sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("EmployeeNo LIKE %s", ( code + "%")); // Using LIKE Operator
|
|
||||||
sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("EmployeeNo = %s", (code)); // Without Using LIKE Operator
|
|
||||||
orderby = "EmployeeNo";
|
|
||||||
top = "TOP 5";
|
|
||||||
|
|
||||||
//Without suggestion
|
|
||||||
//sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("EmployeeNo = %s", code );
|
|
||||||
//orderby = "EmployeeNo";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (name != string.Empty)
|
|
||||||
sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("Name LIKE %s", ("%" + name + "%"));
|
|
||||||
//string finalSQl = SQLParser.MakeSQL(
|
|
||||||
// "%q Select %q EmployeeID, EmployeeNo, Name, categoryID, GradeID, LocationID, designationid, DepartmentID From Employee %q %q Order by %s",
|
|
||||||
// recurSqlClause, top, sqlClause, recurWhereClause, orderby);
|
|
||||||
|
|
||||||
|
|
||||||
string finalSQl = SQLParser.MakeSQL(
|
|
||||||
"%q Select %q EmployeeID, EmployeeNo, Name, categoryID, GradeID, LocationID, designationid, DepartmentID From Employee %q %q " +
|
|
||||||
" UNION Select %q EmployeeID, EmployeeNo, Name, categoryID, GradeID, LocationID, designationid, DepartmentID From Employee %q " +
|
|
||||||
" Order by %s",
|
|
||||||
recurSqlClause, top, sqlClause, recurWhereClause, top, sqlClause, orderby);
|
|
||||||
|
|
||||||
return tc.ExecuteReader(finalSQl);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
}
|
}
|
||||||
|
|
@ -46,9 +46,7 @@ namespace HRM.DA
|
||||||
oDailyAttnProcess.AttenType = (EnumAttendanceType)oReader.GetInt32("AttenType").Value;
|
oDailyAttnProcess.AttenType = (EnumAttendanceType)oReader.GetInt32("AttenType").Value;
|
||||||
oDailyAttnProcess.Comments = oReader.GetString("Comments") == null ? "" : oReader.GetString("Comments");
|
oDailyAttnProcess.Comments = oReader.GetString("Comments") == null ? "" : oReader.GetString("Comments");
|
||||||
oDailyAttnProcess.Reason = oReader.GetString("Reason") == null ? "" : oReader.GetString("Reason");
|
oDailyAttnProcess.Reason = oReader.GetString("Reason") == null ? "" : oReader.GetString("Reason");
|
||||||
oDailyAttnProcess.IsManualEntry = oReader.GetBoolean("IsManualEntry", false);
|
oDailyAttnProcess.IsManualEntry = oReader.GetBoolean("IsManualEntry").Value;
|
||||||
oDailyAttnProcess.OnlyManualInTime = oReader.GetBoolean("OnlyManualInTime", false);
|
|
||||||
oDailyAttnProcess.OnlyManualOutTime = oReader.GetBoolean("OnlyManualOutTime", false);
|
|
||||||
oDailyAttnProcess.IsFromMobile = (EnumIsFromMobile)oReader.GetInt32("IsFromMobile").Value;
|
oDailyAttnProcess.IsFromMobile = (EnumIsFromMobile)oReader.GetInt32("IsFromMobile").Value;
|
||||||
oDailyAttnProcess.InTimeLatitude = oReader.GetString("InTimeLatitude") == null ? 0.0m : Convert.ToDecimal(oReader.GetString("InTimeLatitude"));
|
oDailyAttnProcess.InTimeLatitude = oReader.GetString("InTimeLatitude") == null ? 0.0m : Convert.ToDecimal(oReader.GetString("InTimeLatitude"));
|
||||||
oDailyAttnProcess.OutTimeLatitude = oReader.GetString("OutTimeLatitude") == null ? 0.0m : Convert.ToDecimal(oReader.GetString("OutTimeLatitude"));
|
oDailyAttnProcess.OutTimeLatitude = oReader.GetString("OutTimeLatitude") == null ? 0.0m : Convert.ToDecimal(oReader.GetString("OutTimeLatitude"));
|
||||||
|
|
@ -1137,16 +1135,7 @@ namespace HRM.DA
|
||||||
tc = TransactionContext.Begin(true);
|
tc = TransactionContext.Begin(true);
|
||||||
foreach (DailyAttnProcess item in oDAttnProcessess)
|
foreach (DailyAttnProcess item in oDAttnProcessess)
|
||||||
{
|
{
|
||||||
if (item.IsNew)
|
DailyAttnProcessDA.ManualEditUpdate(tc, item);
|
||||||
{
|
|
||||||
int id = tc.GenerateID("DailyAttnProcess", "DAILYATTNPROCESSID");
|
|
||||||
base.SetObjectID(item, id);
|
|
||||||
DailyAttnProcessDA.Insert(tc, item);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DailyAttnProcessDA.ManualEditUpdate(tc, item);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//if (attnMonthlyBenefit.Count > 0)
|
//if (attnMonthlyBenefit.Count > 0)
|
||||||
|
|
@ -4818,29 +4807,6 @@ namespace HRM.DA
|
||||||
return dt;
|
return dt;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<DailyAttnProcess> GetByEmployees(DateTime attnDate, string employeeIDs)
|
|
||||||
{
|
|
||||||
List<DailyAttnProcess> dailyAttnProcesses = new List<DailyAttnProcess>();
|
|
||||||
TransactionContext tc = null;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
tc = TransactionContext.Begin();
|
|
||||||
DataReader dr = new DataReader(DailyAttnProcessDA.GetByEmployees(tc, attnDate, employeeIDs));
|
|
||||||
dailyAttnProcesses = this.CreateObjects<DailyAttnProcess>(dr);
|
|
||||||
dr.Close();
|
|
||||||
tc.End();
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
#region Handle Exception
|
|
||||||
if (tc != null)
|
|
||||||
tc.HandleError();
|
|
||||||
ExceptionLog.Write(e);
|
|
||||||
throw new ServiceException(e.Message, e);
|
|
||||||
#endregion
|
|
||||||
}
|
|
||||||
return dailyAttnProcesses;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5877,29 +5877,5 @@ namespace HRM.DA
|
||||||
}
|
}
|
||||||
return table;
|
return table;
|
||||||
}
|
}
|
||||||
public DataSet GetEmpDetailsEcho(string sEmpID)
|
|
||||||
{
|
|
||||||
DataSet oEmpDetails = new DataSet();
|
|
||||||
TransactionContext tc = null;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
tc = TransactionContext.Begin();
|
|
||||||
oEmpDetails = EmployeeDA.GetEmpDetailsEcho(tc, sEmpID);
|
|
||||||
tc.End();
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
#region Handle Exception
|
|
||||||
|
|
||||||
if (tc != null)
|
|
||||||
tc.HandleError();
|
|
||||||
ExceptionLog.Write(e);
|
|
||||||
throw new ServiceException(e.Message, e);
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
}
|
|
||||||
|
|
||||||
return oEmpDetails;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -4177,35 +4177,6 @@ namespace HRM.DA
|
||||||
|
|
||||||
return ds;
|
return ds;
|
||||||
}
|
}
|
||||||
public List<EmpAcademic> GetAllEmpAcademics()
|
|
||||||
{
|
|
||||||
List<EmpAcademic> oEmpAcademics = new List<EmpAcademic>();
|
|
||||||
|
|
||||||
TransactionContext tc = null;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
tc = TransactionContext.Begin();
|
|
||||||
DataReader dr = new DataReader(HREmployeeDA.GetAllEmpAcademics(tc));
|
|
||||||
oEmpAcademics = this.CreateEmpAcademicObjects(dr);
|
|
||||||
dr.Close();
|
|
||||||
|
|
||||||
tc.End();
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
#region Handle Exception
|
|
||||||
|
|
||||||
if (tc != null)
|
|
||||||
tc.HandleError();
|
|
||||||
ExceptionLog.Write(e);
|
|
||||||
|
|
||||||
throw new ServiceException(e.Message, e);
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
}
|
|
||||||
|
|
||||||
return oEmpAcademics;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -326,45 +326,8 @@ namespace HRM.DA
|
||||||
return searchEmployees;
|
return searchEmployees;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<SearchEmployee> FindEmpCodeNameForEmployeePickerNew(int userID, int payrollTypeID, string code, string name, bool isForLifeCycle)
|
|
||||||
{
|
|
||||||
List<SearchEmployee> searchEmployees = new List<SearchEmployee>();
|
|
||||||
|
|
||||||
TransactionContext tc = null;
|
public List<SearchEmployee> GetEmployeeNotYetUser(int payrollTypeID)
|
||||||
try
|
|
||||||
{
|
|
||||||
tc = TransactionContext.Begin();
|
|
||||||
|
|
||||||
DataReader dr = new DataReader(SearchEmployeeDA.SearchForEmployeePickerNew(tc, userID, payrollTypeID, code, name, isForLifeCycle));
|
|
||||||
searchEmployees = this.CreateObjects<SearchEmployee>(dr);
|
|
||||||
//while (dr.Read())
|
|
||||||
//{
|
|
||||||
// SearchEmployee item = new SearchEmployee();
|
|
||||||
// item.Name = dr.GetString("name");
|
|
||||||
// item.EmployeeNo = dr.GetString("employeeNo");
|
|
||||||
|
|
||||||
// searchEmployees.Add(item);
|
|
||||||
//}
|
|
||||||
dr.Close();
|
|
||||||
tc.End();
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
#region Handle Exception
|
|
||||||
|
|
||||||
if (tc != null)
|
|
||||||
tc.HandleError();
|
|
||||||
ExceptionLog.Write(e);
|
|
||||||
|
|
||||||
throw new ServiceException(e.Message, e);
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
}
|
|
||||||
|
|
||||||
return searchEmployees;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<SearchEmployee> GetEmployeeNotYetUser(int payrollTypeID)
|
|
||||||
{
|
{
|
||||||
List<SearchEmployee> searchEmployees = new List<SearchEmployee>();
|
List<SearchEmployee> searchEmployees = new List<SearchEmployee>();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3009,217 +3009,5 @@ namespace HRM.Report
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
#region Employee Detail Info
|
|
||||||
|
|
||||||
public byte[] ShowEmployeeDetailInfo(string sEmpID, string reportType, int payrollTypeID)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
ReportProcessor reportProcessor = new ReportProcessor();
|
|
||||||
//string sEmpID = _selectedParameter.ReportItem.INSQL;
|
|
||||||
DataRow dr = null;
|
|
||||||
List<Employee> oEmps = new EmployeeService().GetByEmpIDs(sEmpID);
|
|
||||||
List<HREmployee> hrEmployees = new HREmployeeService().GetEmployeeByIds(sEmpID);
|
|
||||||
List<EducationLevel> educationLevels = new EducationLevelService().Get();
|
|
||||||
List<EmpAcademic> empAcademics = new HREmployeeService().GetAllEmpAcademics();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Employee oEmployee = null;
|
|
||||||
|
|
||||||
List<int> validIds = sEmpID.Split(',')
|
|
||||||
.Select(s => int.Parse(s))
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
DataSet oEmpDetails = new EmployeeService().GetEmpDetailsEcho(sEmpID);
|
|
||||||
|
|
||||||
List<DataRow> rowsToDelete = new List<DataRow>();
|
|
||||||
|
|
||||||
foreach (DataRow row in oEmpDetails.Tables[0].Rows)
|
|
||||||
{
|
|
||||||
int empId = Convert.ToInt32(row["employeeID"]);
|
|
||||||
if (!validIds.Contains(empId))
|
|
||||||
{
|
|
||||||
rowsToDelete.Add(row);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Now remove them
|
|
||||||
foreach (DataRow row in rowsToDelete)
|
|
||||||
{
|
|
||||||
oEmpDetails.Tables[0].Rows.Remove(row);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Optional: accept changes if you want to commit removal
|
|
||||||
oEmpDetails.AcceptChanges();
|
|
||||||
|
|
||||||
|
|
||||||
DataTable dtDFSL = new EmployeeService().GetDFSL();
|
|
||||||
HRM.Report.PayrollDataSet.PayrollDataSet.EmployeeDetailEchoDataTable dTEmpDetail = new HRM.Report.PayrollDataSet.PayrollDataSet.EmployeeDetailEchoDataTable();
|
|
||||||
//bool isDesigFromEmp = ConfigurationManager.GetBoolValue("designation", "desigfromdescriptiontext", EnumConfigurationType.Logic_Old);
|
|
||||||
bool isDesigFromEmp = false;
|
|
||||||
|
|
||||||
foreach (DataRow oDRow in oEmpDetails.Tables[0].Rows)
|
|
||||||
{
|
|
||||||
string[] sDes = GlobalExtensions.GetDFSL(dtDFSL, oDRow["DepartmentID"].ToString());
|
|
||||||
oEmployee = oEmps.Where(o => o.EmployeeNo.ToUpper().Trim() == oDRow["EMPLOYEENO"].ToString().ToUpper().Trim())
|
|
||||||
.SingleOrDefault();
|
|
||||||
|
|
||||||
dr = dTEmpDetail.NewRow();
|
|
||||||
dr["EmpNo"] = oDRow["EMPLOYEENO"];
|
|
||||||
dr["Name"] = oDRow["NAME"];
|
|
||||||
if (isDesigFromEmp && oEmployee != null)
|
|
||||||
dr["Designation"] = oEmployee.DescriptionText;
|
|
||||||
else
|
|
||||||
dr["Designation"] = oDRow["DegName"];
|
|
||||||
if (sDes.Length == 5)
|
|
||||||
{
|
|
||||||
dr["Department"] = sDes[1];
|
|
||||||
dr["Floor"] = sDes[2];
|
|
||||||
dr["Section"] = sDes[3];
|
|
||||||
dr["Line"] = sDes[4];
|
|
||||||
}
|
|
||||||
else if (sDes.Length == 4)
|
|
||||||
{
|
|
||||||
dr["Department"] = sDes[1];
|
|
||||||
dr["Floor"] = sDes[2];
|
|
||||||
dr["Section"] = sDes[3];
|
|
||||||
}
|
|
||||||
else if (sDes.Length == 3)
|
|
||||||
{
|
|
||||||
dr["Department"] = sDes[1];
|
|
||||||
dr["Floor"] = sDes[2];
|
|
||||||
}
|
|
||||||
else if (sDes.Length == 2)
|
|
||||||
{
|
|
||||||
dr["Department"] = sDes[1];
|
|
||||||
}
|
|
||||||
dr["Category"] = oDRow["Category"];
|
|
||||||
dr["Grade"] = oDRow["GDDes"];
|
|
||||||
dr["BasicSalary"] = oDRow["BASICSALARY"];
|
|
||||||
dr["DOB"] = oDRow["BIRTHDATE"];
|
|
||||||
if (Convert.ToInt32(oDRow["GENDER"]) == 0)
|
|
||||||
{
|
|
||||||
dr["Gender"] = "None";
|
|
||||||
}
|
|
||||||
else if (Convert.ToInt32(oDRow["GENDER"]) == 1)
|
|
||||||
{
|
|
||||||
dr["Gender"] = "Male";
|
|
||||||
}
|
|
||||||
else if (Convert.ToInt32(oDRow["GENDER"]) == 2)
|
|
||||||
{
|
|
||||||
dr["Gender"] = "Female";
|
|
||||||
}
|
|
||||||
else if (Convert.ToInt32(oDRow["GENDER"]) == 3)
|
|
||||||
{
|
|
||||||
dr["Gender"] = "Both";
|
|
||||||
}
|
|
||||||
dr["Religion"] = oDRow["RegName"];
|
|
||||||
dr["Bank"] = oDRow["Bank"];
|
|
||||||
dr["Branch"] = oDRow["Branch"];
|
|
||||||
dr["AccountNo"] = oDRow["ACCOUNTNO"];
|
|
||||||
dr["BankOPI"] = oDRow["OUTPayBank"];
|
|
||||||
dr["BranchOPI"] = oDRow["OUTPayBranch"];
|
|
||||||
dr["AccountNoOPI"] = oDRow["OutPayAccountNo"];
|
|
||||||
dr["TempPost"] = oDRow["PresentPO"];
|
|
||||||
dr["PerPost"] = oDRow["PermanentPO"];
|
|
||||||
dr["DOJ"] = oDRow["JOININGDATE"];
|
|
||||||
dr["ConfirmDate"] = oDRow["DATEOFCONFIRMATION"];
|
|
||||||
dr["TaxAmount"] = oDRow["TAXAMOUNT"];
|
|
||||||
dr["LocDes"] = oDRow["LocDes"];
|
|
||||||
dr["GrossSalary"] = oDRow["GrossSalary"];
|
|
||||||
dr["VendorCode"] = oDRow["VendorCode"];
|
|
||||||
dr["BanglaName"] = oDRow["BanglaName"];
|
|
||||||
dr["BanglaDesignation"] = oDRow["BanglaDesignation"];
|
|
||||||
dr["DEPARTMENTBANGLA"] = oDRow["DEPARTMENTBANGLA"];
|
|
||||||
dr["SectionBangla"] = oDRow["SectionBangla"];
|
|
||||||
if (Convert.ToInt32(oDRow["MARITALSTATUSID"]) == 0)
|
|
||||||
{
|
|
||||||
dr["MarStatus"] = "None";
|
|
||||||
}
|
|
||||||
else if (Convert.ToInt32(oDRow["MARITALSTATUSID"]) == 1)
|
|
||||||
{
|
|
||||||
dr["MarStatus"] = "Married";
|
|
||||||
}
|
|
||||||
else if (Convert.ToInt32(oDRow["MARITALSTATUSID"]) == 2)
|
|
||||||
{
|
|
||||||
dr["MarStatus"] = "UnMarried";
|
|
||||||
}
|
|
||||||
dr["MobileNo"] = oDRow["MOBILENO"];
|
|
||||||
dr["MailAdd"] = oDRow["EMAILADDRESS"];
|
|
||||||
dr["RFID"] = oDRow["CardNo"];
|
|
||||||
dr["Nationality"] = oDRow["Nationality"];
|
|
||||||
dr["FathersName"] = oDRow["FATHERNAME"];
|
|
||||||
dr["MothersName"] = oDRow["MOTHERNAME"];
|
|
||||||
dr["Spouse"] = oDRow["Spouse"];
|
|
||||||
dr["OFFICEMOBILE"] = oDRow["OFFICEMOBILE"].ToString();
|
|
||||||
dr["LANDPHONE"] = oDRow["LANDPHONE"].ToString();
|
|
||||||
|
|
||||||
string sEducationLevel = string.Empty;
|
|
||||||
|
|
||||||
HREmployee ohrEmp = hrEmployees.Find(delegate (HREmployee hEmp) { return hEmp.EmployeeNo == oEmployee.EmployeeNo; });
|
|
||||||
if (ohrEmp != null)
|
|
||||||
{
|
|
||||||
ohrEmp.Academics = empAcademics.FindAll(ea => ea.EmployeeID == ohrEmp.ID);//new HREmployeeService().GetAllEmpAcademics(ohrEmp.ID);
|
|
||||||
if(ohrEmp.Academics?.Count > 0)
|
|
||||||
{
|
|
||||||
foreach (EmpAcademic eAcademic in ohrEmp.Academics)
|
|
||||||
{
|
|
||||||
eAcademic.EducationLevel = educationLevels.Find(el => el.ID == (int)eAcademic.EducationLevelID);
|
|
||||||
if (sEducationLevel == "")
|
|
||||||
{
|
|
||||||
sEducationLevel = sEducationLevel + eAcademic.EducationLevel?.Description;
|
|
||||||
}
|
|
||||||
else if (sEducationLevel != "")
|
|
||||||
{
|
|
||||||
sEducationLevel = sEducationLevel + "," + eAcademic.EducationLevel?.Description;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dr["Qualification"] = sEducationLevel;
|
|
||||||
dr["VotterID"] = oDRow["NationalID"];
|
|
||||||
dr["TempVill"] = oDRow["TempVillage"];
|
|
||||||
dr["TempPS"] = oDRow["TempThana"];
|
|
||||||
dr["TempDist"] = oDRow["TempDist"];
|
|
||||||
dr["PerVill"] = oDRow["PerVillage"];
|
|
||||||
dr["PerPS"] = oDRow["PerThana"];
|
|
||||||
dr["PerDist"] = oDRow["PerDist"];
|
|
||||||
|
|
||||||
dr["BloodGroup"] = ((EnumBloodGroup)Convert.ToInt32(oDRow["BLOODGROUP"])).BloodGroupToFriendlyName();
|
|
||||||
|
|
||||||
dTEmpDetail.Rows.Add(dr);
|
|
||||||
}
|
|
||||||
DataSet dSet = new DataSet();
|
|
||||||
dTEmpDetail.TableName = "PayrollDataSet_EmployeeDetail";
|
|
||||||
dSet.Tables.Add(dTEmpDetail);
|
|
||||||
|
|
||||||
//bool isOPISeparateAcountApplicable = ConfigurationManager.GetBoolValue("opi", "opiexist", EnumConfigurationType.Logic_Old);
|
|
||||||
bool isOPISeparateAcountApplicable = true;
|
|
||||||
List<ReportParameter> reportParameters = null;
|
|
||||||
|
|
||||||
if (isOPISeparateAcountApplicable)
|
|
||||||
{
|
|
||||||
//form.CommonReportView(_selectedParameter.ReportItem, dSet, "HRM.Report.RDLC.EmployeeDetailWithOPI.rdlc", null);
|
|
||||||
//return reportProcessor.AttendanceReportsView(null, dSet, null, "HRM.Report.RDLC.EmployeeDetailWithOPI.rdlc", _reportParameters, true, payrollTypeID, reportType);
|
|
||||||
return reportProcessor.CommonReportView(null, "HRM.Report.RDLC.EmployeeDetailWithOPIEcho.rdlc", dSet, null, reportParameters, true, payrollTypeID, reportType);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//form.CommonReportView(_selectedParameter.ReportItem, dSet, "HRM.Report.RDLC.EmployeeDetail.rdlc", null);
|
|
||||||
//return reportProcessor.AttendanceReportsView(null, dSet, null, "HRM.Report.RDLC.EmployeeDetail.rdlc",, _reportParameters, true, payrollTypeID, reportType);
|
|
||||||
return reportProcessor.CommonReportView(null, "HRM.Report.RDLC.EmployeeDetailEcho.rdlc", dSet, null, reportParameters, true, payrollTypeID, reportType);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
throw new Exception(ex.Message, ex);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
#endregion
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -109,9 +109,7 @@
|
||||||
<None Remove="RDLC\EmployeeCV.rdlc" />
|
<None Remove="RDLC\EmployeeCV.rdlc" />
|
||||||
<None Remove="RDLC\EmployeeCVNew.rdlc" />
|
<None Remove="RDLC\EmployeeCVNew.rdlc" />
|
||||||
<None Remove="RDLC\EmployeeDetail.rdlc" />
|
<None Remove="RDLC\EmployeeDetail.rdlc" />
|
||||||
<None Remove="RDLC\EmployeeDetailEcho.rdlc" />
|
|
||||||
<None Remove="RDLC\EmployeeDetailWithOPI.rdlc" />
|
<None Remove="RDLC\EmployeeDetailWithOPI.rdlc" />
|
||||||
<None Remove="RDLC\EmployeeDetailWithOPIEcho.rdlc" />
|
|
||||||
<None Remove="RDLC\EmployeeInfo.rdlc" />
|
<None Remove="RDLC\EmployeeInfo.rdlc" />
|
||||||
<None Remove="RDLC\EmployeeInfoBasic.rdlc" />
|
<None Remove="RDLC\EmployeeInfoBasic.rdlc" />
|
||||||
<None Remove="RDLC\EmployeeInfoBasicForExcel.rdlc" />
|
<None Remove="RDLC\EmployeeInfoBasicForExcel.rdlc" />
|
||||||
|
|
@ -375,8 +373,6 @@
|
||||||
<EmbeddedResource Include="RDLC\BankAdviceSGS.rdlc" />
|
<EmbeddedResource Include="RDLC\BankAdviceSGS.rdlc" />
|
||||||
<EmbeddedResource Include="RDLC\CardInfo.rdlc" />
|
<EmbeddedResource Include="RDLC\CardInfo.rdlc" />
|
||||||
<EmbeddedResource Include="RDLC\CCWiseBonusSummary.rdlc" />
|
<EmbeddedResource Include="RDLC\CCWiseBonusSummary.rdlc" />
|
||||||
<EmbeddedResource Include="RDLC\EmployeeDetailEcho.rdlc" />
|
|
||||||
<EmbeddedResource Include="RDLC\EmployeeDetailWithOPIEcho.rdlc" />
|
|
||||||
<EmbeddedResource Include="RDLC\EmployeeInfoBasicForExcel.rdlc" />
|
<EmbeddedResource Include="RDLC\EmployeeInfoBasicForExcel.rdlc" />
|
||||||
<EmbeddedResource Include="RDLC\EmployeeInfoBasic.rdlc" />
|
<EmbeddedResource Include="RDLC\EmployeeInfoBasic.rdlc" />
|
||||||
<EmbeddedResource Include="RDLC\LeaveLedgerNmgtDetails.rdlc" />
|
<EmbeddedResource Include="RDLC\LeaveLedgerNmgtDetails.rdlc" />
|
||||||
|
|
|
||||||
2755
HRM.Report/PayrollDataSet/PMPDataSet.Designer.cs
generated
2755
HRM.Report/PayrollDataSet/PMPDataSet.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
2468
HRM.Report/PayrollDataSet/PayrollDataSet.Designer.cs
generated
2468
HRM.Report/PayrollDataSet/PayrollDataSet.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
|
|
@ -574,7 +574,7 @@
|
||||||
<xs:element name="EmoNo" msprop:Generator_ColumnPropNameInTable="EmoNoColumn" msprop:Generator_ColumnPropNameInRow="EmoNo" msprop:Generator_UserColumnName="EmoNo" msprop:Generator_ColumnVarNameInTable="columnEmoNo" type="xs:string" minOccurs="0" />
|
<xs:element name="EmoNo" msprop:Generator_ColumnPropNameInTable="EmoNoColumn" msprop:Generator_ColumnPropNameInRow="EmoNo" msprop:Generator_UserColumnName="EmoNo" msprop:Generator_ColumnVarNameInTable="columnEmoNo" type="xs:string" minOccurs="0" />
|
||||||
<xs:element name="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_UserColumnName="Name" msprop:Generator_ColumnVarNameInTable="columnName" type="xs:string" minOccurs="0" />
|
<xs:element name="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_UserColumnName="Name" msprop:Generator_ColumnVarNameInTable="columnName" type="xs:string" minOccurs="0" />
|
||||||
<xs:element name="OTDescription" msprop:Generator_ColumnPropNameInTable="OTDescriptionColumn" msprop:Generator_ColumnPropNameInRow="OTDescription" msprop:Generator_UserColumnName="OTDescription" msprop:Generator_ColumnVarNameInTable="columnOTDescription" type="xs:string" minOccurs="0" />
|
<xs:element name="OTDescription" msprop:Generator_ColumnPropNameInTable="OTDescriptionColumn" msprop:Generator_ColumnPropNameInRow="OTDescription" msprop:Generator_UserColumnName="OTDescription" msprop:Generator_ColumnVarNameInTable="columnOTDescription" type="xs:string" minOccurs="0" />
|
||||||
<xs:element name="OTRate" msprop:Generator_ColumnPropNameInTable="OTRateColumn" msprop:Generator_ColumnPropNameInRow="OTRate" msprop:Generator_UserColumnName="OTRate" msprop:Generator_ColumnVarNameInTable="columnOTRate" type="xs:double" minOccurs="0" />
|
<xs:element name="OTRate" msprop:Generator_ColumnPropNameInTable="OTRateColumn" msprop:Generator_ColumnPropNameInRow="OTRate" msprop:Generator_UserColumnName="OTRate" msprop:Generator_ColumnVarNameInTable="columnOTRate" type="xs:string" minOccurs="0" />
|
||||||
<xs:element name="OTAmount" msprop:Generator_ColumnPropNameInTable="OTAmountColumn" msprop:Generator_ColumnPropNameInRow="OTAmount" msprop:Generator_UserColumnName="OTAmount" msprop:Generator_ColumnVarNameInTable="columnOTAmount" type="xs:double" minOccurs="0" />
|
<xs:element name="OTAmount" msprop:Generator_ColumnPropNameInTable="OTAmountColumn" msprop:Generator_ColumnPropNameInRow="OTAmount" msprop:Generator_UserColumnName="OTAmount" msprop:Generator_ColumnVarNameInTable="columnOTAmount" type="xs:double" minOccurs="0" />
|
||||||
<xs:element name="OTMonth" msprop:Generator_ColumnPropNameInTable="OTMonthColumn" msprop:Generator_ColumnPropNameInRow="OTMonth" msprop:Generator_UserColumnName="OTMonth" msprop:Generator_ColumnVarNameInTable="columnOTMonth" type="xs:dateTime" minOccurs="0" />
|
<xs:element name="OTMonth" msprop:Generator_ColumnPropNameInTable="OTMonthColumn" msprop:Generator_ColumnPropNameInRow="OTMonth" msprop:Generator_UserColumnName="OTMonth" msprop:Generator_ColumnVarNameInTable="columnOTMonth" type="xs:dateTime" minOccurs="0" />
|
||||||
<xs:element name="SLNo" msprop:Generator_ColumnPropNameInTable="SLNoColumn" msprop:Generator_ColumnPropNameInRow="SLNo" msprop:Generator_UserColumnName="SLNo" msprop:Generator_ColumnVarNameInTable="columnSLNo" type="xs:string" minOccurs="0" />
|
<xs:element name="SLNo" msprop:Generator_ColumnPropNameInTable="SLNoColumn" msprop:Generator_ColumnPropNameInRow="SLNo" msprop:Generator_UserColumnName="SLNo" msprop:Generator_ColumnVarNameInTable="columnSLNo" type="xs:string" minOccurs="0" />
|
||||||
|
|
@ -3330,62 +3330,6 @@
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
<xs:element name="EmployeeDetailEcho" msprop:Generator_RowEvHandlerName="EmployeeDetailEchoRowChangeEventHandler" msprop:Generator_RowDeletedName="EmployeeDetailEchoRowDeleted" msprop:Generator_RowDeletingName="EmployeeDetailEchoRowDeleting" msprop:Generator_RowEvArgName="EmployeeDetailEchoRowChangeEvent" msprop:Generator_TablePropName="EmployeeDetailEcho" msprop:Generator_RowChangedName="EmployeeDetailEchoRowChanged" msprop:Generator_RowChangingName="EmployeeDetailEchoRowChanging" msprop:Generator_TableClassName="EmployeeDetailEchoDataTable" msprop:Generator_RowClassName="EmployeeDetailEchoRow" msprop:Generator_TableVarName="tableEmployeeDetailEcho" msprop:Generator_UserTableName="EmployeeDetailEcho">
|
|
||||||
<xs:complexType>
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:element name="EmpNo" msprop:Generator_ColumnPropNameInRow="EmpNo" msprop:Generator_ColumnPropNameInTable="EmpNoColumn" msprop:Generator_ColumnVarNameInTable="columnEmpNo" msprop:Generator_UserColumnName="EmpNo" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Name" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnVarNameInTable="columnName" msprop:Generator_UserColumnName="Name" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Designation" msprop:Generator_ColumnPropNameInRow="Designation" msprop:Generator_ColumnPropNameInTable="DesignationColumn" msprop:Generator_ColumnVarNameInTable="columnDesignation" msprop:Generator_UserColumnName="Designation" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Department" msprop:Generator_ColumnPropNameInRow="Department" msprop:Generator_ColumnPropNameInTable="DepartmentColumn" msprop:Generator_ColumnVarNameInTable="columnDepartment" msprop:Generator_UserColumnName="Department" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Grade" msprop:Generator_ColumnPropNameInRow="Grade" msprop:Generator_ColumnPropNameInTable="GradeColumn" msprop:Generator_ColumnVarNameInTable="columnGrade" msprop:Generator_UserColumnName="Grade" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="BasicSalary" msprop:Generator_ColumnPropNameInRow="BasicSalary" msprop:Generator_ColumnPropNameInTable="BasicSalaryColumn" msprop:Generator_ColumnVarNameInTable="columnBasicSalary" msprop:Generator_UserColumnName="BasicSalary" type="xs:double" minOccurs="0" />
|
|
||||||
<xs:element name="DOB" msprop:Generator_ColumnPropNameInRow="DOB" msprop:Generator_ColumnPropNameInTable="DOBColumn" msprop:Generator_ColumnVarNameInTable="columnDOB" msprop:Generator_UserColumnName="DOB" type="xs:dateTime" minOccurs="0" />
|
|
||||||
<xs:element name="Gender" msprop:Generator_ColumnPropNameInRow="Gender" msprop:Generator_ColumnPropNameInTable="GenderColumn" msprop:Generator_ColumnVarNameInTable="columnGender" msprop:Generator_UserColumnName="Gender" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Religion" msprop:Generator_ColumnPropNameInRow="Religion" msprop:Generator_ColumnPropNameInTable="ReligionColumn" msprop:Generator_ColumnVarNameInTable="columnReligion" msprop:Generator_UserColumnName="Religion" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Bank" msprop:Generator_ColumnPropNameInRow="Bank" msprop:Generator_ColumnPropNameInTable="BankColumn" msprop:Generator_ColumnVarNameInTable="columnBank" msprop:Generator_UserColumnName="Bank" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Branch" msprop:Generator_ColumnPropNameInRow="Branch" msprop:Generator_ColumnPropNameInTable="BranchColumn" msprop:Generator_ColumnVarNameInTable="columnBranch" msprop:Generator_UserColumnName="Branch" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="AccountNo" msprop:Generator_ColumnPropNameInRow="AccountNo" msprop:Generator_ColumnPropNameInTable="AccountNoColumn" msprop:Generator_ColumnVarNameInTable="columnAccountNo" msprop:Generator_UserColumnName="AccountNo" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="DOJ" msprop:Generator_ColumnPropNameInRow="DOJ" msprop:Generator_ColumnPropNameInTable="DOJColumn" msprop:Generator_ColumnVarNameInTable="columnDOJ" msprop:Generator_UserColumnName="DOJ" type="xs:dateTime" minOccurs="0" />
|
|
||||||
<xs:element name="ConfirmDate" msprop:Generator_ColumnPropNameInRow="ConfirmDate" msprop:Generator_ColumnPropNameInTable="ConfirmDateColumn" msprop:Generator_ColumnVarNameInTable="columnConfirmDate" msprop:Generator_UserColumnName="ConfirmDate" type="xs:dateTime" minOccurs="0" />
|
|
||||||
<xs:element name="TaxAmount" msprop:Generator_ColumnPropNameInRow="TaxAmount" msprop:Generator_ColumnPropNameInTable="TaxAmountColumn" msprop:Generator_ColumnVarNameInTable="columnTaxAmount" msprop:Generator_UserColumnName="TaxAmount" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="MarStatus" msprop:Generator_ColumnPropNameInRow="MarStatus" msprop:Generator_ColumnPropNameInTable="MarStatusColumn" msprop:Generator_ColumnVarNameInTable="columnMarStatus" msprop:Generator_UserColumnName="MarStatus" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="MobileNo" msprop:Generator_ColumnPropNameInRow="MobileNo" msprop:Generator_ColumnPropNameInTable="MobileNoColumn" msprop:Generator_ColumnVarNameInTable="columnMobileNo" msprop:Generator_UserColumnName="MobileNo" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="MailAdd" msprop:Generator_ColumnPropNameInRow="MailAdd" msprop:Generator_ColumnPropNameInTable="MailAddColumn" msprop:Generator_ColumnVarNameInTable="columnMailAdd" msprop:Generator_UserColumnName="MailAdd" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="LocDes" msprop:Generator_ColumnPropNameInRow="LocDes" msprop:Generator_ColumnPropNameInTable="LocDesColumn" msprop:Generator_ColumnVarNameInTable="columnLocDes" msprop:Generator_UserColumnName="LocDes" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="GrossSalary" msprop:Generator_ColumnPropNameInRow="GrossSalary" msprop:Generator_ColumnPropNameInTable="GrossSalaryColumn" msprop:Generator_ColumnVarNameInTable="columnGrossSalary" msprop:Generator_UserColumnName="GrossSalary" type="xs:double" minOccurs="0" />
|
|
||||||
<xs:element name="VendorCode" msprop:Generator_ColumnPropNameInRow="VendorCode" msprop:Generator_ColumnPropNameInTable="VendorCodeColumn" msprop:Generator_ColumnVarNameInTable="columnVendorCode" msprop:Generator_UserColumnName="VendorCode" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="BankOPI" msprop:Generator_ColumnPropNameInRow="BankOPI" msprop:Generator_ColumnPropNameInTable="BankOPIColumn" msprop:Generator_ColumnVarNameInTable="columnBankOPI" msprop:Generator_UserColumnName="BankOPI" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="BranchOPI" msprop:Generator_ColumnPropNameInRow="BranchOPI" msprop:Generator_ColumnPropNameInTable="BranchOPIColumn" msprop:Generator_ColumnVarNameInTable="columnBranchOPI" msprop:Generator_UserColumnName="BranchOPI" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="AccountNoOPI" msprop:Generator_ColumnPropNameInRow="AccountNoOPI" msprop:Generator_ColumnPropNameInTable="AccountNoOPIColumn" msprop:Generator_ColumnVarNameInTable="columnAccountNoOPI" msprop:Generator_UserColumnName="AccountNoOPI" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Floor" msprop:Generator_ColumnPropNameInRow="Floor" msprop:Generator_ColumnPropNameInTable="FloorColumn" msprop:Generator_ColumnVarNameInTable="columnFloor" msprop:Generator_UserColumnName="Floor" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Section" msprop:Generator_ColumnPropNameInRow="Section" msprop:Generator_ColumnPropNameInTable="SectionColumn" msprop:Generator_ColumnVarNameInTable="columnSection" msprop:Generator_UserColumnName="Section" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Line" msprop:Generator_ColumnPropNameInRow="Line" msprop:Generator_ColumnPropNameInTable="LineColumn" msprop:Generator_ColumnVarNameInTable="columnLine" msprop:Generator_UserColumnName="Line" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="RFID" msprop:Generator_ColumnPropNameInRow="RFID" msprop:Generator_ColumnPropNameInTable="RFIDColumn" msprop:Generator_ColumnVarNameInTable="columnRFID" msprop:Generator_UserColumnName="RFID" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="BloodGroup" msprop:Generator_ColumnPropNameInRow="BloodGroup" msprop:Generator_ColumnPropNameInTable="BloodGroupColumn" msprop:Generator_ColumnVarNameInTable="columnBloodGroup" msprop:Generator_UserColumnName="BloodGroup" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Qualification" msprop:Generator_ColumnPropNameInRow="Qualification" msprop:Generator_ColumnPropNameInTable="QualificationColumn" msprop:Generator_ColumnVarNameInTable="columnQualification" msprop:Generator_UserColumnName="Qualification" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="VotterID" msprop:Generator_ColumnPropNameInRow="VotterID" msprop:Generator_ColumnPropNameInTable="VotterIDColumn" msprop:Generator_ColumnVarNameInTable="columnVotterID" msprop:Generator_UserColumnName="VotterID" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Nationality" msprop:Generator_ColumnPropNameInRow="Nationality" msprop:Generator_ColumnPropNameInTable="NationalityColumn" msprop:Generator_ColumnVarNameInTable="columnNationality" msprop:Generator_UserColumnName="Nationality" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="FathersName" msprop:Generator_ColumnPropNameInRow="FathersName" msprop:Generator_ColumnPropNameInTable="FathersNameColumn" msprop:Generator_ColumnVarNameInTable="columnFathersName" msprop:Generator_UserColumnName="FathersName" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="MothersName" msprop:Generator_ColumnPropNameInRow="MothersName" msprop:Generator_ColumnPropNameInTable="MothersNameColumn" msprop:Generator_ColumnVarNameInTable="columnMothersName" msprop:Generator_UserColumnName="MothersName" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Spouse" msprop:Generator_ColumnPropNameInRow="Spouse" msprop:Generator_ColumnPropNameInTable="SpouseColumn" msprop:Generator_ColumnVarNameInTable="columnSpouse" msprop:Generator_UserColumnName="Spouse" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="TempVill" msprop:Generator_ColumnPropNameInRow="TempVill" msprop:Generator_ColumnPropNameInTable="TempVillColumn" msprop:Generator_ColumnVarNameInTable="columnTempVill" msprop:Generator_UserColumnName="TempVill" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="TempPost" msprop:Generator_ColumnPropNameInRow="TempPost" msprop:Generator_ColumnPropNameInTable="TempPostColumn" msprop:Generator_ColumnVarNameInTable="columnTempPost" msprop:Generator_UserColumnName="TempPost" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="TempPS" msprop:Generator_ColumnPropNameInRow="TempPS" msprop:Generator_ColumnPropNameInTable="TempPSColumn" msprop:Generator_ColumnVarNameInTable="columnTempPS" msprop:Generator_UserColumnName="TempPS" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="TempDist" msprop:Generator_ColumnPropNameInRow="TempDist" msprop:Generator_ColumnPropNameInTable="TempDistColumn" msprop:Generator_ColumnVarNameInTable="columnTempDist" msprop:Generator_UserColumnName="TempDist" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="PerVill" msprop:Generator_ColumnPropNameInRow="PerVill" msprop:Generator_ColumnPropNameInTable="PerVillColumn" msprop:Generator_ColumnVarNameInTable="columnPerVill" msprop:Generator_UserColumnName="PerVill" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="PerPost" msprop:Generator_ColumnPropNameInRow="PerPost" msprop:Generator_ColumnPropNameInTable="PerPostColumn" msprop:Generator_ColumnVarNameInTable="columnPerPost" msprop:Generator_UserColumnName="PerPost" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="PerPS" msprop:Generator_ColumnPropNameInRow="PerPS" msprop:Generator_ColumnPropNameInTable="PerPSColumn" msprop:Generator_ColumnVarNameInTable="columnPerPS" msprop:Generator_UserColumnName="PerPS" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="PerDist" msprop:Generator_ColumnPropNameInRow="PerDist" msprop:Generator_ColumnPropNameInTable="PerDistColumn" msprop:Generator_ColumnVarNameInTable="columnPerDist" msprop:Generator_UserColumnName="PerDist" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="Category" msprop:Generator_ColumnPropNameInRow="Category" msprop:Generator_ColumnPropNameInTable="CategoryColumn" msprop:Generator_ColumnVarNameInTable="columnCategory" msprop:Generator_UserColumnName="Category" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="BanglaName" msprop:Generator_ColumnPropNameInRow="BanglaName" msprop:Generator_ColumnPropNameInTable="BanglaNameColumn" msprop:Generator_ColumnVarNameInTable="columnBanglaName" msprop:Generator_UserColumnName="BanglaName" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="BanglaDesignation" msprop:Generator_ColumnPropNameInRow="BanglaDesignation" msprop:Generator_ColumnPropNameInTable="BanglaDesignationColumn" msprop:Generator_ColumnVarNameInTable="columnBanglaDesignation" msprop:Generator_UserColumnName="BanglaDesignation" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="DepartmentBangla" msprop:Generator_ColumnPropNameInRow="DepartmentBangla" msprop:Generator_ColumnPropNameInTable="DepartmentBanglaColumn" msprop:Generator_ColumnVarNameInTable="columnDepartmentBangla" msprop:Generator_UserColumnName="DepartmentBangla" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="SectionBangla" msprop:Generator_ColumnPropNameInRow="SectionBangla" msprop:Generator_ColumnPropNameInTable="SectionBanglaColumn" msprop:Generator_ColumnVarNameInTable="columnSectionBangla" msprop:Generator_UserColumnName="SectionBangla" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="LANDPHONE" msprop:Generator_ColumnPropNameInRow="LANDPHONE" msprop:Generator_ColumnPropNameInTable="LANDPHONEColumn" msprop:Generator_ColumnVarNameInTable="columnLANDPHONE" msprop:Generator_UserColumnName="LANDPHONE" type="xs:string" minOccurs="0" />
|
|
||||||
<xs:element name="OFFICEMOBILE" msprop:Generator_ColumnPropNameInRow="OFFICEMOBILE" msprop:Generator_ColumnPropNameInTable="OFFICEMOBILEColumn" msprop:Generator_ColumnVarNameInTable="columnOFFICEMOBILE" msprop:Generator_UserColumnName="OFFICEMOBILE" type="xs:string" minOccurs="0" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element>
|
|
||||||
</xs:choice>
|
</xs:choice>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
|
|
|
||||||
|
|
@ -4,191 +4,190 @@
|
||||||
Changes to this file may cause incorrect behavior and will be lost if
|
Changes to this file may cause incorrect behavior and will be lost if
|
||||||
the code is regenerated.
|
the code is regenerated.
|
||||||
</autogenerated>-->
|
</autogenerated>-->
|
||||||
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-76" ViewPortY="1153" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-76" ViewPortY="-38" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||||
<Shapes>
|
<Shapes>
|
||||||
<Shape ID="DesignTable:Payslip" ZOrder="86" X="917" Y="260" Height="257" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:Payslip" ZOrder="85" X="917" Y="260" Height="257" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmployeeInfo" ZOrder="4" X="-66" Y="301" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
|
<Shape ID="DesignTable:EmployeeInfo" ZOrder="3" X="-66" Y="301" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
|
||||||
<Shape ID="DesignTable:EmployeePersonalInfo" ZOrder="34" X="0" Y="72" Height="239" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
|
<Shape ID="DesignTable:EmployeePersonalInfo" ZOrder="33" X="0" Y="72" Height="239" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
|
||||||
<Shape ID="DesignTable:EmployeeEducation" ZOrder="33" X="0" Y="72" Height="125" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
|
<Shape ID="DesignTable:EmployeeEducation" ZOrder="32" X="0" Y="72" Height="125" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
|
||||||
<Shape ID="DesignTable:EmployeeChildren" ZOrder="32" X="0" Y="72" Height="201" Width="171" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
|
<Shape ID="DesignTable:EmployeeChildren" ZOrder="31" X="0" Y="72" Height="201" Width="171" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
|
||||||
<Shape ID="DesignTable:EmployeeHobby" ZOrder="31" X="0" Y="72" Height="68" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
|
<Shape ID="DesignTable:EmployeeHobby" ZOrder="30" X="0" Y="72" Height="68" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
|
||||||
<Shape ID="DesignTable:EmployeeExperience" ZOrder="30" X="0" Y="72" Height="163" Width="185" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
|
<Shape ID="DesignTable:EmployeeExperience" ZOrder="29" X="0" Y="72" Height="163" Width="185" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
|
||||||
<Shape ID="DesignTable:EmployeeTraining" ZOrder="29" X="0" Y="72" Height="144" Width="171" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
<Shape ID="DesignTable:EmployeeTraining" ZOrder="28" X="0" Y="72" Height="144" Width="171" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
||||||
<Shape ID="DesignTable:EmployeeReferenceInside" ZOrder="28" X="0" Y="72" Height="163" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
|
<Shape ID="DesignTable:EmployeeReferenceInside" ZOrder="27" X="0" Y="72" Height="163" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
|
||||||
<Shape ID="DesignTable:EmployeeNominee" ZOrder="18" X="-1" Y="72" Height="28" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="159" SplitterPosition="24" />
|
<Shape ID="DesignTable:EmployeeNominee" ZOrder="17" X="-1" Y="72" Height="28" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="159" SplitterPosition="24" />
|
||||||
<Shape ID="DesignTable:EmployeeReferenceOutside" ZOrder="25" X="43" Y="181" Height="144" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
<Shape ID="DesignTable:EmployeeReferenceOutside" ZOrder="24" X="43" Y="181" Height="144" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
||||||
<Shape ID="DesignTable:IncomeTax" ZOrder="170" X="616" Y="409" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:IncomeTax" ZOrder="169" X="616" Y="409" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:IncomeTaxSlab" ZOrder="183" X="612" Y="318" Height="143" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="160" SplitterPosition="139" />
|
<Shape ID="DesignTable:IncomeTaxSlab" ZOrder="182" X="612" Y="318" Height="143" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="160" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:IncomeTaxOther" ZOrder="176" X="615" Y="380" Height="124" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="120" />
|
<Shape ID="DesignTable:IncomeTaxOther" ZOrder="175" X="615" Y="380" Height="124" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:BankAdvice" ZOrder="150" X="1214" Y="421" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
|
<Shape ID="DesignTable:BankAdvice" ZOrder="149" X="1214" Y="421" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
|
||||||
<Shape ID="DesignTable:SalarySheet" ZOrder="91" X="1740" Y="101" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="313" SplitterPosition="253" />
|
<Shape ID="DesignTable:SalarySheet" ZOrder="90" X="1740" Y="101" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="313" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:SettlementAdvice" ZOrder="26" X="47" Y="115" Height="257" Width="168" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
|
<Shape ID="DesignTable:SettlementAdvice" ZOrder="25" X="47" Y="115" Height="257" Width="168" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:SalaryReconsilation" ZOrder="92" X="1744" Y="199" Height="257" Width="179" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:SalaryReconsilation" ZOrder="91" X="1744" Y="199" Height="257" Width="179" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:CCWSalaryDetail" ZOrder="89" X="285" Y="303" Height="162" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="158" />
|
<Shape ID="DesignTable:CCWSalaryDetail" ZOrder="88" X="285" Y="303" Height="162" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="158" />
|
||||||
<Shape ID="DesignTable:CCWSaSummary" ZOrder="47" X="286" Y="242" Height="124" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="120" />
|
<Shape ID="DesignTable:CCWSaSummary" ZOrder="46" X="286" Y="242" Height="124" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:CashDisbursement" ZOrder="48" X="286" Y="213" Height="124" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
|
<Shape ID="DesignTable:CashDisbursement" ZOrder="47" X="286" Y="213" Height="124" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:PostingDetails" ZOrder="175" X="911" Y="107" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:PostingDetails" ZOrder="174" X="911" Y="107" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmployeeDetail" ZOrder="27" X="594" Y="62" Height="239" Width="156" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="235" />
|
<Shape ID="DesignTable:EmployeeDetail" ZOrder="26" X="594" Y="62" Height="239" Width="156" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="235" />
|
||||||
<Shape ID="DesignTable:EmployeeHistory" ZOrder="84" X="-66" Y="402" Height="257" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:EmployeeHistory" ZOrder="83" X="-66" Y="402" Height="257" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmpCostAllocation" ZOrder="64" X="-67" Y="534" Height="105" Width="176" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
<Shape ID="DesignTable:EmpCostAllocation" ZOrder="63" X="-67" Y="534" Height="105" Width="176" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:UpcomEmployee" ZOrder="38" X="312" Y="965" Height="105" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
<Shape ID="DesignTable:UpcomEmployee" ZOrder="37" X="312" Y="965" Height="105" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:OTMonthlySheet" ZOrder="5" X="361" Y="66" Height="200" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="196" />
|
<Shape ID="DesignTable:OTMonthlySheet" ZOrder="4" X="361" Y="66" Height="200" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="196" />
|
||||||
<Shape ID="DesignTable:BonusBankAdvice" ZOrder="174" X="1212" Y="333" Height="162" Width="169" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
|
<Shape ID="DesignTable:BonusBankAdvice" ZOrder="173" X="1212" Y="333" Height="162" Width="169" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
|
||||||
<Shape ID="DesignTable:BonusRegister" ZOrder="110" X="1212" Y="361" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="272" SplitterPosition="253" />
|
<Shape ID="DesignTable:BonusRegister" ZOrder="109" X="1212" Y="361" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="272" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:AnnualIncomeTax" ZOrder="173" X="624" Y="607" Height="143" Width="170" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
|
<Shape ID="DesignTable:AnnualIncomeTax" ZOrder="172" X="624" Y="607" Height="143" Width="170" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:LaonPaymentDue" ZOrder="40" X="308" Y="803" Height="257" Width="168" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:LaonPaymentDue" ZOrder="39" X="308" Y="803" Height="257" Width="168" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:LoanIssue" ZOrder="41" X="308" Y="771" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="227" SplitterPosition="253" />
|
<Shape ID="DesignTable:LoanIssue" ZOrder="40" X="308" Y="771" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="227" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:OTHourlySheet" ZOrder="53" X="361" Y="-28" Height="143" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
|
<Shape ID="DesignTable:OTHourlySheet" ZOrder="52" X="361" Y="-28" Height="143" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:BasicReport" ZOrder="36" X="1205" Y="322" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="63" SplitterPosition="102" />
|
<Shape ID="DesignTable:BasicReport" ZOrder="35" X="1205" Y="322" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="63" SplitterPosition="102" />
|
||||||
<Shape ID="DesignTable:ExtendedSalarySheet" ZOrder="70" X="-65" Y="236" Height="257" Width="188" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:ExtendedSalarySheet" ZOrder="69" X="-65" Y="236" Height="257" Width="188" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:OTMonthRange" ZOrder="50" X="361" Y="127" Height="143" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
|
<Shape ID="DesignTable:OTMonthRange" ZOrder="49" X="361" Y="127" Height="143" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:BranchWiseOT" ZOrder="114" X="1217" Y="541" Height="105" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
<Shape ID="DesignTable:BranchWiseOT" ZOrder="113" X="1217" Y="541" Height="105" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:DivisionWiseOT" ZOrder="180" X="1471" Y="161" Height="124" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
|
<Shape ID="DesignTable:DivisionWiseOT" ZOrder="179" X="1471" Y="161" Height="124" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:OverAllSummary" ZOrder="51" X="360" Y="34" Height="257" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:OverAllSummary" ZOrder="50" X="360" Y="34" Height="257" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmpGradeBasic" ZOrder="77" X="-67" Y="72" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:EmpGradeBasic" ZOrder="76" X="-67" Y="72" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmpAllowDeduct" ZOrder="78" X="-68" Y="39" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:EmpAllowDeduct" ZOrder="77" X="-68" Y="39" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmpBankHistory" ZOrder="68" X="-66" Y="333" Height="257" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:EmpBankHistory" ZOrder="67" X="-66" Y="333" Height="257" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmpConfirmHis" ZOrder="71" X="-66" Y="202" Height="257" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:EmpConfirmHis" ZOrder="70" X="-66" Y="202" Height="257" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmpPFHis" ZOrder="169" X="-68" Y="1192" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
|
<Shape ID="DesignTable:EmpPFHis" ZOrder="168" X="-68" Y="1192" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
|
||||||
<Shape ID="DesignTable:JVReport" ZOrder="128" X="294" Y="536" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:JVReport" ZOrder="127" X="294" Y="536" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:UpCommingEmp" ZOrder="37" X="313" Y="997" Height="181" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
|
<Shape ID="DesignTable:UpCommingEmp" ZOrder="36" X="313" Y="997" Height="181" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
|
||||||
<Shape ID="DesignTable:PRBProcessDetail" ZOrder="168" X="914" Y="199" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="194" SplitterPosition="234" />
|
<Shape ID="DesignTable:PRBProcessDetail" ZOrder="167" X="914" Y="199" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="194" SplitterPosition="234" />
|
||||||
<Shape ID="DesignTable:Report108" ZOrder="90" X="949" Y="711" Height="257" Width="256" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="687" SplitterPosition="253" />
|
<Shape ID="DesignTable:Report108" ZOrder="89" X="949" Y="711" Height="257" Width="256" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="687" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:CCWReport" ZOrder="45" X="286" Y="335" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
|
<Shape ID="DesignTable:CCWReport" ZOrder="44" X="286" Y="335" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
|
||||||
<Shape ID="DesignTable:CCDetailReport" ZOrder="46" X="286" Y="271" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:CCDetailReport" ZOrder="45" X="286" Y="271" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:JVSalaryDetail" ZOrder="42" X="295" Y="567" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
|
<Shape ID="DesignTable:JVSalaryDetail" ZOrder="41" X="295" Y="567" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:JVLoactionWReport" ZOrder="167" X="296" Y="598" Height="162" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
|
<Shape ID="DesignTable:JVLoactionWReport" ZOrder="166" X="296" Y="598" Height="162" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
|
||||||
<Shape ID="DesignTable:JVSummaryReport" ZOrder="179" X="297" Y="629" Height="124" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
|
<Shape ID="DesignTable:JVSummaryReport" ZOrder="178" X="297" Y="629" Height="124" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:OPIRegister" ZOrder="81" X="361" Y="96" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:OPIRegister" ZOrder="80" X="361" Y="96" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:AccountReportForSAP" ZOrder="126" X="622" Y="577" Height="162" Width="195" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
|
<Shape ID="DesignTable:AccountReportForSAP" ZOrder="125" X="622" Y="577" Height="162" Width="195" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
|
||||||
<Shape ID="DesignTable:LoanReportForSAP" ZOrder="39" X="311" Y="867" Height="257" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:LoanReportForSAP" ZOrder="38" X="311" Y="867" Height="257" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:ReportForSAP" ZOrder="127" X="948" Y="680" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:ReportForSAP" ZOrder="126" X="948" Y="680" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:BankAdviceOfPRB" ZOrder="113" X="1215" Y="482" Height="162" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
|
<Shape ID="DesignTable:BankAdviceOfPRB" ZOrder="112" X="1215" Y="482" Height="162" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
|
||||||
<Shape ID="DesignTable:OPITotalValueRegister" ZOrder="52" X="360" Y="3" Height="143" Width="196" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
|
<Shape ID="DesignTable:OPITotalValueRegister" ZOrder="51" X="360" Y="3" Height="143" Width="196" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:WartsilaSalarySheetSummary" ZOrder="172" X="649" Y="769" Height="257" Width="237" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:WartsilaSalarySheetSummary" ZOrder="171" X="649" Y="769" Height="257" Width="237" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:WartsilaSalarySheet" ZOrder="129" X="650" Y="830" Height="257" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:WartsilaSalarySheet" ZOrder="128" X="650" Y="830" Height="257" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmployeeJoining" ZOrder="75" X="-67" Y="139" Height="238" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
|
<Shape ID="DesignTable:EmployeeJoining" ZOrder="74" X="-67" Y="139" Height="238" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
|
||||||
<Shape ID="DesignTable:WartsilaPaySlip" ZOrder="116" X="645" Y="935" Height="257" Width="199" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:WartsilaPaySlip" ZOrder="115" X="645" Y="935" Height="257" Width="199" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:WartsilaReconciliation" ZOrder="131" X="649" Y="799" Height="257" Width="196" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:WartsilaReconciliation" ZOrder="130" X="649" Y="799" Height="257" Width="196" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmpJoining4Novartis" ZOrder="76" X="-67" Y="105" Height="257" Width="190" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:EmpJoining4Novartis" ZOrder="75" X="-67" Y="105" Height="257" Width="190" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:WartSilaRSummary" ZOrder="171" X="648" Y="738" Height="257" Width="178" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:WartSilaRSummary" ZOrder="170" X="648" Y="738" Height="257" Width="178" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmpLifeCycle" ZOrder="63" X="-65" Y="596" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:EmpLifeCycle" ZOrder="62" X="-65" Y="596" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:IndividualLoanReport" ZOrder="7" X="613" Y="350" Height="257" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:IndividualLoanReport" ZOrder="6" X="613" Y="350" Height="257" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:BankAdviceLetter" ZOrder="111" X="1217" Y="513" Height="181" Width="168" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
|
<Shape ID="DesignTable:BankAdviceLetter" ZOrder="110" X="1217" Y="513" Height="181" Width="168" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
|
||||||
<Shape ID="DesignTable:EmployeeMonthlyExpense" ZOrder="60" X="-68" Y="753" Height="105" Width="219" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
<Shape ID="DesignTable:EmployeeMonthlyExpense" ZOrder="59" X="-68" Y="753" Height="105" Width="219" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:EmployeeRetirement" ZOrder="59" X="-67" Y="976" Height="181" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
|
<Shape ID="DesignTable:EmployeeRetirement" ZOrder="58" X="-67" Y="976" Height="181" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
|
||||||
<Shape ID="DesignTable:EmpPersonalInformation" ZOrder="58" X="-67" Y="1006" Height="257" Width="211" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
<Shape ID="DesignTable:EmpPersonalInformation" ZOrder="57" X="-67" Y="1006" Height="257" Width="211" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmpAcademicBackground" ZOrder="166" X="-69" Y="881" Height="124" Width="218" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
|
<Shape ID="DesignTable:EmpAcademicBackground" ZOrder="165" X="-69" Y="881" Height="124" Width="218" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:EmpLanguageKnown" ZOrder="161" X="-67" Y="785" Height="86" Width="188" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
|
<Shape ID="DesignTable:EmpLanguageKnown" ZOrder="160" X="-67" Y="785" Height="86" Width="188" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
|
||||||
<Shape ID="DesignTable:EmpMembershipInSocietiesClubsAssociations" ZOrder="178" X="-69" Y="914" Height="86" Width="300" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
|
<Shape ID="DesignTable:EmpMembershipInSocietiesClubsAssociations" ZOrder="177" X="-69" Y="914" Height="86" Width="300" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
|
||||||
<Shape ID="DesignTable:EmpCloseRelations" ZOrder="55" X="-68" Y="1101" Height="86" Width="180" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
|
<Shape ID="DesignTable:EmpCloseRelations" ZOrder="54" X="-68" Y="1101" Height="86" Width="180" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
|
||||||
<Shape ID="DesignTable:EmpEmploymentHistory" ZOrder="56" X="-67" Y="1069" Height="105" Width="207" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
<Shape ID="DesignTable:EmpEmploymentHistory" ZOrder="55" X="-67" Y="1069" Height="105" Width="207" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:EmpOtherProfessionalQualifications" ZOrder="62" X="-68" Y="659" Height="48" Width="276" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
<Shape ID="DesignTable:EmpOtherProfessionalQualifications" ZOrder="61" X="-68" Y="659" Height="48" Width="276" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
||||||
<Shape ID="DesignTable:EmpReferences" ZOrder="57" X="-67" Y="1037" Height="105" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
<Shape ID="DesignTable:EmpReferences" ZOrder="56" X="-67" Y="1037" Height="105" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:EmpDescribeInDetailsPresentJobResponsibilities" ZOrder="61" X="-69" Y="722" Height="48" Width="300" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
<Shape ID="DesignTable:EmpDescribeInDetailsPresentJobResponsibilities" ZOrder="60" X="-69" Y="722" Height="48" Width="300" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
||||||
<Shape ID="DesignTable:EmpReasonForLeavingCurrentJob" ZOrder="163" X="-68" Y="690" Height="48" Width="262" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
<Shape ID="DesignTable:EmpReasonForLeavingCurrentJob" ZOrder="162" X="-68" Y="690" Height="48" Width="262" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
||||||
<Shape ID="DesignTable:EmpExtraCaricularActivities" ZOrder="164" X="-68" Y="816" Height="48" Width="226" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
<Shape ID="DesignTable:EmpExtraCaricularActivities" ZOrder="163" X="-68" Y="816" Height="48" Width="226" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
||||||
<Shape ID="DesignTable:EmpListOfRelativeWorkingInNovatis" ZOrder="162" X="-67" Y="626" Height="105" Width="278" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
<Shape ID="DesignTable:EmpListOfRelativeWorkingInNovatis" ZOrder="161" X="-67" Y="626" Height="105" Width="278" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:EmpAdditionalInformation" ZOrder="149" X="-66" Y="564" Height="48" Width="222" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
<Shape ID="DesignTable:EmpAdditionalInformation" ZOrder="148" X="-66" Y="564" Height="48" Width="222" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
||||||
<Shape ID="DesignTable:EmpAns" ZOrder="54" X="-67" Y="1130" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="63" />
|
<Shape ID="DesignTable:EmpAns" ZOrder="53" X="-67" Y="1130" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="63" />
|
||||||
<Shape ID="DesignTable:EmpWorkingRelativesAns" ZOrder="72" X="-66" Y="172" Height="48" Width="215" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
<Shape ID="DesignTable:EmpWorkingRelativesAns" ZOrder="71" X="-66" Y="172" Height="48" Width="215" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
||||||
<Shape ID="DesignTable:EmpPermanentAndMailingAddress" ZOrder="165" X="-69" Y="848" Height="143" Width="269" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
|
<Shape ID="DesignTable:EmpPermanentAndMailingAddress" ZOrder="164" X="-69" Y="848" Height="143" Width="269" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:EmployeePhotoPath" ZOrder="181" X="-68" Y="944" Height="48" Width="184" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
<Shape ID="DesignTable:EmployeePhotoPath" ZOrder="180" X="-68" Y="944" Height="48" Width="184" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
|
||||||
<Shape ID="DesignTable:EmpListOfRelativeWorkingInCompany" ZOrder="79" X="-69" Y="-25" Height="105" Width="289" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
<Shape ID="DesignTable:EmpListOfRelativeWorkingInCompany" ZOrder="78" X="-69" Y="-25" Height="105" Width="289" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:ITPfAndOtherDetails" ZOrder="182" X="619" Y="470" Height="124" Width="186" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
|
<Shape ID="DesignTable:ITPfAndOtherDetails" ZOrder="181" X="619" Y="470" Height="124" Width="186" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:MultipleEmpIT" ZOrder="120" X="1201" Y="866" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="364" SplitterPosition="253" />
|
<Shape ID="DesignTable:MultipleEmpIT" ZOrder="119" X="1201" Y="866" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="364" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:ITHeader" ZOrder="177" X="617" Y="439" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
|
<Shape ID="DesignTable:ITHeader" ZOrder="176" X="617" Y="439" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:EmployeeLFAData" ZOrder="69" X="-65" Y="269" Height="143" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="139" />
|
<Shape ID="DesignTable:EmployeeLFAData" ZOrder="68" X="-65" Y="269" Height="143" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:TaxRebeatInvestment" ZOrder="154" X="907" Y="511" Height="105" Width="192" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="101" />
|
<Shape ID="DesignTable:TaxRebeatInvestment" ZOrder="153" X="907" Y="511" Height="105" Width="192" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:TaxChallan" ZOrder="158" X="908" Y="542" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="63" />
|
<Shape ID="DesignTable:TaxChallan" ZOrder="157" X="908" Y="542" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="63" />
|
||||||
<Shape ID="DesignTable:Pmpbasic" ZOrder="160" X="906" Y="-14" Height="219" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="176" SplitterPosition="215" />
|
<Shape ID="DesignTable:Pmpbasic" ZOrder="159" X="906" Y="-14" Height="219" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="176" SplitterPosition="215" />
|
||||||
<Shape ID="DesignTable:Pmpobjectives" ZOrder="159" X="912" Y="169" Height="181" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="159" SplitterPosition="177" />
|
<Shape ID="DesignTable:Pmpobjectives" ZOrder="158" X="912" Y="169" Height="181" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="159" SplitterPosition="177" />
|
||||||
<Shape ID="DesignTable:PmpEmpValueBehaviorRatings" ZOrder="13" X="910" Y="79" Height="124" Width="245" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
|
<Shape ID="DesignTable:PmpEmpValueBehaviorRatings" ZOrder="12" X="910" Y="79" Height="124" Width="245" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:FSSJVReport" ZOrder="157" X="646" Y="672" Height="200" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="262" SplitterPosition="196" />
|
<Shape ID="DesignTable:FSSJVReport" ZOrder="156" X="646" Y="672" Height="200" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="262" SplitterPosition="196" />
|
||||||
<Shape ID="DesignTable:dtTransferTPToPR" ZOrder="156" X="1472" Y="73" Height="143" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
|
<Shape ID="DesignTable:dtTransferTPToPR" ZOrder="155" X="1472" Y="73" Height="143" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:EmpContinueFromDiscontinue" ZOrder="67" X="-66" Y="367" Height="181" Width="243" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
|
<Shape ID="DesignTable:EmpContinueFromDiscontinue" ZOrder="66" X="-66" Y="367" Height="181" Width="243" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
|
||||||
<Shape ID="DesignTable:EmpITInfoAndBasicInfo" ZOrder="66" X="-67" Y="438" Height="162" Width="203" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="142" SplitterPosition="158" />
|
<Shape ID="DesignTable:EmpITInfoAndBasicInfo" ZOrder="65" X="-67" Y="438" Height="162" Width="203" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="142" SplitterPosition="158" />
|
||||||
<Shape ID="DesignTable:SalaryStracture" ZOrder="155" X="1737" Y="40" Height="257" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="585" SplitterPosition="253" />
|
<Shape ID="DesignTable:SalaryStracture" ZOrder="154" X="1737" Y="40" Height="257" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="585" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:DedtaxByMonth" ZOrder="153" X="1472" Y="132" Height="143" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="139" />
|
<Shape ID="DesignTable:DedtaxByMonth" ZOrder="152" X="1472" Y="132" Height="143" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:SalarySheetByMonth" ZOrder="132" X="1735" Y="10" Height="257" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="330" SplitterPosition="253" />
|
<Shape ID="DesignTable:SalarySheetByMonth" ZOrder="131" X="1735" Y="10" Height="257" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="330" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmployeeServiceLength" ZOrder="65" X="-67" Y="470" Height="143" Width="204" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
|
<Shape ID="DesignTable:EmployeeServiceLength" ZOrder="64" X="-67" Y="470" Height="143" Width="204" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:PayRollRegisterForAll" ZOrder="151" X="909" Y="48" Height="124" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="120" />
|
<Shape ID="DesignTable:PayRollRegisterForAll" ZOrder="150" X="909" Y="48" Height="124" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:ReckittTaxCard" ZOrder="152" X="950" Y="743" Height="105" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="101" />
|
<Shape ID="DesignTable:ReckittTaxCard" ZOrder="151" X="950" Y="743" Height="105" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:DedtaxByMonthRange" ZOrder="141" X="1471" Y="42" Height="162" Width="197" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="142" SplitterPosition="158" />
|
<Shape ID="DesignTable:DedtaxByMonthRange" ZOrder="140" X="1471" Y="42" Height="162" Width="197" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="142" SplitterPosition="158" />
|
||||||
<Shape ID="DesignTable:dtRolePermission" ZOrder="146" X="1467" Y="-22" Height="105" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
|
<Shape ID="DesignTable:dtRolePermission" ZOrder="145" X="1467" Y="-22" Height="105" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:dtRoleInfo" ZOrder="139" X="1469" Y="12" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
|
<Shape ID="DesignTable:dtRoleInfo" ZOrder="138" X="1469" Y="12" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:dtUserRole" ZOrder="138" X="1471" Y="103" Height="200" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
|
<Shape ID="DesignTable:dtUserRole" ZOrder="137" X="1471" Y="103" Height="200" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
|
||||||
<Shape ID="DesignTable:EERSData" ZOrder="137" X="-68" Y="1161" Height="257" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="227" SplitterPosition="253" />
|
<Shape ID="DesignTable:EERSData" ZOrder="136" X="-68" Y="1161" Height="257" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="227" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:SalaryReconDeduction" ZOrder="148" X="1740" Y="133" Height="124" Width="197" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
|
<Shape ID="DesignTable:SalaryReconDeduction" ZOrder="147" X="1740" Y="133" Height="124" Width="197" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:SalaryReconciliationSummary" ZOrder="147" X="1739" Y="71" Height="86" Width="238" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
|
<Shape ID="DesignTable:SalaryReconciliationSummary" ZOrder="146" X="1739" Y="71" Height="86" Width="238" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
|
||||||
<Shape ID="DesignTable:MemoDebit" ZOrder="119" X="1198" Y="803" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="83" SplitterPosition="120" />
|
<Shape ID="DesignTable:MemoDebit" ZOrder="118" X="1198" Y="803" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="83" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:MemoCredit" ZOrder="118" X="1203" Y="898" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
|
<Shape ID="DesignTable:MemoCredit" ZOrder="117" X="1203" Y="898" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
|
||||||
<Shape ID="DesignTable:SharedLoanIssue" ZOrder="145" X="1735" Y="-23" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:SharedLoanIssue" ZOrder="144" X="1735" Y="-23" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:GratuityProvision" ZOrder="144" X="1205" Y="8" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="210" SplitterPosition="234" />
|
<Shape ID="DesignTable:GratuityProvision" ZOrder="143" X="1205" Y="8" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="210" SplitterPosition="234" />
|
||||||
<Shape ID="DesignTable:GratuityRegister" ZOrder="143" X="1204" Y="-20" Height="143" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
|
<Shape ID="DesignTable:GratuityRegister" ZOrder="142" X="1204" Y="-20" Height="143" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:GratuityLedger" ZOrder="142" X="1206" Y="38" Height="86" Width="153" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="74" SplitterPosition="82" />
|
<Shape ID="DesignTable:GratuityLedger" ZOrder="141" X="1206" Y="38" Height="86" Width="153" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="74" SplitterPosition="82" />
|
||||||
<Shape ID="DesignTable:LoanData" ZOrder="140" X="317" Y="834" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
|
<Shape ID="DesignTable:LoanData" ZOrder="139" X="317" Y="834" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:dtUsers" ZOrder="102" X="1474" Y="258" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="216" SplitterPosition="177" />
|
<Shape ID="DesignTable:dtUsers" ZOrder="101" X="1474" Y="258" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="216" SplitterPosition="177" />
|
||||||
<Shape ID="DesignTable:dtUserLogin" ZOrder="103" X="1472" Y="227" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="158" />
|
<Shape ID="DesignTable:dtUserLogin" ZOrder="102" X="1472" Y="227" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="158" />
|
||||||
<Shape ID="DesignTable:dtBadUser" ZOrder="130" X="1470" Y="194" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
|
<Shape ID="DesignTable:dtBadUser" ZOrder="129" X="1470" Y="194" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:EmpItemWiseSalary" ZOrder="136" X="-67" Y="500" Height="105" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
|
<Shape ID="DesignTable:EmpItemWiseSalary" ZOrder="135" X="-67" Y="500" Height="105" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:PFLedger" ZOrder="135" X="912" Y="137" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
|
<Shape ID="DesignTable:PFLedger" ZOrder="134" X="912" Y="137" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:Challan" ZOrder="44" X="287" Y="365" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
|
<Shape ID="DesignTable:Challan" ZOrder="43" X="287" Y="365" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
|
||||||
<Shape ID="DesignTable:UpcomingTraining" ZOrder="134" X="312" Y="1027" Height="181" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
|
<Shape ID="DesignTable:UpcomingTraining" ZOrder="133" X="312" Y="1027" Height="181" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
|
||||||
<Shape ID="DesignTable:SalaryCertificate" ZOrder="133" X="1742" Y="167" Height="257" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:SalaryCertificate" ZOrder="132" X="1742" Y="167" Height="257" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:ChallanNoWithMonth" ZOrder="43" X="286" Y="398" Height="86" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
|
<Shape ID="DesignTable:ChallanNoWithMonth" ZOrder="42" X="286" Y="398" Height="86" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
|
||||||
<Shape ID="DesignTable:MarketSurveyCom" ZOrder="117" X="1199" Y="834" Height="124" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
|
<Shape ID="DesignTable:MarketSurveyCom" ZOrder="116" X="1199" Y="834" Height="124" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
|
||||||
<Shape ID="DesignTable:activeInactiveUserList" ZOrder="98" X="918" Y="878" Height="105" Width="192" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
|
<Shape ID="DesignTable:activeInactiveUserList" ZOrder="97" X="918" Y="878" Height="105" Width="192" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:dtCashAdvice" ZOrder="125" X="1474" Y="291" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="158" />
|
<Shape ID="DesignTable:dtCashAdvice" ZOrder="124" X="1474" Y="291" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="158" />
|
||||||
<Shape ID="DesignTable:BanglaPaySlip" ZOrder="115" X="1219" Y="604" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:BanglaPaySlip" ZOrder="114" X="1219" Y="604" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:dtProdBonusDetail" ZOrder="124" X="1475" Y="419" Height="200" Width="176" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
|
<Shape ID="DesignTable:dtProdBonusDetail" ZOrder="123" X="1475" Y="419" Height="200" Width="176" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
|
||||||
<Shape ID="DesignTable:dtEmpDesWiseProdBonus" ZOrder="12" X="1476" Y="451" Height="257" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:dtEmpDesWiseProdBonus" ZOrder="11" X="1476" Y="451" Height="257" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:dtMonthlyProdBonus" ZOrder="123" X="1477" Y="484" Height="143" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
|
<Shape ID="DesignTable:dtMonthlyProdBonus" ZOrder="122" X="1477" Y="484" Height="143" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:SalarySheetStatic" ZOrder="122" X="1747" Y="264" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="748" SplitterPosition="253" />
|
<Shape ID="DesignTable:SalarySheetStatic" ZOrder="121" X="1747" Y="264" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="748" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:dtRoleAudit" ZOrder="83" X="1474" Y="322" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
|
<Shape ID="DesignTable:dtRoleAudit" ZOrder="82" X="1474" Y="322" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
|
||||||
<Shape ID="DesignTable:dtRolePermission2" ZOrder="121" X="1474" Y="355" Height="143" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
|
<Shape ID="DesignTable:dtRolePermission2" ZOrder="120" X="1474" Y="355" Height="143" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:CasualSalarySheet" ZOrder="49" X="289" Y="179" Height="257" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:CasualSalarySheet" ZOrder="48" X="289" Y="179" Height="257" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:BankAdviceHNM" ZOrder="112" X="1214" Y="451" Height="181" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
|
<Shape ID="DesignTable:BankAdviceHNM" ZOrder="111" X="1214" Y="451" Height="181" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
|
||||||
<Shape ID="DesignTable:EmpDesCatChange" ZOrder="74" X="127" Y="31" Height="257" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:EmpDesCatChange" ZOrder="73" X="127" Y="31" Height="257" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmployeeConfirmation" ZOrder="109" X="282" Y="436" Height="143" Width="199" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
|
<Shape ID="DesignTable:EmployeeConfirmation" ZOrder="108" X="282" Y="436" Height="143" Width="199" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:MonthlySchedule" ZOrder="108" X="681" Y="1101" Height="257" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:MonthlySchedule" ZOrder="107" X="681" Y="1101" Height="257" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:AllMedicalClaim" ZOrder="105" X="927" Y="908" Height="143" Width="160" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
|
<Shape ID="DesignTable:AllMedicalClaim" ZOrder="104" X="927" Y="908" Height="143" Width="160" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
|
||||||
<Shape ID="DesignTable:AllEmpTaxInfo" ZOrder="107" X="864" Y="1031" Height="181" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
|
<Shape ID="DesignTable:AllEmpTaxInfo" ZOrder="106" X="864" Y="1031" Height="181" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
|
||||||
<Shape ID="DesignTable:dtAllActiveLaons" ZOrder="106" X="1475" Y="388" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:dtAllActiveLaons" ZOrder="105" X="1475" Y="388" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:ArrSheet" ZOrder="104" X="889" Y="597" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:ArrSheet" ZOrder="103" X="889" Y="597" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:EmpGroupInsurance" ZOrder="101" X="571" Y="297" Height="200" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="196" />
|
<Shape ID="DesignTable:EmpGroupInsurance" ZOrder="100" X="571" Y="297" Height="200" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="196" />
|
||||||
<Shape ID="DesignTable:EmpGroupInsuranceDiscon" ZOrder="73" X="114" Y="139" Height="200" Width="222" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="196" />
|
<Shape ID="DesignTable:EmpGroupInsuranceDiscon" ZOrder="72" X="114" Y="139" Height="200" Width="222" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="196" />
|
||||||
<Shape ID="DesignTable:SKFExpencesPaySlip" ZOrder="100" X="1747" Y="296" Height="257" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:SKFExpencesPaySlip" ZOrder="99" X="1747" Y="296" Height="257" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:RemainingLoanforPayslip" ZOrder="99" X="948" Y="769" Height="105" Width="214" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
|
<Shape ID="DesignTable:RemainingLoanforPayslip" ZOrder="98" X="948" Y="769" Height="105" Width="214" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
|
||||||
<Shape ID="DesignTable:PayslipBasicInfo" ZOrder="82" X="915" Y="302" Height="239" Width="160" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="235" />
|
<Shape ID="DesignTable:PayslipBasicInfo" ZOrder="81" X="915" Y="302" Height="239" Width="160" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="235" />
|
||||||
<Shape ID="DesignTable:EmpPromotion" ZOrder="80" X="118" Y="275" Height="200" Width="153" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
|
<Shape ID="DesignTable:EmpPromotion" ZOrder="79" X="118" Y="275" Height="200" Width="153" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
|
||||||
<Shape ID="DesignTable:NewlyIssuedLoan" ZOrder="97" X="650" Y="521" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
|
<Shape ID="DesignTable:NewlyIssuedLoan" ZOrder="96" X="650" Y="521" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
|
||||||
<Shape ID="DesignTable:CurrentMonthDueLoan" ZOrder="96" X="1093" Y="929" Height="257" Width="200" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="253" />
|
<Shape ID="DesignTable:CurrentMonthDueLoan" ZOrder="95" X="1093" Y="929" Height="257" Width="200" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:CashRefund" ZOrder="95" X="875" Y="1079" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
|
<Shape ID="DesignTable:CashRefund" ZOrder="94" X="875" Y="1079" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
|
||||||
<Shape ID="DesignTable:PFRegister" ZOrder="94" X="907" Y="16" Height="257" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="252" SplitterPosition="253" />
|
<Shape ID="DesignTable:PFRegister" ZOrder="93" X="907" Y="16" Height="257" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="252" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:BonusRegisterBAT" ZOrder="93" X="1217" Y="571" Height="238" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
|
<Shape ID="DesignTable:BonusRegisterBAT" ZOrder="92" X="1217" Y="571" Height="238" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
|
||||||
<Shape ID="DesignTable:NmgtSpringFestivalBonusRegister" ZOrder="88" X="1093" Y="962" Height="257" Width="265" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="292" SplitterPosition="253" />
|
<Shape ID="DesignTable:NmgtSpringFestivalBonusRegister" ZOrder="87" X="1093" Y="962" Height="257" Width="265" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="292" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:NmgtBonusPaySlip" ZOrder="87" X="1104" Y="997" Height="257" Width="177" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:NmgtBonusPaySlip" ZOrder="86" X="1104" Y="997" Height="257" Width="177" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:SalaryRegister" ZOrder="85" X="1746" Y="305" Height="239" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="235" />
|
<Shape ID="DesignTable:SalaryRegister" ZOrder="84" X="1746" Y="305" Height="239" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="235" />
|
||||||
<Shape ID="DesignTable:CrewDeployment" ZOrder="35" X="471" Y="78" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:CrewDeployment" ZOrder="34" X="471" Y="78" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:ActiveEmployee" ZOrder="8" X="756" Y="101" Height="28" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="235" SplitterPosition="24" />
|
<Shape ID="DesignTable:ActiveEmployee" ZOrder="7" X="756" Y="101" Height="28" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="235" SplitterPosition="24" />
|
||||||
<Shape ID="DesignTable:BonusPaySlip" ZOrder="11" X="1214" Y="390" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
<Shape ID="DesignTable:BonusPaySlip" ZOrder="10" X="1214" Y="390" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:LoanDueWithCC" ZOrder="23" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
<Shape ID="DesignTable:LoanDueWithCC" ZOrder="22" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
||||||
<Shape ID="DesignTable:dtBankAdvice" ZOrder="22" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
<Shape ID="DesignTable:dtBankAdvice" ZOrder="21" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
||||||
<Shape ID="DesignTable:dtEncashmentReport" ZOrder="21" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
<Shape ID="DesignTable:dtEncashmentReport" ZOrder="20" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
||||||
<Shape ID="DesignTable:SalaryReconNew" ZOrder="20" X="0" Y="0" Height="28" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
|
<Shape ID="DesignTable:SalaryReconNew" ZOrder="19" X="0" Y="0" Height="28" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
|
||||||
<Shape ID="DesignTable:AnnualIncomeCertificate" ZOrder="24" X="155" Y="190" Height="257" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="253" />
|
<Shape ID="DesignTable:AnnualIncomeCertificate" ZOrder="23" X="155" Y="190" Height="257" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:AssetAcknowledgement" ZOrder="9" X="819" Y="0" Height="28" Width="205" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
|
<Shape ID="DesignTable:AssetAcknowledgement" ZOrder="8" X="819" Y="0" Height="28" Width="205" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
|
||||||
<Shape ID="DesignTable:AssetSerialInformation" ZOrder="19" X="580" Y="14" Height="162" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="158" />
|
<Shape ID="DesignTable:AssetSerialInformation" ZOrder="18" X="580" Y="14" Height="162" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="158" />
|
||||||
<Shape ID="DesignTable:BanglaPaySlipNew" ZOrder="17" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
<Shape ID="DesignTable:BanglaPaySlipNew" ZOrder="16" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
||||||
<Shape ID="DesignTable:BanglaPaySlipNewProdBonus" ZOrder="16" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
<Shape ID="DesignTable:BanglaPaySlipNewProdBonus" ZOrder="15" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
||||||
<Shape ID="DesignTable:Employee" ZOrder="15" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
<Shape ID="DesignTable:Employee" ZOrder="14" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
||||||
<Shape ID="DesignTable:dtProdAttendance" ZOrder="14" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
<Shape ID="DesignTable:dtProdAttendance" ZOrder="13" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
|
||||||
<Shape ID="DesignTable:CCWiseSalarySheetNew" ZOrder="10" X="533" Y="586" Height="28" Width="203" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
|
<Shape ID="DesignTable:CCWiseSalarySheetNew" ZOrder="9" X="533" Y="586" Height="28" Width="203" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
|
||||||
<Shape ID="DesignTable:CandidateInformation" ZOrder="6" X="767" Y="198" Height="28" Width="194" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="24" />
|
<Shape ID="DesignTable:CandidateInformation" ZOrder="5" X="767" Y="198" Height="28" Width="194" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="24" />
|
||||||
<Shape ID="DesignTable:EmployeeInfoBasic" ZOrder="3" X="0" Y="0" Height="256" Width="175" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
|
<Shape ID="DesignTable:EmployeeInfoBasic" ZOrder="2" X="0" Y="0" Height="256" Width="175" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
|
||||||
<Shape ID="DesignTable:DeletedLifeCycle" ZOrder="2" X="0" Y="0" Height="257" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
|
<Shape ID="DesignTable:DeletedLifeCycle" ZOrder="1" X="0" Y="0" Height="257" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
|
||||||
<Shape ID="DesignTable:EmployeeDetailEcho" ZOrder="1" X="309" Y="1348" Height="257" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
|
|
||||||
</Shapes>
|
</Shapes>
|
||||||
<Connectors />
|
<Connectors />
|
||||||
</DiagramLayout>
|
</DiagramLayout>
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -48,8 +48,6 @@ export class DailyAttnProcess extends BaseObject {
|
||||||
this.actualOutTime = new Date();
|
this.actualOutTime = new Date();
|
||||||
this.actualShiftID = null;
|
this.actualShiftID = null;
|
||||||
this.shift= null;
|
this.shift= null;
|
||||||
this.onlyManualInTime = false;
|
|
||||||
this.onlyManualOutTime = false;
|
|
||||||
}
|
}
|
||||||
attnDate: Date;
|
attnDate: Date;
|
||||||
inTime: Date;
|
inTime: Date;
|
||||||
|
|
@ -92,9 +90,6 @@ export class DailyAttnProcess extends BaseObject {
|
||||||
shift: Shift;
|
shift: Shift;
|
||||||
remarksType: number;
|
remarksType: number;
|
||||||
|
|
||||||
onlyManualInTime: boolean;
|
|
||||||
onlyManualOutTime: boolean;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -276,9 +276,6 @@ export class AttendanceServices {
|
||||||
getDailyAttnProcessByEmp(empList: any) {
|
getDailyAttnProcessByEmp(empList: any) {
|
||||||
return this.apiService.httpPost<DailyAttnProcess[]>('/Attendance' + '/getDailyAttnProcessByEmp', empList);
|
return this.apiService.httpPost<DailyAttnProcess[]>('/Attendance' + '/getDailyAttnProcessByEmp', empList);
|
||||||
}
|
}
|
||||||
getDailyAttnProcessByEmpForManualEntry(empList: any) {
|
|
||||||
return this.apiService.httpPost<DailyAttnProcess[]>('/Attendance' + '/getDailyAttnProcessByEmpForManualEntry', empList);
|
|
||||||
}
|
|
||||||
|
|
||||||
// DailyAttnProcess
|
// DailyAttnProcess
|
||||||
getDailyAttnProcessByEmployeeId(employeeId: number) {
|
getDailyAttnProcessByEmployeeId(employeeId: number) {
|
||||||
|
|
|
||||||
|
|
@ -105,12 +105,6 @@ export class EmployeeServices {
|
||||||
|
|
||||||
return this.apiService.httpGet<SearchEmployee[]>('/Employee/getEmpCodeNameForEmployeePickerInput' + '/' + ncode + '/' + nname);
|
return this.apiService.httpGet<SearchEmployee[]>('/Employee/getEmpCodeNameForEmployeePickerInput' + '/' + ncode + '/' + nname);
|
||||||
}
|
}
|
||||||
getEmpCodeNameForEmployeePickerInputNew(code?: string, name?: string, isForLifeCycle? : boolean) {
|
|
||||||
let nname = this.apiService.getApiDefaultData(name);
|
|
||||||
let ncode = this.apiService.getApiDefaultData(code);
|
|
||||||
let nIsForLifeCycle = this.apiService.getApiDefaultBoolData(isForLifeCycle);
|
|
||||||
return this.apiService.httpGet<SearchEmployee[]>('/Employee/getEmpCodeNameForEmployeePickerInputNew' + '/' + ncode + '/' + nname + '/' + nIsForLifeCycle);
|
|
||||||
}
|
|
||||||
|
|
||||||
getEmployees() {
|
getEmployees() {
|
||||||
return this.apiService.httpGet(this.apiService.base_url + 'getemployees');
|
return this.apiService.httpGet(this.apiService.base_url + 'getemployees');
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,4 @@ export class ReportServices {
|
||||||
getGeneratedProfileReportData(param: any) {
|
getGeneratedProfileReportData(param: any) {
|
||||||
return this.apiService.httpDownloadFile('/Report/getGeneratedProfileReport/', param);
|
return this.apiService.httpDownloadFile('/Report/getGeneratedProfileReport/', param);
|
||||||
}
|
}
|
||||||
getEmpDetailInfoReport(param: any): Observable<HttpEvent<any>> {
|
|
||||||
return this.apiService.httpPost<any>('/Report/getEmpDetailInfoReport/', param);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ export class ApiService {
|
||||||
public isSSO = false;
|
public isSSO = false;
|
||||||
public versionDeployement = false;
|
public versionDeployement = false;
|
||||||
// public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2025, 1, 25))}-`+"01";
|
// public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2025, 1, 25))}-`+"01";
|
||||||
public versionNumber = `V-20250427-`+"01";
|
public versionNumber = `V-20250421-`+"01";
|
||||||
public static BASE_URL = '';
|
public static BASE_URL = '';
|
||||||
public base_url = '';
|
public base_url = '';
|
||||||
// public currentLink = '';
|
// public currentLink = '';
|
||||||
|
|
@ -168,10 +168,6 @@ export class ApiService {
|
||||||
return (str === undefined || str === null || str.trim() === '') ? undefined : str;
|
return (str === undefined || str === null || str.trim() === '') ? undefined : str;
|
||||||
}
|
}
|
||||||
|
|
||||||
getApiDefaultBoolData(value: boolean) {
|
|
||||||
return (value === undefined || value === null) ? false : value;
|
|
||||||
}
|
|
||||||
|
|
||||||
getApiDateString(dDate: Date) {
|
getApiDateString(dDate: Date) {
|
||||||
if (dDate === undefined || dDate === null) {
|
if (dDate === undefined || dDate === null) {
|
||||||
return dDate;
|
return dDate;
|
||||||
|
|
|
||||||
|
|
@ -282,9 +282,6 @@
|
||||||
set
|
set
|
||||||
</button>
|
</button>
|
||||||
<kendo-grid-spacer></kendo-grid-spacer>
|
<kendo-grid-spacer></kendo-grid-spacer>
|
||||||
<label for="status" style="font-weight: bold;">Remarks</label>
|
|
||||||
<kendo-textbox placeholder="Remarks" [(ngModel)]="_remarks" style="width: 30%;"></kendo-textbox>
|
|
||||||
|
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<kendo-grid-column field="shiftID" title="Date" width="8%">
|
<kendo-grid-column field="shiftID" title="Date" width="8%">
|
||||||
<ng-template kendoGridCellTemplate let-dataItem>
|
<ng-template kendoGridCellTemplate let-dataItem>
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,6 @@ export class AttendanceManualEditForSingleEmployeeComponent implements OnInit {
|
||||||
selectedOutTime: Date;
|
selectedOutTime: Date;
|
||||||
dailyAttenProcessList: DailyAttnProcess[];
|
dailyAttenProcessList: DailyAttnProcess[];
|
||||||
_overTime: number = 0;
|
_overTime: number = 0;
|
||||||
_remarks: string = "";
|
|
||||||
statusList = [
|
statusList = [
|
||||||
{ value: 1, name: 'Present' },
|
{ value: 1, name: 'Present' },
|
||||||
{ value: 2, name: 'Absent' },
|
{ value: 2, name: 'Absent' },
|
||||||
|
|
@ -224,9 +223,6 @@ export class AttendanceManualEditForSingleEmployeeComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.dailyAttenProcessList.forEach(x => {
|
this.dailyAttenProcessList.forEach(x => {
|
||||||
if(this._remarks){
|
|
||||||
x.comments = this._remarks;
|
|
||||||
}
|
|
||||||
x.isManualEntry = true;
|
x.isManualEntry = true;
|
||||||
if (x.wfStatus != EnumWFAttnStatus.None) {
|
if (x.wfStatus != EnumWFAttnStatus.None) {
|
||||||
this.notificationService.showError(x.attnDate.toDateString() +" is in approval stage, so manual edit is not allowed");
|
this.notificationService.showError(x.attnDate.toDateString() +" is in approval stage, so manual edit is not allowed");
|
||||||
|
|
|
||||||
|
|
@ -329,7 +329,7 @@
|
||||||
<div class="p-col-12" align="right">
|
<div class="p-col-12" align="right">
|
||||||
<button kendoButton icon="arrow-left" style="margin-right: 20px;" class="k-button k-primary" *ngIf="isVisibleCordinatorPicker" (click)="goBack()">
|
<button kendoButton icon="arrow-left" style="margin-right: 20px;" class="k-button k-primary" *ngIf="isVisibleCordinatorPicker" (click)="goBack()">
|
||||||
Back </button>
|
Back </button>
|
||||||
<button icon="save" kendoButton class="k-button k-primary" (click)="update()">
|
<button icon="rotate" kendoButton class="k-button k-primary" (click)="update()">
|
||||||
Update
|
Update
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
|
||||||
approvalRole: string;
|
approvalRole: string;
|
||||||
isVisibleEmpPicker: boolean = false;
|
isVisibleEmpPicker: boolean = false;
|
||||||
isVisibleCordinatorPicker: boolean = false;
|
isVisibleCordinatorPicker: boolean = false;
|
||||||
isVisiblelmPicker: boolean = false;
|
isVisiblelmPicker: boolean= false;
|
||||||
selectedShiftID: number;
|
selectedShiftID: number;
|
||||||
selectedStatus: EnumAttendanceType;
|
selectedStatus: EnumAttendanceType;
|
||||||
selectedAttnDate: Date;
|
selectedAttnDate: Date;
|
||||||
|
|
@ -85,7 +85,7 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
|
||||||
this.selectInTime = new Date();
|
this.selectInTime = new Date();
|
||||||
this.selectedOutTime = new Date();
|
this.selectedOutTime = new Date();
|
||||||
this.loadDropDownLists();
|
this.loadDropDownLists();
|
||||||
// this.selectedStatus = EnumAttendanceType.Present;
|
// this.selectedStatus = EnumAttendanceType.Present;
|
||||||
this.getPendindBillings();
|
this.getPendindBillings();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -143,7 +143,7 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
|
||||||
},
|
},
|
||||||
() => {
|
() => {
|
||||||
if (this.shifts.length > 0) {
|
if (this.shifts.length > 0) {
|
||||||
// this.selectedShiftID = this.shifts[0].id;
|
// this.selectedShiftID = this.shifts[0].id;
|
||||||
this.shifts[0].inTime = new Date(this.shifts[0].inTime);
|
this.shifts[0].inTime = new Date(this.shifts[0].inTime);
|
||||||
this.shifts[0].outTime = new Date(this.shifts[0].outTime);
|
this.shifts[0].outTime = new Date(this.shifts[0].outTime);
|
||||||
this.dateChange();
|
this.dateChange();
|
||||||
|
|
@ -207,6 +207,7 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
|
||||||
}
|
}
|
||||||
|
|
||||||
updateobject(type: number) {
|
updateobject(type: number) {
|
||||||
|
debugger;
|
||||||
if (this.selectedRemarks != undefined) {
|
if (this.selectedRemarks != undefined) {
|
||||||
if (this.remarksList.find(y => y.value == this.selectedRemarks).name == "Other") {
|
if (this.remarksList.find(y => y.value == this.selectedRemarks).name == "Other") {
|
||||||
this.isOtherRemarks = true;
|
this.isOtherRemarks = true;
|
||||||
|
|
@ -214,13 +215,6 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
|
||||||
this.isOtherRemarks = false;
|
this.isOtherRemarks = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (type == 3){
|
|
||||||
let oShift : Shift = this.shifts.find(x => x.id === this.selectedShiftID);
|
|
||||||
if(oShift && oShift.id > 0){
|
|
||||||
this.selectInTime = new Date(oShift.inTime);
|
|
||||||
this.selectedOutTime = new Date(oShift.outTime);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.dailyAttenProcessList.forEach(x => {
|
this.dailyAttenProcessList.forEach(x => {
|
||||||
if (type == 1) {
|
if (type == 1) {
|
||||||
x.actualInTime = x.inTime;
|
x.actualInTime = x.inTime;
|
||||||
|
|
@ -280,8 +274,7 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
|
||||||
|
|
||||||
if (attnRequest.length == 0) return;
|
if (attnRequest.length == 0) return;
|
||||||
|
|
||||||
// this.attendanceServices.getDailyAttnProcessByEmp(attnRequest).subscribe(
|
this.attendanceServices.getDailyAttnProcessByEmp(attnRequest).subscribe(
|
||||||
this.attendanceServices.getDailyAttnProcessByEmpForManualEntry(attnRequest).subscribe(
|
|
||||||
(resp) => {
|
(resp) => {
|
||||||
|
|
||||||
if (this.dailyAttenProcessList == undefined || this.dailyAttenProcessList.length == 0) {
|
if (this.dailyAttenProcessList == undefined || this.dailyAttenProcessList.length == 0) {
|
||||||
|
|
@ -372,29 +365,14 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
|
||||||
}
|
}
|
||||||
var msg: string = "";
|
var msg: string = "";
|
||||||
this.dailyAttenProcessList.forEach(x => {
|
this.dailyAttenProcessList.forEach(x => {
|
||||||
if(this.selectedRemarks){
|
|
||||||
let remarks = this.remarksList.find(y => y.value == this.selectedRemarks);
|
|
||||||
if(remarks){
|
|
||||||
x.comments = remarks.name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
x.isManualEntry = true;
|
x.isManualEntry = true;
|
||||||
if (x.wfStatus != EnumWFAttnStatus.None) {
|
if (x.wfStatus != EnumWFAttnStatus.None) {
|
||||||
msg = msg + "Employee: " + x.employee.employeeNo + ". Datais in approval stage, so manual edit is not allowed; ";
|
msg = msg + "Employee: " + x.employee.employeeNo + ". Datais in approval stage, so manual edit is not allowed; ";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ((x.inTime == null && x.outTime == null) && x.attenType == EnumAttendanceType.Present) {
|
if ((x.inTime == null || x.outTime == null) && x.attenType == EnumAttendanceType.Present) {
|
||||||
msg = msg + "Employee: " + x.employee.employeeNo + ", Status present is not allowed while In Time and Out Time is not entered.; ";
|
msg = msg + "Employee: " + x.employee.employeeNo + ", Status present is not allowed while inTime and outTime is not entered.; ";
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (x.inTime != null && x.outTime == null) {
|
|
||||||
x.onlyManualInTime = true;
|
|
||||||
}
|
|
||||||
if (x.inTime == null && x.outTime != null) {
|
|
||||||
x.onlyManualOutTime = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
var bvalid = false;
|
var bvalid = false;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="!newEmployee" class="p-col-12 p-lg-4">
|
<div *ngIf="!newEmployee" class="p-col-12 p-lg-4">
|
||||||
<app-employee-picker [isActive]="!newEmployee" [ForLifeCycleSearch]="true"
|
<app-employee-picker [isActive]="!newEmployee"
|
||||||
(ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
|
(ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="newEmployee" class="p-col-12 p-lg-4">
|
<div *ngIf="newEmployee" class="p-col-12 p-lg-4">
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="p-col-12 p-md-12 p-lg-6" style="margin:auto;">
|
<div class="p-col-12 p-md-12 p-lg-6" style="margin:auto;">
|
||||||
<app-employee-picker for="chkIsnew" id="idself" [isActive]="!newEmployee"
|
<app-employee-picker for="chkIsnew" id="idself" [isActive]="!newEmployee"
|
||||||
[setSelectedEmp]="selectedEmployee" [ForLifeCycleSearch]="true"
|
[setSelectedEmp]="selectedEmployee"
|
||||||
(ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
|
(ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@
|
||||||
(ItemSelected)="GetSelectedEmployee($event)"
|
(ItemSelected)="GetSelectedEmployee($event)"
|
||||||
[setSelectedEmp]="_pickerSelecteEmp"
|
[setSelectedEmp]="_pickerSelecteEmp"
|
||||||
[isActive]="empPickerActive"
|
[isActive]="empPickerActive"
|
||||||
[ForLifeCycleSearch]="true"
|
|
||||||
></app-employee-picker>
|
></app-employee-picker>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,21 @@
|
||||||
<app-loading-panel></app-loading-panel>
|
<app-loading-panel></app-loading-panel>
|
||||||
<form [formGroup]="_salaryDaysDeductEdit">
|
<form [formGroup]="_salaryDaysDeductEdit">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="p-col-12">
|
<div class="p-grid">
|
||||||
<div class="p-grid">
|
<div class="p-col-2">
|
||||||
<div class="p-col-2">
|
<label>Unauthorized Leave</label>
|
||||||
<label>Unauthorized Leave</label>
|
</div>
|
||||||
</div>
|
<div class="p-col-10">
|
||||||
<div class="p-col-10">
|
<kendo-dropdownlist [data]="_unAuthLeaves"
|
||||||
<kendo-dropdownlist [data]="_unAuthLeaves"
|
[(ngModel)]="_uaLeaveParam.unAhuthorizeLeaveID"
|
||||||
[(ngModel)]="_uaLeaveParam.unAhuthorizeLeaveID"
|
[defaultItem]="{ name: 'Select..', value: null }"
|
||||||
[defaultItem]="{ name: 'Select..', value: null }"
|
[textField]="'name'"
|
||||||
[textField]="'name'"
|
[valueField]="'id'"
|
||||||
[valueField]="'id'"
|
[valuePrimitive]="true"
|
||||||
[valuePrimitive]="true"
|
class="form-control form-control-sm input-sm"
|
||||||
class="form-control form-control-sm input-sm"
|
(selectionChange)="paramselectionChange($event)"
|
||||||
(selectionChange)="paramselectionChange($event)"
|
formControlName="unauthorizedLeaveDropDown">
|
||||||
formControlName="unauthorizedLeaveDropDown">
|
</kendo-dropdownlist>
|
||||||
</kendo-dropdownlist>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="p-grid">
|
<div class="p-grid">
|
||||||
|
|
@ -28,7 +26,7 @@
|
||||||
[selectable]="{enabled: true, checkboxOnly: true, mode: 'multiple'}"
|
[selectable]="{enabled: true, checkboxOnly: true, mode: 'multiple'}"
|
||||||
[selectedKeys]="_selectedgrades"
|
[selectedKeys]="_selectedgrades"
|
||||||
[kendoGridSelectBy]="'id'"
|
[kendoGridSelectBy]="'id'"
|
||||||
[height]="500">
|
[height]="200">
|
||||||
<kendo-grid-checkbox-column [class]="{'text-center': true}"
|
<kendo-grid-checkbox-column [class]="{'text-center': true}"
|
||||||
[columnMenu]="false"
|
[columnMenu]="false"
|
||||||
[headerClass]="{'text-center': true}"
|
[headerClass]="{'text-center': true}"
|
||||||
|
|
@ -45,10 +43,10 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="p-col-6">
|
<div class="p-col-6">
|
||||||
<h3>Salary components</h3>
|
<h3>salary components</h3>
|
||||||
<kendo-grid [data]="_uaLeaveParamDetail"
|
<kendo-grid [data]="_uaLeaveParamDetail"
|
||||||
[selectedKeys]="_selectedcomponent"
|
[selectedKeys]="_selectedcomponent"
|
||||||
[height]="500"
|
[height]="200"
|
||||||
[kendoGridSelectBy]="'allowanceID'">
|
[kendoGridSelectBy]="'allowanceID'">
|
||||||
|
|
||||||
<kendo-grid-column field="componenetName" title="Name">
|
<kendo-grid-column field="componenetName" title="Name">
|
||||||
|
|
@ -72,14 +70,8 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="p-col-12 p-md-12" align="right">
|
<div class="p-col-12 p-md-12" align="right">
|
||||||
<!-- <button pButton type="button" label="Go Back" style="margin-bottom: 10px; margin-right: 20px; width: 100px; background:red; color:white" (click)="cancel();" class="ui-button-danger"></button>
|
<button pButton type="button" label="Go Back" style="margin-bottom: 10px; margin-right: 20px; width: 100px; background:red; color:white" (click)="cancel();" class="ui-button-danger"></button>
|
||||||
<button pButton type="submit" label="Save" (click)="Save()" style="margin-bottom: 10px; width: 100px; background:#50AF47; color: white" class="ui-button-success"></button> -->
|
<button pButton type="submit" label="Save" (click)="Save()" style="margin-bottom: 10px; width: 100px; background:#50AF47; color: white" class="ui-button-success"></button>
|
||||||
<button icon="undo" kendoButton class="k-button k-primary" (click)="cancel()" style="margin-right: 5px;">
|
|
||||||
Go Back
|
|
||||||
</button>
|
|
||||||
<button icon="save" kendoButton class="k-button k-primary" (click)="Save()">
|
|
||||||
Save
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
||||||
|
|
@ -211,6 +211,6 @@ export class SalaryDaysDeductEditComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
cancel() {
|
cancel() {
|
||||||
this.router.navigateByUrl('/payroll/absent-deduction-Policy');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
(edit)="editHandler($event)"
|
(edit)="editHandler($event)"
|
||||||
(remove)="removeHandler($event)">
|
(remove)="removeHandler($event)">
|
||||||
<ng-template kendoGridToolbarTemplate>
|
<ng-template kendoGridToolbarTemplate>
|
||||||
<button icon="plus" [primary]="true" kendoGridAddCommand (click)="new()">Add New</button>
|
<button [primary]="true" kendoGridAddCommand (click)="new()">Add New</button>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<kendo-grid-column field="unAuthLeaveName" title="Name" width="80%">
|
<kendo-grid-column field="unAuthLeaveName" title="Name" width="80%">
|
||||||
</kendo-grid-column>
|
</kendo-grid-column>
|
||||||
|
|
|
||||||
|
|
@ -102,10 +102,10 @@ export class EmployeePickerComponent implements OnInit {
|
||||||
isSpanArrowDown: boolean = true;
|
isSpanArrowDown: boolean = true;
|
||||||
isSpanArrowUp: boolean = false;
|
isSpanArrowUp: boolean = false;
|
||||||
gridHeight: number = 305;
|
gridHeight: number = 305;
|
||||||
|
|
||||||
@Input() public payrollTypeID: number;
|
@Input() public payrollTypeID: number;
|
||||||
@Input() public isRecruitment: number;
|
@Input() public isRecruitment: number;
|
||||||
@Input() public set isClear(value) {
|
@Input() public set isClear(value) {
|
||||||
|
debugger;
|
||||||
if (value) {
|
if (value) {
|
||||||
this.selectedItems = [];
|
this.selectedItems = [];
|
||||||
// this.count=0;
|
// this.count=0;
|
||||||
|
|
@ -187,11 +187,6 @@ export class EmployeePickerComponent implements OnInit {
|
||||||
/** role-permission-entry ctor */
|
/** role-permission-entry ctor */
|
||||||
@Input() fixedGrades: number[] = undefined;
|
@Input() fixedGrades: number[] = undefined;
|
||||||
|
|
||||||
private _isForLifeCycle = false;
|
|
||||||
@Input()
|
|
||||||
public set ForLifeCycleSearch(value: boolean) {
|
|
||||||
this._isForLifeCycle = value ?? false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public pageSize = 25;
|
public pageSize = 25;
|
||||||
public skip = 0;
|
public skip = 0;
|
||||||
|
|
@ -459,10 +454,10 @@ export class EmployeePickerComponent implements OnInit {
|
||||||
} else {
|
} else {
|
||||||
name = value;
|
name = value;
|
||||||
}
|
}
|
||||||
debugger;
|
this.loadingEmployee = true;
|
||||||
if(this._isForLifeCycle === false){
|
// this.empSrvc.getEmpCodeName(code, name)
|
||||||
this.loadingEmployee = true;
|
this.empSrvc.getEmpCodeNameForEmployeePickerInput(code, name)
|
||||||
this.empSrvc.getEmpCodeNameForEmployeePickerInput(code, name).subscribe(
|
.subscribe(
|
||||||
(resp: any) => {
|
(resp: any) => {
|
||||||
this.searchEmployees = resp;
|
this.searchEmployees = resp;
|
||||||
},
|
},
|
||||||
|
|
@ -475,36 +470,14 @@ export class EmployeePickerComponent implements OnInit {
|
||||||
this.loadingEmployee = false;
|
this.loadingEmployee = false;
|
||||||
this.empCodeNameListSource = [];
|
this.empCodeNameListSource = [];
|
||||||
this.searchEmployees.forEach(x => {
|
this.searchEmployees.forEach(x => {
|
||||||
this.empCodeNameListSource.push(x.employeeNo + ' ' + x.name);
|
|
||||||
});
|
|
||||||
this.empCodeNameList = this.empCodeNameListSource.filter((s) =>
|
|
||||||
s.toLowerCase().indexOf(value.toLowerCase()) !== -1);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
else{
|
|
||||||
this.loadingEmployee = true;
|
|
||||||
this.empSrvc.getEmpCodeNameForEmployeePickerInputNew(code, name, this._isForLifeCycle).subscribe(
|
|
||||||
(resp: any) => {
|
|
||||||
this.searchEmployees = resp;
|
|
||||||
},
|
|
||||||
(err: any) => {
|
|
||||||
// ON ERROR
|
|
||||||
this.loadingEmployee = false;
|
|
||||||
},
|
|
||||||
() => {
|
|
||||||
// ON Success
|
|
||||||
this.loadingEmployee = false;
|
|
||||||
this.empCodeNameListSource = [];
|
|
||||||
this.searchEmployees.forEach(x => {
|
|
||||||
this.empCodeNameListSource.push(x.employeeNo + ' ' + x.name);
|
|
||||||
});
|
|
||||||
this.empCodeNameList = this.empCodeNameListSource.filter((s) =>
|
|
||||||
s.toLowerCase().indexOf(value.toLowerCase()) !== -1);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
this.empCodeNameListSource.push(x.employeeNo + ' ' + x.name);
|
||||||
|
});
|
||||||
|
this.empCodeNameList = this.empCodeNameListSource.filter((s) =>
|
||||||
|
s.toLowerCase().indexOf(value.toLowerCase()) !== -1);
|
||||||
|
|
||||||
|
}
|
||||||
|
);
|
||||||
/*} else {
|
/*} else {
|
||||||
|
|
||||||
this.empCodeNameList = this.empCodeNameListSource.filter((s) =>
|
this.empCodeNameList = this.empCodeNameListSource.filter((s) =>
|
||||||
|
|
|
||||||
|
|
@ -267,7 +267,6 @@ export class ReportViewerComponent implements OnInit {
|
||||||
let reportName = '';
|
let reportName = '';
|
||||||
if (this.reportType === 'empDetailInfo') {
|
if (this.reportType === 'empDetailInfo') {
|
||||||
this.apiService.selectedMenuName = 'Employee Detail Information';
|
this.apiService.selectedMenuName = 'Employee Detail Information';
|
||||||
this.hiddenExport = true;
|
|
||||||
const employeeBasicInfo = new EmployeeBasicInfo();
|
const employeeBasicInfo = new EmployeeBasicInfo();
|
||||||
this.dynamicColumnNames = [
|
this.dynamicColumnNames = [
|
||||||
{ sl: 1, columnName: 'employeeNo', columnHeader: 'Employee No', width: '80' },
|
{ sl: 1, columnName: 'employeeNo', columnHeader: 'Employee No', width: '80' },
|
||||||
|
|
@ -1536,63 +1535,32 @@ export class ReportViewerComponent implements OnInit {
|
||||||
if (this.selectedEmp !== undefined) {
|
if (this.selectedEmp !== undefined) {
|
||||||
selectedemps.push(this.selectedEmp);
|
selectedemps.push(this.selectedEmp);
|
||||||
}
|
}
|
||||||
// this.employeeService.getEmpDetailInfo(selectedemps).subscribe(
|
this.employeeService.getEmpDetailInfo(selectedemps).subscribe(
|
||||||
// (resp) => {
|
(resp) => {
|
||||||
// // this.employeeDetailInfos = resp;
|
// this.employeeDetailInfos = resp;
|
||||||
// this.loadingPanel.ShowLoadingPanel = false;
|
|
||||||
// this.data = resp;
|
|
||||||
// //debugger;
|
|
||||||
// },
|
|
||||||
// (err) => {
|
|
||||||
// console.log(err);
|
|
||||||
// this.notificationService.showError(err.error);
|
|
||||||
// this.loadingPanel.ShowLoadingPanel = false;
|
|
||||||
// },
|
|
||||||
// () => {
|
|
||||||
// this.loadingPanel.ShowLoadingPanel = false;
|
|
||||||
// // console.log(this.data);
|
|
||||||
// for (let i = 0; i < this.data.length; i++) {
|
|
||||||
// this.data[i]['birthDate'] = this.data[i]['birthDate'] != null ?
|
|
||||||
// this.datePipe.transform(this.data[i]['birthDate'], 'dd MMM yyyy').toString() : "";
|
|
||||||
// this.data[i]['joiningDate'] = this.data[i]['joiningDate'] != null ?
|
|
||||||
// this.datePipe.transform(this.data[i]['joiningDate'], 'dd MMM yyyy').toString() : "";
|
|
||||||
// this.data[i]['dateOfConfirmation'] = this.data[i]['dateOfConfirmation'] != null ?
|
|
||||||
// this.datePipe.transform(this.data[i]['dateOfConfirmation'], 'dd MMM yyyy').toString() : "";
|
|
||||||
// }
|
|
||||||
// // debugger;
|
|
||||||
// this.showAny = true;
|
|
||||||
// this.loadGrid();
|
|
||||||
// }
|
|
||||||
// );
|
|
||||||
|
|
||||||
const data = {
|
|
||||||
reportid: this.reportType,
|
|
||||||
selectedReport: this.selectedReport,
|
|
||||||
empIds: this.empIds,
|
|
||||||
reportType: reportType
|
|
||||||
};
|
|
||||||
this.loadingPanel.ShowLoadingPanel = true;
|
|
||||||
if (reportType === 'PDF')
|
|
||||||
this.showPopUp = true;
|
|
||||||
this.reportService.getEmpDetailInfoReport(data).subscribe(
|
|
||||||
(resp: any) => {
|
|
||||||
if (reportType === 'PDF') {
|
|
||||||
// this.src = URL.createObjectURL(this.b64toBlob(resp, 'data:application/pdf;base64', 1024));
|
|
||||||
// this.showPopUp = true;
|
|
||||||
|
|
||||||
this.src = URL.createObjectURL(this.b64toBlob(resp, 'application/pdf', 1024));
|
|
||||||
var element = <HTMLIFrameElement>(document.getElementById("pdf-viewer-report"));
|
|
||||||
element.src = this.src;
|
|
||||||
} else if (reportType === 'EXCEL') {
|
|
||||||
this.downloadFile(resp);
|
|
||||||
}
|
|
||||||
this.loadingPanel.ShowLoadingPanel = false;
|
this.loadingPanel.ShowLoadingPanel = false;
|
||||||
|
this.data = resp;
|
||||||
|
//debugger;
|
||||||
},
|
},
|
||||||
(err) => {
|
(err) => {
|
||||||
this.closeForm();
|
|
||||||
console.log(err);
|
console.log(err);
|
||||||
this.notificationService.showError(err.error);
|
this.notificationService.showError(err.error);
|
||||||
this.loadingPanel.ShowLoadingPanel = false;
|
this.loadingPanel.ShowLoadingPanel = false;
|
||||||
|
},
|
||||||
|
() => {
|
||||||
|
this.loadingPanel.ShowLoadingPanel = false;
|
||||||
|
// console.log(this.data);
|
||||||
|
for (let i = 0; i < this.data.length; i++) {
|
||||||
|
this.data[i]['birthDate'] = this.data[i]['birthDate'] != null ?
|
||||||
|
this.datePipe.transform(this.data[i]['birthDate'], 'dd MMM yyyy').toString() : "";
|
||||||
|
this.data[i]['joiningDate'] = this.data[i]['joiningDate'] != null ?
|
||||||
|
this.datePipe.transform(this.data[i]['joiningDate'], 'dd MMM yyyy').toString() : "";
|
||||||
|
this.data[i]['dateOfConfirmation'] = this.data[i]['dateOfConfirmation'] != null ?
|
||||||
|
this.datePipe.transform(this.data[i]['dateOfConfirmation'], 'dd MMM yyyy').toString() : "";
|
||||||
|
}
|
||||||
|
// debugger;
|
||||||
|
this.showAny = true;
|
||||||
|
this.loadGrid();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1331,85 +1331,6 @@ namespace HRM.UI.Controllers.Attendance
|
||||||
|
|
||||||
return Ok(attnProcesses);
|
return Ok(attnProcesses);
|
||||||
}
|
}
|
||||||
[HttpPost("getDailyAttnProcessByEmpForManualEntry")]
|
|
||||||
public ActionResult getDailyAttnProcessByEmpForManualEntry(dynamic data)
|
|
||||||
{
|
|
||||||
List<DailyAttnProcess> _dAttnProcessess = new List<DailyAttnProcess>();
|
|
||||||
DailyAttnProcess _dAttnProcess = null;
|
|
||||||
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var items = Newtonsoft.Json.JsonConvert.DeserializeObject(Convert.ToString(data));
|
|
||||||
string empids = "";
|
|
||||||
DateTime attnDate = DateTime.Today;
|
|
||||||
List<int> empIdList = new List<int>();
|
|
||||||
foreach (var item in items)
|
|
||||||
{
|
|
||||||
int empID = (int)item["employeeid"].ToObject<int>();
|
|
||||||
empids = empids + empID.ToString() + ",";
|
|
||||||
attnDate = (DateTime)item["attnDate"].ToObject<DateTime>();
|
|
||||||
empIdList.Add(empID);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (empids.Length > 0) empids = empids.Substring(0, empids.Length - 1);
|
|
||||||
|
|
||||||
attnDate = new DateTime(attnDate.Year, attnDate.Month, attnDate.Day);
|
|
||||||
List<DailyAttnProcess> dAttnProcessess = this._dailyAttnProcessService.GetByEmployees(attnDate, empids);
|
|
||||||
|
|
||||||
foreach (var empid in empIdList)
|
|
||||||
{
|
|
||||||
bool existInList = false;
|
|
||||||
foreach (DailyAttnProcess dattnPs in _dAttnProcessess)
|
|
||||||
{
|
|
||||||
if (dattnPs.EmployeeID == empid)
|
|
||||||
{
|
|
||||||
existInList = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!existInList)
|
|
||||||
{
|
|
||||||
bool ExistInSavedData = false;
|
|
||||||
if (dAttnProcessess != null && dAttnProcessess.Count > 0)
|
|
||||||
{
|
|
||||||
foreach (DailyAttnProcess dAttnProcess in dAttnProcessess)
|
|
||||||
{
|
|
||||||
if (dAttnProcess.EmployeeID == empid)
|
|
||||||
{
|
|
||||||
ExistInSavedData = true;
|
|
||||||
_dAttnProcessess.Add(dAttnProcess);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ExistInSavedData)
|
|
||||||
{
|
|
||||||
_dAttnProcess = new DailyAttnProcess();
|
|
||||||
_dAttnProcess.EmployeeID = empid;
|
|
||||||
_dAttnProcess.AttnDate = attnDate;
|
|
||||||
_dAttnProcessess.Add(_dAttnProcess);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//if (_dAttnProcessess != null && _dAttnProcessess.Count > 0)
|
|
||||||
//{
|
|
||||||
// int serial = 1;
|
|
||||||
// foreach (DailyAttnProcess dAttnProcess in _dAttnProcessess)
|
|
||||||
// {
|
|
||||||
// if (dAttnProcess.IsNew)
|
|
||||||
// {
|
|
||||||
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Ok(_dAttnProcessess);
|
|
||||||
}
|
|
||||||
|
|
||||||
// DailyAttnProcess
|
// DailyAttnProcess
|
||||||
[HttpGet("getDailyAttnProcessByEmployeeId/{employeeId}")]
|
[HttpGet("getDailyAttnProcessByEmployeeId/{employeeId}")]
|
||||||
|
|
|
||||||
|
|
@ -822,54 +822,7 @@ namespace HRM.UI.Controllers
|
||||||
return Ok(olist);
|
return Ok(olist);
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet("getEmpCodeNameForEmployeePickerInputNew/{code}/{name}/{isForLifeCycle}")]
|
[HttpGet("getEmployeeAttachments/{empId}")]
|
||||||
public ActionResult getEmpCodeNameForEmployeePickerInputNew(string code, string name, bool isForLifeCycle)
|
|
||||||
{
|
|
||||||
code = GlobalFunctions.GetApiDefaultData(code);
|
|
||||||
name = GlobalFunctions.GetApiDefaultData(name);
|
|
||||||
|
|
||||||
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
|
||||||
List<SearchEmployee> olist = new List<SearchEmployee>();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
//olist = _serachManager.FindEmpCodeName((int) currentUser.PayrollTypeID, code, name);
|
|
||||||
if (code != "")
|
|
||||||
{
|
|
||||||
List<SearchEmployee> unorderedList = _serachManager.FindEmpCodeNameForEmployeePickerNew((int)currentUser.UserID, (int)currentUser.PayrollTypeID, code, name, isForLifeCycle);
|
|
||||||
|
|
||||||
olist = unorderedList
|
|
||||||
.OrderBy(item => item.EmployeeNo != code) // False (0) for priority value, True (1) for others
|
|
||||||
.ThenBy(item => item.EmployeeNo).ToList();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
olist = _serachManager.FindEmpCodeNameForEmployeePickerNew((int)currentUser.UserID, (int)currentUser.PayrollTypeID, code, name, isForLifeCycle);
|
|
||||||
}
|
|
||||||
|
|
||||||
//List<Grade> grades = new GradeService().Get(EnumStatus.Regardless, (int)currentUser.PayrollTypeID);
|
|
||||||
//List<Designation> designations = new DesignationService().Get(EnumStatus.Regardless, (int)currentUser.PayrollTypeID);
|
|
||||||
//List<Department> departments = new DepartmentService().Get(EnumStatus.Regardless, (int)currentUser.PayrollTypeID);
|
|
||||||
//olist.ForEach(x=>
|
|
||||||
//{
|
|
||||||
// var grd = grades.FirstOrDefault(d => d.ID == x.GradeID);
|
|
||||||
// if(grd != null) x.gradeName = grd.Name;
|
|
||||||
|
|
||||||
// var designation = designations.FirstOrDefault(d => d.ID == x.designationID);
|
|
||||||
// if (designation != null) x.designationName = designation.Name;
|
|
||||||
// var department = departments.FirstOrDefault(d => d.ID == x.DepartmentID);
|
|
||||||
// if (department != null) x.departmentName = department.Name;
|
|
||||||
//}); // Secondary ordering (alphabetical)
|
|
||||||
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
return StatusCode(StatusCodes.Status500InternalServerError, ex.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Ok(olist);
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpGet("getEmployeeAttachments/{empId}")]
|
|
||||||
public ActionResult GetEmployeeAttachments(int empId)
|
public ActionResult GetEmployeeAttachments(int empId)
|
||||||
{
|
{
|
||||||
List<empFileupload> items = new List<empFileupload>();
|
List<empFileupload> items = new List<empFileupload>();
|
||||||
|
|
|
||||||
|
|
@ -954,31 +954,7 @@ namespace HRM.UI.Controllers.Report
|
||||||
return Ok(bytes);
|
return Ok(bytes);
|
||||||
}
|
}
|
||||||
#endregion Production Bonus Report
|
#endregion Production Bonus Report
|
||||||
[HttpPost("getEmpDetailInfoReport")]
|
|
||||||
public ActionResult getEmpDetailInfoReport(dynamic data)
|
|
||||||
{
|
|
||||||
|
|
||||||
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
|
||||||
var items = Newtonsoft.Json.JsonConvert.DeserializeObject(Convert.ToString(data));
|
|
||||||
string reportType = (string)items["reportType"].ToObject<string>();
|
|
||||||
string sEmpIDs = (string)items["empIds"].ToObject<string>();
|
|
||||||
|
|
||||||
byte[] bytes = null;
|
|
||||||
int payrollTypeId = currentUser.PayrollTypeID.GetValueOrDefault();
|
|
||||||
ReportProcessor reportProcessor = new ReportProcessor();
|
|
||||||
rptEmployee rptEmp = new rptEmployee();
|
|
||||||
DataSet resultDataSet = new DataSet();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
bytes = new rptEcho().ShowEmployeeDetailInfo(sEmpIDs, reportType, (int)currentUser.PayrollTypeID);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Ok(bytes);
|
|
||||||
}
|
|
||||||
[HttpGet("getEstimatedConfirmation")]
|
[HttpGet("getEstimatedConfirmation")]
|
||||||
public ActionResult GetEstimatedConfirmation()
|
public ActionResult GetEstimatedConfirmation()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user