Merge pull request 'profile issues' (#47) from dev_mashfiq into devqc

Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/47

DatabaseComparison/Form1.cs

@@ -1166,7 +1166,7 @@ namespace DatabaseComparison
                                     GO");
                 sql.AppendFormat("\r\n\r\n");
                 sql.AppendFormat(@"CREATE VIEW VW_EMPDigitalServiceBook AS 
-                                    SELECT E.EMPLOYEEID, E.EMPLOYEENO, E.BENGALINAME AS NAME, E.FATHERNAME, E.MOTHERNAME, ES.NAME AS SPOUSENAME, E.JOININGDATE, E.EMPLOYEESTATUS,
+                                    SELECT E.EMPLOYEEID, E.EMPLOYEENO, E.BANGLANAME AS NAME, E.FATHERNAME, E.MOTHERNAME, ES.NAME AS SPOUSENAME, E.JOININGDATE, E.EMPLOYEESTATUS,
                                     DES.NAMEINBANGLA AS DESIGNATION, EC.PARMANENTADDRESS AS PARMANENTADDRESS, EC.PRESENTADDRESS AS PRESENTADDRESS, EC.PERMANENTPOSTOFFICE AS POSTOFFICE, 
                                     EC.PERMANENTPOSTCODENO AS POSTCODENO, EC.PERMANENTVILLAGE AS VILLAGE, EC.PERMANENTROADNO AS ROADNO, 
                                     EC.PERMANENTWARDNO AS WARDNO, E.BIRTHDATE AS BIRTHDATE, E.PHOTOPATH AS PHOTO, E.NATIONALID AS NIDNO, E.HEIGHT AS HEIGHT, E.BLOODGROUP AS BLOODGROUP, 

HRM.BO/Attendance/DailyAttnProcess.cs

@@ -441,20 +441,21 @@ 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
+        //public bool OnlyManualOutTime
-        {
+        //{
-            get
+        //    get
-            {
+        //    {
-                return (this.IsManualEntry == true && this.ActualOutTime != null) ? true : false;
+        //        return (this.IsManualEntry == true && this.ActualOutTime != null) ? true : false;
-            }
+        //    }
-        }
+        //}
-        
+        public bool OnlyManualInTime { get; set; }
+        public bool OnlyManualOutTime { get; set; }
 
 
 
@@ -3382,6 +3383,7 @@ namespace HRM.BO
         DataTable getTopEmpAbsentData(Employee oEmp, EnumAttendanceType type);
         DataTable getcorehrAbsentData(Employee oEmp, EnumAttendanceType type);
         DataSet AttnDaysSummaryForSalaryProcess(DateTime FromDate, DateTime ToDate);
+        List<DailyAttnProcess> GetByEmployees(DateTime attnDate, string employeeIDs);
     }
 
     #endregion

HRM.BO/Common/PayrollGlobalFunctions.cs

@@ -1,6 +1,7 @@
 using Ease.Core.Model;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Drawing;
 using System.Linq;
 using System.Text;
@@ -504,6 +505,20 @@ namespace HRM.BO
 
             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

HRM.BO/HRBasic/Enums.cs

@@ -596,38 +596,74 @@ namespace HRM.BO
         public const string EmpMaritalStatus = "<<EmpMaritalStatus>>";
 
         // Bangla Tags
-        public const string EmpNameBangla = "<<bvg>>";
+        //public const string EmpNameBangla = "<<bvg>>";
-        public const string EmpCodeBangla = "<<‡KvW>>";
+        //public const string EmpCodeBangla = "<<‡KvW>>";
-        public const string EmpWorkType = "<<Kv‡RiaiY>>";
+        //public const string EmpWorkType = "<<Kv‡RiaiY>>";
-        public const string EmpSpouseName = "<<¯^vgx/¯¿xibvg>>";
+        //public const string EmpSpouseName = "<<¯^vgx/¯¿xibvg>>";
-        public const string JoiningDateBangla = "<<‡hvM`vb>>";
+        //public const string JoiningDateBangla = "<<‡hvM`vb>>";
-        public const string EmpDesignaionBangla = "<<c`ex>>";
+        //public const string EmpDesignaionBangla = "<<c`ex>>";
-        public const string EmpDepartmentBangla = "<<wefvM>>";
+        //public const string EmpDepartmentBangla = "<<wefvM>>";
-        public const string BirthDateBangla = "<<Rb¥ZvwiL>>";
+        //public const string BirthDateBangla = "<<Rb¥ZvwiL>>";
-        public const string ProbationDateBangla = "<<wk¶vbexkZvwiL>>";
+        //public const string ProbationDateBangla = "<<wk¶vbexkZvwiL>>";
-        public const string GradeBangla = "<<†MÖW>>";
+        //public const string GradeBangla = "<<†MÖW>>";
-        public const string BasicSalaryBangla = "<<gyj†eZb>>";
+        //public const string BasicSalaryBangla = "<<gyj†eZb>>";
-        public const string HouseRentBangla = "<<evoxfvov>>";
+        //public const string HouseRentBangla = "<<evoxfvov>>";
-        public const string ConveyenceBangla = "<<hvZvqvZfvZv>>";
+        //public const string ConveyenceBangla = "<<hvZvqvZfvZv>>";
-        public const string MedicalBangla = "<<wPwKrmvfvZv>>";
+        //public const string MedicalBangla = "<<wPwKrmvfvZv>>";
-        public const string FoodBangla = "<<Lv`¨fvZv>>";
+        //public const string FoodBangla = "<<Lv`¨fvZv>>";
-        public const string AttendenceBonusBangla = "<<ab>>";
+        //public const string AttendenceBonusBangla = "<<ab>>";
-        public const string ConductBonusBangla = "<<cb>>";
+        //public const string ConductBonusBangla = "<<cb>>";
-        public const string FatherNameBangla = "<<wcZvibvg>>";
+        //public const string FatherNameBangla = "<<wcZvibvg>>";
-        public const string MotherNameBangla = "<<gvZvibvg>>";
+        //public const string MotherNameBangla = "<<gvZvibvg>>";
-        public const string SpouseNameBangla = "<<¯úvD†Ri bvg>>";
+        //public const string SpouseNameBangla = "<<¯úvD†Ri bvg>>";
-        public const string VillagePABangla = "<<¯’vqxMÖvg>>";
+        //public const string VillagePABangla = "<<¯’vqxMÖvg>>";
-        public const string PostOfficePABangla = "<<¯’vqx‡cvóAwdm>>";
+        //public const string PostOfficePABangla = "<<¯’vqx‡cvóAwdm>>";
-        public const string ThanaPABangla = "<<¯’vqx_vbv>>";
+        //public const string ThanaPABangla = "<<¯’vqx_vbv>>";
-        public const string DistrictPABangla = "<<¯’vqx‡Rjv>>";
+        //public const string DistrictPABangla = "<<¯’vqx‡Rjv>>";
-        public const string VillageTABangla = "<<eZ©gvbMÖvg>>";
+        //public const string VillageTABangla = "<<eZ©gvbMÖvg>>";
-        public const string PostOfficeTABangla = "<<eZ©gvb‡cvóAwdm>>";
+        //public const string PostOfficeTABangla = "<<eZ©gvb‡cvóAwdm>>";
-        public const string ThanaTABangla = "<<eZ©gvb_vbv>>";
+        //public const string ThanaTABangla = "<<eZ©gvb_vbv>>";
-        public const string DistrictTABangla = "<<eZ©gvb‡Rjv>>";
+        //public const string DistrictTABangla = "<<eZ©gvb‡Rjv>>";
-        public const string TotalTakaBangla = "<<me©‡gvU>>";
+        //public const string TotalTakaBangla = "<<me©‡gvU>>";
-        public const string SectionBangla = "<<‡mKkb>>";
+        //public const string SectionBangla = "<<‡mKkb>>";
-        public const string BloodGroupBangla = "<<i‡³iMÖæc>>";
+        //public const string BloodGroupBangla = "<<i‡³iMÖæc>>";
-        public const string FloorBangla = "<<‡d¬vi>>";
+        //public const string FloorBangla = "<<‡d¬vi>>";
+
+
+
+
+        public const string EmpNameBangla = "EmpNameBangla";
+        public const string EmpCodeBangla = "EmpCodeBangla";
+        public const string EmpWorkType = "EmpWorkType";
+        public const string EmpSpouseName = "EmpSpouseName";
+        public const string JoiningDateBangla = "JoiningDateBangla";
+        public const string EmpDesignaionBangla = "EmpDesignaionBangla";
+        public const string EmpDepartmentBangla = "EmpDepartmentBangla";
+        public const string BirthDateBangla = "BirthDateBangla";
+        public const string ProbationDateBangla = "ProbationDateBangla";
+        public const string GradeBangla = "GradeBangla";
+        public const string BasicSalaryBangla = "BasicSalaryBangla";
+        public const string HouseRentBangla = "HouseRentBangla";
+        public const string ConveyenceBangla = "ConveyenceBangla";
+        public const string MedicalBangla = "MedicalBangla";
+        public const string FoodBangla = "FoodBangla";
+        public const string AttendenceBonusBangla = "AttendenceBonusBangla";
+        public const string ConductBonusBangla = "ConductBonusBangla";
+        public const string FatherNameBangla = "FatherNameBangla";
+        public const string MotherNameBangla = "MotherNameBangla";
+        public const string SpouseNameBangla = "SpouseNameBangla";
+        public const string VillagePABangla = "VillagePABangla";
+        public const string PostOfficePABangla = "PostOfficePABangla";
+        public const string ThanaPABangla = "ThanaPABangla";
+        public const string DistrictPABangla = "DistrictPABangla";
+        public const string VillageTABangla = "VillageTABangla";
+        public const string PostOfficeTABangla = "PostOfficeTABangla";
+        public const string ThanaTABangla = "ThanaTABangla";
+        public const string DistrictTABangla = "DistrictTABangla";
+        public const string TotalTakaBangla = "TotalTakaBangla";
+        public const string SectionBangla = "SectionBangla";
+        public const string BloodGroupBangla = "BloodGroupBangla";
+        public const string FloorBangla = "FloorBangla";
 
         #endregion
 

HRM.BO/HREmployee/EmpLifeCycle.cs

@@ -281,16 +281,16 @@ namespace HRM.BO
             set { _incrementNo = value; }
         }
         #endregion
-           #region payrollTypeID : int
+        #region payrollTypeID : int
 
-       private int _payrollTypeID;
+        private int _payrollTypeID;
-       public int PayrollTypeID
+        public int PayrollTypeID
-       {
+        {
            get { return _payrollTypeID; }
            set { _payrollTypeID = value; }
         }
         #endregion
-        #region payrollTypeID : int
+        #region punishmentID : int
 
         private int _punishmentID;
         public int PunishmentID
@@ -299,7 +299,7 @@ namespace HRM.BO
             set { _punishmentID = value; }
         }
         #endregion
-        #region payrollTypeID : int
+        #region complainID : int
 
         private int _complainID;
         public int ComplainID
@@ -320,27 +320,27 @@ namespace HRM.BO
 #endregion
 
 
-#region IsTransferReceived : bool
+        #region IsTransferReceived : bool
-        private bool _isTransferReceived;
+                private bool _isTransferReceived;
-        public bool IsTransferReceived
+                public bool IsTransferReceived
-        {
+                {
-   get { return _isTransferReceived; }
+           get { return _isTransferReceived; }
-   set { _isTransferReceived = value; }
+           set { _isTransferReceived = value; }
-           }
+                   }
-
-#endregion
-
-
-#region Employee : Employee 
-public Employee Employee { get; set; }
-        public HREmployee HREmployee { get; set; }
-        public List<EmployeeCostCenter> EmployeeCostCenters { get; set; }
-
-        public EmployeeGradeSalary EmployeeGradeSalary { get; set; }
-        public List<OrganogramEmployee> Orgemployees { get; set; }
 
         #endregion
 
+
+        #region Employee : Employee 
+        public Employee Employee { get; set; }
+                public HREmployee HREmployee { get; set; }
+                public List<EmployeeCostCenter> EmployeeCostCenters { get; set; }
+
+                public EmployeeGradeSalary EmployeeGradeSalary { get; set; }
+                public List<OrganogramEmployee> Orgemployees { get; set; }
+
+                #endregion
+
         #region HREmployee : HREmployee
 
         //private HREmployee _hremployee;
@@ -554,6 +554,7 @@ public Employee Employee { get; set; }
 
         #endregion
       
+        public string CreatedByUser { get; set; }
 
 
     }

HRM.BO/HRM.BO.csproj

@@ -77,6 +77,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
     <PackageReference Include="iTextSharp" Version="5.5.13.3" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.12" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

HRM.BO/SearchReport/SearchEmployee.cs

@@ -370,7 +370,8 @@ namespace HRM.BO
         List<SearchEmployee> FindCordinator(int? id, int? payrollTypeID);
         List<SearchEmployee> FindEmpCodeName(int payrolltypeid, string code, string name);
         List<SearchEmployee> FindEmpCodeNameForEmployeePicker(int userid, int payrolltypeid, string code, string name);
-        SearchEmployee get(int empid);
+		List<SearchEmployee> FindEmpCodeNameForEmployeePickerNew(int userid, int payrolltypeid, string code, string name, bool isForLifeCycle);
+		SearchEmployee get(int empid);
         List<SearchEmployee> GetEmployeeNotYetUser(int payrollTypeID);
         List<SearchEmployee> GetTeam(int employeeid);
         List<SearchEmployee> GetTeam(int employeeid, EnumStatus enumStatus);

HRM.BO/TagOutput/MSWord.cs

@@ -1,12 +1,16 @@
-using System;
+using DocumentFormat.OpenXml.Packaging;
-using System.Collections.Generic;
+using DocumentFormat.OpenXml.Wordprocessing;
-using System.Text;
-using System.Collections;
-using System.Data;
-using System.IO;
 //using Microsoft.Office.Interop;
 using Microsoft.Office.Interop.Word;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
 using System.Reflection;
+using System.Text;
+using Paragraph = DocumentFormat.OpenXml.Wordprocessing.Paragraph;
 
 namespace HRM.BO
 {
@@ -15,6 +19,7 @@ namespace HRM.BO
         private Hashtable _Pair;
         private string _OriginalFile;
         private string _PreparedFile;
+        public string PreparedFile => _PreparedFile;
         private Application _wordapp;
         public MSWord()
         {
@@ -40,13 +45,13 @@ namespace HRM.BO
             }
         }
 
-        public string PreparedFile
+        //public string PreparedFile
-        {
+        //{
-            get
+        //    get
-            {
+        //    {
-                return _PreparedFile;
+        //        return _PreparedFile;
-            }
+        //    }
-        }
+        //}
 
         public void DeleteFile()
         {
@@ -183,6 +188,70 @@ namespace HRM.BO
             }
         }
 
+        public void ReplaceWordsDocx(string destFileName, Hashtable tagValueHashTable)
+        {
+            if (tagValueHashTable == null || tagValueHashTable.Count == 0)
+                return;
+
+            CreateCopy(destFileName);
+            try
+            {
+
+                if (!Path.GetExtension(_PreparedFile).Equals(".docx", StringComparison.OrdinalIgnoreCase))
+                    throw new InvalidOperationException("Only .docx files are supported. Please convert your template to .docx.");
+
+                using (WordprocessingDocument wordDoc = WordprocessingDocument.Open(_PreparedFile, true))
+                {
+                    var docPart = wordDoc.MainDocumentPart;
+                    var texts = docPart.Document.Descendants<Text>().ToList();
+                    string docText;
+
+                    // Load the entire document XML
+                    using (StreamReader sr = new StreamReader(docPart.GetStream()))
+                    {
+                        docText = sr.ReadToEnd();
+                    }
+
+                    // Perform replacements
+                    _Pair = (tagValueHashTable != null) ? tagValueHashTable : new Hashtable();
+                    foreach (string key in _Pair.Keys)
+                    {
+                        //FindText = sKey;
+                        //ReplaceText = tagValueHashTable[sKey];
+                        string value = tagValueHashTable[key]?.ToString() ?? string.Empty;
+                        docText = docText.Replace(key, value);
+                    }
+                    // Write updated XML back
+                    using (StreamWriter sw = new StreamWriter(docPart.GetStream(FileMode.Create)))
+                    {
+                        sw.Write(docText);
+                    }
+                }
+                //using (WordprocessingDocument wordDoc = WordprocessingDocument.Open(_PreparedFile, true))
+                //{
+                //    var docPart = wordDoc.MainDocumentPart;
+
+                //    foreach (var text in docPart.Document.Descendants<Text>())
+                //    {
+                //        foreach (string key in tagValueHashTable.Keys)
+                //        {
+                //            string value = tagValueHashTable[key]?.ToString() ?? string.Empty;
+
+                //            if (text.Text.Contains(key))
+                //            {
+                //                text.Text = text.Text.Replace(key, value);
+                //            }
+                //        }
+                //    }
+
+                //    docPart.Document.Save();
+                //}
+            }
+            catch (Exception ex)
+            {
+                throw new Exception("Error: Could not read file from disk. Original error: " + ex.Message);
+            }
+        }
         public void printDoc()
         {
             Microsoft.Office.Interop.Word.Application ac = new Microsoft.Office.Interop.Word.Application();

HRM.DA/DA/Attendance/DailyAttnProcessDA.cs

@@ -24,19 +24,37 @@ namespace HRM.DA
 
         #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
 
@@ -4092,6 +4110,11 @@ namespace HRM.DA
 
             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
 

HRM.DA/DA/Employee/EmployeeDA.cs

@@ -3769,8 +3769,9 @@ AND ea.EMPLOYEEID=emp.EMPLOYEEID AND ea.LASTLEVEL=1),'') LastAcademic ,
         {
             tc.CommandTimeOut = 60;
             string sSQL = SQLParser.MakeSQL(@"SELECT EMPLOYEEID, EMPLOYEENO, NAME, FATHERNAME, MOTHERNAME, SPOUSENAME, JOININGDATE, 
-                                                DESIGNATION, BIRTHDATE, NIDNO, HEIGHT, BLOODGROUP, PARMANENTADDRESS, PARMANENTDISTRICT, 
+                                                DESIGNATION, BIRTHDATE, NIDNO, HEIGHT, BLOODGROUP, 
-                                                PARMANENTTHANA, PRESENTADDRESS, LMDESIGNATION, PHOTO, EDUCATIONLEVEL
+                                                PARMANENTADDRESS, PRESENTADDRESS, POSTOFFICEPA, DISTRICTPA,THANAPA,VILLAGEPA, ROADNOPA, WARDNOPA,  POSTOFFICETA, DISTRICTTA, THANATA, VILLAGETA, ROADNOTA, WARDNOTA,
+                                                LMDESIGNATION, PHOTO, EDUCATIONLEVEL
                                                 FROM dbo.VW_EMPDIGITALSERVICEBOOK 
                                                 WHERE EMPLOYEEID = %n", empID);
             return tc.ExecuteDataSet(sSQL);
@@ -4150,6 +4151,85 @@ AND ea.EMPLOYEEID=emp.EMPLOYEEID AND ea.LASTLEVEL=1),'') LastAcademic ,
             return tc.ExecuteDataTable(
                 "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

HRM.DA/DA/HREmployee/HREmployeeDA.cs

@@ -1095,6 +1095,31 @@ namespace HRM.DA
             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
 
         #region EmpAchievements Get

HRM.DA/DA/SearchReport/SearchEmployeeDA.cs

@@ -400,8 +400,170 @@ END;";
             return tc.ExecuteReader(finalSQl);
         }
 
-        #endregion
+		internal static IDataReader SearchForEmployeePickerNew(TransactionContext tc, int userID, int payrollTypeID, string code, string name, bool isForLifeCycle)
-    }
+		{
+			string orderby = "name";
+			string sqlClause = "";
+			string top = "";
 
-    #endregion
+			string recurSqlClause = SQLParser.MakeSQL(@"
+                                    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
 }

HRM.DA/Service/Attendance/AttendanceProcess.cs

@@ -443,7 +443,7 @@ namespace HRM.DA
             foreach(var item in Groupdate)
             {            
                 Thread myNewThread = new Thread(() => Process(item.Key, 
-                    EnumProcessMode.Auto, oemp.PayrollTypeID, ouser.ID, emps));
+                    EnumProcessMode.Auto, oemp.PayrollTypeID, ouser.ID, emps, false));
                 myNewThread.Start();
                 
             }
@@ -462,16 +462,16 @@ namespace HRM.DA
             _shifts = new ShiftService().GetAllShift();
             for (DateTime currentDate = ProcessDate; currentDate <= endDate; currentDate = currentDate.AddDays(1))
             {
-                Process(currentDate, EnumProcessMode.Auto, payrollTypeID, processUserID, emp);
+                Process(currentDate, EnumProcessMode.Auto, payrollTypeID, processUserID, emp, false);
             }
         }
 
-        public void Process(DateTime fromDate, EnumProcessMode prMode, int payrollTypeID, int processUserID, List<Employee> emps)
+        public void Process(DateTime fromDate, EnumProcessMode prMode, int payrollTypeID, int processUserID, List<Employee> emps, bool overrideManualEntry)
         {
             bool isEchoTex = new SystemConfigarationService().GetconfigBooleanValue(EnumConfigurationType.Logic, "attendence", "echotexprocess");
             if (isEchoTex == true)
             {
-                echoTexProcess(fromDate, prMode, payrollTypeID, processUserID, emps);
+                echoTexProcess(fromDate, prMode, payrollTypeID, processUserID, emps, overrideManualEntry);
                 return;
             }
             _attnRunSummary = new AttnProcessRunSummary();
@@ -2565,7 +2565,7 @@ namespace HRM.DA
 
 
             
-        public void echoTexProcess(DateTime Attdate, EnumProcessMode prMode, int payrolltypeid, int processUserID, List< Employee> employees)
+        public void echoTexProcess(DateTime Attdate, EnumProcessMode prMode, int payrolltypeid, int processUserID, List< Employee> employees, bool overrideManualEntry)
         {
 
             AttnProcessRunSummary oAttnRunSummary = new AttnProcessRunSummary();
@@ -2668,7 +2668,7 @@ namespace HRM.DA
                                       .FirstOrDefault(obj => obj.EmployeeID == emp.ID);
 
                     // 2. If Attendendence is manually enterred 
-                    if (manualEntry != null)
+                    if (manualEntry != null && overrideManualEntry == false)
                     {
                         // 2.1 If Both In and Out are Manually Enterred then add the item
                         if (!manualEntry.OnlyManualInTime && !manualEntry.OnlyManualOutTime)

HRM.DA/Service/Attendance/DailyAttnProcessService.cs

@@ -46,7 +46,9 @@ namespace HRM.DA
             oDailyAttnProcess.AttenType = (EnumAttendanceType)oReader.GetInt32("AttenType").Value;
             oDailyAttnProcess.Comments = oReader.GetString("Comments") == null ? "" : oReader.GetString("Comments");
             oDailyAttnProcess.Reason = oReader.GetString("Reason") == null ? "" : oReader.GetString("Reason");
-            oDailyAttnProcess.IsManualEntry = oReader.GetBoolean("IsManualEntry").Value;
+            oDailyAttnProcess.IsManualEntry = oReader.GetBoolean("IsManualEntry", false);
+            oDailyAttnProcess.OnlyManualInTime = oReader.GetBoolean("OnlyManualInTime", false);
+            oDailyAttnProcess.OnlyManualOutTime = oReader.GetBoolean("OnlyManualOutTime", false);
             oDailyAttnProcess.IsFromMobile = (EnumIsFromMobile)oReader.GetInt32("IsFromMobile").Value;
             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"));
@@ -1135,7 +1137,16 @@ namespace HRM.DA
                 tc = TransactionContext.Begin(true);
                 foreach (DailyAttnProcess item in oDAttnProcessess)
                 {
-                    DailyAttnProcessDA.ManualEditUpdate(tc, item);
+                    if (item.IsNew)
+                    {
+                        int id = tc.GenerateID("DailyAttnProcess", "DAILYATTNPROCESSID");
+                        base.SetObjectID(item, id);
+                        DailyAttnProcessDA.Insert(tc, item);
+                    }
+                    else
+                    {
+                        DailyAttnProcessDA.ManualEditUpdate(tc, item);
+                    }
                 }
 
                 //if (attnMonthlyBenefit.Count > 0)
@@ -4807,6 +4818,29 @@ namespace HRM.DA
             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;
+        }
     }
 
 

HRM.DA/Service/Employee/EmployeeService.cs

@@ -5877,5 +5877,29 @@ namespace HRM.DA
             }
             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;
+        }
     }
 }

HRM.DA/Service/HREmployee/HREmployeeService.cs

@@ -4177,6 +4177,35 @@ namespace HRM.DA
 
             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
 

HRM.DA/Service/SearchReport/SearchEmployeeService.cs

@@ -326,8 +326,45 @@ namespace HRM.DA
             return searchEmployees;
         }
 
+		public List<SearchEmployee> FindEmpCodeNameForEmployeePickerNew(int userID, int payrollTypeID, string code, string name, bool isForLifeCycle)
+		{
+			List<SearchEmployee> searchEmployees = new List<SearchEmployee>();
 
-        public List<SearchEmployee> GetEmployeeNotYetUser(int payrollTypeID)
+			TransactionContext tc = null;
+			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>();
 

HRM.Report/Class/rptDigitalServiceBook.cs

@@ -1,17 +1,19 @@
-using System;
+using HRM.BO;
+using HRM.DA;
+using System;
 using System.Collections.Generic;
+using System.Data;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Data;
+using static HRM.Report.PayrollDataSet.PayrollDataSet;
-using HRM.BO;
-using HRM.DA;
 
 namespace HRM.Report
 {
     public class rptDigitalServiceBook
     {
-        public byte[] DigitalServiceBook(int empID, int payrollTypeID, DateTime fromDate, string sEmpIDs, string reportType)
+        public byte[] DigitalServiceBook(int empID, int payrollTypeID, DateTime fromDate, string sEmpIDs, int? authorizePersionID, string reportType)
         {
             DataSet dSet = new DataSet();
             DataRow oDR = null;
@@ -19,6 +21,16 @@ namespace HRM.Report
             if (sEmpIDs != null)
                 empID = Convert.ToInt32(sEmpIDs);
 
+            AuthorizedPerson authPerson = null;
+            if(authorizePersionID != null)
+            {
+                authPerson = new AuthorizedPersonService().Get((int)authorizePersionID);
+            }
+
+            //string TargetFolder = @"Documents\EMPPHOTO\";
+            //string currentDirectory = Directory.GetCurrentDirectory();
+            string TargetFolder = System.IO.Path.Combine(System.Environment.CurrentDirectory + @"\Documents\EMPPHOTO\");
+
             #region Employee general info
 
             DataSet oEmp = new EmployeeService().GetEmpDigitalServiceBook(empID);
@@ -34,25 +46,51 @@ namespace HRM.Report
                 oDR["FATHERNAME"] = oDRow["FATHERNAME"];
                 oDR["MOTHERNAME"] = oDRow["MOTHERNAME"];
                 oDR["SPOUSENAME"] = oDRow["SPOUSENAME"];
-                oDR["JOININGDATE"] = Convert.ToDateTime(oDRow["JOININGDATE"]).ToString("dd/MM/yyyy");
+                //oDR["JOININGDATE"] = Convert.ToDateTime(oDRow["JOININGDATE"]).ToString("dd/MM/yyyy");
+
+                DateTime jointDate = Convert.ToDateTime(oDRow["JOININGDATE"]);
+                oDR["JOININGDATE"] = string.Format("{0} {1} {2}", jointDate.Day, GlobalExtensions.BanglaMonth(jointDate), jointDate.Year);
+
                 oDR["DESIGNATION"] = oDRow["DESIGNATION"];
                 //oDR["DESIGNATION"] = rptDigitalServiceBook.ConvertToBijoy(oDRow["DESIGNATION"].ToString());
                 oDR["PARMANENTADDRESS"] = oDRow["PARMANENTADDRESS"];
                 oDR["PRESENTADDRESS"] = oDRow["PRESENTADDRESS"];
-                oDR["BIRTHDATE"] = Convert.ToDateTime(oDRow["BIRTHDATE"]).ToString("dd/MM/yyyy");
+
+                //oDR["BIRTHDATE"] = Convert.ToDateTime(oDRow["BIRTHDATE"]).ToString("dd/MM/yyyy");
+
+                DateTime birthDate = Convert.ToDateTime(oDRow["BIRTHDATE"]);
+                oDR["BIRTHDATE"] = string.Format("{0} {1} {2}", birthDate.Day, GlobalExtensions.BanglaMonth(birthDate), birthDate.Year);
+
                 //if (oDRow["PHOTO"] is not DBNull)
                 //    oDR["PHOTO"] = Convert.ToBase64String((byte[])oDRow["PHOTO"]);
                 oDR["NIDNO"] = oDRow["NIDNO"];
                 oDR["HEIGHT"] = oDRow["HEIGHT"];
-                oDR["BLOODGROUP"] = GlobalExtensions.BloodGroupToFriendlyName((EnumBloodGroup)Enum.Parse(typeof(EnumBloodGroup),
+                //oDR["BLOODGROUP"] = GlobalExtensions.BloodGroupToFriendlyName((EnumBloodGroup)Enum.Parse(typeof(EnumBloodGroup),
-                    Convert.ToInt32(oDRow["BLOODGROUP"]).ToString()));
+                //    Convert.ToInt32(oDRow["BLOODGROUP"]).ToString()));
+                oDR["BLOODGROUP"] = GlobalFunctions.BloodGroupToBangla((EnumBloodGroup)Convert.ToInt32(oDRow["BLOODGROUP"]));
                 //oDR["BLOODGROUP"] = (EnumBloodGroup)Enum.Parse(typeof(EnumBloodGroup), Convert.ToInt32(oDRow["BLOODGROUP"]).ToString());
                 oDR["LMDESIGNATION"] = oDRow["LMDESIGNATION"];
                 //oDR["LMDESIGNATION"] = rptDigitalServiceBook.ConvertToBijoy(oDRow["LMDESIGNATION"].ToString());
                 oDR["EDUCATIONLEVEL"] = oDRow["EDUCATIONLEVEL"];
-                oDR["PARMANENTDISTRICT"] = oDRow["PARMANENTDISTRICT"];
-                oDR["PARMANENTTHANA"] = oDRow["PARMANENTTHANA"];
 
+                oDR["POSTOFFICEPA"] = oDRow["POSTOFFICEPA"];
+                oDR["DISTRICTPA"] = oDRow["DISTRICTPA"];
+                oDR["THANAPA"] = oDRow["THANAPA"];
+                oDR["VILLAGEPA"] = oDRow["VILLAGEPA"];
+                oDR["ROADNOPA"] = oDRow["ROADNOPA"];
+                oDR["WARDNOPA"] = oDRow["WARDNOPA"];
+
+                oDR["POSTOFFICETA"] = oDRow["POSTOFFICETA"];
+                oDR["DISTRICTTA"] = oDRow["DISTRICTTA"];
+                oDR["THANATA"] = oDRow["THANATA"];
+                oDR["VILLAGETA"] = oDRow["VILLAGETA"];
+                oDR["ROADNOTA"] = oDRow["ROADNOTA"];
+                oDR["WARDNOTA"] = oDRow["WARDNOTA"];
+
+                oDR["PHOTO"] = System.IO.Path.Combine(TargetFolder + string.Format("Image-{0}.jpg", oDRow["EMPLOYEENO"]));
+                oDR["SIGNATURE"] = System.IO.Path.Combine(TargetFolder + string.Format("Signature-{0}.jpg", oDRow["EMPLOYEENO"]));
+                if (authPerson != null)
+                    oDR["AUTHSIGN"] = authPerson.Signature;
 
                 dTable.Rows.Add(oDR);
                 //count++;
@@ -95,7 +133,9 @@ namespace HRM.Report
             foreach (DataRow oDRow in dtEmplifecycle.Rows)
             {
                 oDR = dTable.NewRow();
-                oDR["EFFECTDATE"] = Convert.ToDateTime(oDRow["EFFECTDATE"]).ToString("dd/MM/yyyy");
+                //oDR["EFFECTDATE"] = Convert.ToDateTime(oDRow["EFFECTDATE"]).ToString("dd/MM/yyyy");
+                DateTime efectDate = Convert.ToDateTime(oDRow["EFFECTDATE"]);
+                oDR["EFFECTDATE"] = string.Format("{0} {1} {2}", efectDate.Day, GlobalExtensions.BanglaMonth(efectDate), efectDate.Year);
                 //Designation Designation = new DesignationService().Get(Convert.ToInt32(oDRow["DESIGNATIONID"]));
                 //oDR["DESIGNATION"] = Designation.NameInBangla;
                 Grade oGrade = new GradeService().Get(Convert.ToInt32(oDRow["GradeID"]));
@@ -124,8 +164,14 @@ namespace HRM.Report
             foreach (DataRow oDRow in oLeaveEntry.Tables[0].Rows)
             {
                 oDR = dTable.NewRow();
-                oDR["FROMDATE"] = Convert.ToDateTime(oDRow["APRFROMDATE"]).ToString("dd/MM/yyyy");
+
-                oDR["TODATE"] = Convert.ToDateTime(oDRow["APRTODATE"]).ToString("dd/MM/yyyy");
+                DateTime fromDateDr = Convert.ToDateTime(oDRow["APRFROMDATE"]);
+                oDR["FROMDATE"] = string.Format("{0} {1} {2}", fromDateDr.Day, GlobalExtensions.BanglaMonth(fromDateDr), fromDateDr.Year);
+                DateTime toDateDr = Convert.ToDateTime(oDRow["APRTODATE"]);
+                oDR["TODATE"] = string.Format("{0} {1} {2}", toDateDr.Day, GlobalExtensions.BanglaMonth(toDateDr), toDateDr.Year);
+
+                //oDR["FROMDATE"] = Convert.ToDateTime(oDRow["APRFROMDATE"]).ToString("dd/MM/yyyy");
+                //oDR["TODATE"] = Convert.ToDateTime(oDRow["APRTODATE"]).ToString("dd/MM/yyyy");
                 oDR["TOTALDAYS"] = Convert.ToInt32(oDRow["APRTOTALDAYS"]).ToString();
 
                 dTable.Rows.Add(oDR);
@@ -146,7 +192,9 @@ namespace HRM.Report
             foreach (DataRow oDRow in oComplain.Tables[0].Rows)
             {
                 oDR = dTable.NewRow();
-                oDR["EFFECTDATE"] = Convert.ToDateTime(oDRow["EFFECTDATE"]).ToString("dd/MM/yyyy");
+                //oDR["EFFECTDATE"] = Convert.ToDateTime(oDRow["EFFECTDATE"]).ToString("dd/MM/yyyy");
+                DateTime efectDate = Convert.ToDateTime(oDRow["EFFECTDATE"]);
+                oDR["EFFECTDATE"] = string.Format("{0} {1} {2}", efectDate.Day, GlobalExtensions.BanglaMonth(efectDate), efectDate.Year);
                 //if (oDRow["DESCRIPTIONINBANGLA"] is DBNull)
                 //    oDR["DESCRIPTION"] = oDRow["DESCRIPTION"];
                 //else

HRM.Report/Class/rptEcho.cs

@@ -3009,5 +3009,217 @@ namespace HRM.Report
         #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
     }
 }

HRM.Report/Class/rptEmployee.cs

@@ -18,10 +18,12 @@ using Org.BouncyCastle.Ocsp;
 using HRM.Service;
 using HRM.BO.Configuration;
 using Microsoft.Extensions.Configuration;
-using NPOI.SS.Formula.Functions;
+//using NPOI.SS.Formula.Functions;
 using System.Collections;
 using Microsoft.AspNetCore.Http;
-using NPOI.HPSF;
+//using NPOI.HPSF;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
 
 namespace HRM.Report
 {
@@ -3569,7 +3571,7 @@ namespace HRM.Report
                         table.Add(TagOutputConstant.AllowTotal, TotalAllowance.ToString("#,###.00"));
                         table.Add(TagOutputConstant.TakaInWord, HRM.BO.GlobalFunctions.MillionToInWords((int)TotalAllowance));
 
-                        sFilePath = sFPath.TrimEnd('\\') + "\\" + oEmp.EmployeeNo + "-" + sLetterName + ".doc";
+                        sFilePath = sFPath.TrimEnd('\\') + "\\" + oEmp.EmployeeNo + "-" + sLetterName + ".docx";
 
                         #endregion
 
@@ -3589,7 +3591,7 @@ namespace HRM.Report
 
                         table = new EmployeeService().CollectDataForBanglaAppointmentHash(oHREmp, payrollType);
 
-                        sFilePath = sFPath.TrimEnd('\\') + "\\" + oEmp.EmployeeNo + "-" + sLetterName + ".doc";
+                        sFilePath = sFPath.TrimEnd('\\') + "\\" + oEmp.EmployeeNo + "-" + sLetterName + ".docx";
 
                         #endregion
 
@@ -3608,7 +3610,7 @@ namespace HRM.Report
 
                         table = new EmployeeService().CollectDataForBanglaAppointmentHash(oHREmp, payrollType);
 
-                        sFilePath = sFPath.TrimEnd('\\') + "\\" + oEmp.EmployeeNo + "-" + sLetterName + ".doc";
+                        sFilePath = sFPath.TrimEnd('\\') + "\\" + oEmp.EmployeeNo + "-" + sLetterName + ".docx";
 
                         #endregion
 
@@ -3619,11 +3621,11 @@ namespace HRM.Report
                         if (oCandidate.IsEmployee == false)
                         {
                             table.Add(TagOutputConstant.CandidateName, oCV.Name);
-                            sFilePath = sFPath.TrimEnd('\\') + "\\" + oCV.TrackNo + "-" + sLetterName + ".doc";
+                            sFilePath = sFPath.TrimEnd('\\') + "\\" + oCV.TrackNo + "-" + sLetterName + ".docx";
                         }
                         else
                         {
-                            sFilePath = sFPath.TrimEnd('\\') + "\\" + oEmp.EmployeeNo + "-" + sLetterName + ".doc";
+                            sFilePath = sFPath.TrimEnd('\\') + "\\" + oEmp.EmployeeNo + "-" + sLetterName + ".docx";
                         }
 
                         break;
@@ -3633,26 +3635,49 @@ namespace HRM.Report
 
                 if (table != null)
                 {
+
+                    #region OLD
+                    //MSWord file = new MSWord();
+                    //FileInfo ossInfo = null;
+                    ////file.OriginalFile = letterTemplte.FilePath.Trim();
+                    //file.OriginalFile = System.IO.Path.Combine(System.Environment.CurrentDirectory + "\\Documents\\LetterTempFolder\\" + lFileName);
+
+                    //ossInfo = new FileInfo(sFilePath);
+                    //if (ossInfo.Exists)
+                    //{
+                    //    ossInfo.Delete();
+                    //}
+                    //File.Copy(file.OriginalFile, sFilePath, true);
+                    //file = new MSWord();
+                    //file.OpenWordApplication();
+                    ////file.OriginalFile = letterTemplte.FilePath.Trim();
+                    //file.OriginalFile = System.IO.Path.Combine(System.Environment.CurrentDirectory + "\\Documents\\LetterTempFolder\\" + lFileName);
+                    //file.ReplaceWords(sFilePath, table);
+
+                    //file.CloseWordApplication();
+                    ////pdfFilePath = System.IO.Path.ChangeExtension(sFilePath, ".pdf");
+                    ////ConvertDocToPdf(sFilePath, pdfFilePath);
+                    //pdfFilePath = sFilePath;
+
+                    #endregion
+
+                    string templatePath = System.IO.Path.Combine(System.Environment.CurrentDirectory + "\\Documents\\LetterTempFolder\\" + lFileName);
+
+                    // Copy template to output file
+                    if (File.Exists(sFilePath))
+                        File.Delete(sFilePath);
+
+                    File.Copy(templatePath, sFilePath, true);
+
+                    // Replace placeholders in Word document
+                    //ReplaceWords(sFilePath, table);
+
                     MSWord file = new MSWord();
-                    FileInfo ossInfo = null;
-                    //file.OriginalFile = letterTemplte.FilePath.Trim();
                     file.OriginalFile = System.IO.Path.Combine(System.Environment.CurrentDirectory + "\\Documents\\LetterTempFolder\\" + lFileName);
+                    //file.ReplaceWords(sFilePath, table);
+                    file.ReplaceWordsDocx(sFilePath, table);
 
-                    ossInfo = new FileInfo(sFilePath);
+                    // pdfFilePath = Path.ChangeExtension(sFilePath, ".pdf"); // (if you later want PDF)
-                    if (ossInfo.Exists)
-                    {
-                        ossInfo.Delete();
-                    }
-                    File.Copy(file.OriginalFile, sFilePath, true);
-                    file = new MSWord();
-                    file.OpenWordApplication();
-                    //file.OriginalFile = letterTemplte.FilePath.Trim();
-                    file.OriginalFile = System.IO.Path.Combine(System.Environment.CurrentDirectory + "\\Documents\\LetterTempFolder\\" + lFileName);
-                    file.ReplaceWords(sFilePath, table);
-
-                    file.CloseWordApplication();
-                    //pdfFilePath = System.IO.Path.ChangeExtension(sFilePath, ".pdf");
-                    //ConvertDocToPdf(sFilePath, pdfFilePath);
                     pdfFilePath = sFilePath;
 
                 }
@@ -3688,5 +3713,61 @@ namespace HRM.Report
                 System.Runtime.InteropServices.Marshal.ReleaseComObject(wordApp);
             }
         }
+
+        //public void ReplaceWords(string filePath, Hashtable replacements)
+        //{
+        //    using (WordprocessingDocument wordDoc = WordprocessingDocument.Open(filePath, true))
+        //    {
+        //        var body = wordDoc.MainDocumentPart.Document.Body;
+
+        //        foreach (var text in body.Descendants<Text>())
+        //        {
+        //            foreach (DictionaryEntry entry in replacements)
+        //            {
+        //                string key = entry.Key.ToString();
+        //                string value = entry.Value?.ToString() ?? string.Empty;
+
+        //                if (text.Text.Contains(key))
+        //                {
+        //                    text.Text = text.Text.Replace(key, value);
+        //                }
+        //            }
+        //        }
+
+        //        wordDoc.MainDocumentPart.Document.Save();
+        //    }
+        //}
+        public void ReplaceWords(string filePath, Hashtable replacements)
+        {
+            if (!File.Exists(filePath))
+                throw new FileNotFoundException("Template file not found", filePath);
+
+            if (!Path.GetExtension(filePath).Equals(".docx", StringComparison.OrdinalIgnoreCase))
+                throw new InvalidOperationException("Only .docx files are supported. Please convert your template to .docx format.");
+
+            using (WordprocessingDocument wordDoc = WordprocessingDocument.Open(filePath, true))
+            {
+                var documentPart = wordDoc.MainDocumentPart;
+                string docText = null;
+
+                using (var sr = new StreamReader(documentPart.GetStream()))
+                {
+                    docText = sr.ReadToEnd();
+                }
+
+                foreach (DictionaryEntry entry in replacements)
+                {
+                    string key = entry.Key.ToString();
+                    string value = entry.Value?.ToString() ?? string.Empty;
+
+                    docText = docText.Replace(key, value);
+                }
+
+                using (var sw = new StreamWriter(documentPart.GetStream(FileMode.Create)))
+                {
+                    sw.Write(docText);
+                }
+            }
+        }
     }
 }

HRM.Report/HRM.Report.csproj

@@ -109,7 +109,9 @@
     <None Remove="RDLC\EmployeeCV.rdlc" />
     <None Remove="RDLC\EmployeeCVNew.rdlc" />
     <None Remove="RDLC\EmployeeDetail.rdlc" />
+    <None Remove="RDLC\EmployeeDetailEcho.rdlc" />
     <None Remove="RDLC\EmployeeDetailWithOPI.rdlc" />
+    <None Remove="RDLC\EmployeeDetailWithOPIEcho.rdlc" />
     <None Remove="RDLC\EmployeeInfo.rdlc" />
     <None Remove="RDLC\EmployeeInfoBasic.rdlc" />
     <None Remove="RDLC\EmployeeInfoBasicForExcel.rdlc" />
@@ -373,6 +375,8 @@
 	<EmbeddedResource Include="RDLC\BankAdviceSGS.rdlc" />
 	<EmbeddedResource Include="RDLC\CardInfo.rdlc" />
 	<EmbeddedResource Include="RDLC\CCWiseBonusSummary.rdlc" />
+	<EmbeddedResource Include="RDLC\EmployeeDetailEcho.rdlc" />
+	<EmbeddedResource Include="RDLC\EmployeeDetailWithOPIEcho.rdlc" />
 	<EmbeddedResource Include="RDLC\EmployeeInfoBasicForExcel.rdlc" />
 	<EmbeddedResource Include="RDLC\EmployeeInfoBasic.rdlc" />
 	<EmbeddedResource Include="RDLC\LeaveLedgerNmgtDetails.rdlc" />
@@ -616,6 +620,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="ReportViewerCore.NETCore" Version="15.1.18" />
   </ItemGroup>

HRM.Report/PayrollDataSet/DigitalServiceBookDataSet.Designer.cs

@@ -49,6 +49,8 @@ namespace HRM.Report.PayrollDataSet {
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        [System.ObsoleteAttribute("This API supports obsolete formatter-based serialization. It should not be called" +
+            " or extended by application code.", DiagnosticId="SYSLIB0051")]
         protected DigitalServiceBookDataSet(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
                 base(info, context, false) {
             if ((this.IsBinarySerialized(info, context) == true)) {
@@ -453,9 +455,33 @@ namespace HRM.Report.PayrollDataSet {
             
             private global::System.Data.DataColumn columnEDUCATIONLEVEL;
             
-            private global::System.Data.DataColumn columnPARMANENTDISTRICT;
+            private global::System.Data.DataColumn columnPOSTOFFICEPA;
             
-            private global::System.Data.DataColumn columnPARMANENTTHANA;
+            private global::System.Data.DataColumn columnDISTRICTPA;
+            
+            private global::System.Data.DataColumn columnTHANAPA;
+            
+            private global::System.Data.DataColumn columnVILLAGEPA;
+            
+            private global::System.Data.DataColumn columnROADNOPA;
+            
+            private global::System.Data.DataColumn columnWARDNOPA;
+            
+            private global::System.Data.DataColumn columnPOSTOFFICETA;
+            
+            private global::System.Data.DataColumn columnDISTRICTTA;
+            
+            private global::System.Data.DataColumn columnTHANATA;
+            
+            private global::System.Data.DataColumn columnVILLAGETA;
+            
+            private global::System.Data.DataColumn columnROADNOTA;
+            
+            private global::System.Data.DataColumn columnWARDNOTA;
+            
+            private global::System.Data.DataColumn columnSIGNATURE;
+            
+            private global::System.Data.DataColumn columnAUTHSIGN;
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
@@ -485,6 +511,8 @@ namespace HRM.Report.PayrollDataSet {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            [System.ObsoleteAttribute("This API supports obsolete formatter-based serialization. It should not be called" +
+                " or extended by application code.", DiagnosticId="SYSLIB0051")]
             protected EMPDigitalServiceBookDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
                     base(info, context) {
                 this.InitVars();
@@ -628,17 +656,113 @@ namespace HRM.Report.PayrollDataSet {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public global::System.Data.DataColumn PARMANENTDISTRICTColumn {
+            public global::System.Data.DataColumn POSTOFFICEPAColumn {
                 get {
-                    return this.columnPARMANENTDISTRICT;
+                    return this.columnPOSTOFFICEPA;
                 }
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public global::System.Data.DataColumn PARMANENTTHANAColumn {
+            public global::System.Data.DataColumn DISTRICTPAColumn {
                 get {
-                    return this.columnPARMANENTTHANA;
+                    return this.columnDISTRICTPA;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn THANAPAColumn {
+                get {
+                    return this.columnTHANAPA;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn VILLAGEPAColumn {
+                get {
+                    return this.columnVILLAGEPA;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn ROADNOPAColumn {
+                get {
+                    return this.columnROADNOPA;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn WARDNOPAColumn {
+                get {
+                    return this.columnWARDNOPA;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn POSTOFFICETAColumn {
+                get {
+                    return this.columnPOSTOFFICETA;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn DISTRICTTAColumn {
+                get {
+                    return this.columnDISTRICTTA;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn THANATAColumn {
+                get {
+                    return this.columnTHANATA;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn VILLAGETAColumn {
+                get {
+                    return this.columnVILLAGETA;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn ROADNOTAColumn {
+                get {
+                    return this.columnROADNOTA;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn WARDNOTAColumn {
+                get {
+                    return this.columnWARDNOTA;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn SIGNATUREColumn {
+                get {
+                    return this.columnSIGNATURE;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn AUTHSIGNColumn {
+                get {
+                    return this.columnAUTHSIGN;
                 }
             }
             
@@ -697,8 +821,20 @@ namespace HRM.Report.PayrollDataSet {
                         string BLOODGROUP, 
                         string LMDESIGNATION, 
                         string EDUCATIONLEVEL, 
-                        string PARMANENTDISTRICT, 
+                        string POSTOFFICEPA, 
-                        string PARMANENTTHANA) {
+                        string DISTRICTPA, 
+                        string THANAPA, 
+                        string VILLAGEPA, 
+                        string ROADNOPA, 
+                        string WARDNOPA, 
+                        string POSTOFFICETA, 
+                        string DISTRICTTA, 
+                        string THANATA, 
+                        string VILLAGETA, 
+                        string ROADNOTA, 
+                        string WARDNOTA, 
+                        string SIGNATURE, 
+                        string AUTHSIGN) {
                 EMPDigitalServiceBookRow rowEMPDigitalServiceBookRow = ((EMPDigitalServiceBookRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         EMPLOYEEID,
@@ -718,8 +854,20 @@ namespace HRM.Report.PayrollDataSet {
                         BLOODGROUP,
                         LMDESIGNATION,
                         EDUCATIONLEVEL,
-                        PARMANENTDISTRICT,
+                        POSTOFFICEPA,
-                        PARMANENTTHANA};
+                        DISTRICTPA,
+                        THANAPA,
+                        VILLAGEPA,
+                        ROADNOPA,
+                        WARDNOPA,
+                        POSTOFFICETA,
+                        DISTRICTTA,
+                        THANATA,
+                        VILLAGETA,
+                        ROADNOTA,
+                        WARDNOTA,
+                        SIGNATURE,
+                        AUTHSIGN};
                 rowEMPDigitalServiceBookRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowEMPDigitalServiceBookRow);
                 return rowEMPDigitalServiceBookRow;
@@ -759,8 +907,20 @@ namespace HRM.Report.PayrollDataSet {
                 this.columnBLOODGROUP = base.Columns["BLOODGROUP"];
                 this.columnLMDESIGNATION = base.Columns["LMDESIGNATION"];
                 this.columnEDUCATIONLEVEL = base.Columns["EDUCATIONLEVEL"];
-                this.columnPARMANENTDISTRICT = base.Columns["PARMANENTDISTRICT"];
+                this.columnPOSTOFFICEPA = base.Columns["POSTOFFICEPA"];
-                this.columnPARMANENTTHANA = base.Columns["PARMANENTTHANA"];
+                this.columnDISTRICTPA = base.Columns["DISTRICTPA"];
+                this.columnTHANAPA = base.Columns["THANAPA"];
+                this.columnVILLAGEPA = base.Columns["VILLAGEPA"];
+                this.columnROADNOPA = base.Columns["ROADNOPA"];
+                this.columnWARDNOPA = base.Columns["WARDNOPA"];
+                this.columnPOSTOFFICETA = base.Columns["POSTOFFICETA"];
+                this.columnDISTRICTTA = base.Columns["DISTRICTTA"];
+                this.columnTHANATA = base.Columns["THANATA"];
+                this.columnVILLAGETA = base.Columns["VILLAGETA"];
+                this.columnROADNOTA = base.Columns["ROADNOTA"];
+                this.columnWARDNOTA = base.Columns["WARDNOTA"];
+                this.columnSIGNATURE = base.Columns["SIGNATURE"];
+                this.columnAUTHSIGN = base.Columns["AUTHSIGN"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -800,10 +960,34 @@ namespace HRM.Report.PayrollDataSet {
                 base.Columns.Add(this.columnLMDESIGNATION);
                 this.columnEDUCATIONLEVEL = new global::System.Data.DataColumn("EDUCATIONLEVEL", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnEDUCATIONLEVEL);
-                this.columnPARMANENTDISTRICT = new global::System.Data.DataColumn("PARMANENTDISTRICT", typeof(string), null, global::System.Data.MappingType.Element);
+                this.columnPOSTOFFICEPA = new global::System.Data.DataColumn("POSTOFFICEPA", typeof(string), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnPARMANENTDISTRICT);
+                base.Columns.Add(this.columnPOSTOFFICEPA);
-                this.columnPARMANENTTHANA = new global::System.Data.DataColumn("PARMANENTTHANA", typeof(string), null, global::System.Data.MappingType.Element);
+                this.columnDISTRICTPA = new global::System.Data.DataColumn("DISTRICTPA", typeof(string), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnPARMANENTTHANA);
+                base.Columns.Add(this.columnDISTRICTPA);
+                this.columnTHANAPA = new global::System.Data.DataColumn("THANAPA", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnTHANAPA);
+                this.columnVILLAGEPA = new global::System.Data.DataColumn("VILLAGEPA", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnVILLAGEPA);
+                this.columnROADNOPA = new global::System.Data.DataColumn("ROADNOPA", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnROADNOPA);
+                this.columnWARDNOPA = new global::System.Data.DataColumn("WARDNOPA", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnWARDNOPA);
+                this.columnPOSTOFFICETA = new global::System.Data.DataColumn("POSTOFFICETA", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPOSTOFFICETA);
+                this.columnDISTRICTTA = new global::System.Data.DataColumn("DISTRICTTA", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnDISTRICTTA);
+                this.columnTHANATA = new global::System.Data.DataColumn("THANATA", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnTHANATA);
+                this.columnVILLAGETA = new global::System.Data.DataColumn("VILLAGETA", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnVILLAGETA);
+                this.columnROADNOTA = new global::System.Data.DataColumn("ROADNOTA", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnROADNOTA);
+                this.columnWARDNOTA = new global::System.Data.DataColumn("WARDNOTA", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnWARDNOTA);
+                this.columnSIGNATURE = new global::System.Data.DataColumn("SIGNATURE", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnSIGNATURE);
+                this.columnAUTHSIGN = new global::System.Data.DataColumn("AUTHSIGN", typeof(byte[]), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnAUTHSIGN);
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -969,6 +1153,8 @@ namespace HRM.Report.PayrollDataSet {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            [System.ObsoleteAttribute("This API supports obsolete formatter-based serialization. It should not be called" +
+                " or extended by application code.", DiagnosticId="SYSLIB0051")]
             protected SystemInformationDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
                     base(info, context) {
                 this.InitVars();
@@ -1232,6 +1418,8 @@ namespace HRM.Report.PayrollDataSet {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            [System.ObsoleteAttribute("This API supports obsolete formatter-based serialization. It should not be called" +
+                " or extended by application code.", DiagnosticId="SYSLIB0051")]
             protected LeaveEntryDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
                     base(info, context) {
                 this.InitVars();
@@ -1513,6 +1701,8 @@ namespace HRM.Report.PayrollDataSet {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            [System.ObsoleteAttribute("This API supports obsolete formatter-based serialization. It should not be called" +
+                " or extended by application code.", DiagnosticId="SYSLIB0051")]
             protected EMPLifecycleDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
                     base(info, context) {
                 this.InitVars();
@@ -1822,6 +2012,8 @@ namespace HRM.Report.PayrollDataSet {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            [System.ObsoleteAttribute("This API supports obsolete formatter-based serialization. It should not be called" +
+                " or extended by application code.", DiagnosticId="SYSLIB0051")]
             protected ComplainDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
                     base(info, context) {
                 this.InitVars();
@@ -2335,35 +2527,225 @@ namespace HRM.Report.PayrollDataSet {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public string PARMANENTDISTRICT {
+            public string POSTOFFICEPA {
                 get {
                     try {
-                        return ((string)(this[this.tableEMPDigitalServiceBook.PARMANENTDISTRICTColumn]));
+                        return ((string)(this[this.tableEMPDigitalServiceBook.POSTOFFICEPAColumn]));
                     }
                     catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'PARMANENTDISTRICT\' in table \'EMPDigitalServiceBook\' is DBNu" +
+                        throw new global::System.Data.StrongTypingException("The value for column \'POSTOFFICEPA\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
-                                "ll.", e);
                     }
                 }
                 set {
-                    this[this.tableEMPDigitalServiceBook.PARMANENTDISTRICTColumn] = value;
+                    this[this.tableEMPDigitalServiceBook.POSTOFFICEPAColumn] = value;
                 }
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public string PARMANENTTHANA {
+            public string DISTRICTPA {
                 get {
                     try {
-                        return ((string)(this[this.tableEMPDigitalServiceBook.PARMANENTTHANAColumn]));
+                        return ((string)(this[this.tableEMPDigitalServiceBook.DISTRICTPAColumn]));
                     }
                     catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'PARMANENTTHANA\' in table \'EMPDigitalServiceBook\' is DBNull." +
+                        throw new global::System.Data.StrongTypingException("The value for column \'DISTRICTPA\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
-                                "", e);
                     }
                 }
                 set {
-                    this[this.tableEMPDigitalServiceBook.PARMANENTTHANAColumn] = value;
+                    this[this.tableEMPDigitalServiceBook.DISTRICTPAColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string THANAPA {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.THANAPAColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'THANAPA\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.THANAPAColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string VILLAGEPA {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.VILLAGEPAColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'VILLAGEPA\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.VILLAGEPAColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string ROADNOPA {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.ROADNOPAColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'ROADNOPA\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.ROADNOPAColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string WARDNOPA {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.WARDNOPAColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'WARDNOPA\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.WARDNOPAColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string POSTOFFICETA {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.POSTOFFICETAColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'POSTOFFICETA\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.POSTOFFICETAColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string DISTRICTTA {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.DISTRICTTAColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'DISTRICTTA\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.DISTRICTTAColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string THANATA {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.THANATAColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'THANATA\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.THANATAColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string VILLAGETA {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.VILLAGETAColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'VILLAGETA\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.VILLAGETAColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string ROADNOTA {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.ROADNOTAColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'ROADNOTA\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.ROADNOTAColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string WARDNOTA {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.WARDNOTAColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'WARDNOTA\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.WARDNOTAColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string SIGNATURE {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.SIGNATUREColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'SIGNATURE\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.SIGNATUREColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string AUTHSIGN {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.AUTHSIGNColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'AUTHSIGN\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.AUTHSIGNColumn] = value;
                 }
             }
             
@@ -2573,26 +2955,170 @@ namespace HRM.Report.PayrollDataSet {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public bool IsPARMANENTDISTRICTNull() {
+            public bool IsPOSTOFFICEPANull() {
-                return this.IsNull(this.tableEMPDigitalServiceBook.PARMANENTDISTRICTColumn);
+                return this.IsNull(this.tableEMPDigitalServiceBook.POSTOFFICEPAColumn);
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public void SetPARMANENTDISTRICTNull() {
+            public void SetPOSTOFFICEPANull() {
-                this[this.tableEMPDigitalServiceBook.PARMANENTDISTRICTColumn] = global::System.Convert.DBNull;
+                this[this.tableEMPDigitalServiceBook.POSTOFFICEPAColumn] = global::System.Convert.DBNull;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public bool IsPARMANENTTHANANull() {
+            public bool IsDISTRICTPANull() {
-                return this.IsNull(this.tableEMPDigitalServiceBook.PARMANENTTHANAColumn);
+                return this.IsNull(this.tableEMPDigitalServiceBook.DISTRICTPAColumn);
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public void SetPARMANENTTHANANull() {
+            public void SetDISTRICTPANull() {
-                this[this.tableEMPDigitalServiceBook.PARMANENTTHANAColumn] = global::System.Convert.DBNull;
+                this[this.tableEMPDigitalServiceBook.DISTRICTPAColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsTHANAPANull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.THANAPAColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetTHANAPANull() {
+                this[this.tableEMPDigitalServiceBook.THANAPAColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsVILLAGEPANull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.VILLAGEPAColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetVILLAGEPANull() {
+                this[this.tableEMPDigitalServiceBook.VILLAGEPAColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsROADNOPANull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.ROADNOPAColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetROADNOPANull() {
+                this[this.tableEMPDigitalServiceBook.ROADNOPAColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsWARDNOPANull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.WARDNOPAColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetWARDNOPANull() {
+                this[this.tableEMPDigitalServiceBook.WARDNOPAColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsPOSTOFFICETANull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.POSTOFFICETAColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetPOSTOFFICETANull() {
+                this[this.tableEMPDigitalServiceBook.POSTOFFICETAColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsDISTRICTTANull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.DISTRICTTAColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetDISTRICTTANull() {
+                this[this.tableEMPDigitalServiceBook.DISTRICTTAColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsTHANATANull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.THANATAColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetTHANATANull() {
+                this[this.tableEMPDigitalServiceBook.THANATAColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsVILLAGETANull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.VILLAGETAColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetVILLAGETANull() {
+                this[this.tableEMPDigitalServiceBook.VILLAGETAColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsROADNOTANull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.ROADNOTAColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetROADNOTANull() {
+                this[this.tableEMPDigitalServiceBook.ROADNOTAColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsWARDNOTANull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.WARDNOTAColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetWARDNOTANull() {
+                this[this.tableEMPDigitalServiceBook.WARDNOTAColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsSIGNATURENull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.SIGNATUREColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetSIGNATURENull() {
+                this[this.tableEMPDigitalServiceBook.SIGNATUREColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsAUTHSIGNNull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.AUTHSIGNColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetAUTHSIGNNull() {
+                this[this.tableEMPDigitalServiceBook.AUTHSIGNColumn] = global::System.Convert.DBNull;
             }
         }
         

HRM.Report/PayrollDataSet/DigitalServiceBookDataSet.xsd

@@ -12,65 +12,77 @@
   <xs:element name="DigitalServiceBookDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="DigitalServiceBookDataSet" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DigitalServiceBookDataSet">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="EMPDigitalServiceBook" msprop:Generator_RowClassName="EMPDigitalServiceBookRow" msprop:Generator_RowEvHandlerName="EMPDigitalServiceBookRowChangeEventHandler" msprop:Generator_RowDeletedName="EMPDigitalServiceBookRowDeleted" msprop:Generator_RowDeletingName="EMPDigitalServiceBookRowDeleting" msprop:Generator_RowEvArgName="EMPDigitalServiceBookRowChangeEvent" msprop:Generator_TablePropName="EMPDigitalServiceBook" msprop:Generator_RowChangedName="EMPDigitalServiceBookRowChanged" msprop:Generator_UserTableName="EMPDigitalServiceBook" msprop:Generator_RowChangingName="EMPDigitalServiceBookRowChanging" msprop:Generator_TableClassName="EMPDigitalServiceBookDataTable" msprop:Generator_TableVarName="tableEMPDigitalServiceBook">
+        <xs:element name="EMPDigitalServiceBook" msprop:Generator_RowEvHandlerName="EMPDigitalServiceBookRowChangeEventHandler" msprop:Generator_RowDeletedName="EMPDigitalServiceBookRowDeleted" msprop:Generator_RowDeletingName="EMPDigitalServiceBookRowDeleting" msprop:Generator_RowEvArgName="EMPDigitalServiceBookRowChangeEvent" msprop:Generator_TablePropName="EMPDigitalServiceBook" msprop:Generator_RowChangedName="EMPDigitalServiceBookRowChanged" msprop:Generator_UserTableName="EMPDigitalServiceBook" msprop:Generator_RowChangingName="EMPDigitalServiceBookRowChanging" msprop:Generator_RowClassName="EMPDigitalServiceBookRow" msprop:Generator_TableClassName="EMPDigitalServiceBookDataTable" msprop:Generator_TableVarName="tableEMPDigitalServiceBook">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="EMPLOYEEID" msprop:Generator_UserColumnName="EMPLOYEEID" msprop:Generator_ColumnPropNameInTable="EMPLOYEEIDColumn" msprop:Generator_ColumnPropNameInRow="EMPLOYEEID" msprop:Generator_ColumnVarNameInTable="columnEMPLOYEEID" type="xs:string" minOccurs="0" />
+              <xs:element name="EMPLOYEEID" msprop:Generator_ColumnPropNameInTable="EMPLOYEEIDColumn" msprop:Generator_ColumnPropNameInRow="EMPLOYEEID" msprop:Generator_UserColumnName="EMPLOYEEID" msprop:Generator_ColumnVarNameInTable="columnEMPLOYEEID" type="xs:string" minOccurs="0" />
-              <xs:element name="EMPLOYEENO" msprop:Generator_UserColumnName="EMPLOYEENO" msprop:Generator_ColumnPropNameInTable="EMPLOYEENOColumn" msprop:Generator_ColumnPropNameInRow="EMPLOYEENO" msprop:Generator_ColumnVarNameInTable="columnEMPLOYEENO" type="xs:string" minOccurs="0" />
+              <xs:element name="EMPLOYEENO" msprop:Generator_ColumnPropNameInTable="EMPLOYEENOColumn" msprop:Generator_ColumnPropNameInRow="EMPLOYEENO" msprop:Generator_UserColumnName="EMPLOYEENO" msprop:Generator_ColumnVarNameInTable="columnEMPLOYEENO" type="xs:string" minOccurs="0" />
-              <xs:element name="NAME" msprop:Generator_UserColumnName="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_ColumnPropNameInRow="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="FATHERNAME" msprop:Generator_UserColumnName="FATHERNAME" msprop:Generator_ColumnPropNameInTable="FATHERNAMEColumn" msprop:Generator_ColumnPropNameInRow="FATHERNAME" msprop:Generator_ColumnVarNameInTable="columnFATHERNAME" type="xs:string" minOccurs="0" />
+              <xs:element name="FATHERNAME" msprop:Generator_ColumnPropNameInTable="FATHERNAMEColumn" msprop:Generator_ColumnPropNameInRow="FATHERNAME" msprop:Generator_UserColumnName="FATHERNAME" msprop:Generator_ColumnVarNameInTable="columnFATHERNAME" type="xs:string" minOccurs="0" />
-              <xs:element name="MOTHERNAME" msprop:Generator_UserColumnName="MOTHERNAME" msprop:Generator_ColumnPropNameInTable="MOTHERNAMEColumn" msprop:Generator_ColumnPropNameInRow="MOTHERNAME" msprop:Generator_ColumnVarNameInTable="columnMOTHERNAME" type="xs:string" minOccurs="0" />
+              <xs:element name="MOTHERNAME" msprop:Generator_ColumnPropNameInTable="MOTHERNAMEColumn" msprop:Generator_ColumnPropNameInRow="MOTHERNAME" msprop:Generator_UserColumnName="MOTHERNAME" msprop:Generator_ColumnVarNameInTable="columnMOTHERNAME" type="xs:string" minOccurs="0" />
-              <xs:element name="SPOUSENAME" msprop:Generator_UserColumnName="SPOUSENAME" msprop:Generator_ColumnPropNameInTable="SPOUSENAMEColumn" msprop:Generator_ColumnPropNameInRow="SPOUSENAME" msprop:Generator_ColumnVarNameInTable="columnSPOUSENAME" type="xs:string" minOccurs="0" />
+              <xs:element name="SPOUSENAME" msprop:Generator_ColumnPropNameInTable="SPOUSENAMEColumn" msprop:Generator_ColumnPropNameInRow="SPOUSENAME" msprop:Generator_UserColumnName="SPOUSENAME" msprop:Generator_ColumnVarNameInTable="columnSPOUSENAME" type="xs:string" minOccurs="0" />
-              <xs:element name="JOININGDATE" msprop:Generator_UserColumnName="JOININGDATE" msprop:Generator_ColumnPropNameInTable="JOININGDATEColumn" msprop:Generator_ColumnPropNameInRow="JOININGDATE" msprop:Generator_ColumnVarNameInTable="columnJOININGDATE" type="xs:string" minOccurs="0" />
+              <xs:element name="JOININGDATE" msprop:Generator_ColumnPropNameInTable="JOININGDATEColumn" msprop:Generator_ColumnPropNameInRow="JOININGDATE" msprop:Generator_UserColumnName="JOININGDATE" msprop:Generator_ColumnVarNameInTable="columnJOININGDATE" type="xs:string" minOccurs="0" />
-              <xs:element name="DESIGNATION" msprop:Generator_UserColumnName="DESIGNATION" msprop:Generator_ColumnPropNameInTable="DESIGNATIONColumn" msprop:Generator_ColumnPropNameInRow="DESIGNATION" msprop:Generator_ColumnVarNameInTable="columnDESIGNATION" type="xs:string" minOccurs="0" />
+              <xs:element name="DESIGNATION" msprop:Generator_ColumnPropNameInTable="DESIGNATIONColumn" msprop:Generator_ColumnPropNameInRow="DESIGNATION" msprop:Generator_UserColumnName="DESIGNATION" msprop:Generator_ColumnVarNameInTable="columnDESIGNATION" type="xs:string" minOccurs="0" />
-              <xs:element name="PARMANENTADDRESS" msprop:Generator_UserColumnName="PARMANENTADDRESS" msprop:Generator_ColumnPropNameInTable="PARMANENTADDRESSColumn" msprop:Generator_ColumnPropNameInRow="PARMANENTADDRESS" msprop:Generator_ColumnVarNameInTable="columnPARMANENTADDRESS" type="xs:string" minOccurs="0" />
+              <xs:element name="PARMANENTADDRESS" msprop:Generator_ColumnPropNameInTable="PARMANENTADDRESSColumn" msprop:Generator_ColumnPropNameInRow="PARMANENTADDRESS" msprop:Generator_UserColumnName="PARMANENTADDRESS" msprop:Generator_ColumnVarNameInTable="columnPARMANENTADDRESS" type="xs:string" minOccurs="0" />
-              <xs:element name="PRESENTADDRESS" msprop:Generator_UserColumnName="PRESENTADDRESS" msprop:Generator_ColumnPropNameInTable="PRESENTADDRESSColumn" msprop:Generator_ColumnPropNameInRow="PRESENTADDRESS" msprop:Generator_ColumnVarNameInTable="columnPRESENTADDRESS" type="xs:string" minOccurs="0" />
+              <xs:element name="PRESENTADDRESS" msprop:Generator_ColumnPropNameInTable="PRESENTADDRESSColumn" msprop:Generator_ColumnPropNameInRow="PRESENTADDRESS" msprop:Generator_UserColumnName="PRESENTADDRESS" msprop:Generator_ColumnVarNameInTable="columnPRESENTADDRESS" type="xs:string" minOccurs="0" />
-              <xs:element name="BIRTHDATE" msprop:Generator_UserColumnName="BIRTHDATE" msprop:Generator_ColumnPropNameInTable="BIRTHDATEColumn" msprop:Generator_ColumnPropNameInRow="BIRTHDATE" msprop:Generator_ColumnVarNameInTable="columnBIRTHDATE" type="xs:string" minOccurs="0" />
+              <xs:element name="BIRTHDATE" msprop:Generator_ColumnPropNameInTable="BIRTHDATEColumn" msprop:Generator_ColumnPropNameInRow="BIRTHDATE" msprop:Generator_UserColumnName="BIRTHDATE" msprop:Generator_ColumnVarNameInTable="columnBIRTHDATE" type="xs:string" minOccurs="0" />
-              <xs:element name="PHOTO" msprop:Generator_UserColumnName="PHOTO" msprop:Generator_ColumnPropNameInTable="PHOTOColumn" msprop:Generator_ColumnPropNameInRow="PHOTO" msprop:Generator_ColumnVarNameInTable="columnPHOTO" type="xs:string" minOccurs="0" />
+              <xs:element name="PHOTO" msprop:Generator_ColumnPropNameInTable="PHOTOColumn" msprop:Generator_ColumnPropNameInRow="PHOTO" msprop:Generator_UserColumnName="PHOTO" msprop:Generator_ColumnVarNameInTable="columnPHOTO" type="xs:string" minOccurs="0" />
-              <xs:element name="NIDNO" msprop:Generator_UserColumnName="NIDNO" msprop:Generator_ColumnPropNameInTable="NIDNOColumn" msprop:Generator_ColumnPropNameInRow="NIDNO" msprop:Generator_ColumnVarNameInTable="columnNIDNO" type="xs:string" minOccurs="0" />
+              <xs:element name="NIDNO" msprop:Generator_ColumnPropNameInTable="NIDNOColumn" msprop:Generator_ColumnPropNameInRow="NIDNO" msprop:Generator_UserColumnName="NIDNO" msprop:Generator_ColumnVarNameInTable="columnNIDNO" type="xs:string" minOccurs="0" />
-              <xs:element name="HEIGHT" msprop:Generator_UserColumnName="HEIGHT" msprop:Generator_ColumnPropNameInTable="HEIGHTColumn" msprop:Generator_ColumnPropNameInRow="HEIGHT" msprop:Generator_ColumnVarNameInTable="columnHEIGHT" type="xs:string" minOccurs="0" />
+              <xs:element name="HEIGHT" msprop:Generator_ColumnPropNameInTable="HEIGHTColumn" msprop:Generator_ColumnPropNameInRow="HEIGHT" msprop:Generator_UserColumnName="HEIGHT" msprop:Generator_ColumnVarNameInTable="columnHEIGHT" type="xs:string" minOccurs="0" />
-              <xs:element name="BLOODGROUP" msprop:Generator_UserColumnName="BLOODGROUP" msprop:Generator_ColumnPropNameInTable="BLOODGROUPColumn" msprop:Generator_ColumnPropNameInRow="BLOODGROUP" msprop:Generator_ColumnVarNameInTable="columnBLOODGROUP" type="xs:string" minOccurs="0" />
+              <xs:element name="BLOODGROUP" msprop:Generator_ColumnPropNameInTable="BLOODGROUPColumn" msprop:Generator_ColumnPropNameInRow="BLOODGROUP" msprop:Generator_UserColumnName="BLOODGROUP" msprop:Generator_ColumnVarNameInTable="columnBLOODGROUP" type="xs:string" minOccurs="0" />
-              <xs:element name="LMDESIGNATION" msprop:Generator_UserColumnName="LMDESIGNATION" msprop:Generator_ColumnPropNameInTable="LMDESIGNATIONColumn" msprop:Generator_ColumnPropNameInRow="LMDESIGNATION" msprop:Generator_ColumnVarNameInTable="columnLMDESIGNATION" type="xs:string" minOccurs="0" />
+              <xs:element name="LMDESIGNATION" msprop:Generator_ColumnPropNameInTable="LMDESIGNATIONColumn" msprop:Generator_ColumnPropNameInRow="LMDESIGNATION" msprop:Generator_UserColumnName="LMDESIGNATION" msprop:Generator_ColumnVarNameInTable="columnLMDESIGNATION" type="xs:string" minOccurs="0" />
-              <xs:element name="EDUCATIONLEVEL" msprop:Generator_UserColumnName="EDUCATIONLEVEL" msprop:Generator_ColumnPropNameInTable="EDUCATIONLEVELColumn" msprop:Generator_ColumnPropNameInRow="EDUCATIONLEVEL" msprop:Generator_ColumnVarNameInTable="columnEDUCATIONLEVEL" type="xs:string" minOccurs="0" />
+              <xs:element name="EDUCATIONLEVEL" msprop:Generator_ColumnPropNameInTable="EDUCATIONLEVELColumn" msprop:Generator_ColumnPropNameInRow="EDUCATIONLEVEL" msprop:Generator_UserColumnName="EDUCATIONLEVEL" msprop:Generator_ColumnVarNameInTable="columnEDUCATIONLEVEL" type="xs:string" minOccurs="0" />
-              <xs:element name="PARMANENTDISTRICT" msprop:Generator_UserColumnName="PARMANENTDISTRICT" msprop:Generator_ColumnPropNameInTable="PARMANENTDISTRICTColumn" msprop:Generator_ColumnPropNameInRow="PARMANENTDISTRICT" msprop:Generator_ColumnVarNameInTable="columnPARMANENTDISTRICT" type="xs:string" minOccurs="0" />
+              <xs:element name="POSTOFFICEPA" msprop:Generator_ColumnPropNameInTable="POSTOFFICEPAColumn" msprop:Generator_ColumnPropNameInRow="POSTOFFICEPA" msprop:Generator_UserColumnName="POSTOFFICEPA" msprop:Generator_ColumnVarNameInTable="columnPOSTOFFICEPA" type="xs:string" minOccurs="0" />
-              <xs:element name="PARMANENTTHANA" msprop:Generator_UserColumnName="PARMANENTTHANA" msprop:Generator_ColumnPropNameInTable="PARMANENTTHANAColumn" msprop:Generator_ColumnPropNameInRow="PARMANENTTHANA" msprop:Generator_ColumnVarNameInTable="columnPARMANENTTHANA" type="xs:string" minOccurs="0" />
+              <xs:element name="DISTRICTPA" msprop:Generator_ColumnPropNameInTable="DISTRICTPAColumn" msprop:Generator_ColumnPropNameInRow="DISTRICTPA" msprop:Generator_UserColumnName="DISTRICTPA" msprop:Generator_ColumnVarNameInTable="columnDISTRICTPA" type="xs:string" minOccurs="0" />
+              <xs:element name="THANAPA" msprop:Generator_ColumnPropNameInRow="THANAPA" msprop:Generator_ColumnPropNameInTable="THANAPAColumn" msprop:Generator_ColumnVarNameInTable="columnTHANAPA" msprop:Generator_UserColumnName="THANAPA" type="xs:string" minOccurs="0" />
+              <xs:element name="VILLAGEPA" msprop:Generator_ColumnPropNameInRow="VILLAGEPA" msprop:Generator_ColumnPropNameInTable="VILLAGEPAColumn" msprop:Generator_ColumnVarNameInTable="columnVILLAGEPA" msprop:Generator_UserColumnName="VILLAGEPA" type="xs:string" minOccurs="0" />
+              <xs:element name="ROADNOPA" msprop:Generator_ColumnPropNameInRow="ROADNOPA" msprop:Generator_ColumnPropNameInTable="ROADNOPAColumn" msprop:Generator_ColumnVarNameInTable="columnROADNOPA" msprop:Generator_UserColumnName="ROADNOPA" type="xs:string" minOccurs="0" />
+              <xs:element name="WARDNOPA" msprop:Generator_ColumnPropNameInRow="WARDNOPA" msprop:Generator_ColumnPropNameInTable="WARDNOPAColumn" msprop:Generator_ColumnVarNameInTable="columnWARDNOPA" msprop:Generator_UserColumnName="WARDNOPA" type="xs:string" minOccurs="0" />
+              <xs:element name="POSTOFFICETA" msprop:Generator_ColumnPropNameInRow="POSTOFFICETA" msprop:Generator_ColumnPropNameInTable="POSTOFFICETAColumn" msprop:Generator_ColumnVarNameInTable="columnPOSTOFFICETA" msprop:Generator_UserColumnName="POSTOFFICETA" type="xs:string" minOccurs="0" />
+              <xs:element name="DISTRICTTA" msprop:Generator_ColumnPropNameInRow="DISTRICTTA" msprop:Generator_ColumnPropNameInTable="DISTRICTTAColumn" msprop:Generator_ColumnVarNameInTable="columnDISTRICTTA" msprop:Generator_UserColumnName="DISTRICTTA" type="xs:string" minOccurs="0" />
+              <xs:element name="THANATA" msprop:Generator_ColumnPropNameInRow="THANATA" msprop:Generator_ColumnPropNameInTable="THANATAColumn" msprop:Generator_ColumnVarNameInTable="columnTHANATA" msprop:Generator_UserColumnName="THANATA" type="xs:string" minOccurs="0" />
+              <xs:element name="VILLAGETA" msprop:Generator_ColumnPropNameInRow="VILLAGETA" msprop:Generator_ColumnPropNameInTable="VILLAGETAColumn" msprop:Generator_ColumnVarNameInTable="columnVILLAGETA" msprop:Generator_UserColumnName="VILLAGETA" type="xs:string" minOccurs="0" />
+              <xs:element name="ROADNOTA" msprop:Generator_ColumnPropNameInRow="ROADNOTA" msprop:Generator_ColumnPropNameInTable="ROADNOTAColumn" msprop:Generator_ColumnVarNameInTable="columnROADNOTA" msprop:Generator_UserColumnName="ROADNOTA" type="xs:string" minOccurs="0" />
+              <xs:element name="WARDNOTA" msprop:Generator_ColumnPropNameInRow="WARDNOTA" msprop:Generator_ColumnPropNameInTable="WARDNOTAColumn" msprop:Generator_ColumnVarNameInTable="columnWARDNOTA" msprop:Generator_UserColumnName="WARDNOTA" type="xs:string" minOccurs="0" />
+              <xs:element name="SIGNATURE" msprop:Generator_ColumnPropNameInRow="SIGNATURE" msprop:Generator_ColumnPropNameInTable="SIGNATUREColumn" msprop:Generator_ColumnVarNameInTable="columnSIGNATURE" msprop:Generator_UserColumnName="SIGNATURE" type="xs:string" minOccurs="0" />
+              <xs:element name="AUTHSIGN" msprop:Generator_ColumnPropNameInRow="AUTHSIGN" msprop:Generator_ColumnPropNameInTable="AUTHSIGNColumn" msprop:Generator_ColumnVarNameInTable="columnAUTHSIGN" msprop:Generator_UserColumnName="AUTHSIGN" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SystemInformation" msprop:Generator_RowClassName="SystemInformationRow" msprop:Generator_RowEvHandlerName="SystemInformationRowChangeEventHandler" msprop:Generator_RowDeletedName="SystemInformationRowDeleted" msprop:Generator_RowDeletingName="SystemInformationRowDeleting" msprop:Generator_RowEvArgName="SystemInformationRowChangeEvent" msprop:Generator_TablePropName="SystemInformation" msprop:Generator_RowChangedName="SystemInformationRowChanged" msprop:Generator_UserTableName="SystemInformation" msprop:Generator_RowChangingName="SystemInformationRowChanging" msprop:Generator_TableClassName="SystemInformationDataTable" msprop:Generator_TableVarName="tableSystemInformation">
+        <xs:element name="SystemInformation" msprop:Generator_RowEvHandlerName="SystemInformationRowChangeEventHandler" msprop:Generator_RowDeletedName="SystemInformationRowDeleted" msprop:Generator_RowDeletingName="SystemInformationRowDeleting" msprop:Generator_RowEvArgName="SystemInformationRowChangeEvent" msprop:Generator_TablePropName="SystemInformation" msprop:Generator_RowChangedName="SystemInformationRowChanged" msprop:Generator_UserTableName="SystemInformation" msprop:Generator_RowChangingName="SystemInformationRowChanging" msprop:Generator_RowClassName="SystemInformationRow" msprop:Generator_TableClassName="SystemInformationDataTable" msprop:Generator_TableVarName="tableSystemInformation">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="NAME" msprop:Generator_UserColumnName="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_ColumnPropNameInRow="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="CORPORATEADDRESS" msprop:Generator_UserColumnName="CORPORATEADDRESS" msprop:Generator_ColumnPropNameInTable="CORPORATEADDRESSColumn" msprop:Generator_ColumnPropNameInRow="CORPORATEADDRESS" msprop:Generator_ColumnVarNameInTable="columnCORPORATEADDRESS" type="xs:string" minOccurs="0" />
+              <xs:element name="CORPORATEADDRESS" msprop:Generator_ColumnPropNameInTable="CORPORATEADDRESSColumn" msprop:Generator_ColumnPropNameInRow="CORPORATEADDRESS" msprop:Generator_UserColumnName="CORPORATEADDRESS" msprop:Generator_ColumnVarNameInTable="columnCORPORATEADDRESS" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="LeaveEntry" msprop:Generator_RowClassName="LeaveEntryRow" msprop:Generator_RowEvHandlerName="LeaveEntryRowChangeEventHandler" msprop:Generator_RowDeletedName="LeaveEntryRowDeleted" msprop:Generator_RowDeletingName="LeaveEntryRowDeleting" msprop:Generator_RowEvArgName="LeaveEntryRowChangeEvent" msprop:Generator_TablePropName="LeaveEntry" msprop:Generator_RowChangedName="LeaveEntryRowChanged" msprop:Generator_UserTableName="LeaveEntry" msprop:Generator_RowChangingName="LeaveEntryRowChanging" msprop:Generator_TableClassName="LeaveEntryDataTable" msprop:Generator_TableVarName="tableLeaveEntry">
+        <xs:element name="LeaveEntry" msprop:Generator_RowEvHandlerName="LeaveEntryRowChangeEventHandler" msprop:Generator_RowDeletedName="LeaveEntryRowDeleted" msprop:Generator_RowDeletingName="LeaveEntryRowDeleting" msprop:Generator_RowEvArgName="LeaveEntryRowChangeEvent" msprop:Generator_TablePropName="LeaveEntry" msprop:Generator_RowChangedName="LeaveEntryRowChanged" msprop:Generator_UserTableName="LeaveEntry" msprop:Generator_RowChangingName="LeaveEntryRowChanging" msprop:Generator_RowClassName="LeaveEntryRow" msprop:Generator_TableClassName="LeaveEntryDataTable" msprop:Generator_TableVarName="tableLeaveEntry">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="FROMDATE" msprop:Generator_UserColumnName="FROMDATE" msprop:Generator_ColumnPropNameInTable="FROMDATEColumn" msprop:Generator_ColumnPropNameInRow="FROMDATE" msprop:Generator_ColumnVarNameInTable="columnFROMDATE" type="xs:string" minOccurs="0" />
+              <xs:element name="FROMDATE" msprop:Generator_ColumnPropNameInTable="FROMDATEColumn" msprop:Generator_ColumnPropNameInRow="FROMDATE" msprop:Generator_UserColumnName="FROMDATE" msprop:Generator_ColumnVarNameInTable="columnFROMDATE" type="xs:string" minOccurs="0" />
-              <xs:element name="TODATE" msprop:Generator_UserColumnName="TODATE" msprop:Generator_ColumnPropNameInTable="TODATEColumn" msprop:Generator_ColumnPropNameInRow="TODATE" msprop:Generator_ColumnVarNameInTable="columnTODATE" type="xs:string" minOccurs="0" />
+              <xs:element name="TODATE" msprop:Generator_ColumnPropNameInTable="TODATEColumn" msprop:Generator_ColumnPropNameInRow="TODATE" msprop:Generator_UserColumnName="TODATE" msprop:Generator_ColumnVarNameInTable="columnTODATE" type="xs:string" minOccurs="0" />
-              <xs:element name="TOTALDAYS" msprop:Generator_UserColumnName="TOTALDAYS" msprop:Generator_ColumnPropNameInTable="TOTALDAYSColumn" msprop:Generator_ColumnPropNameInRow="TOTALDAYS" msprop:Generator_ColumnVarNameInTable="columnTOTALDAYS" type="xs:string" minOccurs="0" />
+              <xs:element name="TOTALDAYS" msprop:Generator_ColumnPropNameInTable="TOTALDAYSColumn" msprop:Generator_ColumnPropNameInRow="TOTALDAYS" msprop:Generator_UserColumnName="TOTALDAYS" msprop:Generator_ColumnVarNameInTable="columnTOTALDAYS" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EMPLifecycle" msprop:Generator_RowClassName="EMPLifecycleRow" msprop:Generator_RowEvHandlerName="EMPLifecycleRowChangeEventHandler" msprop:Generator_RowDeletedName="EMPLifecycleRowDeleted" msprop:Generator_RowDeletingName="EMPLifecycleRowDeleting" msprop:Generator_RowEvArgName="EMPLifecycleRowChangeEvent" msprop:Generator_TablePropName="EMPLifecycle" msprop:Generator_RowChangedName="EMPLifecycleRowChanged" msprop:Generator_UserTableName="EMPLifecycle" msprop:Generator_RowChangingName="EMPLifecycleRowChanging" msprop:Generator_TableClassName="EMPLifecycleDataTable" msprop:Generator_TableVarName="tableEMPLifecycle">
+        <xs:element name="EMPLifecycle" msprop:Generator_RowEvHandlerName="EMPLifecycleRowChangeEventHandler" msprop:Generator_RowDeletedName="EMPLifecycleRowDeleted" msprop:Generator_RowDeletingName="EMPLifecycleRowDeleting" msprop:Generator_RowEvArgName="EMPLifecycleRowChangeEvent" msprop:Generator_TablePropName="EMPLifecycle" msprop:Generator_RowChangedName="EMPLifecycleRowChanged" msprop:Generator_UserTableName="EMPLifecycle" msprop:Generator_RowChangingName="EMPLifecycleRowChanging" msprop:Generator_RowClassName="EMPLifecycleRow" msprop:Generator_TableClassName="EMPLifecycleDataTable" msprop:Generator_TableVarName="tableEMPLifecycle">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="EFFECTDATE" msprop:Generator_UserColumnName="EFFECTDATE" msprop:Generator_ColumnPropNameInTable="EFFECTDATEColumn" msprop:Generator_ColumnPropNameInRow="EFFECTDATE" msprop:Generator_ColumnVarNameInTable="columnEFFECTDATE" type="xs:string" minOccurs="0" />
+              <xs:element name="EFFECTDATE" msprop:Generator_ColumnPropNameInTable="EFFECTDATEColumn" msprop:Generator_ColumnPropNameInRow="EFFECTDATE" msprop:Generator_UserColumnName="EFFECTDATE" msprop:Generator_ColumnVarNameInTable="columnEFFECTDATE" type="xs:string" minOccurs="0" />
-              <xs:element name="DESIGNATION" msprop:Generator_UserColumnName="DESIGNATION" msprop:Generator_ColumnPropNameInTable="DESIGNATIONColumn" msprop:Generator_ColumnPropNameInRow="DESIGNATION" msprop:Generator_ColumnVarNameInTable="columnDESIGNATION" type="xs:string" minOccurs="0" />
+              <xs:element name="DESIGNATION" msprop:Generator_ColumnPropNameInTable="DESIGNATIONColumn" msprop:Generator_ColumnPropNameInRow="DESIGNATION" msprop:Generator_UserColumnName="DESIGNATION" msprop:Generator_ColumnVarNameInTable="columnDESIGNATION" type="xs:string" minOccurs="0" />
-              <xs:element name="BASICSALARY" msprop:Generator_UserColumnName="BASICSALARY" msprop:Generator_ColumnPropNameInTable="BASICSALARYColumn" msprop:Generator_ColumnPropNameInRow="BASICSALARY" msprop:Generator_ColumnVarNameInTable="columnBASICSALARY" type="xs:string" minOccurs="0" />
+              <xs:element name="BASICSALARY" msprop:Generator_ColumnPropNameInTable="BASICSALARYColumn" msprop:Generator_ColumnPropNameInRow="BASICSALARY" msprop:Generator_UserColumnName="BASICSALARY" msprop:Generator_ColumnVarNameInTable="columnBASICSALARY" type="xs:string" minOccurs="0" />
-              <xs:element name="HOUSERENT" msprop:Generator_ColumnPropNameInRow="HOUSERENT" msprop:Generator_ColumnPropNameInTable="HOUSERENTColumn" msprop:Generator_ColumnVarNameInTable="columnHOUSERENT" msprop:Generator_UserColumnName="HOUSERENT" type="xs:string" minOccurs="0" />
+              <xs:element name="HOUSERENT" msprop:Generator_UserColumnName="HOUSERENT" msprop:Generator_ColumnPropNameInTable="HOUSERENTColumn" msprop:Generator_ColumnPropNameInRow="HOUSERENT" msprop:Generator_ColumnVarNameInTable="columnHOUSERENT" type="xs:string" minOccurs="0" />
-              <xs:element name="MEDICAL" msprop:Generator_ColumnPropNameInRow="MEDICAL" msprop:Generator_ColumnPropNameInTable="MEDICALColumn" msprop:Generator_ColumnVarNameInTable="columnMEDICAL" msprop:Generator_UserColumnName="MEDICAL" type="xs:string" minOccurs="0" />
+              <xs:element name="MEDICAL" msprop:Generator_UserColumnName="MEDICAL" msprop:Generator_ColumnPropNameInTable="MEDICALColumn" msprop:Generator_ColumnPropNameInRow="MEDICAL" msprop:Generator_ColumnVarNameInTable="columnMEDICAL" type="xs:string" minOccurs="0" />
-              <xs:element name="BONUS" msprop:Generator_ColumnPropNameInRow="BONUS" msprop:Generator_ColumnPropNameInTable="BONUSColumn" msprop:Generator_ColumnVarNameInTable="columnBONUS" msprop:Generator_UserColumnName="BONUS" type="xs:string" minOccurs="0" />
+              <xs:element name="BONUS" msprop:Generator_UserColumnName="BONUS" msprop:Generator_ColumnPropNameInTable="BONUSColumn" msprop:Generator_ColumnPropNameInRow="BONUS" msprop:Generator_ColumnVarNameInTable="columnBONUS" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Complain" msprop:Generator_RowClassName="ComplainRow" msprop:Generator_RowEvHandlerName="ComplainRowChangeEventHandler" msprop:Generator_RowDeletedName="ComplainRowDeleted" msprop:Generator_RowDeletingName="ComplainRowDeleting" msprop:Generator_RowEvArgName="ComplainRowChangeEvent" msprop:Generator_TablePropName="Complain" msprop:Generator_RowChangedName="ComplainRowChanged" msprop:Generator_UserTableName="Complain" msprop:Generator_RowChangingName="ComplainRowChanging" msprop:Generator_TableClassName="ComplainDataTable" msprop:Generator_TableVarName="tableComplain">
+        <xs:element name="Complain" msprop:Generator_RowEvHandlerName="ComplainRowChangeEventHandler" msprop:Generator_RowDeletedName="ComplainRowDeleted" msprop:Generator_RowDeletingName="ComplainRowDeleting" msprop:Generator_RowEvArgName="ComplainRowChangeEvent" msprop:Generator_TablePropName="Complain" msprop:Generator_RowChangedName="ComplainRowChanged" msprop:Generator_UserTableName="Complain" msprop:Generator_RowChangingName="ComplainRowChanging" msprop:Generator_RowClassName="ComplainRow" msprop:Generator_TableClassName="ComplainDataTable" msprop:Generator_TableVarName="tableComplain">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="EFFECTDATE" msprop:Generator_UserColumnName="EFFECTDATE" msprop:Generator_ColumnPropNameInTable="EFFECTDATEColumn" msprop:Generator_ColumnPropNameInRow="EFFECTDATE" msprop:Generator_ColumnVarNameInTable="columnEFFECTDATE" type="xs:string" minOccurs="0" />
+              <xs:element name="EFFECTDATE" msprop:Generator_ColumnPropNameInTable="EFFECTDATEColumn" msprop:Generator_ColumnPropNameInRow="EFFECTDATE" msprop:Generator_UserColumnName="EFFECTDATE" msprop:Generator_ColumnVarNameInTable="columnEFFECTDATE" type="xs:string" minOccurs="0" />
-              <xs:element name="DESCRIPTION" msprop:Generator_UserColumnName="DESCRIPTION" msprop:Generator_ColumnPropNameInTable="DESCRIPTIONColumn" msprop:Generator_ColumnPropNameInRow="DESCRIPTION" msprop:Generator_ColumnVarNameInTable="columnDESCRIPTION" type="xs:string" minOccurs="0" />
+              <xs:element name="DESCRIPTION" msprop:Generator_ColumnPropNameInTable="DESCRIPTIONColumn" msprop:Generator_ColumnPropNameInRow="DESCRIPTION" msprop:Generator_UserColumnName="DESCRIPTION" msprop:Generator_ColumnVarNameInTable="columnDESCRIPTION" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

HRM.Report/PayrollDataSet/DigitalServiceBookDataSet.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" 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="0" ViewPortY="43" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:EMPDigitalServiceBook" ZOrder="5" X="19" Y="101" Height="391" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="387" />
     <Shape ID="DesignTable:SystemInformation" ZOrder="4" X="235" Y="104" Height="67" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />

HRM.Report/PayrollDataSet/PayrollDataSet.xsd

@@ -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="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="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="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="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="SLNo" msprop:Generator_ColumnPropNameInTable="SLNoColumn" msprop:Generator_ColumnPropNameInRow="SLNo" msprop:Generator_UserColumnName="SLNo" msprop:Generator_ColumnVarNameInTable="columnSLNo" type="xs:string" minOccurs="0" />
@@ -3330,6 +3330,62 @@
             </xs:sequence>
           </xs:complexType>
         </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:complexType>
   </xs:element>

HRM.Report/PayrollDataSet/PayrollDataSet.xss

@@ -4,190 +4,191 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </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="-38" 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="1153" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <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:Payslip" ZOrder="86" X="917" Y="260" Height="257" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:EmployeeInfo" ZOrder="4" X="-66" Y="301" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <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:EmployeePersonalInfo" ZOrder="34" X="0" Y="72" Height="239" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <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:EmployeeEducation" ZOrder="33" X="0" Y="72" Height="125" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <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:EmployeeChildren" ZOrder="32" X="0" Y="72" Height="201" Width="171" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <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:EmployeeHobby" ZOrder="31" X="0" Y="72" Height="68" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <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:EmployeeExperience" ZOrder="30" X="0" Y="72" Height="163" Width="185" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <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:EmployeeTraining" ZOrder="29" X="0" Y="72" Height="144" Width="171" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <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:EmployeeReferenceInside" ZOrder="28" X="0" Y="72" Height="163" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <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:EmployeeNominee" ZOrder="18" X="-1" Y="72" Height="28" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="159" SplitterPosition="24" />
-    <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:EmployeeReferenceOutside" ZOrder="25" X="43" Y="181" Height="144" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <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:IncomeTax" ZOrder="170" X="616" Y="409" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <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:IncomeTaxSlab" ZOrder="183" X="612" Y="318" Height="143" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="160" SplitterPosition="139" />
-    <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:IncomeTaxOther" ZOrder="176" X="615" Y="380" Height="124" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="120" />
-    <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:BankAdvice" ZOrder="150" X="1214" Y="421" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
-    <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:SalarySheet" ZOrder="91" X="1740" Y="101" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="313" 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:SettlementAdvice" ZOrder="26" X="47" Y="115" Height="257" Width="168" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" 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:SalaryReconsilation" ZOrder="92" X="1744" Y="199" Height="257" Width="179" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:CCWSalaryDetail" ZOrder="89" X="285" Y="303" Height="162" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="158" />
-    <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:CCWSaSummary" ZOrder="47" X="286" Y="242" Height="124" Width="162" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" 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:CashDisbursement" ZOrder="48" X="286" Y="213" Height="124" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
-    <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:PostingDetails" ZOrder="175" X="911" Y="107" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <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:EmployeeDetail" ZOrder="27" X="594" Y="62" Height="239" Width="156" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="235" />
-    <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:EmployeeHistory" ZOrder="84" X="-66" Y="402" Height="257" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:EmpCostAllocation" ZOrder="64" X="-67" Y="534" Height="105" Width="176" 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:UpcomEmployee" ZOrder="38" X="312" Y="965" Height="105" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <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:OTMonthlySheet" ZOrder="5" X="361" Y="66" Height="200" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="196" />
-    <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:BonusBankAdvice" ZOrder="174" X="1212" Y="333" Height="162" Width="169" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
-    <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:BonusRegister" ZOrder="110" X="1212" Y="361" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="272" SplitterPosition="253" />
-    <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:AnnualIncomeTax" ZOrder="173" X="624" Y="607" Height="143" Width="170" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
-    <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:LaonPaymentDue" ZOrder="40" X="308" Y="803" Height="257" Width="168" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" 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:LoanIssue" ZOrder="41" X="308" Y="771" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="227" SplitterPosition="253" />
-    <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:OTHourlySheet" ZOrder="53" X="361" Y="-28" Height="143" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
-    <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:BasicReport" ZOrder="36" X="1205" Y="322" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="63" SplitterPosition="102" />
-    <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:ExtendedSalarySheet" ZOrder="70" X="-65" Y="236" Height="257" Width="188" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <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:OTMonthRange" ZOrder="50" X="361" Y="127" Height="143" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
-    <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:BranchWiseOT" ZOrder="114" X="1217" Y="541" Height="105" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <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:DivisionWiseOT" ZOrder="180" X="1471" Y="161" Height="124" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
-    <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:OverAllSummary" ZOrder="51" X="360" Y="34" Height="257" Width="164" 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:EmpGradeBasic" ZOrder="77" X="-67" Y="72" Height="257" Width="155" 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:EmpAllowDeduct" ZOrder="78" X="-68" Y="39" Height="257" Width="166" 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:EmpBankHistory" ZOrder="68" X="-66" Y="333" Height="257" Width="162" 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:EmpConfirmHis" ZOrder="71" X="-66" Y="202" Height="257" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:EmpPFHis" ZOrder="169" X="-68" Y="1192" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
-    <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:JVReport" ZOrder="128" X="294" Y="536" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <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:UpCommingEmp" ZOrder="37" X="313" Y="997" Height="181" Width="164" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
-    <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:PRBProcessDetail" ZOrder="168" X="914" Y="199" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="194" SplitterPosition="234" />
-    <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:Report108" ZOrder="90" X="949" Y="711" Height="257" Width="256" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="687" SplitterPosition="253" />
-    <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:CCWReport" ZOrder="45" X="286" Y="335" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
-    <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:CCDetailReport" ZOrder="46" X="286" Y="271" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:JVSalaryDetail" ZOrder="42" X="295" Y="567" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
-    <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:JVLoactionWReport" ZOrder="167" X="296" Y="598" Height="162" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
-    <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:JVSummaryReport" ZOrder="179" X="297" Y="629" Height="124" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
-    <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:OPIRegister" ZOrder="81" X="361" Y="96" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:AccountReportForSAP" ZOrder="126" X="622" Y="577" Height="162" Width="195" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
-    <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:LoanReportForSAP" ZOrder="39" X="311" Y="867" Height="257" Width="175" 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:ReportForSAP" ZOrder="127" X="948" Y="680" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <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:BankAdviceOfPRB" ZOrder="113" X="1215" Y="482" Height="162" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="158" />
-    <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:OPITotalValueRegister" ZOrder="52" X="360" Y="3" Height="143" Width="196" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
-    <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:WartsilaSalarySheetSummary" ZOrder="172" X="649" Y="769" Height="257" Width="237" 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:WartsilaSalarySheet" ZOrder="129" X="650" Y="830" Height="257" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <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:EmployeeJoining" ZOrder="75" X="-67" Y="139" Height="238" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
-    <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:WartsilaPaySlip" ZOrder="116" X="645" Y="935" Height="257" Width="199" 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:WartsilaReconciliation" ZOrder="131" X="649" Y="799" Height="257" Width="196" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" 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:EmpJoining4Novartis" ZOrder="76" X="-67" Y="105" Height="257" Width="190" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" 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:WartSilaRSummary" ZOrder="171" X="648" Y="738" Height="257" Width="178" 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:EmpLifeCycle" ZOrder="63" X="-65" Y="596" Height="257" Width="150" 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:IndividualLoanReport" ZOrder="7" X="613" Y="350" Height="257" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <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:BankAdviceLetter" ZOrder="111" X="1217" Y="513" Height="181" Width="168" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
-    <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:EmployeeMonthlyExpense" ZOrder="60" X="-68" Y="753" Height="105" Width="219" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <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:EmployeeRetirement" ZOrder="59" X="-67" Y="976" Height="181" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="177" />
-    <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:EmpPersonalInformation" ZOrder="58" X="-67" Y="1006" Height="257" Width="211" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="211" SplitterPosition="253" />
-    <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:EmpAcademicBackground" ZOrder="166" X="-69" Y="881" Height="124" Width="218" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
-    <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:EmpLanguageKnown" ZOrder="161" X="-67" Y="785" Height="86" Width="188" 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:EmpMembershipInSocietiesClubsAssociations" ZOrder="178" X="-69" Y="914" Height="86" Width="300" 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:EmpCloseRelations" ZOrder="55" X="-68" Y="1101" Height="86" Width="180" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="58" SplitterPosition="82" />
-    <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:EmpEmploymentHistory" ZOrder="56" X="-67" Y="1069" Height="105" Width="207" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <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:EmpOtherProfessionalQualifications" ZOrder="62" X="-68" Y="659" Height="48" Width="276" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
-    <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:EmpReferences" ZOrder="57" X="-67" Y="1037" Height="105" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <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:EmpDescribeInDetailsPresentJobResponsibilities" ZOrder="61" X="-69" Y="722" Height="48" Width="300" 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:EmpReasonForLeavingCurrentJob" ZOrder="163" X="-68" Y="690" Height="48" Width="262" 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:EmpExtraCaricularActivities" ZOrder="164" X="-68" Y="816" Height="48" Width="226" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
-    <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:EmpListOfRelativeWorkingInNovatis" ZOrder="162" X="-67" Y="626" Height="105" Width="278" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <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:EmpAdditionalInformation" ZOrder="149" X="-66" Y="564" Height="48" Width="222" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
-    <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:EmpAns" ZOrder="54" X="-67" Y="1130" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="63" />
-    <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:EmpWorkingRelativesAns" ZOrder="72" X="-66" Y="172" Height="48" Width="215" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
-    <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:EmpPermanentAndMailingAddress" ZOrder="165" X="-69" Y="848" Height="143" Width="269" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="109" SplitterPosition="139" />
-    <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:EmployeePhotoPath" ZOrder="181" X="-68" Y="944" Height="48" Width="184" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="41" SplitterPosition="44" />
-    <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:EmpListOfRelativeWorkingInCompany" ZOrder="79" X="-69" Y="-25" Height="105" Width="289" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="75" SplitterPosition="101" />
-    <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:ITPfAndOtherDetails" ZOrder="182" X="619" Y="470" Height="124" Width="186" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="120" />
-    <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:MultipleEmpIT" ZOrder="120" X="1201" Y="866" Height="257" Width="155" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="364" SplitterPosition="253" />
-    <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:ITHeader" ZOrder="177" X="617" Y="439" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
-    <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:EmployeeLFAData" ZOrder="69" X="-65" Y="269" Height="143" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="139" />
-    <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:TaxRebeatInvestment" ZOrder="154" X="907" Y="511" Height="105" Width="192" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="101" />
-    <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:TaxChallan" ZOrder="158" X="908" Y="542" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="92" SplitterPosition="63" />
-    <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:Pmpbasic" ZOrder="160" X="906" Y="-14" Height="219" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="176" SplitterPosition="215" />
-    <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:Pmpobjectives" ZOrder="159" X="912" Y="169" Height="181" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="159" SplitterPosition="177" />
-    <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:PmpEmpValueBehaviorRatings" ZOrder="13" X="910" Y="79" Height="124" Width="245" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
-    <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:FSSJVReport" ZOrder="157" X="646" Y="672" Height="200" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="262" SplitterPosition="196" />
-    <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:dtTransferTPToPR" ZOrder="156" X="1472" Y="73" Height="143" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
-    <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:EmpContinueFromDiscontinue" ZOrder="67" X="-66" Y="367" Height="181" Width="243" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
-    <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:EmpITInfoAndBasicInfo" ZOrder="66" X="-67" Y="438" Height="162" Width="203" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="142" SplitterPosition="158" />
-    <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:SalaryStracture" ZOrder="155" X="1737" Y="40" Height="257" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="585" SplitterPosition="253" />
-    <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:DedtaxByMonth" ZOrder="153" X="1472" Y="132" Height="143" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="126" SplitterPosition="139" />
-    <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:SalarySheetByMonth" ZOrder="132" X="1735" Y="10" Height="257" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="330" SplitterPosition="253" />
-    <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:EmployeeServiceLength" ZOrder="65" X="-67" Y="470" Height="143" Width="204" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
-    <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:PayRollRegisterForAll" ZOrder="151" X="909" Y="48" Height="124" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="143" SplitterPosition="120" />
-    <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:ReckittTaxCard" ZOrder="152" X="950" Y="743" Height="105" Width="154" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="101" />
-    <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:DedtaxByMonthRange" ZOrder="141" X="1471" Y="42" Height="162" Width="197" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="142" SplitterPosition="158" />
-    <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:dtRolePermission" ZOrder="146" X="1467" Y="-22" Height="105" Width="167" 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:dtRoleInfo" ZOrder="139" X="1469" Y="12" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
-    <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:dtUserRole" ZOrder="138" X="1471" Y="103" Height="200" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
-    <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:EERSData" ZOrder="137" X="-68" Y="1161" Height="257" Width="187" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="227" SplitterPosition="253" />
-    <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:SalaryReconDeduction" ZOrder="148" X="1740" Y="133" Height="124" Width="197" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
-    <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:SalaryReconciliationSummary" ZOrder="147" X="1739" Y="71" Height="86" Width="238" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
-    <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:MemoDebit" ZOrder="119" X="1198" Y="803" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="83" SplitterPosition="120" />
-    <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:MemoCredit" ZOrder="118" X="1203" Y="898" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
-    <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:SharedLoanIssue" ZOrder="145" X="1735" Y="-23" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:GratuityProvision" ZOrder="144" X="1205" Y="8" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="210" SplitterPosition="234" />
-    <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:GratuityRegister" ZOrder="143" X="1204" Y="-20" Height="143" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="125" SplitterPosition="139" />
-    <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:GratuityLedger" ZOrder="142" X="1206" Y="38" Height="86" Width="153" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="74" SplitterPosition="82" />
-    <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:LoanData" ZOrder="140" X="317" Y="834" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="120" />
-    <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:dtUsers" ZOrder="102" X="1474" Y="258" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="216" SplitterPosition="177" />
-    <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:dtUserLogin" ZOrder="103" X="1472" Y="227" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" SplitterPosition="158" />
-    <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:dtBadUser" ZOrder="130" X="1470" Y="194" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
-    <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:EmpItemWiseSalary" ZOrder="136" X="-67" Y="500" Height="105" Width="181" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
-    <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:PFLedger" ZOrder="135" X="912" Y="137" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
-    <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:Challan" ZOrder="44" X="287" Y="365" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
-    <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:UpcomingTraining" ZOrder="134" X="312" Y="1027" Height="181" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
-    <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:SalaryCertificate" ZOrder="133" X="1742" Y="167" Height="257" Width="161" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:ChallanNoWithMonth" ZOrder="43" X="286" Y="398" Height="86" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="82" SplitterPosition="82" />
-    <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:MarketSurveyCom" ZOrder="117" X="1199" Y="834" Height="124" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="120" SplitterPosition="120" />
-    <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:activeInactiveUserList" ZOrder="98" X="918" Y="878" Height="105" Width="192" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
-    <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:dtCashAdvice" ZOrder="125" X="1474" Y="291" Height="162" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="158" />
-    <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:BanglaPaySlip" ZOrder="115" X="1219" Y="604" Height="257" Width="163" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:dtProdBonusDetail" ZOrder="124" X="1475" Y="419" Height="200" Width="176" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
-    <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:dtEmpDesWiseProdBonus" ZOrder="12" X="1476" Y="451" Height="257" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:dtMonthlyProdBonus" ZOrder="123" X="1477" Y="484" Height="143" Width="191" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
-    <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:SalarySheetStatic" ZOrder="122" X="1747" Y="264" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="748" SplitterPosition="253" />
-    <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:dtRoleAudit" ZOrder="83" X="1474" Y="322" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
-    <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:dtRolePermission2" ZOrder="121" X="1474" Y="355" Height="143" Width="174" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
-    <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:CasualSalarySheet" ZOrder="49" X="289" Y="179" Height="257" Width="171" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:BankAdviceHNM" ZOrder="112" X="1214" Y="451" Height="181" Width="165" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
-    <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:EmpDesCatChange" ZOrder="74" X="127" Y="31" Height="257" Width="175" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:EmployeeConfirmation" ZOrder="109" X="282" Y="436" Height="143" Width="199" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
-    <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:MonthlySchedule" ZOrder="108" X="681" Y="1101" Height="257" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:AllMedicalClaim" ZOrder="105" X="927" Y="908" Height="143" Width="160" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="139" SplitterPosition="139" />
-    <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:AllEmpTaxInfo" ZOrder="107" X="864" Y="1031" Height="181" Width="151" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
-    <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:dtAllActiveLaons" ZOrder="106" X="1475" Y="388" Height="257" Width="163" 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:ArrSheet" ZOrder="104" X="889" Y="597" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:EmpGroupInsurance" ZOrder="101" X="571" Y="297" Height="200" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="158" 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:EmpGroupInsuranceDiscon" ZOrder="73" X="114" Y="139" Height="200" Width="222" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="196" />
-    <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:SKFExpencesPaySlip" ZOrder="100" X="1747" Y="296" Height="257" Width="183" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:RemainingLoanforPayslip" ZOrder="99" X="948" Y="769" Height="105" Width="214" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="101" />
-    <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:PayslipBasicInfo" ZOrder="82" X="915" Y="302" Height="239" Width="160" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="235" />
-    <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:EmpPromotion" ZOrder="80" X="118" Y="275" Height="200" Width="153" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="196" SplitterPosition="196" />
-    <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:NewlyIssuedLoan" ZOrder="97" X="650" Y="521" Height="238" Width="167" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
-    <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:CurrentMonthDueLoan" ZOrder="96" X="1093" Y="929" Height="257" Width="200" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="253" />
-    <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:CashRefund" ZOrder="95" X="875" Y="1079" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="177" SplitterPosition="177" />
-    <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:PFRegister" ZOrder="94" X="907" Y="16" Height="257" Width="193" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="252" SplitterPosition="253" />
-    <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:BonusRegisterBAT" ZOrder="93" X="1217" Y="571" Height="238" Width="173" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="234" SplitterPosition="234" />
-    <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:NmgtSpringFestivalBonusRegister" ZOrder="88" X="1093" Y="962" Height="257" Width="265" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="292" 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:NmgtBonusPaySlip" ZOrder="87" X="1104" Y="997" Height="257" Width="177" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:SalaryRegister" ZOrder="85" X="1746" Y="305" Height="239" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="235" />
-    <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:CrewDeployment" ZOrder="35" X="471" Y="78" Height="257" Width="166" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:ActiveEmployee" ZOrder="8" X="756" Y="101" Height="28" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="235" SplitterPosition="24" />
-    <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:BonusPaySlip" ZOrder="11" X="1214" Y="390" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
-    <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:LoanDueWithCC" ZOrder="23" 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:dtBankAdvice" ZOrder="22" 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:dtEncashmentReport" ZOrder="21" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <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:SalaryReconNew" ZOrder="20" X="0" Y="0" Height="28" Width="158" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="86" SplitterPosition="24" />
-    <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:AnnualIncomeCertificate" ZOrder="24" X="155" Y="190" Height="257" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="253" />
-    <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:AssetAcknowledgement" ZOrder="9" X="819" Y="0" Height="28" Width="205" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />
-    <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:AssetSerialInformation" ZOrder="19" X="580" Y="14" Height="162" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="158" />
-    <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:BanglaPaySlipNew" ZOrder="17" 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:BanglaPaySlipNewProdBonus" ZOrder="16" 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:Employee" ZOrder="15" 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:dtProdAttendance" ZOrder="14" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <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:CCWiseSalarySheetNew" ZOrder="10" X="533" Y="586" Height="28" Width="203" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" 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:CandidateInformation" ZOrder="6" X="767" Y="198" Height="28" Width="194" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="101" SplitterPosition="24" />
-    <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:EmployeeInfoBasic" ZOrder="3" X="0" Y="0" Height="256" Width="175" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
-    <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:DeletedLifeCycle" ZOrder="2" 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>
   <Connectors />
 </DiagramLayout>

HRM.Report/ReportProcessor.cs

@@ -3963,8 +3963,8 @@ namespace HRM.Report
 
                 GetParameters(payrollTypeId);
                 ////GetImageFromEmpFileUpload(empId);
-                rParam = new ReportParameter("Photo", _PATH);
+                //rParam = new ReportParameter("Photo", _PATH);
-                reportParameters.Add(rParam);
+                //reportParameters.Add(rParam);
                 if (reportParameters != null)
                     localReport.SetParameters(reportParameters);
                 Warning[] warnings;

HRM.UI/ClientApp/src/app/_models/Attendance/dailyAttnProcess.ts

@@ -48,6 +48,8 @@ export class DailyAttnProcess extends BaseObject {
         this.actualOutTime = new Date();
         this.actualShiftID = null;
         this.shift= null;
+        this.onlyManualInTime = false;
+        this.onlyManualOutTime = false;
     }
     attnDate: Date;
     inTime: Date;
@@ -90,6 +92,9 @@ export class DailyAttnProcess extends BaseObject {
     shift: Shift;
     remarksType: number;
 
+    onlyManualInTime: boolean;
+    onlyManualOutTime: boolean;
+
 
 
 

HRM.UI/ClientApp/src/app/_models/Employee/empLifeCycle.ts

@@ -40,6 +40,7 @@ export class EmpLifeCycle extends BaseObject {
     punishmentID: number;
     isPayrollTypeChanged: boolean;
     isTransferReceived: boolean;
+    createdByUser: string;
 
     constructor() {
         super();

HRM.UI/ClientApp/src/app/_services/attendance/attendance.service.ts

@@ -276,6 +276,9 @@ export class AttendanceServices {
     getDailyAttnProcessByEmp(empList: any) {
         return this.apiService.httpPost<DailyAttnProcess[]>('/Attendance' + '/getDailyAttnProcessByEmp', empList);
     }
+    getDailyAttnProcessByEmpForManualEntry(empList: any) {
+        return this.apiService.httpPost<DailyAttnProcess[]>('/Attendance' + '/getDailyAttnProcessByEmpForManualEntry', empList);
+    }
 
     // DailyAttnProcess
     getDailyAttnProcessByEmployeeId(employeeId: number) {

HRM.UI/ClientApp/src/app/_services/employee/employee.service.ts

@@ -105,6 +105,12 @@ export class EmployeeServices {
 
         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() {
         return this.apiService.httpGet(this.apiService.base_url + 'getemployees');
@@ -498,7 +504,7 @@ export class EmployeeServices {
         return this.apiService.httpPost('/Employee/updateBanglaInformation', params);
     }
     updateBanglaContactInformation(params : any) {
-        return this.apiService.httpPost('/Employee/updateBanglaContactInformation', params);
+        return this.apiService.httpPost<number>('/Employee/updateBanglaContactInformation', params);
     }
     getPFExceptionData() {
         return this.apiService.httpGet<any[]>('/Employee/getPFExceptionData');

HRM.UI/ClientApp/src/app/_services/reports/report.service.ts

@@ -136,4 +136,7 @@ export class ReportServices {
     getGeneratedProfileReportData(param: any) {
         return this.apiService.httpDownloadFile('/Report/getGeneratedProfileReport/', param);
     }
+    getEmpDetailInfoReport(param: any): Observable<HttpEvent<any>> {
+        return this.apiService.httpPost<any>('/Report/getEmpDetailInfoReport/', param);
+    }
 }

HRM.UI/ClientApp/src/app/app.api.service.ts

@@ -14,7 +14,7 @@ export class ApiService {
     public isSSO = false;
     public versionDeployement = false;
     // public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2025, 1, 25))}-`+"01";
-    public versionNumber = `V-20250421-`+"01";
+    public versionNumber = `V-20250724-`+"01";
     public static BASE_URL = '';
     public base_url = '';
     // public currentLink = '';
@@ -168,6 +168,10 @@ export class ApiService {
         return (str === undefined || str === null || str.trim() === '') ? undefined : str;
     }
 
+    getApiDefaultBoolData(value: boolean) {
+        return (value === undefined || value === null) ? false : value;
+    }
+    
     getApiDateString(dDate: Date) {
         if (dDate === undefined || dDate === null) {
             return dDate;

HRM.UI/ClientApp/src/app/attendance/attendance-manual-edit-for-Single-employee/attendance-manual-edit-for-single-employee.component.html

@@ -282,6 +282,9 @@
                     set
                 </button>
                 <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>
             <kendo-grid-column field="shiftID" title="Date" width="8%">
                 <ng-template kendoGridCellTemplate let-dataItem>

HRM.UI/ClientApp/src/app/attendance/attendance-manual-edit-for-Single-employee/attendance-manual-edit-for-single-employee.component.ts

@@ -39,6 +39,7 @@ export class AttendanceManualEditForSingleEmployeeComponent implements OnInit {
     selectedOutTime: Date;
     dailyAttenProcessList: DailyAttnProcess[];
     _overTime: number = 0;
+    _remarks: string = "";
     statusList = [
         { value: 1, name: 'Present' },
         { value: 2, name: 'Absent' },
@@ -223,6 +224,9 @@ export class AttendanceManualEditForSingleEmployeeComponent implements OnInit {
         }
 
         this.dailyAttenProcessList.forEach(x => {
+            if(this._remarks){
+                x.comments = this._remarks;
+            }
             x.isManualEntry = true;
             if (x.wfStatus != EnumWFAttnStatus.None) {
                 this.notificationService.showError(x.attnDate.toDateString() +" is in approval stage, so manual edit is not allowed");

HRM.UI/ClientApp/src/app/attendance/attendance-manual-edit-for-multiple-employee/attendance-manual-edit-for-multiple-employee.component.html

@@ -329,7 +329,7 @@
     <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()">
             Back </button>
-        <button icon="rotate" kendoButton class="k-button k-primary" (click)="update()">
+        <button icon="save" kendoButton class="k-button k-primary" (click)="update()">
             Update
         </button>
     </div>

HRM.UI/ClientApp/src/app/attendance/attendance-manual-edit-for-multiple-employee/attendance-manual-edit-for-multiple-employee.component.ts

@@ -34,7 +34,7 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
     approvalRole: string;
     isVisibleEmpPicker: boolean = false;
     isVisibleCordinatorPicker: boolean = false;
-    isVisiblelmPicker: boolean= false;
+    isVisiblelmPicker: boolean = false;
     selectedShiftID: number;
     selectedStatus: EnumAttendanceType;
     selectedAttnDate: Date;
@@ -85,7 +85,7 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
         this.selectInTime = new Date();
         this.selectedOutTime = new Date();
         this.loadDropDownLists();
-     //   this.selectedStatus = EnumAttendanceType.Present;
+        //   this.selectedStatus = EnumAttendanceType.Present;
         this.getPendindBillings();
 
     }
@@ -143,7 +143,7 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
             },
             () => {
                 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].outTime = new Date(this.shifts[0].outTime);
                     this.dateChange();
@@ -207,7 +207,6 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
     }
 
     updateobject(type: number) {
-        debugger;
         if (this.selectedRemarks != undefined) {
             if (this.remarksList.find(y => y.value == this.selectedRemarks).name == "Other") {
                 this.isOtherRemarks = true;
@@ -215,6 +214,13 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
                 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 => {
             if (type == 1) {
                 x.actualInTime = x.inTime;
@@ -236,7 +242,7 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
             }
             else if (type == 6)
                 if (this.remarksList.find(y => y.value == this.selectedRemarks).name == "Other") {
-                    
+
                     x.empRemarks = this.otherRemarks;
                 }
                 else {
@@ -274,7 +280,8 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
 
         if (attnRequest.length == 0) return;
 
-        this.attendanceServices.getDailyAttnProcessByEmp(attnRequest).subscribe(
+        // this.attendanceServices.getDailyAttnProcessByEmp(attnRequest).subscribe(
+        this.attendanceServices.getDailyAttnProcessByEmpForManualEntry(attnRequest).subscribe(
             (resp) => {
 
                 if (this.dailyAttenProcessList == undefined || this.dailyAttenProcessList.length == 0) {
@@ -365,14 +372,29 @@ export class AttendanceManualEditForMultipleEmployeeComponent implements OnInit
         }
         var msg: string = "";
         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;
             if (x.wfStatus != EnumWFAttnStatus.None) {
                 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 inTime and outTime is not entered.; ";
+                msg = msg + "Employee: " + x.employee.employeeNo + ", Status present is not allowed while In Time and Out Time 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;
 

HRM.UI/ClientApp/src/app/attendance/attendance-process/attendance-process.component.html

@@ -2,7 +2,7 @@
 <form>
     <div class="card card-w-title">
         <div class="p-grid form-group">
-            <div class="p-col-12 p-md-4">
+            <div class="p-col-12 p-md-6 p-lg-4">
                 <div class="p-col-12">
                     <label for="processFromDate">Process From</label>
                 </div>
@@ -17,7 +17,7 @@
                 </div>
             </div>
 
-            <div class="p-col-12 p-md-4">
+            <div class="p-col-12 p-md-6 p-lg-4">
                 <div class="p-col-12">
                     <label for="processToDate">Process To</label>
                 </div>
@@ -32,17 +32,17 @@
                 </div>
             </div>
 
-            <div class="p-col-12 p-md-2">
+            <div class="p-col-12 p-md-4 p-lg-1">
                 <div class="p-col-12">
                     <label for="chkIWithEmployee">Employee Wise</label>
                 </div>
                 <div class="p-col-12">
                 <input type="checkbox" (change)="checkBoxChange()" [checked]="withEmployee"
-                    id="withEmployee" kendoCheckBox/>
+                    id="chkIWithEmployee" kendoCheckBox/>
                 </div>
             </div>
 
-            <div class="p-col-12 p-md-2" *ngIf="withEmployee">
+            <div class="p-col-12 p-md-4 p-lg-2" *ngIf="withEmployee">
                 <div class="p-col-12">
                     <label for="employeePicker">Select Employee</label>
                 </div>
@@ -54,6 +54,16 @@
                     ></app-employee-picker>
                 </div>
             </div>
+            
+            <div class="p-col-12 p-md-4 p-lg-1" *ngIf="enableManualEntry">
+                <div class="p-col-12">
+                    <label for="chkOverrideManualEntry">Override Manual Entry</label>
+                </div>
+                <div class="p-col-12">
+                <input type="checkbox" [checked]="overrideManualEntry" (change)="checkBoxChangeOverrideManualEntry()"
+                    id="manualEntry" kendoCheckBox/>
+                </div>
+            </div>
         </div>
         <div class="p-grid form-group">
             <div class="p-col-12 p-md-5">

HRM.UI/ClientApp/src/app/attendance/attendance-process/attendance-process.component.ts

@@ -27,6 +27,8 @@ export class AttendanceProcessComponent {
     processStatus: string = "";
     withEmployee: boolean = false;
     showModal: boolean = false;
+    enableManualEntry: boolean = false;
+    overrideManualEntry: boolean = false;
     constructor(public attnService: AttendanceServices, public datatransferservice: DataTransferService,
         public loadingPanel: loadingPanelService,
         public notificationService: HRMNotificationService,
@@ -65,6 +67,13 @@ export class AttendanceProcessComponent {
     }
     public GetSelectedEmployee(childData) {
         this.selectedEmployees = childData;
+        if (this.selectedEmployees != undefined && this.selectedEmployees.length == 1) {
+            this.enableManualEntry = true;
+        }
+        else {
+            this.enableManualEntry = false;
+        }
+        this.overrideManualEntry = false;
     }
 
     public onSave(e): void {
@@ -91,16 +100,16 @@ export class AttendanceProcessComponent {
         //    }
         //}
 
-        var attnRequest: { fromDate: Date, toDate: Date, isWithEmployee: boolean, employeeID: number }[];
+        var attnRequest: { fromDate: Date, toDate: Date, isWithEmployee: boolean, employeeID: number, overrideManualEntry: boolean }[];
         attnRequest = [];
 
-
+        debugger
-        attnRequest.push({ "fromDate": this.fromDate, "toDate": this.toDate, "isWithEmployee": true, "employeeID": 0 });
+        attnRequest.push({ "fromDate": this.fromDate, "toDate": this.toDate, "isWithEmployee": true, "employeeID": 0, "overrideManualEntry": this.overrideManualEntry });
         if (this.withEmployee) {
             if (this.selectedEmployees != undefined && this.selectedEmployees.length > 0) {
                 attnRequest = [];
                 this.selectedEmployees.forEach(x => {
-                    attnRequest.push({ "fromDate": this.fromDate, "toDate": this.toDate, "isWithEmployee": false, "employeeID": x.employeeID });
+                    attnRequest.push({ "fromDate": this.fromDate, "toDate": this.toDate, "isWithEmployee": false, "employeeID": x.employeeID, "overrideManualEntry": this.overrideManualEntry });
 
                 });
             }
@@ -138,8 +147,18 @@ export class AttendanceProcessComponent {
         else
             this.withEmployee = true;
 
+        this.enableManualEntry = false;
+        this.overrideManualEntry = false;
+
     }
     public onClickNotInWorkPlanEmployee() {
         this.showModal = true;
     }
+    public checkBoxChangeOverrideManualEntry() {
+        if (this.overrideManualEntry) {
+            this.overrideManualEntry = false;
+        }
+        else
+            this.overrideManualEntry = true;
+    }
 }

HRM.UI/ClientApp/src/app/core-hr/core-hr.module.ts

@@ -35,6 +35,8 @@ import { TextBoxModule } from "@progress/kendo-angular-inputs";
 import { LabelModule } from "@progress/kendo-angular-label";
 import { FloatingLabelModule } from "@progress/kendo-angular-label";
 import { IconsModule } from "@progress/kendo-angular-icons";
+import { UploadModule } from '@progress/kendo-angular-upload';
+import { ButtonsModule } from '@progress/kendo-angular-buttons';
 
 import { ReactiveFormsModule, FormsModule } from '@angular/forms';
 import { TabViewModule } from 'primeng/tabview';
@@ -129,7 +131,9 @@ import { HallOfFameUploaderComponent } from './hall-of-fame-uploader/hall-of-fam
         IconsModule,
         LabelModule,
         PanelModule,
-        CardManagemnetModule
+        CardManagemnetModule,
+        UploadModule,
+        ButtonsModule
     ],
     declarations: [
         NationalityComponent,

HRM.UI/ClientApp/src/app/core-hr/employee-profile/academic/academic-entry/academic-entry.component.html

@@ -38,9 +38,9 @@
                 <kendo-dropdownlist [(ngModel)]="selectedInstitutionID" [data]="institutions"
                     [defaultItem]="{ name: 'Select institution/Board', id: null }" [textField]="'name'"
                     [valueField]="'id'" [valuePrimitive]="true" class="form-control form-control-sm input-sm"
-                    [filterable]="true" (filterChange)="handleFilterInstitution($event)"
                     (valueChange)="selectInstitutionEvent($event)" formControlName="institutionPicker"
                     style="width:100%;">
+                    <!-- [filterable]="true" (filterChange)="handleFilterInstitution($event)" -->
                     <!-- [disabled]="(selectedEducationTypeID == undefined ||selectedEducationTypeID == null) || (selectedEducationLevelID == undefined || selectedEducationLevelID == null)" -->
                 </kendo-dropdownlist>
             </div>
@@ -51,9 +51,9 @@
             <div class="p-col-12 p-md-6 p-lg-4" style="margin: auto;">
                 <kendo-dropdownlist class="form-control form-control-sm" id="subject" [data]="educationDiscipline"
                     [defaultItem]="{ description: 'Select a discipline', id: null }" [textField]="'description'"
-                    [valueField]="'id'" [valuePrimitive]="true" [(ngModel)]="selectedDisciplineID"
+                    [valueField]="'id'" [valuePrimitive]="true" [(ngModel)]="selectedDisciplineID" 
-                    [filterable]="true" (filterChange)="handleFilter($event)" formControlName="disciplinePicker"
+                    formControlName="disciplinePicker" style="width:100%">
-                    style="width:100%">
+                    <!-- [filterable]="true" (filterChange)="handleFilter($event)"  -->
                     <!-- [disabled]="isEditActive"
                     [disabled]="selectedEducationLevelID == undefined || selectedEducationLevelID == null" -->
                 </kendo-dropdownlist>

HRM.UI/ClientApp/src/app/core-hr/employee-profile/academic/academic-entry/academic-entry.component.ts

@@ -230,8 +230,8 @@ export class AcademicEntryComponent implements OnInit {
             },
             () => {
                 this.educationLevels = this.alleducationLevels;
-                this.educationDiscipline = this.alleducationDiscipline;
+                this.educationDiscipline = this.alleducationDiscipline.sort((a, b) => a.description.localeCompare(b.description));
-                this.institutions = this.allinstitutions;
+                this.institutions = this.allinstitutions.sort((a, b) => a.name.localeCompare(b.name));
                 this.resultTypes = this.allresultTypes;
 
                 this.loadingPanelService.ShowLoadingPanel = false;

HRM.UI/ClientApp/src/app/core-hr/employee-profile/contact/contact.component.ts

@@ -45,8 +45,9 @@ export class ContactComponent implements OnInit {
         this.basicService.getAllDistricts().subscribe((resp) => {
             this.districts = resp;
         },
-            () => {
+            (err: any) => {
-
+                this.loadingPanel.ShowLoadingPanel = false;
+                this.notificationService.showError(err.error);
             },
             () => {
 
@@ -58,8 +59,9 @@ export class ContactComponent implements OnInit {
         this.basicService.getAllThanas(value).subscribe((resp) => {
             this.permanentThanas = resp;
         },
-            () => {
+            (err: any) => {
-
+                this.loadingPanel.ShowLoadingPanel = false;
+                this.notificationService.showError(err.error);
             },
             () => {
 
@@ -71,8 +73,9 @@ export class ContactComponent implements OnInit {
         this.basicService.getAllThanas(value).subscribe((resp) => {
             this.presentThanas = resp;
         },
-            () => {
+            (err: any) => {
-
+                this.loadingPanel.ShowLoadingPanel = false;
+                this.notificationService.showError(err.error);
             },
             () => {
 
@@ -135,7 +138,8 @@ export class ContactComponent implements OnInit {
                 }
             },
             (err: any) => {
-
+                this.loadingPanel.ShowLoadingPanel = false;
+                this.notificationService.showError(err.error);
             },
             () => {
                 if (this.employeeService.hrEmployee.id != undefined && this.employeeService.hrEmployee.id != 0) {
@@ -147,7 +151,9 @@ export class ContactComponent implements OnInit {
         this.basicService.getAllRelations().subscribe((resp) => {
             this.relations = resp;
         },
-            () => {
+            (err) => {
+                this.loadingPanel.ShowLoadingPanel = false;
+                this.notificationService.showError(err.error);
 
             },
             () => {
@@ -186,8 +192,9 @@ export class ContactComponent implements OnInit {
             (resp) => {
                 this.contact.id = resp;
             },
-            () => {
+            (err) => {
                 this.loadingPanel.ShowLoadingPanel = false;
+                this.notificationService.showError(err.error);
             },
             () => {
                 this.loadingPanel.ShowLoadingPanel = false;
@@ -222,8 +229,9 @@ export class ContactComponent implements OnInit {
                 this.presentThanas = resp;
                 this.contact.presentThanaID = this.contact.permanentThanaID;
             },
-                () => {
+                (err) => {
-
+                    this.loadingPanel.ShowLoadingPanel = false;
+                    this.notificationService.showError(err.error);
                 },
                 () => {
 

HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.html

@@ -11,7 +11,7 @@
         </label>
     </div>
     <div *ngIf="!newEmployee" class="p-col-12 p-lg-4">
-        <app-employee-picker [isActive]="!newEmployee"
+        <app-employee-picker [isActive]="!newEmployee" [ForLifeCycleSearch]="true"
             (ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
     </div>
     <div *ngIf="newEmployee" class="p-col-12 p-lg-4">
@@ -25,14 +25,17 @@
     </div>
 </div>
 
-<p-tabView [scrollable]="true">
+<p-tabView #tabView
+        [(activeIndex)]="activeIndex"
+        (onChange)="onTabChange($event, tabView)"
+        [scrollable]="true">
     <p-tabPanel header="General" leftIcon="pi pi-user">
-        <app-general [isActive]="!newEmployee" [employeeNo]="this.employeeService.hrEmployee.employeeNo" 
+        <app-general #general [isActive]="!newEmployee" [employeeNo]="this.employeeService.hrEmployee.employeeNo" 
             (defaultNationalityHandler)="defaultNationalityHandler($event)"
             (defaultEmployeeTypeHandler)="defaultEmployeeTypeHandler($event)"></app-general>
     </p-tabPanel>
      <p-tabPanel header="Contacts" leftIcon="pi pi-phone">
-        <app-contact (saveContact)="saveContact($event)"></app-contact>
+        <app-contact #contact (saveContact)="saveContact($event)"></app-contact>
     </p-tabPanel>
     <!-- <p-tabPanel header="Bangla" leftIcon="pi pi-star">
         <app-bangla></app-bangla>

HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { EmployeeServices } from '../../_services/employee/employee.service';
 import { empFileuploads, HrEmployee } from '../../_models/HREmployee/hrEmployee';
@@ -13,6 +13,8 @@ import { HRMNotificationService } from '../../app.notification.service';
 import { DomSanitizer } from '@angular/platform-browser';
 import { Nationality } from '../nationality/nationality';
 import { Category } from 'src/app/_models/Basic/category';
+import { GeneralComponent } from './general/general.component';
+import { ContactComponent } from './contact/contact.component';
 
 @Component({
     selector: 'app-employee-profile',
@@ -34,6 +36,15 @@ export class EmployeeProfileComponent implements OnInit {
     isDisplay = false;
     defaultNationality: Nationality;
     defaultEmployeeType: Category;
+
+    activeIndex: number = 0;
+    previousIndex: number = 0; // 👈 track the previous tab index manually
+    @ViewChild('general') generalComponent!: GeneralComponent;
+    @ViewChild('contact') contactComponent!: ContactComponent;
+    newEmpSaved: boolean = false;
+    newEmpContactSaved: boolean = false;
+
+
     constructor(private fb: FormBuilder,
         public employeeService: EmployeeServices,
         public basicService: BasicService,
@@ -189,8 +200,10 @@ export class EmployeeProfileComponent implements OnInit {
 
 
     checkValue(value: any) {
+        debugger
         if (value === true) {
 
+            this.hrEmployeeProfile = new HrEmployee();
             this.refreshEmployee(new HrEmployee());
 
             // this.loadingPanel.ShowLoadingPanel = true;
@@ -209,6 +222,7 @@ export class EmployeeProfileComponent implements OnInit {
         }
         else {
             this.employeeService.hrEmployee.employeeNo = undefined;
+            this.employeeService.Employee_Get_Completed.next(new HrEmployee());
         }
     }
 
@@ -325,5 +339,85 @@ export class EmployeeProfileComponent implements OnInit {
     defaultEmployeeTypeHandler(dataItem: Category) {
         this.defaultEmployeeType = dataItem;
     }
+
+    onTabChange(event: any, tabView: any) {
+        const nextIndex = event.index;
+        const currentIndex = this.previousIndex; // 👈 previous tab before switch
+
+        const currentTab = tabView.tabs[currentIndex];
+        const nextTab = tabView.tabs[nextIndex];
+
+        debugger
+        if (this.newEmployee) {
+
+            if (currentTab.header.toLowerCase() == 'general' && !this.newEmpSaved) {
+
+                setTimeout(() => {
+
+                    if (this.generalComponent != undefined && this.generalComponent.personalInfo.valid === false && this.generalComponent.hrEmployee.employeeNo === '') {
+                        this.notificationService.showError('Required Fields Can\'t Be Empty');
+                        this.activeIndex = currentIndex;
+                        this.previousIndex = currentIndex;
+                        return;
+                    }
+                    this.generalComponent.SavePersonalInfo();
+                    this.newEmpSaved = true;
+                    return;
+                });
+            }
+            if (currentTab.header.toLowerCase() == 'contacts' && !this.newEmpContactSaved) {
+                setTimeout(() => {
+
+                    if (!this.contactComponent.contactForm.valid) {
+                        this.notificationService.showWarning('Must Entry field can\'t be Empty');
+                        this.activeIndex = currentIndex;
+                        this.previousIndex = currentIndex;
+                        return;
+                    }
+                    this.contactComponent.SaveContact();
+                    this.newEmpContactSaved = true;
+                    return;
+                });
+            }
+        }
+        if (currentTab.header.toLowerCase() == 'general') {
+            if (this.generalComponent != undefined && this.contactComponent != undefined) {
+                if (this.generalComponent.contact.id == 0) {
+                    this.contactComponent.contact.id = this.generalComponent.contact.id;
+                }
+                if (this.generalComponent.contact.presentPOInBangla != null && this.generalComponent.contact.presentPOInBangla != "") {
+                    this.contactComponent.contact.presentPOInBangla = this.generalComponent.contact.presentPOInBangla;
+                }
+                if (this.generalComponent.contact.presentAddressInBangla != null && this.generalComponent.contact.presentAddressInBangla != "") {
+                    this.contactComponent.contact.presentAddressInBangla = this.generalComponent.contact.presentAddressInBangla;
+                }
+                if (this.generalComponent.contact.parmanentPOInBangla != null && this.generalComponent.contact.parmanentPOInBangla != "") {
+                    this.contactComponent.contact.parmanentPOInBangla = this.generalComponent.contact.parmanentPOInBangla;
+                }
+                if (this.generalComponent.contact.permanentAddressInBangla != null && this.generalComponent.contact.permanentAddressInBangla != "") {
+                    this.contactComponent.contact.permanentAddressInBangla = this.generalComponent.contact.permanentAddressInBangla;
+                }
+            }
+        }
+        if (nextTab.header.toLowerCase() == 'attachments') {
+            debugger;
+            this.employeeService.getEmployeeAttachments(this.selectedEmployee != undefined ? this.selectedEmployee.employeeID : this.employeeService.hrEmployee.id)
+                .subscribe(
+                    (resp) => {
+                        this.attachments = resp;
+                    },
+                    (x) => {
+                        console.log(x);
+                        this.loadingPanel.ShowLoadingPanel = false;
+                    },
+                    () => {
+                        this.loadingPanel.ShowLoadingPanel = false;
+                        this.hrEmployeeProfile.attachments = this.attachments;
+                    }
+                );
+        }
+        // ✅ Save current as previous after successful switch
+        this.previousIndex = nextIndex;
+    }
 }
 

HRM.UI/ClientApp/src/app/core-hr/employee-profile/family/spouse/spouse-entry/spouse-entry.component.html

@@ -12,13 +12,13 @@
                     required style="width:100%">
             </div>
 
-            <div class="p-col-12 p-md-6 p-lg-2" >
+            <!-- <div class="p-col-12 p-md-6 p-lg-2" >
                 <label for="txtSpouseNameInBangla">Name (Bn)</label>
             </div>
             <div class="p-col-12 p-md-6 p-lg-4" style="margin: auto;">
                 <input id="txtSpouseNameInBangla" formControlName="banglaname" class="bangla-font"
                     [(ngModel)]="spouse.nameinbangla" type="text" pInputText style="width:100%">
-            </div>
+            </div> -->
 
             <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
                 <label>Level of Education</label>
@@ -57,6 +57,7 @@
                 <kendo-datepicker [(ngModel)]="spouse.marriageDate" [format]="'dd-MMM-yyyy'"
                     formControlName="marriageDate" id="dtpMarriageDate" style="width:100%"></kendo-datepicker>
             </div>
+            <div class="p-lg-6"></div>
 
             <!-- <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
                 <label>Insurance Id</label>

HRM.UI/ClientApp/src/app/core-hr/employee-profile/general/general.component.html

@@ -10,26 +10,38 @@
                                 <div class="p-col-12">
                                     <div style="position: relative; display: inline-block;">
                                         <img id="imgProfilePicture" [src]="employeePhoto"
-                                             style="height: 180px; width: 180px; border-radius: 50%; border: 1px solid #52527A;" />
+                                            style="height: 180px; width: 180px; border-radius: 50%; border: 1px solid #52527A;" />
-                                        <button class="editImage" (click)="fileInput.click()"
+                                        <!-- <button class="editImage" (click)="fileInput.click()"
                                                 style="position: absolute; bottom: 18px; right: 18px;">
                                             <span class="editIcon">&#9998;</span>
+                                        </button> -->
+                                        <button class="editImage" (click)="triggerUploadClick()"
+                                            style="position: absolute; bottom: 18px; right: 18px;">
+                                            <span class="editIcon">&#9998;</span>
                                         </button>
                                     </div>
                                     <div style="position: relative; display: inline-block;">
                                         <img id="imgEmpSigneture" [src]="empSigneture"
-                                             style="height: 60px; width: 180px; border-radius: 10px; border: 1px solid #52527A;" />
+                                            style="height: 60px; width: 180px; border-radius: 10px; border: 1px solid #52527A;" />
-                                        
+
                                     </div>
-                                    
+
                                 </div>
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-12" align="center">
-                                <input formControlName="empPhoto" id="fupEmpPhoto" #fileInput
+                                <!-- <input formControlName="empPhoto" id="fupEmpPhoto" #fileInput
-                                    (change)="selectFile($event)" type="file" style="display: none;">
+                                    (change)="selectProfilePhoto($event)" type="file" style="display: none;"> -->
+                                <!-- <kendo-upload #fileInput formControlName="empPhoto" id="fupEmpPhoto"
+                                    [autoUpload]="false" [multiple]="false" [saveUrl]="'noop'" [removeUrl]="'noop'"
+                                    (select)="selectProfilePhoto($event)" style="width: 100%;display: none;">
+                                </kendo-upload> -->
+                                <kendo-upload #uploadPhoto formControlName="empPhoto" id="fupEmpPhoto" [autoUpload]="false"
+                                    [multiple]="false" [saveUrl]="'noop'" [removeUrl]="'noop'"
+                                    (select)="selectProfilePhoto($event)" style="width: 100%; display: none;">
+                                </kendo-upload>
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-12" style="height: 76px;">
-                                
+
                             </div>
                         </div>
                     </div>
@@ -179,8 +191,7 @@
                         </div>
                         <div class="p-col-12 p-lg-12" align="right" style="margin-top: 20px;">
 
-                            <button class="k-button k-primary" kendoButton icon="save"
+                            <button class="k-button k-primary" kendoButton icon="save" (click)="SavePersonalInfo()">
-                                (click)="SavePersonalInfo()">
                                 <!-- (click)="SavePersonalInfo()"> -->
                                 Save
                             </button>
@@ -207,11 +218,16 @@
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-8">
                                 <input [(ngModel)]="hrEmployee.drivingLicenceNo" formControlName="drivingLicenseNo"
-                                    id="txtDrivingLicenseNo" pInputText style="width: 84%" type="text"
+                                    id="txtDrivingLicenseNo" pInputText style="width: 100%" type="text"
                                     [readonly]="!active">
-                                <button class="k-button k-primary" kendoButton icon="k-i-attachment-45 k-i-clip-45"
+                                <!-- style="width: 84%" -->
+                                <!-- <button class="k-button k-primary" kendoButton icon="k-i-attachment-45 k-i-clip-45"
                                     style="width: 15.5%; vertical-align: bottom; padding: 16px;" [disabled]="!active"
-                                    (click)="popUpAttachment('DLN')"></button>
+                                    (click)="popUpAttachment('DLN')"></button> -->
+                                <kendo-upload #uploadDL [autoUpload]="false" [multiple]="false" [saveUrl]="'noop'"
+                                    [removeUrl]="'noop'" (select)="selectFileDrivingLicense($event)"
+                                    style="width: 100%;">
+                                </kendo-upload>
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-4">
                                 <label for="txtPassportNo">Height in centemeter</label>
@@ -239,10 +255,15 @@
                                 <label for="empSignaturePhotoId">Signature</label>
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-8">
-                                <input id="empSignaturePhotoId" pInputText style="width:84%" type="text" [readonly]="true">
+                                <input id="empSignaturePhotoId" pInputText style="width:100%" type="text"
-                            <button class="k-button k-primary" kendoButton icon="k-i-attachment-45 k-i-clip-45"
+                                    [readonly]="true">
+                                <!-- style="width: 84%" -->
+                                <!-- <button class="k-button k-primary" kendoButton icon="k-i-attachment-45 k-i-clip-45"
                                 style="width: 15.5%; vertical-align: bottom; padding: 16px;" [disabled]="!active"
-                                (click)="popUpAttachment('Signature')"></button>
+                                (click)="popUpAttachment('Signature')"></button> -->
+                                <kendo-upload #uploadSig [autoUpload]="false" [multiple]="false" [saveUrl]="'noop'"
+                                    [removeUrl]="'noop'" (select)="selectSignature($event)" style="width: 100%;">
+                                </kendo-upload>
                             </div>
                         </div>
 
@@ -256,22 +277,44 @@
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-8">
                                 <input [(ngModel)]="hrEmployee.nationalID" formControlName="nationalId"
-                                    id="txtNationalId" pInputText style="width:84%" type="text">
+                                    id="txtNationalId" pInputText type="text" style="width:100%">
-                                    <!--  [readonly]="!active" -->
+                                <!-- style="width:84%" -->
-                                <button class="k-button k-primary" kendoButton icon="k-i-attachment-45 k-i-clip-45"
+
+                                <!--  [readonly]="!active" -->
+                                <!-- <button class="k-button k-primary" kendoButton icon="k-i-attachment-45 k-i-clip-45"
                                     style="width: 15.5%; vertical-align: bottom; padding: 16px;"
-                                    (click)="popUpAttachment('NID')"></button>
+                                    (click)="popUpAttachment('NID')" [disabled]="!active"></button> -->
-                                    <!--  [disabled]="!active" -->
+
+
+                                <!-- <input [(ngModel)]="NIDFiles" (change)="selectFileNationalId($event)" type="file" pInputText
+                                    style="width: 100%;padding: 5px;margin:5px 0;"> -->
+                                <!-- <kendo-upload [saveUrl]="uploadSaveUrl" [removeUrl]="uploadRemoveUrl">
+                                    </kendo-upload> -->
+
+
+                                <!-- <kendo-upload
+                                        [autoUpload]="false"
+                                        [saveUrl]="'noop'"
+                                        [removeUrl]="'noop'"
+                                        (select)="onFileSelect($event)">
+                                        </kendo-upload> -->
+                                <kendo-upload #uploadNID [autoUpload]="false" [multiple]="false" [saveUrl]="'noop'"
+                                    [removeUrl]="'noop'" (select)="selectFileNationalId($event)" style="width: 100%;">
+                                </kendo-upload>
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-4">
                                 <label for="txtPassportNo">Passport No</label>
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-8">
                                 <input [(ngModel)]="hrEmployee.passportNo" formControlName="passportNo"
-                                    id="txtPassportNo" pInputText style="width:84%;" type="text" [readonly]="!active">
+                                    id="txtPassportNo" pInputText style="width:100%;" type="text" [readonly]="!active">
-                                <button class="k-button k-primary" kendoButton icon="k-i-attachment-45 k-i-clip-45"
+                                <!-- style="width:84%;" -->
+                                <!-- <button class="k-button k-primary" kendoButton icon="k-i-attachment-45 k-i-clip-45"
                                     style="width: 15.5%; vertical-align: bottom; padding: 16px;" [disabled]="!active"
-                                    (click)="popUpAttachment('PNo')"></button>
+                                    (click)="popUpAttachment('PNo')"></button> -->
+                                <kendo-upload #uploadPassPort [autoUpload]="false" [multiple]="false" [saveUrl]="'noop'"
+                                    [removeUrl]="'noop'" (select)="selectPassport($event)" style="width: 100%;">
+                                </kendo-upload>
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-4">
                                 <label for="txtSpouseNameBangla">Spouse Name Bangla</label>
@@ -299,7 +342,8 @@
                                 <label for="">Bangla Information</label>
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-8">
-                                <button class="k-button k-primary" style="width: 100%;" kendoButton icon="info" (click)="DisplayBanglaInformation()">
+                                <button class="k-button k-primary" style="width: 100%;" kendoButton icon="info"
+                                    (click)="DisplayBanglaInformation()">
                                     View & Update
                                 </button>
                             </div>
@@ -316,10 +360,15 @@
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-8">
                                 <input [(ngModel)]="hrEmployee.tinNo" formControlName="tin" id="txtTin" pInputText
-                                    style="width:84%" type="text" [readonly]="!active">
+                                    type="text" [readonly]="!active" style="width:100%">
-                                <button class="k-button k-primary" kendoButton icon="k-i-attachment-45 k-i-clip-45"
+                                <!-- style="width:84%" -->
+                                <!-- <button class="k-button k-primary" kendoButton icon="k-i-attachment-45 k-i-clip-45"
                                     style="width: 15.5%; vertical-align: bottom; padding: 16px;" [disabled]="!active"
-                                    (click)="popUpAttachment('TIN')"></button>
+                                    (click)="popUpAttachment('TIN')"></button> -->
+
+                                <kendo-upload #uploadTIN [autoUpload]="false" [multiple]="false" [saveUrl]="'noop'"
+                                    [removeUrl]="'noop'" (select)="selectFileTin($event)" style="width: 100%;">
+                                </kendo-upload>
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-4">
                                 <label for="dtpPassportIssueDate">Passport Issue Date</label>
@@ -360,16 +409,15 @@
                                     formControlName="motherOccupation" id="txtreligion">
                                 </kendo-dropdownlist>
                             </div>
-                            <div class="p-col-12 p-md-12 p-lg-4" ></div>
+                            <div class="p-col-12 p-md-12 p-lg-4"></div>
-                            <div class="p-col-12 p-md-12 p-lg-4" style="margin-top: 11px;" >
+                            <div class="p-col-12 p-md-12 p-lg-4" style="margin-top: 11px;">
-                                <button class="k-button k-primary" kendoButton icon="add"
+                                <button class="k-button k-primary" kendoButton icon="add" (click)="AddAccessCard()"
-                                (click)="AddAccessCard()">
+                                    [disabled]="!active">
-                                Add Access Card
+                                    Add Access Card
-                            </button>
+                                </button>
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-4" style="margin-top: 11px;" align="right">
-                                <button class="k-button k-primary" kendoButton icon="save" 
+                                <button class="k-button k-primary" kendoButton icon="save" (click)="SavePersonalInfo()">
-                                    (click)="SavePersonalInfo()">
                                     <!-- (click)="SavePersonalInfo()"> -->
                                     Save
                                 </button>
@@ -463,8 +511,8 @@
 </p-tabView>
 
 
-<kendo-dialog class="blur-background" *ngIf="nidPopUp||tinPopUp||dlnoPopUp||passnoPopUp||signaturePopUp" (close)="close()"
+<kendo-dialog class="blur-background" *ngIf="nidPopUp||tinPopUp||dlnoPopUp||passnoPopUp||signaturePopUp"
-    [width]="450">
+    (close)="close()" [width]="450">
     <app-loading-panel></app-loading-panel>
     <kendo-dialog-titlebar>
         <div style="font-size: 18px; line-height: 1.3em;"><span class=""></span>Attcahment</div>
@@ -507,7 +555,7 @@
                 <label for="txtLastName">Name</label>
             </div>
             <div class="p-col-12 p-md-6 p-lg-3" style="margin: auto;">
-                <input [(ngModel)]="hrEmployee.banglaName" id="txtBanglaName"  class="bangla-font"
+                <input [(ngModel)]="hrEmployee.banglaName" id="txtBanglaName" class="bangla-font"
                     formControlName="banglaName" pInputText style="width:100%" type="text">
             </div>
 
@@ -515,23 +563,23 @@
                 <label for="txtSpouseNameBangla">Spouse Name</label>
             </div>
             <div class="p-col-12 p-md-6 p-lg-3" style="margin: auto;">
-                <input class="bangla-font"  formControlName="spouseNameBangla"
+                <input class="bangla-font" formControlName="spouseNameBangla" [(ngModel)]="hrEmployee.spouseNameBangla"
-                    [(ngModel)]="hrEmployee.spouseNameBangla" pInputText style="width:100%" type="text">
+                    pInputText style="width:100%" type="text">
             </div>
 
             <div class="p-col-12 p-md-6 p-lg-3" style="margin: auto;">
                 <label for="txtFatherNameBangla">Father's Name</label>
             </div>
             <div class="p-col-12 p-md-6 p-lg-3" style="margin: auto;">
-                <input class="bangla-font"  formControlName="fatherNameBangla"
+                <input class="bangla-font" formControlName="fatherNameBangla" [(ngModel)]="hrEmployee.fatherNameBangla"
-                    [(ngModel)]="hrEmployee.fatherNameBangla" pInputText style="width:100%" type="text">
+                    pInputText style="width:100%" type="text">
             </div>
             <div class="p-col-12 p-md-6 p-lg-3" style="margin: auto;">
                 <label for="txtMotherNameBangla">Mother's Name</label>
             </div>
             <div class="p-col-12 p-md-6 p-lg-3" style="margin: auto;">
-                <input formControlName="motherNameBangla"  [(ngModel)]="hrEmployee.motherNameBangla"
+                <input formControlName="motherNameBangla" [(ngModel)]="hrEmployee.motherNameBangla" class="bangla-font"
-                    class="bangla-font" pInputText style="width:100%" type="text">
+                    pInputText style="width:100%" type="text">
             </div>
 
             <!-- <div class="p-col-12 p-md-12 p-lg-12" style="margin: auto;" align="right">
@@ -555,7 +603,7 @@
                         <label for="txtPermanentAddress"> Permanent Address </label>
                     </div>
                     <div class="p-col-12 p-md-6 p-lg-6" style="margin: auto;">
-                        <input id="txtPermanentAddressBangla"  formControlName="permanentAddressInBangla"
+                        <input id="txtPermanentAddressBangla" formControlName="permanentAddressInBangla"
                             class="bangla-font" [(ngModel)]="contact.permanentAddressInBangla" type="text" pInputText
                             style="width:100%">
                     </div>
@@ -564,7 +612,7 @@
                         <label for="txtParmanentPOInBangla">Post Office Name </label>
                     </div>
                     <div class="p-col-12 p-md-6 p-lg-6" style="margin: auto;">
-                        <input class="bangla-font" id="txtParmanentPOInBangla"  formControlName="parmanentPOInBangla"
+                        <input class="bangla-font" id="txtParmanentPOInBangla" formControlName="parmanentPOInBangla"
                             [(ngModel)]="contact.parmanentPOInBangla" type="text" pInputText style="width:100%">
                     </div>
                 </div>
@@ -580,7 +628,7 @@
                         <label for="txtPresentAddress"> Present Address</label>
                     </div>
                     <div class="p-col-12 p-md-6 p-lg-6" style="margin: auto;">
-                        <input id="txtPresentAddressBangla"  formControlName="presentAddressInBangla" class="bangla-font"
+                        <input id="txtPresentAddressBangla" formControlName="presentAddressInBangla" class="bangla-font"
                             [(ngModel)]="contact.presentAddressInBangla" type="text" pInputText style="width:100%">
                     </div>
 
@@ -588,7 +636,7 @@
                         <label for="txtPresentPOInBangla">Post Office Name</label>
 
                     </div>
-                    <div class="p-col-12 p-md-6 p-lg-6"  style="margin: auto;">
+                    <div class="p-col-12 p-md-6 p-lg-6" style="margin: auto;">
                         <input class="bangla-font" id="txtPresentPOInBangla" formControlName="presentPOInBangla"
                             [(ngModel)]="contact.presentPOInBangla" type="text" pInputText style="width:100%">
                     </div>
@@ -596,10 +644,9 @@
             </div>
         </div>
         <div class="p-col-12 p-md-12 p-lg-12" style="margin: auto;" align="right">
-            <button class="k-button k-primary" kendoButton icon="save"
+            <button class="k-button k-primary" kendoButton icon="save" (click)="saveBanglaInfo()">
-            (click)="SaveBanglaContactInformation()">
+                Save
-            Save
+            </button>
-        </button>
         </div>
     </form>
 </kendo-dialog>
@@ -608,5 +655,5 @@
     <kendo-dialog-titlebar>
         Access Card
     </kendo-dialog-titlebar>
-    <app-access-card-management [SetEmployee]="pickerEmployee" ></app-access-card-management>
+    <app-access-card-management [SetEmployee]="pickerEmployee"></app-access-card-management>
-</kendo-dialog>
+</kendo-dialog>

HRM.UI/ClientApp/src/app/core-hr/employee-profile/general/general.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { DataTransferService } from '../../../data.transfer.service';
 import { EmployeeServices } from '../../../_services/employee/employee.service';
@@ -33,6 +33,9 @@ import { Nationality } from '../../nationality/nationality';
 import { EmpContact } from 'src/app/_models/HREmployee/empContact';
 import { Thana } from '../../thana/thana';
 import { CardManagemnetModule } from 'src/app/attendance/access-card-management/card-management.module';
+import { Observable, EMPTY } from 'rxjs';
+import { tap, finalize, catchError } from 'rxjs/operators';
+import { FileInfo, UploadComponent } from '@progress/kendo-angular-upload';
 
 @Component({
     selector: 'app-general',
@@ -53,6 +56,13 @@ import { CardManagemnetModule } from 'src/app/attendance/access-card-management/
             border-radius: 5px;
             border: 1px solid #52527A;
         }
+
+        ::ng-deep .k-upload .k-actions, .k-upload .k-action-buttons, .k-upload .k-columnmenu-actions {
+            display: none;
+        }
+        ::ng-deep .k-upload .k-dropzone {
+            padding: 3px 3px;
+        }
     `]
 })
 /* general component*/
@@ -61,8 +71,21 @@ export class GeneralComponent implements OnInit {
 
     @Input() public set isActive(isActive: boolean) {
         this.active = isActive;
+        this.uploadDL.clearFiles();
+        this.uploadSig.clearFiles();
+        this.uploadNID.clearFiles();
+        this.uploadPassPort.clearFiles();
+        this.uploadTIN.clearFiles();
     }
 
+    @ViewChild('uploadDL') uploadDL: UploadComponent;
+    @ViewChild('uploadSig') uploadSig: UploadComponent;
+    @ViewChild('uploadNID') uploadNID: UploadComponent;
+    @ViewChild('uploadPassPort') uploadPassPort: UploadComponent;
+    @ViewChild('uploadTIN') uploadTIN: UploadComponent;
+    // @ViewChild('uploadPhoto') uploadPhoto: UploadComponent;
+    @ViewChild('uploadPhoto', { read: ElementRef }) uploadPhotoRef!: ElementRef;
+
     active: boolean = false;
 
     NIDFiles: any;
@@ -70,9 +93,15 @@ export class GeneralComponent implements OnInit {
     DLfiles: any;
     Passfiles: any;
     Sigfiles: any;
-    selectedNidFiles: any;
+    // selectedNidFiles: any;
-    selectedTinFiles?: FileList;
+    // selectedTinFiles?: FileList;
-    selectedDlFiles: any;
+    // selectedDlFiles: any;
+    selectedNidFiles: File[] = [];
+    selectedTinFiles: File[] = [];
+    selectedDlFiles: File[] = [];
+    selectedPassportFiles: File[] = [];
+    selectedSignature: File[] = [];
+    selectedFiles: File[] = [];
     departmentPicker: DynamicPicker;
     gradePicker: DynamicPicker;
     religionPicker: DynamicPicker;
@@ -101,7 +130,7 @@ export class GeneralComponent implements OnInit {
     employeeTypes: Category[];
     religions: Religion[];
     public userRoleselectableSettings: SelectableSettings;
-    selectedFiles?: FileList;
+    // selectedFiles?: FileList;
     currentFile?: File;
     employeePhoto: any;
     empSigneture: any;
@@ -116,7 +145,7 @@ export class GeneralComponent implements OnInit {
     nationalities: Nationality[];
     defaultNationality: Nationality;
     defaultEmployeeType: Category;
-    nameBangla: string = 'asasas';
+    nameBangla: string = '';
     defaultPhoto = "assets/photos/profile-default.jpg";
     photoPath = "Documents/EMPPHOTO";
     isDisplay: boolean = false;
@@ -405,7 +434,7 @@ export class GeneralComponent implements OnInit {
 
                     this.empSigneture = this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp}`);
                 } else {
-                    this.employeePhoto = this.defaultPhoto;
+                    // this.employeePhoto = this.defaultPhoto;
                 }
 
             },
@@ -450,6 +479,7 @@ export class GeneralComponent implements OnInit {
     //     }
     // }
     SavePersonalInfo() {
+        debugger
         // console.log(this.hrEmployee.banglaName);
         // return;
         if (this.personalInfo.valid === false && this.hrEmployee.employeeNo === '') {
@@ -473,7 +503,8 @@ export class GeneralComponent implements OnInit {
                     this.hrEmployee.id = resp.id;
                     if (this.active == false) {
                         this.hrEmployee.employeeNo = resp.employeeNo;
-                        this.employeeService.hrEmployee.employeeNo = resp.employeeNo;
+                        // this.employeeService.hrEmployee.employeeNo = resp.employeeNo;
+                        this.employeeService.hrEmployee = resp;
                     }
                 }
             },
@@ -495,6 +526,45 @@ export class GeneralComponent implements OnInit {
                 if (this.selectedDlFiles !== null && this.selectedDlFiles !== undefined && this.selectedDlFiles.length > 0) {
                     this.saveFile(this.hrEmployee.id, this.selectedDlFiles, enumEmpFileUploadType.DrivingLicense);
                 }
+                if (this.selectedPassportFiles !== null && this.selectedPassportFiles !== undefined && this.selectedPassportFiles.length > 0) {
+                    this.saveFile(this.hrEmployee.id, this.selectedPassportFiles, enumEmpFileUploadType.passport);
+                }
+                if (this.selectedSignature !== null && this.selectedSignature !== undefined && this.selectedSignature.length > 0) {
+                    const file: File | null = this.selectedSignature[0];
+                    this.currentFile = file;
+                    this.employeeService.uploadEmpFile(this.currentFile, this.hrEmployee.id, this.hrEmployee.id, enumEmpFileUploadType.signature).subscribe(
+                        (resp: any) => {
+                            this.empSigneture = this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp.body}`);
+                            // console.log(resp.body);
+                            //this.Sigfiles = resp;// this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp.body}`);
+                        },
+                        (err: any) => {
+                            this.notificationService.showError(err.error);
+                            this.currentFile = undefined;
+                        }, () => {
+                            this.signaturePopUp = false;
+                            this.notificationService.showSuccess("Signature Uploaded Successfully!")
+                        });
+                }
+                if (this.selectedFiles !== null && this.selectedFiles !== undefined && this.selectedFiles.length > 0) {
+                    const file: File | null = this.selectedFiles[0];
+                    this.currentFile = file;
+                    debugger;
+                    this.employeeService.uploadEmpFile(this.currentFile, this.hrEmployee.id, this.hrEmployee.id, enumEmpFileUploadType.Profile_Picture).subscribe(
+                        (resp: any) => {
+                            console.log('image data');
+                            // console.log(resp.body);
+                            //this.employeePhoto = resp;
+                            this.employeePhoto = this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp.body}`);
+                        },
+                        (err: any) => {
+                            this.notificationService.showError(err.error);
+                            this.currentFile = undefined;
+                        });
+
+
+                    this.selectedFiles = undefined;
+                }
             }
         );
     }
@@ -531,7 +601,8 @@ export class GeneralComponent implements OnInit {
     saveFile(feferenceID: number, selectedFiles: any, type: enumEmpFileUploadType) {
         debugger;
         if (selectedFiles != undefined && selectedFiles.length > 0) {
-            const file: File | null = selectedFiles.item(0);
+            // const file: File | null = selectedFiles.item(0);
+            const file: File | null = selectedFiles[0];
             this.currentFile = file;
             this.employeeService.uploadEmpFile(file, this.employeeService.hrEmployee.id, feferenceID, type).subscribe(
                 (resp: any) => {
@@ -554,6 +625,79 @@ export class GeneralComponent implements OnInit {
             this.selectedNidFiles = undefined;
             this.NIDFiles = undefined;
         }
+        if (type === enumEmpFileUploadType.passport) {
+            this.selectedPassportFiles = undefined;
+            this.Passfiles = undefined;
+        }
+    }
+    private getSavePersonalInfoObservable(): Observable<HrEmployee> | null {
+        debugger;
+        if (this.personalInfo.valid === false && this.hrEmployee.employeeNo === '') {
+            this.notificationService.showError('Required Fields Can\'t Be Empty');
+            return null;
+        }
+
+        this.loadingPanel.ShowLoadingPanel = true;
+        this.hrEmployee.name = this.hrEmployee.firstName;
+        if (this.hrEmployee.middleName !== null) {
+            this.hrEmployee.name += ' ' + this.hrEmployee.middleName;
+        }
+        if (this.hrEmployee.lastName !== null) {
+            this.hrEmployee.name += ' ' + this.hrEmployee.lastName;
+        }
+
+        return this.employeeService.saveHrPersonalInfo(this.hrEmployee).pipe(
+            tap((resp: HrEmployee) => {
+                debugger;
+                if (resp != undefined) {
+                    this.hrEmployee.id = resp.id;
+                    if (!this.active) {
+                        this.hrEmployee.employeeNo = resp.employeeNo;
+                        this.employeeService.hrEmployee = resp;
+                    }
+
+                    if (this.selectedTinFiles?.length > 0) {
+                        this.saveFile(this.hrEmployee.id, this.selectedTinFiles, enumEmpFileUploadType.TIN);
+                    }
+                    if (this.selectedNidFiles?.length > 0) {
+                        this.saveFile(this.hrEmployee.id, this.selectedNidFiles, enumEmpFileUploadType.nationalID);
+                    }
+                    if (this.selectedDlFiles?.length > 0) {
+                        this.saveFile(this.hrEmployee.id, this.selectedDlFiles, enumEmpFileUploadType.DrivingLicense);
+                    }
+                }
+            }),
+            finalize(() => {
+                this.loadingPanel.ShowLoadingPanel = false;
+            }),
+            catchError((err) => {
+                debugger;
+                console.error(err);
+                this.notificationService.showError(err.error);
+                return EMPTY; // No emission on error
+            })
+        );
+    }
+    saveBanglaInfo() {
+        if (!this.active) {
+            const personalInfo$ = this.getSavePersonalInfoObservable();
+            if (personalInfo$) {
+                personalInfo$.subscribe({
+                    next: () => {
+                        debugger;
+                        this.isDisplay = false;
+                        this.notificationService.showSuccess('Data saved successfully');
+                        this.SaveBanglaContactInformation();
+                    }
+                });
+            }
+            else {
+                this.isDisplay = false;
+            }
+            // If null, validation failed — nothing is executed
+        } else {
+            this.SaveBanglaContactInformation();
+        }
     }
     saveBanglaPersonalInformation() {
         const data = {
@@ -589,6 +733,14 @@ export class GeneralComponent implements OnInit {
         this.loadingPanel.ShowLoadingPanel = true;
         this.employeeService.updateBanglaContactInformation(data).subscribe(
             (resp: any) => {
+                // debugger
+                // if(this.contact.id == 0)
+                //     this.employeeService.hrEmployee.contacts[0].id = resp;
+
+                // this.employeeService.hrEmployee.contacts[0].presentPOInBangla = this.contact.presentPOInBangla;
+                // this.employeeService.hrEmployee.contacts[0].presentAddressInBangla = this.contact.presentAddressInBangla,
+                // this.employeeService.hrEmployee.contacts[0].parmanentPOInBangla = this.contact.parmanentPOInBangla;
+                // this.employeeService.hrEmployee.contacts[0].permanentAddressInBangla = this.contact.permanentAddressInBangla;
 
             }, (err) => {
                 this.loadingPanel.ShowLoadingPanel = false;
@@ -620,53 +772,53 @@ export class GeneralComponent implements OnInit {
         });
     }
 
-    selectFile(event: any): void {
+    // selectFile(event: any): void {
-        if (this.hrEmployee.id == 0) {
+    //     if (this.hrEmployee.id == 0) {
-            this.notificationService.showWarning('select an employee to change the profile picture');
+    //         this.notificationService.showWarning('select an employee to change the profile picture');
-            return;
+    //         return;
-        }
+    //     }
 
-        if (confirm('Are you sure change the profile picture? selected picture will be store in database as well as will be used as profile picture.') == false) {
+    //     if (confirm('Are you sure change the profile picture? selected picture will be store in database as well as will be used as profile picture.') == false) {
-            return;
+    //         return;
-        }
+    //     }
-        debugger;
+    //     debugger;
-        this.selectedFiles = event.target.files;
+    //     this.selectedFiles = event.target.files;
 
-        if (this.selectedFiles.length > 0) {
+    //     if (this.selectedFiles.length > 0) {
-            const file: File | null = this.selectedFiles.item(0);
+    //         const file: File | null = this.selectedFiles.item(0);
-            this.currentFile = file;
+    //         this.currentFile = file;
-            debugger;
+    //         debugger;
-            this.employeeService.uploadEmpFile(this.currentFile, this.hrEmployee.id, this.hrEmployee.id, enumEmpFileUploadType.Profile_Picture).subscribe(
+    //         this.employeeService.uploadEmpFile(this.currentFile, this.hrEmployee.id, this.hrEmployee.id, enumEmpFileUploadType.Profile_Picture).subscribe(
-                (resp: any) => {
+    //             (resp: any) => {
-                    console.log('image data');
+    //                 console.log('image data');
-                    // console.log(resp.body);
+    //                 // console.log(resp.body);
-                    //this.employeePhoto = resp;
+    //                 //this.employeePhoto = resp;
-                    this.employeePhoto = this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp.body}`);
+    //                 this.employeePhoto = this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp.body}`);
-                },
+    //             },
-                (err: any) => {
+    //             (err: any) => {
-                    this.notificationService.showError(err.error);
+    //                 this.notificationService.showError(err.error);
-                    this.currentFile = undefined;
+    //                 this.currentFile = undefined;
-                });
+    //             });
 
 
-            this.selectedFiles = undefined;
+    //         this.selectedFiles = undefined;
-        }
+    //     }
-    }
+    // }
 
-    upload(): void {
+    // upload(): void {
-        if (this.selectedFiles.length > 0) {
+    //     if (this.selectedFiles.length > 0) {
-            const file: File | null = this.selectedFiles.item(0);
+    //         const file: File | null = this.selectedFiles.item(0);
-            this.currentFile = file;
+    //         this.currentFile = file;
-            this.employeeService.uploadEmpFile(this.currentFile, this.hrEmployee.id, this.hrEmployee.id, enumEmpFileUploadType.Profile_Picture).subscribe(
+    //         this.employeeService.uploadEmpFile(this.currentFile, this.hrEmployee.id, this.hrEmployee.id, enumEmpFileUploadType.Profile_Picture).subscribe(
-                (event: any) => {
+    //             (event: any) => {
-                },
+    //             },
-                (err: any) => {
+    //             (err: any) => {
-                    this.notificationService.showError(err.error);
+    //                 this.notificationService.showError(err.error);
-                    this.currentFile = undefined;
+    //                 this.currentFile = undefined;
-                });
+    //             });
-            this.selectedFiles = undefined;
+    //         this.selectedFiles = undefined;
-        }
+    //     }
-    }
+    // }
 
     RolePermission() {
         console.log('Role Permission');
@@ -822,77 +974,120 @@ export class GeneralComponent implements OnInit {
     }
 
 
-    selectFileTin(event: any): void {
+    // selectFileTin(event: any): void {
-        this.selectedTinFiles = event.target.files;
+    //     this.selectedTinFiles = event.target.files;
-        const file = this.selectedTinFiles.item(0);
+    //     const file = this.selectedTinFiles.item(0);
-        // if (file.size > 500000) {
+    //     // if (file.size > 500000) {
-        //     this.notificationService.showError('File size can not be more than 500kb');
+    //     //     this.notificationService.showError('File size can not be more than 500kb');
-        //     this.selectedTinFiles = undefined;
+    //     //     this.selectedTinFiles = undefined;
-        //     return;
+    //     //     return;
-        // }
+    //     // }
+    // }
+
+    // selectFileNationalId(event: any): void {
+    //     this.selectedNidFiles = event.target.files;
+    //     const file = this.selectedNidFiles.item(0);
+    //     // if (file.size > 500000) {
+    //     //     this.notificationService.showError('File size can not be more than 500kb');
+    //     //     this.selectedNidFiles = undefined;
+    //     //     return;
+    //     // }
+    // }
+
+    // selectFileDrivingLicense(event: any): void {
+    //     this.selectedDlFiles = event.target.files;
+    //     const file = this.selectedDlFiles.item(0);
+    //     // if (file.size > 500000) {
+    //     //     this.notificationService.showError('File size can not be more than 500kb');
+    //     //     this.selectedDlFiles = undefined;
+    //     //     return;
+    //     // }
+    // }
+    // selectPassport(event: any): void {
+    //     this.selectedDlFiles = event.target.files;
+    //     const file = this.selectedDlFiles.item(0);
+    //     // if (file.size > 500000) {
+    //     //     this.notificationService.showError('File size can not be more than 500kb');
+    //     //     this.selectedDlFiles = undefined;
+    //     //     return;
+    //     // }
+    // }
+
+    // selectSignature(event: any): void {
+    //     if (this.hrEmployee.id == 0) {
+    //         this.notificationService.showWarning('select an employee to change the profile picture');
+    //         return;
+    //     }
+
+    //     if (confirm('Are you sure change the signature picture? selected picture will be store in database as well as will be used as signature picture.') == false) {
+    //         return;
+    //     }
+
+    //     this.selectedFiles = event.target.files;
+
+    //     if (this.selectedFiles.length > 0) {
+    //         const file: File | null = this.selectedFiles.item(0);
+    //         this.currentFile = file;
+    //         this.employeeService.uploadEmpFile(this.currentFile, this.hrEmployee.id, this.hrEmployee.id, enumEmpFileUploadType.signature).subscribe(
+    //             (resp: any) => {
+    //                 this.empSigneture = this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp.body}`);
+    //                 // console.log(resp.body);
+    //                 //this.Sigfiles = resp;// this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp.body}`);
+    //             },
+    //             (err: any) => {
+    //                 this.notificationService.showError(err.error);
+    //                 this.currentFile = undefined;
+    //             }, () => {
+    //                 this.signaturePopUp = false;
+    //                 this.notificationService.showSuccess("Signature Uploaded Successfully!")
+    //             });
+    //         this.selectedFiles = undefined;
+    //     }
+    // }
+
+    selectFileTin(event: { files: FileInfo[] }): void {
+        this.selectedTinFiles = event.files
+            .map(f => f.rawFile)
+            .filter((f): f is File => f instanceof File);
+        const file = this.selectedTinFiles[0];
     }
-
+    selectFileNationalId(event: { files: FileInfo[] }): void {
-    selectFileNationalId(event: any): void {
+        debugger;
-        this.selectedNidFiles = event.target.files;
+        // Extract File[] from FileInfo[]
-        const file = this.selectedNidFiles.item(0);
+        this.selectedNidFiles = event.files
-        // if (file.size > 500000) {
+            .map(f => f.rawFile)
-        //     this.notificationService.showError('File size can not be more than 500kb');
+            .filter((f): f is File => f instanceof File);
-        //     this.selectedNidFiles = undefined;
+        const file = this.selectedNidFiles[0];
-        //     return;
-        // }
     }
-
+    selectFileDrivingLicense(event: { files: FileInfo[] }): void {
-    selectFileDrivingLicense(event: any): void {
+        this.selectedDlFiles = event.files
-        this.selectedDlFiles = event.target.files;
+            .map(f => f.rawFile)
-        const file = this.selectedDlFiles.item(0);
+            .filter((f): f is File => f instanceof File);
-        // if (file.size > 500000) {
+        // const file = this.selectedDlFiles[0];
-        //     this.notificationService.showError('File size can not be more than 500kb');
-        //     this.selectedDlFiles = undefined;
-        //     return;
-        // }
     }
-    selectPassport(event: any): void {
+    selectPassport(event: { files: FileInfo[] }): void {
-        this.selectedDlFiles = event.target.files;
+        this.selectedPassportFiles = event.files
-        const file = this.selectedDlFiles.item(0);
+            .map(f => f.rawFile)
-        // if (file.size > 500000) {
+            .filter((f): f is File => f instanceof File);
-        //     this.notificationService.showError('File size can not be more than 500kb');
+        // const file = this.selectedPassportFiles[0];
-        //     this.selectedDlFiles = undefined;
-        //     return;
-        // }
     }
-
+    selectSignature(event: { files: FileInfo[] }): void {
-    selectSignature(event: any): void {
+        this.selectedSignature = event.files
-        if (this.hrEmployee.id == 0) {
+            .map(f => f.rawFile)
-            this.notificationService.showWarning('select an employee to change the profile picture');
+            .filter((f): f is File => f instanceof File);
-            return;
+    }
-        }
+    selectProfilePhoto(event: { files: FileInfo[] }): void {
-
+        debugger
-        if (confirm('Are you sure change the signature picture? selected picture will be store in database as well as will be used as signature picture.') == false) {
+        this.selectedFiles = event.files
-            return;
+            .map(f => f.rawFile)
-        }
+            .filter((f): f is File => f instanceof File);;
-
+    }
-        this.selectedFiles = event.target.files;
+    triggerUploadClick(): void {
-
+        const input = this.uploadPhotoRef.nativeElement.querySelector('input[type="file"]');
-        if (this.selectedFiles.length > 0) {
+        if (input) {
-            const file: File | null = this.selectedFiles.item(0);
+            input.click();
-            this.currentFile = file;
-            this.employeeService.uploadEmpFile(this.currentFile, this.hrEmployee.id, this.hrEmployee.id, enumEmpFileUploadType.signature).subscribe(
-                (resp: any) => {
-                    this.empSigneture = this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp.body}`);
-                    // console.log(resp.body);
-                    //this.Sigfiles = resp;// this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp.body}`);
-                },
-                (err: any) => {
-                    this.notificationService.showError(err.error);
-                    this.currentFile = undefined;
-                }, () => {
-                    this.signaturePopUp = false;
-                    this.notificationService.showSuccess("Signature Uploaded Successfully!")
-                });
-            this.selectedFiles = undefined;
         }
     }
-
     changePassword() {
 
         if (this.userPassword == '') {

HRM.UI/ClientApp/src/app/payroll/career-and-profile/employee-payroll-profile/employee-payroll-profile.component.html

@@ -15,7 +15,7 @@
                 </div>
                 <div class="p-col-12 p-md-12 p-lg-6" style="margin:auto;">
                     <app-employee-picker for="chkIsnew" id="idself" [isActive]="!newEmployee"
-                        [setSelectedEmp]="selectedEmployee"
+                        [setSelectedEmp]="selectedEmployee" [ForLifeCycleSearch]="true"
                         (ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
                 </div>
             </div>

HRM.UI/ClientApp/src/app/payroll/career-and-profile/life-cycle-entry/life-cycle-entry.component.html

@@ -15,6 +15,7 @@
                         (ItemSelected)="GetSelectedEmployee($event)"
                         [setSelectedEmp]="_pickerSelecteEmp"
                         [isActive]="empPickerActive"
+                        [ForLifeCycleSearch]="true"
                     ></app-employee-picker>
                 </div>
 
@@ -78,7 +79,10 @@
                     <label for="txtGrade">Status</label>
                 </div>
                 <div class="p-col-12 p-lg-1" align="center">:</div>
-                <div class="p-col-12 p-lg-4">{{ _statusString }}</div>
+                <div class="p-col-12 p-lg-4"
+                    [ngStyle]="{ 'color': _statusString === 'Discontinued' ? 'red' : 'inherit' }">
+                    {{ _statusString }}
+                </div>
 
                 <div class="p-col-12 p-lg-1">
                     <label for="txtBasicSalary">Basic Salary</label>
@@ -101,6 +105,12 @@
                 </div>
                 <div class="p-col-12 p-lg-1" align="center">:</div>
                 <div class="p-col-12 p-lg-4">{{ _employee.categoryName }}</div>
+
+                <div class="p-col-12 p-lg-1">
+                    <label for="txtCategory">Joining Date</label>
+                </div>
+                <div class="p-col-12 p-lg-1" align="center">:</div>
+                <div class="p-col-12 p-lg-4">{{ _employee.joiningDate | date: 'dd MMM yyyy'}}</div>
             </div>
         </fieldset>
     </div>
@@ -508,7 +518,7 @@
                             <kendo-grid-column
                                 field="effectDate"
                                 title="Effect Date"
-                                width="15%"
+                                width="13%"
                             >
                                 <ng-template
                                     kendoGridCellTemplate
@@ -524,12 +534,29 @@
                             <kendo-grid-column
                                 field="description"
                                 title="Description"
-                                width="77%"
+                                width="70%"
                             >
                             </kendo-grid-column>
+                            
+                            <kendo-grid-column
+                                field=""
+                                title="Created by"
+                                width="10%"
+                            >
+                                <ng-template
+                                    kendoGridCellTemplate
+                                    let-dataItem
+                                    let-rowIndex="rowIndex"
+                                >
+                                    {{ dataItem.createdByUser }} 
+                                    <br>
+                                    <label style="font-size: 12px; color: darkgray;">On {{ dataItem.createdDate | date : "dd-MMM-yyyy" }}</label>
+                                </ng-template>
+                            </kendo-grid-column>
+
                             <kendo-grid-command-column
                                 title="Action"
-                                width="8%"
+                                width="7%"
                             >
                                 <ng-template
                                     kendoGridCellTemplate

HRM.UI/ClientApp/src/app/payroll/career-and-profile/life-cycle-entry/life-cycle-entry.component.ts

@@ -127,6 +127,7 @@ export class LifeCycleEntryComponent implements OnInit {
 
     ngOnInit() {
         this._employee = new Employee();
+        this._employee.joiningDate = undefined;
         this._empLifeCycle = new EmpLifeCycle();
         this._CurrentEmpgranogram = new OrganogramBasic();
         this.lifecycleService.GetByUserID().subscribe(
@@ -174,6 +175,7 @@ export class LifeCycleEntryComponent implements OnInit {
     private CreateFormValidator(): void {
 
         this._employee = new Employee();
+        this._employee.joiningDate = undefined;
         this._fromValidator = new FormBuilder().group({
             loginId: ['', Validators.required],
             name: ['', Validators.required],
@@ -305,10 +307,10 @@ export class LifeCycleEntryComponent implements OnInit {
 
                 });
                 this._sDescription = item.description;
-                if(this._employeeStatus != undefined && this._employeeStatus.length > 0)
+                if (this._employeeStatus != undefined && this._employeeStatus.length > 0)
-                    if(item == this._employeeStatus.find(x => x.description.toLowerCase() == 'joining') ){
+                    if (item == this._employeeStatus.find(x => x.description.toLowerCase() == 'joining')) {
                         this._effectDate = new Date(this._employee.joiningDate);
-                    } 
+                    }
                     else {
                         debugger;
                         // let currentDate: Date = new Date();
@@ -353,6 +355,8 @@ export class LifeCycleEntryComponent implements OnInit {
             this._empLifeCycle = new EmpLifeCycle();
             this._lifecycleHistory = [];
             this._employee = new Employee();
+            this._employee.joiningDate = undefined;
+            this._statusString = undefined;
             return;
         }
         this.loadingPanelService.ShowLoadingPanel = true;

HRM.UI/ClientApp/src/app/payroll/days-deduction/salary-days-deduction-parameterization/salary-days-deduct-edit/salary-days-deduct-edit.component.html

@@ -1,21 +1,23 @@
 <app-loading-panel></app-loading-panel>
 <form [formGroup]="_salaryDaysDeductEdit">
     <div class="card">
-        <div class="p-grid">
+        <div class="p-col-12">
-            <div class="p-col-2">
+            <div class="p-grid">
-                <label>Unauthorized Leave</label>
+                <div class="p-col-2">
-            </div>
+                    <label>Unauthorized Leave</label>
-            <div class="p-col-10">
+                </div>
-                <kendo-dropdownlist [data]="_unAuthLeaves"
+                <div class="p-col-10">
-                                    [(ngModel)]="_uaLeaveParam.unAhuthorizeLeaveID"
+                    <kendo-dropdownlist [data]="_unAuthLeaves"
-                                    [defaultItem]="{ name: 'Select..', value: null }"
+                                        [(ngModel)]="_uaLeaveParam.unAhuthorizeLeaveID"
-                                    [textField]="'name'"
+                                        [defaultItem]="{ name: 'Select..', value: null }"
-                                    [valueField]="'id'"
+                                        [textField]="'name'"
-                                    [valuePrimitive]="true"
+                                        [valueField]="'id'"
-                                    class="form-control form-control-sm input-sm"
+                                        [valuePrimitive]="true"
-                                    (selectionChange)="paramselectionChange($event)"
+                                        class="form-control form-control-sm input-sm"
-                                    formControlName="unauthorizedLeaveDropDown">
+                                        (selectionChange)="paramselectionChange($event)"
-                </kendo-dropdownlist>
+                                        formControlName="unauthorizedLeaveDropDown">
+                    </kendo-dropdownlist>
+                </div>
             </div>
         </div>
         <div class="p-grid">
@@ -26,7 +28,7 @@
                             [selectable]="{enabled: true, checkboxOnly: true, mode: 'multiple'}"
                             [selectedKeys]="_selectedgrades"
                             [kendoGridSelectBy]="'id'"
-                            [height]="200">
+                            [height]="500">
                     <kendo-grid-checkbox-column [class]="{'text-center': true}"
                                                 [columnMenu]="false"
                                                 [headerClass]="{'text-center': true}"
@@ -43,10 +45,10 @@
             </div>
 
             <div class="p-col-6">
-                <h3>salary components</h3>
+                <h3>Salary components</h3>
                 <kendo-grid [data]="_uaLeaveParamDetail"
                             [selectedKeys]="_selectedcomponent"
-                            [height]="200"
+                            [height]="500"
                             [kendoGridSelectBy]="'allowanceID'">
 
                     <kendo-grid-column field="componenetName" title="Name">
@@ -70,8 +72,14 @@
     </div>
         <div class="card">
             <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>
 </form>

HRM.UI/ClientApp/src/app/payroll/days-deduction/salary-days-deduction-parameterization/salary-days-deduct-edit/salary-days-deduct-edit.component.ts

@@ -211,6 +211,6 @@ export class SalaryDaysDeductEditComponent implements OnInit {
     }
 
     cancel() {
-
+        this.router.navigateByUrl('/payroll/absent-deduction-Policy');
     }
 }

HRM.UI/ClientApp/src/app/payroll/days-deduction/salary-days-deduction-parameterization/salary-days-deduction-parameterization.component.html

@@ -6,7 +6,7 @@
                     (edit)="editHandler($event)"
                     (remove)="removeHandler($event)">
             <ng-template kendoGridToolbarTemplate>
-                <button [primary]="true" kendoGridAddCommand (click)="new()">Add New</button>
+                <button icon="plus" [primary]="true" kendoGridAddCommand (click)="new()">Add New</button>
             </ng-template>
             <kendo-grid-column field="unAuthLeaveName" title="Name" width="80%">
             </kendo-grid-column>

HRM.UI/ClientApp/src/app/picker/employee-picker.component.ts

@@ -102,10 +102,10 @@ export class EmployeePickerComponent implements OnInit {
     isSpanArrowDown: boolean = true;
     isSpanArrowUp: boolean = false;
     gridHeight: number = 305;
+    
     @Input() public payrollTypeID: number;
     @Input() public isRecruitment: number;
     @Input() public set isClear(value) {
-        debugger;
         if (value) {
             this.selectedItems = [];
             // this.count=0;
@@ -187,6 +187,11 @@ export class EmployeePickerComponent implements OnInit {
     /** role-permission-entry ctor */
     @Input() fixedGrades: number[] = undefined;
 
+    private _isForLifeCycle = false;
+    @Input()
+    public set ForLifeCycleSearch(value: boolean) {
+        this._isForLifeCycle = value ?? false;
+    }
 
     public pageSize = 25;
     public skip = 0;
@@ -454,10 +459,10 @@ export class EmployeePickerComponent implements OnInit {
             } else {
                 name = value;
             }
-            this.loadingEmployee = true;
+            debugger;
-            // this.empSrvc.getEmpCodeName(code, name)
+            if(this._isForLifeCycle === false){
-            this.empSrvc.getEmpCodeNameForEmployeePickerInput(code, name)
+                this.loadingEmployee = true;
-                .subscribe(
+                this.empSrvc.getEmpCodeNameForEmployeePickerInput(code, name).subscribe(
                     (resp: any) => {
                         this.searchEmployees = resp;
                     },
@@ -470,14 +475,36 @@ export class EmployeePickerComponent implements OnInit {
                         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);
+                        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);
+                    }
+                );
+            }
+            
             /*} else {
 
                 this.empCodeNameList = this.empCodeNameListSource.filter((s) =>

HRM.UI/ClientApp/src/app/reports/digital-service-book/digital-service-book.component.html

@@ -2,7 +2,7 @@
 <div class="p-grid card">
     <div class="p-col-12 p-md-12" style="padding: 7px;">
         <div class="p-grid">
-            <div class="p-col-5">
+            <div class="p-col-12 p-md-5">
                 <app-employee-picker (ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
             </div>
 
@@ -14,9 +14,18 @@
                                   style="width:100%">
                 </kendo-datepicker>
             </div> -->
-            <div class="p-col-5">
+            <div class="p-col-12 p-md-1" style="margin: auto"></div>
+            <div class="p-col-6 p-md-2" style="margin: auto">
+                <label>Authorized Person</label>
             </div>
-            <div class="p-col-2">
+            <div class="p-col-6 p-md-2">
+
+                <kendo-dropdownlist [data]="authorizedPersonList"
+                    [defaultItem]="{ name: 'Select..', id: null }" [textField]="'name'" [valueField]="'id'"
+                    [valuePrimitive]="true" [(ngModel)]="selectedPersonID" id="signatory">
+                </kendo-dropdownlist>
+            </div>
+            <div class="p-col-12 p-md-2">
                 <button kendoButton style="width: 100%; margin-right: 5%" (click)="onPreview('PDF')"
                     class="k-primary">Preview</button>
             </div>

HRM.UI/ClientApp/src/app/reports/digital-service-book/digital-service-book.component.ts

@@ -11,8 +11,8 @@ import { AttendanceServices } from '../../_services/attendance/attendance.servic
 import { LoanService } from 'src/app/_services/payroll/loan.service';
 import { SalaryService } from '../../_services/payroll/salary.service';
 import { LeaveService } from '../../_services/leave/leave.service';
-import {PayrollType} from '../../_models/Authentication/payrollType';
+import { PayrollType } from '../../_models/Authentication/payrollType';
-import { SearchEmployee, SearchManager } from '../../_models/Employee/searchEmployee'; 
+import { SearchEmployee, SearchManager } from '../../_models/Employee/searchEmployee';
 import {
   EnumBloodGroup,
   EnumExtension,
@@ -31,6 +31,8 @@ import { ApiService } from '../../app.api.service';
 import { NgxExtendedPdfViewerService, PDFPrintRange } from 'ngx-extended-pdf-viewer';
 import { Employee } from '../../_models/Employee/employee';
 import { saveAs } from 'file-saver';
+import { LetterRequestService } from 'src/app/_services/letter-request/letter-request.service';
+import { AuthorizedPerson } from 'src/app/adhoc-feature/authorized-persons/authorizedPerson';
 
 @Component({
   selector: 'app-digital-service-book',
@@ -49,6 +51,8 @@ export class DigitalServiceBookComponent implements OnInit {
   fromDate: Date = new Date();
   toDate: Date = new Date();
   payrolltype: PayrollType;
+  authorizedPersonList: AuthorizedPerson[] = [];
+  selectedPersonID: number;
   // user: User;
 
   constructor(public employeeService: EmployeeServices,
@@ -64,6 +68,7 @@ export class DigitalServiceBookComponent implements OnInit {
     public taxService: TaxService,
     public salaryService: SalaryService,
     public leaveYearService: LeaveService,
+    public letterRequestService: LetterRequestService,
     public router: Router,
     public authService: AuthService) {
     this.apiService.selectedMenuName = 'Digital Service Book';
@@ -95,7 +100,7 @@ export class DigitalServiceBookComponent implements OnInit {
     // this.setSelectableSettings();
     // this.loadBank();
 
-
+    this.loadDataAuthorizedPersons();
     this.loadLoggedInEmployee();
   }
   loadLoggedInEmployee() {
@@ -135,13 +140,14 @@ export class DigitalServiceBookComponent implements OnInit {
 
     const data = {
       reportid: 1000,
-      itemid: 0,
+      itemid: this.selectedPersonID != undefined ? this.selectedPersonID : null,
       // empIds: '',
       empIds: this.selectedEmp.employeeID,
       reportType: type,
       // fromDate: this.selectedMonth,
       fromDate: new Date().toDateString(),
-      toDate: new Date().toDateString()
+      toDate: new Date().toDateString(),
+
     };
     this.loadingPanel.ShowLoadingPanel = true;
     console.log(data);
@@ -211,4 +217,20 @@ export class DigitalServiceBookComponent implements OnInit {
     this.printService.print();
   }
 
+  loadDataAuthorizedPersons() {
+    this.loadingPanel.ShowLoadingPanel = true;
+    this.letterRequestService.getAuthorisedPersons().subscribe(
+      (resp) => {
+        this.authorizedPersonList = resp;
+      },
+      (err) => {
+        this.notificationService.showError(err.error);
+        this.loadingPanel.ShowLoadingPanel = false;
+      },
+      () => {
+        this.loadingPanel.ShowLoadingPanel = false;
+      },
+    );
+  }
+
 }

HRM.UI/ClientApp/src/app/reports/report-viewer/report-viewer.component.ts

@@ -267,6 +267,7 @@ export class ReportViewerComponent implements OnInit {
         let reportName = '';
         if (this.reportType === 'empDetailInfo') {
             this.apiService.selectedMenuName = 'Employee Detail Information';
+            this.hiddenExport = true;
             const employeeBasicInfo = new EmployeeBasicInfo();
             this.dynamicColumnNames = [
                 { sl: 1, columnName: 'employeeNo', columnHeader: 'Employee No', width: '80' },
@@ -1535,32 +1536,63 @@ export class ReportViewerComponent implements OnInit {
             if (this.selectedEmp !== undefined) {
                 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.data = resp;
-                    //debugger;
                 },
                 (err) => {
+                    this.closeForm();
                     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();
                 }
             );
         }

HRM.UI/Controllers/Attendance/AttendanceController.cs

@@ -1331,6 +1331,85 @@ namespace HRM.UI.Controllers.Attendance
 
             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 
         [HttpGet("getDailyAttnProcessByEmployeeId/{employeeId}")]
@@ -2618,6 +2697,7 @@ namespace HRM.UI.Controllers.Attendance
             DateTime fromDate = DateTime.Today;
             DateTime toDate = DateTime.Today;
             bool withoutEmployee = true;
+            bool overrideManualEntry = false;
             List<SearchEmployee> emps = null;
             List<Employee> employees = null;
             int empid;
@@ -2632,6 +2712,7 @@ namespace HRM.UI.Controllers.Attendance
                     fromDate = (DateTime)item["fromDate"].ToObject<DateTime>();
                     toDate = (DateTime)item["toDate"].ToObject<DateTime>();
                     withoutEmployee = (bool)item["isWithEmployee"].ToObject<bool>();
+                    overrideManualEntry = (bool)item["overrideManualEntry"].ToObject<bool>();
                     if (withoutEmployee == true) break;
                     if (withoutEmployee == false && emps == null)
                         emps = new List<SearchEmployee>();
@@ -2656,7 +2737,7 @@ namespace HRM.UI.Controllers.Attendance
                 for (DateTime attDate = fromDate; attDate <= toDate; attDate = attDate.AddDays(1))
                 {
                     new AttendanceProcess().Process(new DateTime(attDate.Year, attDate.Month, attDate.Day),
-                        EnumProcessMode.Manual, (int)currentUser.PayrollTypeID, currentUser.UserID, employees);
+                        EnumProcessMode.Manual, (int)currentUser.PayrollTypeID, currentUser.UserID, employees, overrideManualEntry);
                 }
             }
             catch (Exception e)

HRM.UI/Controllers/Employee/EmployeeController.cs

@@ -822,7 +822,54 @@ namespace HRM.UI.Controllers
             return Ok(olist);
         }
 
-        [HttpGet("getEmployeeAttachments/{empId}")]
+		[HttpGet("getEmpCodeNameForEmployeePickerInputNew/{code}/{name}/{isForLifeCycle}")]
+		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)
         {
             List<empFileupload> items = new List<empFileupload>();
@@ -2118,6 +2165,7 @@ namespace HRM.UI.Controllers
                     ec.PresentAddressInBangla = presentAddressInBangla;
                     ec.PermanentAddressInBangla = presentAddressInBangla;
                     _hrEmployeeService.SaveContact(ec);
+                    return Ok(ec.ID);
                 }
             }
             catch (Exception ex)

HRM.UI/Controllers/Employee/empLifeCycleController.cs

@@ -119,7 +119,13 @@ namespace HRM.UI.Controllers
         {
             try
             {
-                return Ok(this._lifeCycleService.GetEmpID(EmpID));
+                List<EmpLifeCycle> empLifeCycles = this._lifeCycleService.GetEmpID(EmpID);
+                List<User> users = _userService.GetAll();
+                foreach (var empLifeCycle in empLifeCycles)
+                {
+                    empLifeCycle.CreatedByUser = users.Find(u=> u.ID == empLifeCycle.CreatedBy)?.UserName;
+                }
+                return Ok(empLifeCycles);
             }
             catch (Exception ex)
             {

HRM.UI/Controllers/LetterRequest/LetterRequestController.cs

@@ -816,7 +816,7 @@ namespace HRM.UI.Controllers
                     ltemplate.Type = EnumDocType.Desktop_Letter;
                     ltemplate.TypeID = (int)EnumDocType.Desktop_Letter;
 
-                    lFileName = "Staff.doc";
+                    lFileName = "Staff.docx";
                 }
                 else
                 {
@@ -828,7 +828,7 @@ namespace HRM.UI.Controllers
                     ltemplate.Type = EnumDocType.Desktop_Letter;
                     ltemplate.TypeID = (int)EnumDocType.Desktop_Letter;
 
-                    lFileName = "Worker.doc";
+                    lFileName = "Worker.docx";
 
                 }
 

HRM.UI/Controllers/Report/ReportController.cs

@@ -633,7 +633,7 @@ namespace HRM.UI.Controllers.Report
                         bytes = rptLeave.ShowCCWiseLeaveEncashmentReturn(itemid, payrollTypeId, reportType);
                         break;
                     case EnumReportType.DigitalServiceBook:
-                        bytes = new rptDigitalServiceBook().DigitalServiceBook(currentUser.EmployeeID.HasValue ? currentUser.EmployeeID.Value : 0, (int)currentUser.PayrollTypeID, fromDate, sEmpIDs, reportType);
+                        bytes = new rptDigitalServiceBook().DigitalServiceBook(currentUser.EmployeeID.HasValue ? currentUser.EmployeeID.Value : 0, (int)currentUser.PayrollTypeID, fromDate, sEmpIDs, itemid == 0 ? null : itemid, reportType);
                         break;
                     case EnumReportType.SalaryAllocationReportEmployeeWise:
                         bytes = new rptJV().showJVSalaryDetailEmployeeWReport(1, GlobalFunctions.LastDateOfMonth(fromDate), null, payrollTypeId, reportType);
@@ -954,7 +954,31 @@ namespace HRM.UI.Controllers.Report
             return Ok(bytes);
         }
         #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")]
         public ActionResult GetEstimatedConfirmation()
         {
@@ -1787,7 +1811,7 @@ namespace HRM.UI.Controllers.Report
                         ltemplate.Type = EnumDocType.Desktop_Letter;
                         ltemplate.TypeID = (int)EnumDocType.Desktop_Letter;
 
-                        lFileName = "Worker.doc";
+                        lFileName = "Worker.docx";
 
                         sFilePath = new rptEmployee().Generate(ltemplate, employeeID, payrollTypeId, downloadPath, lFileName);
                         break;
@@ -1800,7 +1824,7 @@ namespace HRM.UI.Controllers.Report
                         ltemplate.Type = EnumDocType.Desktop_Letter;
                         ltemplate.TypeID = (int)EnumDocType.Desktop_Letter;
 
-                        lFileName = "Staff.doc";
+                        lFileName = "Staff.docx";
 
                         sFilePath = new rptEmployee().Generate(ltemplate, employeeID, payrollTypeId, downloadPath, lFileName);
                         break;

HRM.UI/Documents/LetterTempFolder/Staff.docx

@@ -0,0 +1,129 @@
+                            B‡Kv‡U· wjwg‡UW
+                                  wb‡qvMcÎ
+                        Kg(C)KZ(C)v‡`i Rb¨ cÖ‡hvR¨
+                                       
+‡hvM`v‡bi ZvwiL t	  JoiningDateBangla
+--------------------------------------------------------------------------------
+KvW(C) bs :  EmpCodeBangla
+                           (‡d-vi - FloorBangla)
+
+IME/HR/F-16
+RbYen ZvwiL t
+wcZvi bvg t
+gvZvi bvg t
+¯'vqx wVKvbv
+i‡³i MÖæc t
+MÖvg t
+‡cvó Awdm t
+_vbv t
+‡Rjv t
+                               cÖv_x(C)i ¯^v¶i
+                                  GBP,Avi ,wW
+Echotex Limited, Head Office: Road No # 4, House No # 139 , Mohakhali New DOHS, Dhaka-1206. Tel # (02) 9881717,9882177, Fax # (02) 9883430
+Factory: Pollibiddut(Chandra),Kaliakoire,Gazipur-1751,Mob:01786-339955,Tel # (06822) 51877, Fax # (06822) 51876
+EmpNameBangla
+EmpDesignaionBangla
+
+EmpDepartmentBangla
+
+VillagePABangla
+PostOfficePABangla
+
+ThanaPABangla
+
+DistrictPABangla
+
+
+VillageTABangla
+
+PostOfficeTABangla
+
+
+ThanaTABangla
+
+
+DistrictTABangla
+FatherNameBangla
+
+MotherNameBangla
+
+BirthDateBangla
+
+wbqgvejx t
+1| PjwZ gvm †kl nIqvi cieZx(C) 07(mvZ)Kg(C) w`e‡mi g‡a¨ gRyix cwi‡kva Kiv n‡e|
+2| mvavib Kg(C)N›Uv ˆ`wbK 08(AvU) N›Uv |
+3| mvßvwnK QywU 1(GK) w`b, ˆbwgwËK QywU eQ‡i 10(`k) w`b , Amy¯'ZvRwbZ QywU c~Y(C) †eZ‡b 14(‡PŠÏ) w`b, evwl(C)K QywU (AvBbvbymv‡i) 18 w`‡b 01(GK) w`b, Drme QywU eQ‡i 12 (ev‡iv) w`b, gvZ...Z¡Kvjxb QywU  
+  ïay gvÎ gwnjv‡`i Rb¨ AvBbvbymv‡i cÖm‡ei c~‡e(C) 60 w`b cÖm‡ei c‡i 60 w`b (‡gvU 120w`b) Ges wcZ...Z¡Kvjxb QywU ïaygvÎ cyiæl‡`i Rb¨ d¨v+-wii wbqgvbymv‡i 07 w`b|
+4| ¯'vqxfv‡e wb‡qvMcÖvß mK‡j eQ‡i `yB C‡` g~j †eZb nv‡i Drme †evbvm cv‡eb| Kv‡iv PvKzix ¯'vqx bv n‡j †evbvm cÖ`v‡bi mgq wZwb g~j †eZb 10% †evbvm cv‡eb|
+5| KZ...(C)cÿ cÖ‡qvR‡b Avcbvi mKj kZ(C) AcwiewZ(C)Z †i‡L †Kv¤úvbxi Ab¨vb¨ d¨v+-wi‡Z A_ev GKB d¨v+-ixi Ab¨ †Kvb wefv‡M ev kvLvq ev wkd&U G e`wj Ki‡Z cvi‡e|
+6| ‡Kv¤úvbxi wbqgvbymv‡i evrmwiK gRyix e„wx Kiv n‡e|
+7| ¯'vqx fv‡e wb‡qvwRZ Kg(C)KZ(C)v PvKzix n‡Z Aemvb wb‡Z PvB‡j gvwjK‡K 60(lvU) w`‡bi wjwLZ †bvwUk cÖ`vb Ki‡Z n‡e A_ev 60(lvU) w`‡bi g~j †eZ‡bi mgcwigvb A_(C)  
+  gvwjK‡K cÖ`vb Ki‡Z n‡e| KZ(C)...cÿ Avcbv‡K eiLv¯Í e¨ZxZ PvKzix nB‡Z Aemvb NUv‡Z PvB‡j 120 (GKk wek) w`‡bi wjwLZ †bvwUk cÖ`vb Ki‡e A_ev 120 (GKk wek) 
+  w`‡bi g~j †eZ‡bi mgcwigvb A_(C) cÖ`vb Ki‡e|
+8| KZ...(C)c¶ B"Qv Ki‡j Am`vPi‡Yi Rb¨ wb¤œwjwLZ †h †Kvb cÖKvi `Û cÖ`vb Ki‡Z cvi‡e-
+K) PvKzix n‡Z AcmviY L) bx‡Pi c‡`, †MÖ‡W ev †eZb †¯‹‡j AbwaK 01(GK) ermi ch(C)šÍ Avbqb M) AbwaK 01 (GK) erm‡ii Rb¨ c‡`vbœwZ eÜ N) AbwaK 01(GK) erm‡ii Rb¨ †eZb  e„wx eÜ O) Rwigvbv P) AbwaK 07(mvZ) w`b ch(C)šÍ webv ‡eZ‡b mvgwqK eiLv¯Í Q) mZKx(C)KiY |
+9| Avcwb AÎ cÖwZôv‡b _vKv Ae¯'vq Ab¨ †Kvb cÖwZôv‡b PvKzix Ki‡Z cvi‡eb bv A_ev cÖwZôv‡bi e¨em¨v msuvšÍ †Kvb †Mvcb Z_¨vw` KvD‡K cÖ`vb Ki‡eb bv|
+10| †Kvb †iwR/vW(C) wPwKrmK KZ...(C)K cÖZ¨vwqZ kvixwiK ev gvbwmK AÿgZv A_ev `xN(C)‡gqvw` Ae¨nZ fMœ-¯^v¯'¨ ev Amy¯'¨Zvi Kvi‡Y PvKzix n‡Z wWmPvR(C) Kiv n‡e|
+11| Avcbvi Awf‡hvM I civgk(C) GBP.Avi Awdm, Awf‡hvM e· A_ev I‡qj‡dqvi Awdmv‡ii Kv‡Q wjwLZfv‡e Rvbvb|
+12| Avcbvi wVKvbv cwieZ(C)b Ki‡j 07(mvZ) w`‡bi g‡a¨ Awdm‡K wjwLZfv‡e Aek¨B Rvbv‡Z n‡e|
+13| wbqwgZ †bvwUk †ev‡W(C)i w`‡K j¶¨ ivLyb Ges Ab¨vb¨ Z_¨vw` Rvb‡Z Awdm PjvKvjxb mg‡q Awd‡m †hvMv‡hvM Kiæb|
+14| Avcbvi Av‡e`‡bi †cªwÿ‡Z fwel¨ Znwej AvBbvbymv‡i g~j †eZb †_‡K 8% nv‡i KZ(C)b K‡i fwel¨ Znwej MwVZ n‡e| fwel¨ Znwej AvBbvbyhvqx cwiPvwjZ n‡e|
+15| PvKzixi eqm Kgc‡ÿ 5 (cuvP) eQi c~Y(C) n‡j ‡Kv¤úvbxi cwjwm Abymv‡i MÖvPzBwU cÖ`vb Kiv n‡e|
+16| Avcbv‡K wbivcËv wewagvjv †g‡b I (cÖ‡hvR¨ †ÿ‡Î) wc.wc.B (e¨vw³MZ myiÿv mvgMª(C)x) cwiavb K‡i KvR Ki‡Z n‡e|
+17| †Kvb Kg(C)KZ(C)v eqm 60 eQi c~Y(C) n‡j wZwb PvKzix n‡Z ¯^vfvweK Aemi MÖnb Ki‡eb| 
+18| Avcbvi wb‡qv‡Mi hveZxq kZ(C)vejx †Kv¤úvbxi wbqgvbymv‡i cwiPvwjZ n‡e|
+19| KZ...(C)cÿ KZ(C)„K Awc(C)Z `vwqZ¡ h_vh_fv‡e cvjb Ki‡Z n‡e|
+20| †Kv¤úvbxi mKj wbqg-Kvbyb h_vh_ fv‡e cÖwZcvjb Ki‡Z n‡e|
+
+     
+Avwg my¯'¨ I ¯^Áv‡b D‡jøwLZ k‡Z(C) m¤§Z n‡q wb‡qvM c‡Î ¯^v¶i K‡i 1(GK) Kwc Abywjwc MÖnb Kijvg|
+	†eZb wnmve 			t
+             K) g~j †eZb		t
+   L) evoxfvov		t
+   M) wPwKrmv fvZv	t
+   N) hvZvqvZ fvZv	t
+   O) Lv`¨ fvZv		t
+   
+   me(C)‡gvU			t 
+
+                                                             BasicSalaryBangla
+                                                                               
+UvKv
+                                                                HouseRentBangla
+UvKv
+                                                                  MedicalBangla
+                                                                               
+UvKv
+                                                               ConveyenceBangla
+                                                                               
+UvKv
+                                                                     FoodBangla
+                                                                               
+UvKv
+SectionBangla
+
+SectionBangla
+SpouseNameBangla
+
+BloodGroupBangla
+
+Avcbvi JoiningDateBangla Bs Zvwi‡Li Av‡e`‡bi I KZ...(C)c‡¶i mv‡_ mv¶v‡Zi wfwˇZ Avcbv‡K †Kv¤úvwbi EmpDepartmentBangla wefv‡M EmpDesignaionBangla c‡` †MÖW - GradeBangla, G JoiningDateBangla Bs ZvwiL n‡Z wk¶vbwek wn‡m‡e wb‡qvM cÖ`vb Kiv nj| wk¶vbwekKvj JoiningDateBangla Bs ZvwiL n‡Z ProbationDateBangla Bs ZvwiL ch(C)šÍ |
+
+D³ †gqv` AwZuvšÍ n‡j ¯'vqx Kg(C)Pvix wnmv‡e MY¨ Kiv n‡e| D³ 03(wZb) gv‡m KZ...(C)cÿ mš`ó bv n‡j AviI 03(wZb) gvm wkÿvbwekKvj e„wx Kiv n‡Z cv‡i|
+
+
+wefvM t
+‡mKkb t
+ bvg t
+Kv‡Ri aiY t
+¯^vgx/¯¿xi bvg t
+c`ex t
+eZ(C)gvb wVKvbv
+MÖvg t
+‡cvó Awdm t
+_vbv t
+‡Rjv t
+                                                               TotalTakaBangla
+                                                                               
+ UvKv
+

HRM.UI/Documents/LetterTempFolder/Worker.docx

@@ -0,0 +1,117 @@
+                            B‡Kv‡U· wjwg‡UW
+                                  wb‡qvMcÎ
+                          kªwg‡Ki Rb¨ cÖ‡hvR¨
+                                       
+                                       
+‡hvM`v‡bi ZvwiL t	  JoiningDateBangla
+--------------------------------------------------------------------------------
+KvW(C) bs :  EmpCodeBangla
+                           (‡d-vi - FloorBangla)
+
+IME/HR/F-16
+ bvg t
+RbYen ZvwiL t
+wcZvi bvg t
+gvZvi bvg t
+¯'vqx wVKvbv
+c`ex t
+‡mKkb t
+¯^vgx/¯¿xi bvg t
+wefvM t
+i‡³i MÖæc t
+eZ(C)gvb wVKvbv
+MÖvg t
+‡cvó Awdm t
+_vbv t
+‡Rjv t
+‡Rjv t
+Kv‡Ri aiY t
+_vbv t
+‡cvó Awdm t
+MÖvg t
+                               cÖv_x(C)i ¯^v¶i
+                                  GBP,Avi ,wW
+Echotex Limited, Head Office: Road No # 4, House No # 139 , Mohakhali New DOHS, Dhaka-1206. Tel # (02) 9881717,9882177, Fax # (02) 9883430
+Factory: Pollibiddut(Chandra),Kaliakoire,Gazipur-1751,Mob:01786-339955,Tel # (06822) 51877, Fax # (06822) 51876
+EmpNameBangla
+EmpDesignaionBangla
+EmpDepartmentBangla
+VillagePABangla
+PostOfficePABangla
+ThanaPABangla
+DistrictPABangla
+
+VillageTABangla
+
+PostOfficeTABangla
+
+ThanaTABangla
+
+DistrictTABangla
+FatherNameBangla
+MotherNameBangla
+BirthDateBangla
+wbqgvejx t
+1| PjwZ gvm †kl nIqvi cieZx(C) 07(mvZ)Kg(C) w`e‡mi g‡a¨ gRyix cwi‡kva Kiv n‡e|
+2| mvavib Kg(C)N›Uv ˆ`wbK 08(AvU) N›Uv, Gi AwZwi³ n‡j Ifvi UvBg cÖ`vb Kiv n‡e|
+3| IfviUvBg fvZv AvBbvbymv‡i †`Iqv nq| †hgb t {(g~j †eZb/208)x 2 x AwZwi³ Kv‡Ri N›Uv}=AwZwi³ gRyixi UvKv|
+4| mvßvwnK QywU 1(GK) w`b, ˆbwgwËK QywU eQ‡i 10(`k) w`b , Amy¯'ZvRwbZ QywU c~Y(C) †eZ‡b 14(‡PŠÏ) w`b, evwl(C)K QywU (AvBbvbymv‡i) 18 w`‡b 01(GK) w`b, Drme QywU eQ‡i 12 (ev‡iv) w`b, gvZ...Z¡Kvjxb QywU  
+  ïay gvÎ gwnjv kÖwgKe„‡›`i Rb¨ AvBbvbymv‡i cÖm‡ei c~‡e(C) 60 w`b cÖm‡ei c‡i 60 w`b (‡gvU 120w`b) Ges wcZ...Z¡Kvjxb QywU ïaygvÎ cyiæl kÖwgKe„‡›`i Rb¨ d¨v+-wii wbqgvbymv‡i 07 w`b|
+5| weiwZ I Avnv‡ii mgq 01(GK)N›Uv|
+6| †Kv¤úvbxi wbqg Abymv‡i (cÖ‡hvR¨ †ÿ‡Î) †cÖvWvKkb, AvPiY, nvwRiv †evbvm cÖ`vb Kiv n‡e|
+7| ¯'vqxfv‡e wb‡qvMcÖvß mK‡j eQ‡i `yB C‡` g~j gRyix /†eZb nv‡i Drme †evbvm cv‡eb| Kv‡iv PvKzix ¯'vqx bv n‡j †evbvm cÖ`v‡bi mgq wZwb g~j gRyixi 10% †evbvm cv‡eb|
+8| KZ...(C)cÿ cÖ‡qvR‡b Avcbvi mKj kZ(C) AcwiewZ(C)Z †i‡L †Kv¤úvbxi Ab¨vb¨ d¨v+-wi‡Z A_ev GKB d¨v+-ixi Ab¨ †Kvb wefv‡M ev kvLvq ev wkd&U G e`wj Ki‡Z cvi‡e| 
+9| kÖg AvBb Abymv‡i evrmwiK gRyix e„wx Kiv n‡e|
+10| ¯'vqxfv‡e wb‡qvwRZ †Kvb kªwgK PvKzix n‡Z Aemvb wb‡Z PvB‡j Òevsjv‡`k kªg AvBb,2006ÓGi aviv 27 (kªwgK KZ(C)...K PvKyixi Aemvb) Abymv‡i kªwgK KZ(C)...K 
+  gvwjK‡K 60(lvU) w`‡bi wjwLZ †bvwUk cÖ`vb Ki‡Z n‡e A_ev 60(lvU) w`‡bi gRyixi mgcwigvY A_(C) gvwjK‡K cª`vb Ki‡Z n‡e|
+11| KZ...(C)c¶ B"Qv Ki‡j Am`vPi‡Yi Rb¨ wb¤œwjwLZ †h †Kvb cÖKvi `Û cÖ`vb Ki‡Z cvi‡e -
+   K) PvKzix n‡Z AcmviY L) bx‡Pi c‡`, †MÖ‡W ev †eZb †¯‹‡j AbwaK 01(GK) ermi ch(C)šÍ Avbqb M) AbwaK 01 (GK) erm‡ii Rb¨ c‡`vbœwZ eÜ N) AbwaK 01(GK) erm‡ii Rb¨ gRyix  
+   e„wx eÜ O) Rwigvbv P) AbwaK 07(mvZ) w`b ch(C)šÍ webv gRyix‡Z /webv †LvivKx‡Z mvgwqK eiLv¯Í Q) mZKx(C)KiY |
+12| Avcwb AÎ cÖwZôv‡b _vKv Ae¯'vq Ab¨ †Kvb cÖwZôv‡b PvKzix Ki‡Z cvi‡eb bv A_ev cÖwZôv‡bi e¨em¨v msuvšÍ †Kvb †Mvcb Z_¨vw` KvD‡K cÖ`vb Ki‡eb bv|
+13| K) KZ...(C)c¶ hw` †Kvb ¯'vqx kªwgK‡K cÖ‡qvRb AwZwi³Zvi Kvi‡Y PvKzixi Aemvb NUv‡Z Pvb, Z‡e kªwgK‡K 30 w`‡bi (1 gv‡mi) wjwLZ †bvwUk cª`vb Ki‡e| hw` †Kvb †bvwUk bv 
+    †`Iqv nq †m‡¶‡Î †bvwU‡ki cwie‡Z(C) †bvwUk †gqv` 30 w`‡bi (1 gv‡mi) gRyixi mgcwigvY A_(C) kªwgK‡K cÖ`vb Ki‡e | 
+    L) KZ...(C)c¶ hw` †Kvb ¯'vqx kªwg‡Ki eiLv¯Í e¨ZxZ PvKzix Aemvb NUv‡Z Pvb, Z‡e kªwgK‡K 120 w`‡bi (4 gv‡mi) wjwLZ †bvwUk cª`vb Ki‡Z n‡e | hw` †Kvb ‡bvwUk bv ‡`Iqv nq 
+     †m‡¶‡Î †bvwU‡ki cwie‡Z(C) †bvwUk †gqv` 120 w`‡bi (4 gv‡mi) gRyixi mgcwigvY A_(C) kªwgK‡K cÖ`vb Ki‡e | 
+14| †Kvb †iwR/vW(C) wPwKrmK KZ...(C)K cÖZ¨vwqZ kvixwiK ev gvbwmK AÿgZv A_ev `xN(C)‡gqvw` Ae¨nZ fMœ-¯^v¯'¨ ev Amy¯'¨Zvi Kvi‡Y PvKzix n‡Z wWmPvR(C) Kiv n‡e|
+15| Avcbvi Awf‡hvM I civgk(C) GBP.Avi Awdm, Awf‡hvM e· A_ev I‡qj‡dqvi Awdmv‡ii Kv‡Q wjwLZfv‡e Rvbvb|
+16| Avcbvi wVKvbv cwieZ(C)b Ki‡j 07(mvZ) w`‡bi g‡a¨ Awdm‡K wjwLZfv‡e Aek¨B Rvbv‡Z n‡e|
+17| wbqwgZ †bvwUk †ev‡W(C)i w`‡K j¶¨ ivLyb Ges Ab¨vb¨ Z_¨vw` Rvb‡Z Awdm PjvKvjxb mg‡q Awd‡m †hvMv‡hvM Kiæb|
+18| Avcbvi Av‡e`‡bi †cªwÿ‡Z fwel¨ Znwej AvBbvbymv‡i g~j †eZb †_‡K 8% nv‡i KZ(C)b K‡i fwel¨ Znwej MwVZ n‡e| fwel¨ Znwej AvBbvbyhvqx cwiPvwjZ n‡e|
+19| PvKzixi eqm Kgc‡ÿ 5 (cuvP) eQi c~Y(C) n‡j evsjv‡`k kªg AvBb Abymv‡i MÖvPzBwU cÖ`vb Kiv n‡e|
+20| Avcbv‡K wbivcËv wewagvjv †g‡b I (cÖ‡hvR¨ †ÿ‡Î) wc.wc.B (e¨vw³MZ myiÿv mvgMª(C)x) cwiavb K‡i KvR Ki‡Z n‡e| 
+21| †Kvb kÖwg‡Ki eqm 60 eQi c~Y(C) n‡j wZwb PvKzix n‡Z ¯^vfvweK Aemi MÖnb Ki‡eb| 
+22| Avcbvi wb‡qv‡Mi hveZxq kZ(C)vejx evsjv‡`k kÖg-AvBb Abyhvqx cwiPvwjZ n‡e|
+     
+Avwg my¯'¨ I ¯^Áv‡b D‡jøwLZ k‡Z(C) m¤§Z n‡q wb‡qvM c‡Î ¯^v¶i K‡i 1(GK) Kwc Abywjwc MÖnb Kijvg|
+†eZb I gRyix wb¤œiƒc wnmve t
+  	K) g~j †eZb		t
+   L) evoxfvov		t
+   M) wPwKrmv fvZv	t
+   N) hvZvqvZ fvZv	t
+   O) Lv`¨ fvZv		t
+   
+   me(C)‡gvU			t 
+
+                                                             BasicSalaryBangla
+                                                                               
+UvKv
+                                                                HouseRentBangla
+UvKv
+                                                                  MedicalBangla
+UvKv
+                                                               ConveyenceBangla
+UvKv
+                                                                     FoodBangla
+UvKv
+                                                               TotalTakaBangla
+                                                                               
+ UvKv
+SectionBangla
+SectionBangla
+SpouseNameBangla
+BloodGroupBangla
+Avcbvi JoiningDateBangla Bs Zvwi‡Li Av‡e`‡bi I KZ...(C)c‡¶i mv‡_ mv¶v‡Zi wfwˇZ Avcbv‡K †Kv¤úvwbi EmpDepartmentBangla wefv‡M EmpDesignaionBangla c‡` †MÖW -GradeBangla, G JoiningDateBangla Bs ZvwiL n‡Z wk¶vbwek wn‡m‡e wb‡qvM cÖ`vb Kiv nj| wk¶vbwekKvj JoiningDateBangla Bs ZvwiL n‡Z ProbationDateBangla Bs ZvwiL ch(C)šÍ |
+
+D³ †gqv` AwZuvšÍ n‡j ¯'vqx kªwgK wnmv‡e MY¨ Kiv n‡e| `¶ kªwg‡Ki †¶‡Î D³ 03(wZb) gv‡m `¶Zvi cÖgvY bv w`‡Z cvi‡j KZ...(C)c¶ `¶Zv cÖgv‡Yi Rb¨ AviI 03(wZb) gvm wk¶vbwekKvj e„wx Ki‡Z cvi‡e|
+
+