CelHRTeam/EchoTex_Payroll
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: CelHRTeam:dddeb8fbed854dc9ffdd84841fba5b21899f3eae
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_sojib
CelHRTeam:main
..
compare: CelHRTeam:d0c80f9276160b24c5a9acd8b4031b72aa0d2ead
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_sojib
CelHRTeam:main

No commits in common. "dddeb8fbed854dc9ffdd84841fba5b21899f3eae" and "d0c80f9276160b24c5a9acd8b4031b72aa0d2ead" have entirely different histories.
dddeb8fbed ... d0c80f9276

29 changed files with 6294 additions and 6862 deletions
Show Stats Expand all files Collapse all files

19
HRM.BO/Fund/Basic/GlobalFunctions.cs
View File

@ -312,10 +312,18 @@ namespace HRM.BO
type = "A"; type = "A";
break; break;
case EnumAttendanceType.Delay:
type = "L";
break;
case EnumAttendanceType.Holiday: case EnumAttendanceType.Holiday:
type = "H"; type = "H";
break; break;
case EnumAttendanceType.Late:
type = "L";
break;
case EnumAttendanceType.Leave: case EnumAttendanceType.Leave:
type = "Lv"; type = "Lv";
break; break;
@ -324,17 +332,6 @@ namespace HRM.BO
type = "P"; type = "P";
break; break;
case EnumAttendanceType.HalfDay:
type = "HD";
break;
case EnumAttendanceType.Delay:
type = "L";
break;
case EnumAttendanceType.Late:
type = "L";
break;
case EnumAttendanceType.OutSideDuty: case EnumAttendanceType.OutSideDuty:
type = "OD"; type = "OD";

22
HRM.BO/HRBasic/Enums.cs
View File

@ -2425,24 +2425,13 @@ namespace HRM.BO
//Delay = 3, //Delay = 3,
//Leave = 4, //Leave = 4,
//Holiday = 5, //Holiday = 5,
//WeeklyOff = 6, WeeklyOff = 6,
//TourDuty = 7, //TourDuty = 7,
//OfficialDuty = 8, //OfficialDuty = 8,
//Compensation = 9, Compensation = 9,
//ManualEntry = 10, ManualEntry = 10,
//Late = 11 //Late = 11
None = 0, None = 0,
//Present = 1,
//Absent = 2,
//Delay = 3,
//Late = 11,
//Early = 12,
//Leave = 4,
//Holiday = 5,
//OutSideDuty = 7,
//WeeklyHoliday = 8,
//HalfDay = 18,
//LOA = 22
Present = 1, Present = 1,
Absent = 2, Absent = 2,
Delay = 3, Delay = 3,
@ -2450,9 +2439,10 @@ namespace HRM.BO
Early = 12, Early = 12,
Leave = 4, Leave = 4,
Holiday = 5, Holiday = 5,
HalfDay = 6,
OutSideDuty = 7, OutSideDuty = 7,
WeeklyHoliday = 8 WeeklyHoliday = 8,
HalfDay = 18,
LOA = 22
} }

3
HRM.DA/DA/Employee/EmployeeDA.cs
View File

@ -730,8 +730,7 @@ namespace HRM.DA
} }
internal static void UpdateBanglaContactInformation(TransactionContext tc, List<object> employeBanglaInfo) internal static void UpdateBanglaContactInformation(TransactionContext tc, List<object> employeBanglaInfo)
{ {
string sql = SQLParser.MakeSQL("UPDATE EMPCONTACT SET presentPOInBangla = %s, presentAddressInBangla = %s, parmanentPOInBangla = %s, permanentAddressInBangla =%s WHERE EMPLOYEEID = %n", employeBanglaInfo[1], employeBanglaInfo[2], employeBanglaInfo[3], employeBanglaInfo[4], employeBanglaInfo[0]); tc.ExecuteNonQuery("UPDATE EMPCONTACT SET presentPOInBangla = %s, presentAddressInBangla = %s, parmanentPOInBangla = %s, permanentAddressInBangla =%s WHERE EMPLOYEEID = %s", employeBanglaInfo[1], employeBanglaInfo[2], employeBanglaInfo[3], employeBanglaInfo[4], employeBanglaInfo[0]);
tc.ExecuteNonQuery(sql);
} }
internal static IDataReader GetByEmpIDs(TransactionContext tc, string empIDs) internal static IDataReader GetByEmpIDs(TransactionContext tc, string empIDs)

2
HRM.DA/DA/Salary/SalaryProcessDA.cs
View File

@ -223,7 +223,7 @@ namespace HRM.DA
id); id);
tc.ExecuteNonQuery("DELETE FROM SalaryMonthly WHERE SalaryProcessID=%n", id); tc.ExecuteNonQuery("DELETE FROM SalaryMonthly WHERE SalaryProcessID=%n", id);
//} //}
//tc.ExecuteNonQuery("DELETE FROM SalaryProcess WHERE SalaryProcessID=%n", id); tc.ExecuteNonQuery("DELETE FROM SalaryProcess WHERE SalaryProcessID=%n", id);
} }
internal static void UndoMonthlySalaryByIDs(TransactionContext tc, string ids) internal static void UndoMonthlySalaryByIDs(TransactionContext tc, string ids)

5
HRM.DA/DA/SearchReport/SearchEmployeeDA.cs
View File

@ -374,10 +374,9 @@ END;";
//orderby = "EmployeeNo"; //orderby = "EmployeeNo";
//Using TOP //Using TOP
//sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("EmployeeNo LIKE %s", ( code + "%")); // Using LIKE Operator sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("EmployeeNo LIKE %s", ( code + "%"));
sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("EmployeeNo = %s", ( code)); // Without Using LIKE Operator
orderby = "EmployeeNo"; orderby = "EmployeeNo";
top = "TOP 5"; top = "TOP 15";
//Without suggestion //Without suggestion
//sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("EmployeeNo = %s", code ); //sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("EmployeeNo = %s", code );

15
HRM.DA/Service/Attendance/AttendanceProcess.cs
View File

@ -117,11 +117,8 @@ namespace HRM.DA
{ {
DateTime oLastDate = attnProcess.AttnDate.LastDateOfMonth(); DateTime oLastDate = attnProcess.AttnDate.LastDateOfMonth();
DateTime oFirstDate = attnProcess.AttnDate.FirstDateOfMonth(); DateTime oFirstDate = attnProcess.AttnDate.FirstDateOfMonth();
//_AttNHolidays =
// new AttnNationalHolidayService().GetByMonthAndPayrollType(oFirstDate, oLastDate, payrollTypeID);
_AttNHolidays = _AttNHolidays =
new AttnNationalHolidayService().Get(EnumStatus.Active, payrollTypeID); new AttnNationalHolidayService().GetByMonthAndPayrollType(oFirstDate, oLastDate, payrollTypeID);
} }
AttnNationalHoliday oAttNHoliday = _AttNHolidays.Where(o => AttnNationalHoliday oAttNHoliday = _AttNHolidays.Where(o =>
@ -2455,8 +2452,7 @@ namespace HRM.DA
foreach (DataRow Dr in EmpOTHours.Tables[0].Rows) foreach (DataRow Dr in EmpOTHours.Tables[0].Rows)
{ {
Employee tempEmployee = employees.Where(emp => emp.ID.ToString() == Dr["EmployeeID"].ToString()).FirstOrDefault(); Employee tempEmployee = employees.Where(emp => emp.ID.ToString() == Dr["EmployeeID"].ToString()).FirstOrDefault();
if (tempEmployee == null || tempEmployee.IsEligibleOT == false) continue; if (tempEmployee == null) continue;
if (tempEmployee.GradeID == null) if (tempEmployee.GradeID == null)
{ {
ErrorList.Add(new SalaryProcessStatus(tempEmployee.EmployeeNo, tempEmployee.Name, "Grade not assinged")); ErrorList.Add(new SalaryProcessStatus(tempEmployee.EmployeeNo, tempEmployee.Name, "Grade not assinged"));
@ -2601,11 +2597,7 @@ namespace HRM.DA
List<Shift> shifts =new ShiftService().GetAllShift(); List<Shift> shifts =new ShiftService().GetAllShift();
List<WorkPlanGroup> workPlanGroups = new WorkPlanGroupService().GetAll(); List<WorkPlanGroup> workPlanGroups = new WorkPlanGroupService().GetAll();
//if( employees == null) employees = new EmployeeService().GetAllLive(); if( employees == null) employees = new EmployeeService().GetAllLive();
if( employees == null)
employees = new EmployeeService().Get(EnumEmployeeStatus.Live, payrolltypeid)
.OrderBy(num => num.EmployeeNo.Length).ThenBy(num => Convert.ToInt32(num.EmployeeNo)).ToList();
List<Employee> discontinueEmps =new EmployeeService().GetDiscontinueEmp(Attdate, DateTime.Now, payrolltypeid); List<Employee> discontinueEmps =new EmployeeService().GetDiscontinueEmp(Attdate, DateTime.Now, payrolltypeid);
//List<AttnRawData> attRawdata = new AttnRawDataService().Get(startTime, ToTime, payrolltypeid);// get raw data by a date and order by date, employee, punchTime //List<AttnRawData> attRawdata = new AttnRawDataService().Get(startTime, ToTime, payrolltypeid);// get raw data by a date and order by date, employee, punchTime
@ -2644,6 +2636,7 @@ namespace HRM.DA
foreach (Employee emp in employees) foreach (Employee emp in employees)
{ {
//EmpTempid = emp.ID.Integer; //EmpTempid = emp.ID.Integer;
#region EmployeeWise Setup #region EmployeeWise Setup

6
HRM.DA/Service/Attendance/DailyAttnProcessService.cs
View File

@ -2960,9 +2960,9 @@ namespace HRM.DA
} }
} }
public DateTime? GetLastProcessDateUsingPayrollType(int PayrolltypeID) public DateTime GetLastProcessDateUsingPayrollType(int PayrolltypeID)
{ {
DateTime? lastProcessDate = null; DateTime lastProcessDate = DateTime.MinValue;
TransactionContext tc = null; TransactionContext tc = null;
try try
{ {
@ -2972,7 +2972,7 @@ namespace HRM.DA
{ {
lastProcessDate = oreader.GetDateTime("LastProcessDate").HasValue lastProcessDate = oreader.GetDateTime("LastProcessDate").HasValue
? oreader.GetDateTime("LastProcessDate").Value ? oreader.GetDateTime("LastProcessDate").Value
: null; : DateTime.MinValue;
} }
oreader.Close(); oreader.Close();

26
HRM.DA/Service/OverTime/EmployeeOverTimeService.cs
View File

@ -340,19 +340,19 @@ namespace HRM.DA
using (SqlBulkCopy bulkCopy = new SqlBulkCopy((SqlConnection)tc.Connection, SqlBulkCopyOptions.Default, (SqlTransaction)tc.Transaction)) using (SqlBulkCopy bulkCopy = new SqlBulkCopy((SqlConnection)tc.Connection, SqlBulkCopyOptions.Default, (SqlTransaction)tc.Transaction))
{ {
bulkCopy.BulkCopyTimeout = 6000; // in seconds bulkCopy.BulkCopyTimeout = 6000; // in seconds
bulkCopy.ColumnMappings.Add("EMPLOYEEID", "EmployeeID"); bulkCopy.ColumnMappings.Add("EMPLOYEEID", "EMPLOYEEID");
bulkCopy.ColumnMappings.Add("MONTHDATE", "MonthDate"); bulkCopy.ColumnMappings.Add("MONTHDATE", "MONTHDATE");
bulkCopy.ColumnMappings.Add("TERMID", "TermID"); bulkCopy.ColumnMappings.Add("TERMID", "TERMID");
bulkCopy.ColumnMappings.Add("TERMPARAMETERID", "TermParameterID"); bulkCopy.ColumnMappings.Add("TERMPARAMETERID", "TERMPARAMETERID");
bulkCopy.ColumnMappings.Add("OTHOURS", "OTHours"); bulkCopy.ColumnMappings.Add("OTHOURS", "OTHOURS");
bulkCopy.ColumnMappings.Add("AMOUNT", "Amount"); bulkCopy.ColumnMappings.Add("AMOUNT", "AMOUNT");
bulkCopy.ColumnMappings.Add("CREATEDBY", "CreatedBy"); bulkCopy.ColumnMappings.Add("CREATEDBY", "CREATEDBY");
bulkCopy.ColumnMappings.Add("CREATIONDATE", "CreationDate"); bulkCopy.ColumnMappings.Add("CREATIONDATE", "CREATIONDATE");
bulkCopy.ColumnMappings.Add("MODIFIEDBY", "ModifiedBy"); bulkCopy.ColumnMappings.Add("MODIFIEDBY", "MODIFIEDBY");
bulkCopy.ColumnMappings.Add("MODIFIEDDATE", "ModifiedDate"); bulkCopy.ColumnMappings.Add("MODIFIEDDATE", "MODIFIEDDATE");
bulkCopy.ColumnMappings.Add("OTMONTH", "OTMonth"); bulkCopy.ColumnMappings.Add("OTMONTH", "OTMONTH");
bulkCopy.ColumnMappings.Add("EMPOVERTIMEID", "EmpOverTimeID"); bulkCopy.ColumnMappings.Add("EMPOVERTIMEID", "EMPOVERTIMEID");
bulkCopy.ColumnMappings.Add("PAYROLLTYPEID", "PayrollTypeID"); bulkCopy.ColumnMappings.Add("PAYROLLTYPEID", "PAYROLLTYPEID");
bulkCopy.ColumnMappings.Add("PRVMONTHHOURS", "PRVMONTHHOURS"); bulkCopy.ColumnMappings.Add("PRVMONTHHOURS", "PRVMONTHHOURS");
bulkCopy.ColumnMappings.Add("CURRMONTHHOURS", "CURRMONTHHOURS"); bulkCopy.ColumnMappings.Add("CURRMONTHHOURS", "CURRMONTHHOURS");

16
HRM.DA/Service/UnAuthLeave/EmployeeUnAuthorizeLeaveService.cs
View File

@ -759,21 +759,21 @@ namespace HRM.DA
using (SqlBulkCopy bulkCopy = new SqlBulkCopy((SqlConnection)tc.Connection, SqlBulkCopyOptions.Default, (SqlTransaction)tc.Transaction)) using (SqlBulkCopy bulkCopy = new SqlBulkCopy((SqlConnection)tc.Connection, SqlBulkCopyOptions.Default, (SqlTransaction)tc.Transaction))
{ {
bulkCopy.BulkCopyTimeout = 6000; // in seconds bulkCopy.BulkCopyTimeout = 6000; // in seconds
bulkCopy.ColumnMappings.Add("EMPLEAVEID", "EmpLeaveID"); bulkCopy.ColumnMappings.Add("EMPLEAVEID", "EMPLEAVEID");
bulkCopy.ColumnMappings.Add("EMPLOYEEID", "EMPLOYEEID"); bulkCopy.ColumnMappings.Add("EMPLOYEEID", "EMPLOYEEID");
bulkCopy.ColumnMappings.Add("LEAVEID", "LEAVEID"); bulkCopy.ColumnMappings.Add("LEAVEID", "LEAVEID");
bulkCopy.ColumnMappings.Add("MONTHDATE", "MONTHDATE"); bulkCopy.ColumnMappings.Add("MONTHDATE", "MONTHDATE");
bulkCopy.ColumnMappings.Add("LEAVEDAY", "LEAVEDAY"); bulkCopy.ColumnMappings.Add("LEAVEDAY", "LEAVEDAY");
bulkCopy.ColumnMappings.Add("CREATEDBY", "CreatedBy"); bulkCopy.ColumnMappings.Add("CREATEDBY", "CREATEDBY");
bulkCopy.ColumnMappings.Add("LEAVEMONTH", "LEAVEMONTH"); bulkCopy.ColumnMappings.Add("LEAVEMONTH", "LEAVEMONTH");
bulkCopy.ColumnMappings.Add("FROMDATE", "FROMDATE"); bulkCopy.ColumnMappings.Add("FROMDATE", "FROMDATE");
bulkCopy.ColumnMappings.Add("TODATE", "TODATE"); bulkCopy.ColumnMappings.Add("TODATE", "TODATE");
bulkCopy.ColumnMappings.Add("CREATIONDATE", "CreationDate"); bulkCopy.ColumnMappings.Add("CREATIONDATE", "CREATIONDATE");
bulkCopy.ColumnMappings.Add("MODIFIEDBY", "ModifiedBy"); bulkCopy.ColumnMappings.Add("MODIFIEDBY", "MODIFIEDBY");
bulkCopy.ColumnMappings.Add("MODIFIEDDATE", "ModifiedDate"); bulkCopy.ColumnMappings.Add("MODIFIEDDATE", "MODIFIEDDATE");
bulkCopy.ColumnMappings.Add("TYPE", "Type"); bulkCopy.ColumnMappings.Add("TYPE", "TYPE");
bulkCopy.ColumnMappings.Add("REFERENCEID", "ReferenceID"); bulkCopy.ColumnMappings.Add("REFERENCEID", "REFERENCEID");
bulkCopy.ColumnMappings.Add("PARAMID", "ParamID"); bulkCopy.ColumnMappings.Add("PARAMID", "PARAMID");
bulkCopy.ColumnMappings.Add("ISLATEATTENDANCERELATED", "ISLATEATTENDANCERELATED"); bulkCopy.ColumnMappings.Add("ISLATEATTENDANCERELATED", "ISLATEATTENDANCERELATED");
bulkCopy.ColumnMappings.Add("PAYROLLTYPEID", "PAYROLLTYPEID"); bulkCopy.ColumnMappings.Add("PAYROLLTYPEID", "PAYROLLTYPEID");

334
HRM.Report/Attendence/RDLC/MonthlyDetailAttnEcho.rdlc
View File

@ -266,146 +266,6 @@
<TablixCornerCell /> <TablixCornerCell />
<TablixCornerCell /> <TablixCornerCell />
<TablixCornerCell /> <TablixCornerCell />
<TablixCornerCell>
<CellContents>
<Textbox Name="Textbox3">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Department</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox3</rd:DefaultName>
<Style>
<Border>
<Style>Solid</Style>
</Border>
<BackgroundColor>Gainsboro</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCornerCell>
<TablixCornerCell>
<CellContents>
<Textbox Name="Textbox9">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Floor</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox9</rd:DefaultName>
<Style>
<Border>
<Style>Solid</Style>
</Border>
<BackgroundColor>Gainsboro</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCornerCell>
<TablixCornerCell>
<CellContents>
<Textbox Name="Textbox11">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Section</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox11</rd:DefaultName>
<Style>
<Border>
<Style>Solid</Style>
</Border>
<BackgroundColor>Gainsboro</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCornerCell>
<TablixCornerCell>
<CellContents>
<Textbox Name="Textbox13">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Line</Value>
<Style>
<FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox13</rd:DefaultName>
<Style>
<Border>
<Style>Solid</Style>
</Border>
<BackgroundColor>Gainsboro</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCornerCell>
</TablixCornerRow> </TablixCornerRow>
</TablixCornerRows> </TablixCornerRows>
</TablixCorner> </TablixCorner>
@ -679,190 +539,6 @@
</Textbox> </Textbox>
</CellContents> </CellContents>
</TablixHeader> </TablixHeader>
<TablixMembers>
<TablixMember>
<Group Name="matrix1_Department">
<GroupExpressions>
<GroupExpression>=Fields!Department.Value</GroupExpression>
</GroupExpressions>
</Group>
<SortExpressions>
<SortExpression>
<Value>=Fields!Department.Value</Value>
</SortExpression>
</SortExpressions>
<TablixHeader>
<Size>1in</Size>
<CellContents>
<Textbox Name="Department">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=First(Fields!Department.Value)</Value>
<Style>
<FontSize>7pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Department</rd:DefaultName>
<Style>
<Border>
<Style>Solid</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixHeader>
<TablixMembers>
<TablixMember>
<Group Name="matrix1_Floor">
<GroupExpressions>
<GroupExpression>=Fields!Floor.Value</GroupExpression>
</GroupExpressions>
</Group>
<SortExpressions>
<SortExpression>
<Value>=Fields!Floor.Value</Value>
</SortExpression>
</SortExpressions>
<TablixHeader>
<Size>1in</Size>
<CellContents>
<Textbox Name="Floor">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=First(Fields!Floor.Value)</Value>
<Style>
<FontSize>7pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Floor</rd:DefaultName>
<Style>
<Border>
<Style>Solid</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixHeader>
<TablixMembers>
<TablixMember>
<Group Name="matrix1_Section">
<GroupExpressions>
<GroupExpression>=Fields!Section.Value</GroupExpression>
</GroupExpressions>
</Group>
<SortExpressions>
<SortExpression>
<Value>=Fields!Section.Value</Value>
</SortExpression>
</SortExpressions>
<TablixHeader>
<Size>1in</Size>
<CellContents>
<Textbox Name="Section">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=First(Fields!Section.Value)</Value>
<Style>
<FontSize>7pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Section</rd:DefaultName>
<Style>
<Border>
<Style>Solid</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixHeader>
<TablixMembers>
<TablixMember>
<Group Name="matrix1_Line">
<GroupExpressions>
<GroupExpression>=Fields!Line.Value</GroupExpression>
</GroupExpressions>
</Group>
<SortExpressions>
<SortExpression>
<Value>=Fields!Line.Value</Value>
</SortExpression>
</SortExpressions>
<TablixHeader>
<Size>1in</Size>
<CellContents>
<Textbox Name="Line">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=First(Fields!Line.Value)</Value>
<Style>
<FontSize>7pt</FontSize>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Line</rd:DefaultName>
<Style>
<Border>
<Style>Solid</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixHeader>
<TablixMembers> <TablixMembers>
<TablixMember> <TablixMember>
<Group Name="matrix1_RowGroup7"> <Group Name="matrix1_RowGroup7">
@ -894,14 +570,6 @@
<DataElementOutput>Output</DataElementOutput> <DataElementOutput>Output</DataElementOutput>
</TablixMember> </TablixMember>
</TablixMembers> </TablixMembers>
</TablixMember>
</TablixMembers>
</TablixMember>
</TablixMembers>
</TablixMember>
</TablixMembers>
</TablixMember>
</TablixMembers>
<DataElementOutput>Output</DataElementOutput> <DataElementOutput>Output</DataElementOutput>
</TablixMember> </TablixMember>
</TablixMembers> </TablixMembers>
@ -923,7 +591,7 @@
<DataSetName>AttendenceDataSet_MonthlyDetail</DataSetName> <DataSetName>AttendenceDataSet_MonthlyDetail</DataSetName>
<Top>0.6875in</Top> <Top>0.6875in</Top>
<Height>0.9in</Height> <Height>0.9in</Height>
<Width>8.35in</Width> <Width>4.35in</Width>
<Style /> <Style />
</Tablix> </Tablix>
<Textbox Name="textbox1"> <Textbox Name="textbox1">

2
HRM.Report/Attendence/RDLC/MultipleJobCardSub.rdlc
View File

@ -1371,7 +1371,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>="Festival Holidays: "&amp;sum(cint(iif(Fields!Status.Value="N",1,0)))</Value> <Value>="Festival Holidays: "&amp;sum(cint(iif(Fields!Status.Value="H",1,0)))</Value>
<Style> <Style>
<FontSize>8pt</FontSize> <FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight> <FontWeight>Bold</FontWeight>

19
HRM.Report/Class/rptDigitalServiceBook.cs
View File

@ -57,8 +57,7 @@ namespace HRM.Report
dTable.Rows.Add(oDR); dTable.Rows.Add(oDR);
//count++; //count++;
} }
//dTable.TableName = "DigitalServiceBookDataSet_EMPDigitalServiceBook"; dTable.TableName = "DigitalServiceBookDataSet_EMPDigitalServiceBook";
dTable.TableName = "EMPDigitalServiceBook";
dSet.Tables.Add(dTable); dSet.Tables.Add(dTable);
#endregion #endregion
@ -72,14 +71,13 @@ namespace HRM.Report
foreach (DataRow oDRow in oSystemInfo.Tables[0].Rows) foreach (DataRow oDRow in oSystemInfo.Tables[0].Rows)
{ {
oDR = dTable.NewRow(); oDR = dTable.NewRow();
oDR["NAME"] = "B‡Kv‡U· wjwg‡UW"; oDR["NAME"] = oDRow["NAME"];
oDR["CORPORATEADDRESS"] = "Pv›`iv , cjøxwe`y¨r , Kvwjqv‰Ki , MvRxcyi | "; oDR["CORPORATEADDRESS"] = oDRow["CORPORATEADDRESS"];
dTable.Rows.Add(oDR); dTable.Rows.Add(oDR);
} }
//dTable.TableName = "DigitalServiceBookDataSet_SystemInformation"; dTable.TableName = "DigitalServiceBookDataSet_SystemInformation";
dTable.TableName = "SystemInformation";
dSet.Tables.Add(dTable); dSet.Tables.Add(dTable);
#endregion #endregion
@ -110,8 +108,7 @@ namespace HRM.Report
dTable.Rows.Add(oDR); dTable.Rows.Add(oDR);
} }
//dTable.TableName = "DigitalServiceBookDataSet_EMPLifecycle"; dTable.TableName = "DigitalServiceBookDataSet_EMPLifecycle";
dTable.TableName = "EMPLifecycle";
dSet.Tables.Add(dTable); dSet.Tables.Add(dTable);
#endregion #endregion
@ -131,8 +128,7 @@ namespace HRM.Report
dTable.Rows.Add(oDR); dTable.Rows.Add(oDR);
} }
//dTable.TableName = "DigitalServiceBookDataSet_LeaveEntry"; dTable.TableName = "DigitalServiceBookDataSet_LeaveEntry";
dTable.TableName = "LeaveEntry";
dSet.Tables.Add(dTable); dSet.Tables.Add(dTable);
#endregion #endregion
@ -155,8 +151,7 @@ namespace HRM.Report
dTable.Rows.Add(oDR); dTable.Rows.Add(oDR);
} }
//dTable.TableName = "DigitalServiceBookDataSet_Complain"; dTable.TableName = "DigitalServiceBookDataSet_Complain";
dTable.TableName = "Complain";
dSet.Tables.Add(dTable); dSet.Tables.Add(dTable);
#endregion #endregion

32
HRM.Report/Class/rptEcho.cs
View File

@ -2338,7 +2338,7 @@ namespace HRM.Report
continue; continue;
} }
var empDailyAttnProcess = dAttnProcessess.Where(x => x.EmployeeID == employee.ID && var empDailyAttnProcess = dAttnProcessess.Where(x => x.EmployeeID == employee.ID &&
x.AttnDate >= firstDateOfMonth && x.AttnDate <= lastDateOfMonth).OrderBy(x => x.AttnDate).ToList(); x.AttnDate >= firstDateOfMonth && x.AttnDate <= lastDateOfMonth).ToList();
if (empDailyAttnProcess.Count > 0) if (empDailyAttnProcess.Count > 0)
{ {
GetEmpDailyAttn(employee, empDailyAttnProcess, dTableChild, month, out totalOTHour, out totalLateHour, _adps, _Adparameters, oShiftIDs, oShiftIDsSpecial, oNationalHolidays, GetEmpDailyAttn(employee, empDailyAttnProcess, dTableChild, month, out totalOTHour, out totalLateHour, _adps, _Adparameters, oShiftIDs, oShiftIDsSpecial, oNationalHolidays,
@ -2628,7 +2628,6 @@ namespace HRM.Report
DataSet oDailyInOut = null; DataSet oDailyInOut = null;
DataSet oPreviousDayInOut = null; DataSet oPreviousDayInOut = null;
DataRow oDR = null; DataRow oDR = null;
List<Shift> oShifts = new ShiftService().Get(EnumStatus.Regardless, payrollTypeID);
oDailyInOut = new EchoTexExceptionReportService().GetDailyInOut(attnDate, sEmpID); oDailyInOut = new EchoTexExceptionReportService().GetDailyInOut(attnDate, sEmpID);
oPreviousDayInOut = new EchoTexExceptionReportService().GetDailyInOut(PreviousAttnDate, sEmpID); oPreviousDayInOut = new EchoTexExceptionReportService().GetDailyInOut(PreviousAttnDate, sEmpID);
position = 1; position = 1;
@ -2667,35 +2666,6 @@ namespace HRM.Report
oDR["Shift"] = Dr["Shift"].ToString(); oDR["Shift"] = Dr["Shift"].ToString();
oDR["CardNo"] = Dr["CardNo"].ToString(); oDR["CardNo"] = Dr["CardNo"].ToString();
Shift oSft = oShifts.Find(x => x.ShortName == Dr["Shift"].ToString());
DateTime? dtIn = null;
DateTime? dtOut = null;
if (Dr["InTime"] is DBNull)
{
dtIn = null;
}
else
{
dtIn = Convert.ToDateTime(Dr["InTime"].ToString());
}
if (Dr["OutTime"] is DBNull)
{
dtOut = null;
}
else
{
dtOut = Convert.ToDateTime(Dr["OutTime"].ToString());
}
if (oSft != null && dtIn != null && dtOut != null)
{
if (Convert.ToDateTime(dtIn).TimeOfDay > oSft.InTime.TimeOfDay &&
Convert.ToDateTime(dtOut).TimeOfDay < oSft.OutTime.TimeOfDay)
{
oDR["Status"] = "LE";
}
}
dTable.Rows.Add(oDR); dTable.Rows.Add(oDR);
} }
position = 6; position = 6;

16
HRM.Report/HRM.Report.csproj
View File

@ -324,15 +324,9 @@
<EmbeddedResource Include="Attendence\RDLC\MonthlyAttendanceSummary.rdlc" /> <EmbeddedResource Include="Attendence\RDLC\MonthlyAttendanceSummary.rdlc" />
<EmbeddedResource Include="Attendence\RDLC\MonthlyAttendanceReportNew.rdlc" /> <EmbeddedResource Include="Attendence\RDLC\MonthlyAttendanceReportNew.rdlc" />
<EmbeddedResource Include="Attendence\RDLC\MonthlyAttnLiFung.rdlc" /> <EmbeddedResource Include="Attendence\RDLC\MonthlyAttnLiFung.rdlc" />
<EmbeddedResource Include="Attendence\RDLC\MonthlyDetailAttnEcho.rdlc"> <EmbeddedResource Include="Attendence\RDLC\MonthlyDetailAttnEcho.rdlc" />
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <EmbeddedResource Include="Attendence\RDLC\MultipleJobCard.rdlc" />
</EmbeddedResource> <EmbeddedResource Include="Attendence\RDLC\MultipleJobCardSub.rdlc" />
<EmbeddedResource Include="Attendence\RDLC\MultipleJobCard.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Attendence\RDLC\MultipleJobCardSub.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Attendence\RDLC\rptMonthlyKPI.rdlc"> <EmbeddedResource Include="Attendence\RDLC\rptMonthlyKPI.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource> </EmbeddedResource>
@ -413,9 +407,7 @@
<EmbeddedResource Include="RDLC\DateRangeMultipleJobCardNew.rdlc" /> <EmbeddedResource Include="RDLC\DateRangeMultipleJobCardNew.rdlc" />
<EmbeddedResource Include="RDLC\DateRangeMultipleJobCardSubNew.rdlc" /> <EmbeddedResource Include="RDLC\DateRangeMultipleJobCardSubNew.rdlc" />
<EmbeddedResource Include="RDLC\DepartmentalLeaveReport.rdlc" /> <EmbeddedResource Include="RDLC\DepartmentalLeaveReport.rdlc" />
<EmbeddedResource Include="RDLC\DigitalServiceBook.rdlc"> <EmbeddedResource Include="RDLC\DigitalServiceBook.rdlc" />
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="RDLC\DivisionWiseOT.rdlc" /> <EmbeddedResource Include="RDLC\DivisionWiseOT.rdlc" />
<EmbeddedResource Include="RDLC\EducationalInfo.rdlc" /> <EmbeddedResource Include="RDLC\EducationalInfo.rdlc" />
<EmbeddedResource Include="RDLC\EERS.rdlc" /> <EmbeddedResource Include="RDLC\EERS.rdlc" />

560
HRM.Report/RDLC/DigitalServiceBook.rdlc
View File

@ -1,227 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2016/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner"> <Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2008/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
<AutoRefresh>0</AutoRefresh>
<DataSources>
<DataSource Name="DigitalServiceBookDataSet">
<ConnectionProperties>
<DataProvider>System.Data.DataSet</DataProvider>
<ConnectString>/* Local Connection */</ConnectString>
</ConnectionProperties>
<rd:DataSourceID>d39c60b2-8a79-4bb8-aed2-7927b2b3603a</rd:DataSourceID>
</DataSource>
</DataSources>
<DataSets>
<DataSet Name="EMPDigitalServiceBook">
<Query>
<DataSourceName>DigitalServiceBookDataSet</DataSourceName>
<CommandText>/* Local Query */</CommandText>
</Query>
<Fields>
<Field Name="EMPLOYEEID">
<DataField>EMPLOYEEID</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="EMPLOYEENO">
<DataField>EMPLOYEENO</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="NAME">
<DataField>NAME</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="FATHERNAME">
<DataField>FATHERNAME</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="MOTHERNAME">
<DataField>MOTHERNAME</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="SPOUSENAME">
<DataField>SPOUSENAME</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="JOININGDATE">
<DataField>JOININGDATE</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="DESIGNATION">
<DataField>DESIGNATION</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="PARMANENTADDRESS">
<DataField>PARMANENTADDRESS</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="PRESENTADDRESS">
<DataField>PRESENTADDRESS</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="BIRTHDATE">
<DataField>BIRTHDATE</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="PHOTO">
<DataField>PHOTO</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="NIDNO">
<DataField>NIDNO</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="HEIGHT">
<DataField>HEIGHT</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="BLOODGROUP">
<DataField>BLOODGROUP</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="LMDESIGNATION">
<DataField>LMDESIGNATION</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="EDUCATIONLEVEL">
<DataField>EDUCATIONLEVEL</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="PARMANENTDISTRICT">
<DataField>PARMANENTDISTRICT</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="PARMANENTTHANA">
<DataField>PARMANENTTHANA</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DigitalServiceBookDataSet</rd:DataSetName>
<rd:SchemaPath>D:\LOCAL\SanofiNew\HRM.Report\PayrollDataSet\DigitalServiceBookDataSet.xsd</rd:SchemaPath>
<rd:TableName>EMPDigitalServiceBook</rd:TableName>
<rd:TableAdapterFillMethod />
<rd:TableAdapterGetDataMethod />
<rd:TableAdapterName />
</rd:DataSetInfo>
</DataSet>
<DataSet Name="SystemInformation">
<Query>
<DataSourceName>DigitalServiceBookDataSet</DataSourceName>
<CommandText>/* Local Query */</CommandText>
</Query>
<Fields>
<Field Name="NAME">
<DataField>NAME</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="CORPORATEADDRESS">
<DataField>CORPORATEADDRESS</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DigitalServiceBookDataSet</rd:DataSetName>
<rd:SchemaPath>D:\LOCAL\SanofiNew\HRM.Report\PayrollDataSet\DigitalServiceBookDataSet.xsd</rd:SchemaPath>
<rd:TableName>SystemInformation</rd:TableName>
<rd:TableAdapterFillMethod />
<rd:TableAdapterGetDataMethod />
<rd:TableAdapterName />
</rd:DataSetInfo>
</DataSet>
<DataSet Name="EMPLifecycle">
<Query>
<DataSourceName>DigitalServiceBookDataSet</DataSourceName>
<CommandText>/* Local Query */</CommandText>
</Query>
<Fields>
<Field Name="EFFECTDATE">
<DataField>EFFECTDATE</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="DESIGNATION">
<DataField>DESIGNATION</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="BASICSALARY">
<DataField>BASICSALARY</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="HOUSERENT">
<DataField>HOUSERENT</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="MEDICAL">
<DataField>MEDICAL</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="BONUS">
<DataField>BONUS</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DigitalServiceBookDataSet</rd:DataSetName>
<rd:SchemaPath>D:\SVN\cel.hrm\branches\SanofiNew\HRM.Report\PayrollDataSet\DigitalServiceBookDataSet.xsd</rd:SchemaPath>
<rd:TableName>EMPLifecycle</rd:TableName>
<rd:TableAdapterFillMethod />
<rd:TableAdapterGetDataMethod />
<rd:TableAdapterName />
</rd:DataSetInfo>
</DataSet>
<DataSet Name="LeaveEntry">
<Query>
<DataSourceName>DigitalServiceBookDataSet</DataSourceName>
<CommandText>/* Local Query */</CommandText>
</Query>
<Fields>
<Field Name="FROMDATE">
<DataField>FROMDATE</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="TODATE">
<DataField>TODATE</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="TOTALDAYS">
<DataField>TOTALDAYS</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DigitalServiceBookDataSet</rd:DataSetName>
<rd:SchemaPath>D:\LOCAL\SanofiNew\HRM.Report\PayrollDataSet\DigitalServiceBookDataSet.xsd</rd:SchemaPath>
<rd:TableName>LeaveEntry</rd:TableName>
<rd:TableAdapterFillMethod />
<rd:TableAdapterGetDataMethod />
<rd:TableAdapterName />
</rd:DataSetInfo>
</DataSet>
<DataSet Name="Complain">
<Query>
<DataSourceName>DigitalServiceBookDataSet</DataSourceName>
<CommandText>/* Local Query */</CommandText>
</Query>
<Fields>
<Field Name="EFFECTDATE">
<DataField>EFFECTDATE</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="DESCRIPTION">
<DataField>DESCRIPTION</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DigitalServiceBookDataSet</rd:DataSetName>
<rd:SchemaPath>D:\LOCAL\SanofiNew\HRM.Report\PayrollDataSet\DigitalServiceBookDataSet.xsd</rd:SchemaPath>
<rd:TableName>Complain</rd:TableName>
<rd:TableAdapterFillMethod />
<rd:TableAdapterGetDataMethod />
<rd:TableAdapterName />
</rd:DataSetInfo>
</DataSet>
</DataSets>
<ReportSections>
<ReportSection>
<Body> <Body>
<ReportItems> <ReportItems>
<Tablix Name="Tablix5"> <Tablix Name="Tablix5">
@ -402,7 +180,7 @@
<TextRun> <TextRun>
<Value>=Fields!EMPLOYEENO.Value</Value> <Value>=Fields!EMPLOYEENO.Value</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -464,7 +242,7 @@
<TextRun> <TextRun>
<Value>=Fields!EMPLOYEENO.Value</Value> <Value>=Fields!EMPLOYEENO.Value</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -691,7 +469,7 @@
<TextRun> <TextRun>
<Value>=Fields!FATHERNAME.Value</Value> <Value>=Fields!FATHERNAME.Value</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -732,7 +510,7 @@
<TextRun> <TextRun>
<Value>=Fields!FATHERNAME.Value</Value> <Value>=Fields!FATHERNAME.Value</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -778,7 +556,7 @@
<TextRun> <TextRun>
<Value>=Fields!MOTHERNAME.Value</Value> <Value>=Fields!MOTHERNAME.Value</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -819,7 +597,7 @@
<TextRun> <TextRun>
<Value>=Fields!MOTHERNAME.Value</Value> <Value>=Fields!MOTHERNAME.Value</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -952,7 +730,7 @@
<TextRun> <TextRun>
<Value>=Fields!PRESENTADDRESS.Value</Value> <Value>=Fields!PRESENTADDRESS.Value</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -993,7 +771,7 @@
<TextRun> <TextRun>
<Value>=Fields!PRESENTADDRESS.Value</Value> <Value>=Fields!PRESENTADDRESS.Value</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -2316,7 +2094,7 @@
<TextRun> <TextRun>
<Value>=First(Fields!PARMANENTADDRESS.Value, "EMPDigitalServiceBook")</Value> <Value>=First(Fields!PARMANENTADDRESS.Value, "EMPDigitalServiceBook")</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -2387,7 +2165,7 @@
<TextRun> <TextRun>
<Value>=First(Fields!PARMANENTTHANA.Value, "EMPDigitalServiceBook")</Value> <Value>=First(Fields!PARMANENTTHANA.Value, "EMPDigitalServiceBook")</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -2496,7 +2274,7 @@
<TextRun> <TextRun>
<Value>=First(Fields!PARMANENTDISTRICT.Value, "EMPDigitalServiceBook")</Value> <Value>=First(Fields!PARMANENTDISTRICT.Value, "EMPDigitalServiceBook")</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -2534,7 +2312,7 @@
<TextRun> <TextRun>
<Value>=First(Fields!PRESENTADDRESS.Value, "EMPDigitalServiceBook")</Value> <Value>=First(Fields!PRESENTADDRESS.Value, "EMPDigitalServiceBook")</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -2863,7 +2641,8 @@
<TextRun> <TextRun>
<Value>=Fields!NAME.Value</Value> <Value>=Fields!NAME.Value</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>9pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
</TextRuns> </TextRuns>
@ -2876,7 +2655,8 @@
<TextRun> <TextRun>
<Value>=Fields!CORPORATEADDRESS.Value</Value> <Value>=Fields!CORPORATEADDRESS.Value</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>9pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
</TextRuns> </TextRuns>
@ -5889,7 +5669,7 @@
<TextRun> <TextRun>
<Value>=First(Fields!FATHERNAME.Value, "EMPDigitalServiceBook")</Value> <Value>=First(Fields!FATHERNAME.Value, "EMPDigitalServiceBook")</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -5925,7 +5705,7 @@
<TextRun> <TextRun>
<Value>=First(Fields!MOTHERNAME.Value, "EMPDigitalServiceBook")</Value> <Value>=First(Fields!MOTHERNAME.Value, "EMPDigitalServiceBook")</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -5961,7 +5741,7 @@
<TextRun> <TextRun>
<Value>=First(Fields!SPOUSENAME.Value, "EMPDigitalServiceBook")</Value> <Value>=First(Fields!SPOUSENAME.Value, "EMPDigitalServiceBook")</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -6033,7 +5813,7 @@
<TextRun> <TextRun>
<Value>=First(Fields!NIDNO.Value, "EMPDigitalServiceBook")</Value> <Value>=First(Fields!NIDNO.Value, "EMPDigitalServiceBook")</Value>
<Style> <Style>
<FontFamily>SutonnyMJ</FontFamily> <FontFamily>times New Roman</FontFamily>
<FontSize>11pt</FontSize> <FontSize>11pt</FontSize>
</Style> </Style>
</TextRun> </TextRun>
@ -6408,84 +6188,226 @@
<BottomMargin>0.29in</BottomMargin> <BottomMargin>0.29in</BottomMargin>
<Style /> <Style />
</Page> </Page>
</ReportSection> <AutoRefresh>0</AutoRefresh>
</ReportSections> <DataSources>
<ReportParameters> <DataSource Name="DigitalServiceBookDataSet">
<ReportParameter Name="CompanyInfo"> <ConnectionProperties>
<DataType>String</DataType> <DataProvider>System.Data.DataSet</DataProvider>
<Nullable>true</Nullable> <ConnectString>/* Local Connection */</ConnectString>
<AllowBlank>true</AllowBlank> </ConnectionProperties>
<Prompt>ReportParameter1</Prompt> <rd:DataSourceID>d39c60b2-8a79-4bb8-aed2-7927b2b3603a</rd:DataSourceID>
</ReportParameter> </DataSource>
<ReportParameter Name="Logo"> </DataSources>
<DataType>String</DataType> <DataSets>
<Nullable>true</Nullable> <DataSet Name="EMPDigitalServiceBook">
<AllowBlank>true</AllowBlank> <Query>
<Prompt>ReportParameter1</Prompt> <DataSourceName>DigitalServiceBookDataSet</DataSourceName>
</ReportParameter> <CommandText>/* Local Query */</CommandText>
<ReportParameter Name="Address"> </Query>
<DataType>String</DataType> <Fields>
<Nullable>true</Nullable> <Field Name="EMPLOYEEID">
<AllowBlank>true</AllowBlank> <DataField>EMPLOYEEID</DataField>
<Prompt>ReportParameter1</Prompt> <rd:TypeName>System.String</rd:TypeName>
</ReportParameter> </Field>
<ReportParameter Name="SearchCriteria"> <Field Name="EMPLOYEENO">
<DataType>String</DataType> <DataField>EMPLOYEENO</DataField>
<Nullable>true</Nullable> <rd:TypeName>System.String</rd:TypeName>
<AllowBlank>true</AllowBlank> </Field>
<Prompt>ReportParameter1</Prompt> <Field Name="NAME">
</ReportParameter> <DataField>NAME</DataField>
<ReportParameter Name="Phone"> <rd:TypeName>System.String</rd:TypeName>
<DataType>String</DataType> </Field>
<Nullable>true</Nullable> <Field Name="FATHERNAME">
<AllowBlank>true</AllowBlank> <DataField>FATHERNAME</DataField>
<Prompt>ReportParameter1</Prompt> <rd:TypeName>System.String</rd:TypeName>
</ReportParameter> </Field>
<ReportParameter Name="Photo"> <Field Name="MOTHERNAME">
<DataType>String</DataType> <DataField>MOTHERNAME</DataField>
<Nullable>true</Nullable> <rd:TypeName>System.String</rd:TypeName>
<AllowBlank>true</AllowBlank> </Field>
<Prompt>ReportParameter1</Prompt> <Field Name="SPOUSENAME">
</ReportParameter> <DataField>SPOUSENAME</DataField>
</ReportParameters> <rd:TypeName>System.String</rd:TypeName>
<ReportParametersLayout> </Field>
<GridLayoutDefinition> <Field Name="JOININGDATE">
<NumberOfColumns>4</NumberOfColumns> <DataField>JOININGDATE</DataField>
<NumberOfRows>2</NumberOfRows> <rd:TypeName>System.String</rd:TypeName>
<CellDefinitions> </Field>
<CellDefinition> <Field Name="DESIGNATION">
<ColumnIndex>0</ColumnIndex> <DataField>DESIGNATION</DataField>
<RowIndex>0</RowIndex> <rd:TypeName>System.String</rd:TypeName>
<ParameterName>CompanyInfo</ParameterName> </Field>
</CellDefinition> <Field Name="PARMANENTADDRESS">
<CellDefinition> <DataField>PARMANENTADDRESS</DataField>
<ColumnIndex>1</ColumnIndex> <rd:TypeName>System.String</rd:TypeName>
<RowIndex>0</RowIndex> </Field>
<ParameterName>Logo</ParameterName> <Field Name="PRESENTADDRESS">
</CellDefinition> <DataField>PRESENTADDRESS</DataField>
<CellDefinition> <rd:TypeName>System.String</rd:TypeName>
<ColumnIndex>2</ColumnIndex> </Field>
<RowIndex>0</RowIndex> <Field Name="BIRTHDATE">
<ParameterName>Address</ParameterName> <DataField>BIRTHDATE</DataField>
</CellDefinition> <rd:TypeName>System.String</rd:TypeName>
<CellDefinition> </Field>
<ColumnIndex>3</ColumnIndex> <Field Name="PHOTO">
<RowIndex>0</RowIndex> <DataField>PHOTO</DataField>
<ParameterName>SearchCriteria</ParameterName> <rd:TypeName>System.String</rd:TypeName>
</CellDefinition> </Field>
<CellDefinition> <Field Name="NIDNO">
<ColumnIndex>0</ColumnIndex> <DataField>NIDNO</DataField>
<RowIndex>1</RowIndex> <rd:TypeName>System.String</rd:TypeName>
<ParameterName>Phone</ParameterName> </Field>
</CellDefinition> <Field Name="HEIGHT">
<CellDefinition> <DataField>HEIGHT</DataField>
<ColumnIndex>1</ColumnIndex> <rd:TypeName>System.String</rd:TypeName>
<RowIndex>1</RowIndex> </Field>
<ParameterName>Photo</ParameterName> <Field Name="BLOODGROUP">
</CellDefinition> <DataField>BLOODGROUP</DataField>
</CellDefinitions> <rd:TypeName>System.String</rd:TypeName>
</GridLayoutDefinition> </Field>
</ReportParametersLayout> <Field Name="LMDESIGNATION">
<DataField>LMDESIGNATION</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="EDUCATIONLEVEL">
<DataField>EDUCATIONLEVEL</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="PARMANENTDISTRICT">
<DataField>PARMANENTDISTRICT</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="PARMANENTTHANA">
<DataField>PARMANENTTHANA</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DigitalServiceBookDataSet</rd:DataSetName>
<rd:SchemaPath>D:\LOCAL\SanofiNew\HRM.Report\PayrollDataSet\DigitalServiceBookDataSet.xsd</rd:SchemaPath>
<rd:TableName>EMPDigitalServiceBook</rd:TableName>
<rd:TableAdapterFillMethod />
<rd:TableAdapterGetDataMethod />
<rd:TableAdapterName />
</rd:DataSetInfo>
</DataSet>
<DataSet Name="SystemInformation">
<Query>
<DataSourceName>DigitalServiceBookDataSet</DataSourceName>
<CommandText>/* Local Query */</CommandText>
</Query>
<Fields>
<Field Name="NAME">
<DataField>NAME</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="CORPORATEADDRESS">
<DataField>CORPORATEADDRESS</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DigitalServiceBookDataSet</rd:DataSetName>
<rd:SchemaPath>D:\LOCAL\SanofiNew\HRM.Report\PayrollDataSet\DigitalServiceBookDataSet.xsd</rd:SchemaPath>
<rd:TableName>SystemInformation</rd:TableName>
<rd:TableAdapterFillMethod />
<rd:TableAdapterGetDataMethod />
<rd:TableAdapterName />
</rd:DataSetInfo>
</DataSet>
<DataSet Name="EMPLifecycle">
<Query>
<DataSourceName>DigitalServiceBookDataSet</DataSourceName>
<CommandText>/* Local Query */</CommandText>
</Query>
<Fields>
<Field Name="EFFECTDATE">
<DataField>EFFECTDATE</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="DESIGNATION">
<DataField>DESIGNATION</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="BASICSALARY">
<DataField>BASICSALARY</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="HOUSERENT">
<DataField>HOUSERENT</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="MEDICAL">
<DataField>MEDICAL</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="BONUS">
<DataField>BONUS</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DigitalServiceBookDataSet</rd:DataSetName>
<rd:SchemaPath>D:\SVN\cel.hrm\branches\SanofiNew\HRM.Report\PayrollDataSet\DigitalServiceBookDataSet.xsd</rd:SchemaPath>
<rd:TableName>EMPLifecycle</rd:TableName>
<rd:TableAdapterFillMethod />
<rd:TableAdapterGetDataMethod />
<rd:TableAdapterName />
</rd:DataSetInfo>
</DataSet>
<DataSet Name="LeaveEntry">
<Query>
<DataSourceName>DigitalServiceBookDataSet</DataSourceName>
<CommandText>/* Local Query */</CommandText>
</Query>
<Fields>
<Field Name="FROMDATE">
<DataField>FROMDATE</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="TODATE">
<DataField>TODATE</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="TOTALDAYS">
<DataField>TOTALDAYS</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DigitalServiceBookDataSet</rd:DataSetName>
<rd:SchemaPath>D:\LOCAL\SanofiNew\HRM.Report\PayrollDataSet\DigitalServiceBookDataSet.xsd</rd:SchemaPath>
<rd:TableName>LeaveEntry</rd:TableName>
<rd:TableAdapterFillMethod />
<rd:TableAdapterGetDataMethod />
<rd:TableAdapterName />
</rd:DataSetInfo>
</DataSet>
<DataSet Name="Complain">
<Query>
<DataSourceName>DigitalServiceBookDataSet</DataSourceName>
<CommandText>/* Local Query */</CommandText>
</Query>
<Fields>
<Field Name="EFFECTDATE">
<DataField>EFFECTDATE</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="DESCRIPTION">
<DataField>DESCRIPTION</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
<rd:DataSetName>DigitalServiceBookDataSet</rd:DataSetName>
<rd:SchemaPath>D:\LOCAL\SanofiNew\HRM.Report\PayrollDataSet\DigitalServiceBookDataSet.xsd</rd:SchemaPath>
<rd:TableName>Complain</rd:TableName>
<rd:TableAdapterFillMethod />
<rd:TableAdapterGetDataMethod />
<rd:TableAdapterName />
</rd:DataSetInfo>
</DataSet>
</DataSets>
<rd:ReportUnitType>Inch</rd:ReportUnitType> <rd:ReportUnitType>Inch</rd:ReportUnitType>
<rd:ReportID>d4372a4e-ecfa-4ddb-8c60-7a03e554d1d6</rd:ReportID> <rd:ReportID>d4372a4e-ecfa-4ddb-8c60-7a03e554d1d6</rd:ReportID>
</Report> </Report>

2
HRM.Report/ReportProcessor.cs
View File

@ -3939,7 +3939,7 @@ namespace HRM.Report
{ {
byte[] bytes = null; byte[] bytes = null;
string RDLC = "HRM.Report.RDLC.DigitalServiceBook.rdlc";//AllDigitalServiceBook.rdlc"; string RDLC = "HRM.Report.RDLC.AllDigitalServiceBook.rdlc";
//string filePath = Path.Combine(folderPath, "../HRM.Report/RDLC/DigitalServiceBook.rdlc"); //string filePath = Path.Combine(folderPath, "../HRM.Report/RDLC/DigitalServiceBook.rdlc");
//string RDLC = filePath; //string RDLC = filePath;
//_PATH = Application.StartupPath + @"\Logo.jpg"; //_PATH = Application.StartupPath + @"\Logo.jpg";

4
HRM.UI/ClientApp/src/app/_services/attendance/attendance.service.ts
View File

@ -209,10 +209,6 @@ export class AttendanceServices {
// return this.apiService.httpGet<EmployeeWorkPlanSetup[]>('/Attendance' + '/getNotYetAssiged'); // return this.apiService.httpGet<EmployeeWorkPlanSetup[]>('/Attendance' + '/getNotYetAssiged');
return this.apiService.httpGet<Employee[]>('/Attendance' + '/getNotYetAssiged'); return this.apiService.httpGet<Employee[]>('/Attendance' + '/getNotYetAssiged');
} }
getLastAttnProcessDate() {
// return this.apiService.httpGet<EmployeeWorkPlanSetup[]>('/Attendance' + '/getNotYetAssiged');
return this.apiService.httpGet<Date>('/Attendance' + '/getLastAttnProcessDate');
}
getEmployeeWorkPlanSetupByWPGroupID(groupId: number) { getEmployeeWorkPlanSetupByWPGroupID(groupId: number) {
return this.apiService.httpGet<EmployeeWorkPlanSetup[]>('/Attendance' + '/getEmployeeWorkPlanSetupByWPGroupID' + '/' + groupId); return this.apiService.httpGet<EmployeeWorkPlanSetup[]>('/Attendance' + '/getEmployeeWorkPlanSetupByWPGroupID' + '/' + groupId);
} }

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

@ -2,7 +2,7 @@
<form> <form>
<div class="card card-w-title"> <div class="card card-w-title">
<div class="p-grid form-group"> <div class="p-grid form-group">
<div class="p-col-12 p-md-4"> <div class="p-col-12 p-md-5">
<div class="p-col-12"> <div class="p-col-12">
<label for="processFromDate">Process From</label> <label for="processFromDate">Process From</label>
</div> </div>
@ -17,7 +17,7 @@
</div> </div>
</div> </div>
<div class="p-col-12 p-md-4"> <div class="p-col-12 p-md-5">
<div class="p-col-12"> <div class="p-col-12">
<label for="processToDate">Process To</label> <label for="processToDate">Process To</label>
</div> </div>
@ -33,23 +33,12 @@
</div> </div>
<div class="p-col-12 p-md-2"> <div class="p-col-12 p-md-2">
<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/>
</div>
</div>
<div class="p-col-12 p-md-2" *ngIf="withEmployee">
<div class="p-col-12"> <div class="p-col-12">
<label for="employeePicker">Select Employee</label> <label for="employeePicker">Select Employee</label>
</div> </div>
<div class="p-col-12"> <div class="p-col-12">
<app-employee-picker <app-employee-picker
[MultiSelect]="true" [MultiSelect]="true"
[isActive]="withEmployee"
(ItemSelected)="GetSelectedEmployee($event)" (ItemSelected)="GetSelectedEmployee($event)"
></app-employee-picker> ></app-employee-picker>
</div> </div>
@ -58,11 +47,7 @@
<div class="p-grid form-group"> <div class="p-grid form-group">
<div class="p-col-12 p-md-5"> <div class="p-col-12 p-md-5">
<div class="p-col-12"> <div class="p-col-12">
<!-- <label for="txtLE">(Number of Attendance Employees : {{ employees.length }})</label> --> <label for="txtWP">(Number of Employees not in Work Plan : {{ employees.length }})</label>
<label for="txtWP">Number of Employees not in Work Plan : {{ employees.length }}</label>
</div>
<div class="p-col-12" *ngIf="lastProcessDate != null">
<label style="color: red;" for="txtWP">Last Process date : {{ lastProcessDate != null ? (lastProcessDate | date: 'dd MMM yyyy') : '' }}</label>
</div> </div>
<div class="p-col-12"> <div class="p-col-12">
<button icon="rotate" <button icon="rotate"

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

@ -23,9 +23,7 @@ export class AttendanceProcessComponent {
selectedEmployees: SearchEmployee[] = []; selectedEmployees: SearchEmployee[] = [];
notYetAssingedList: EmployeeWorkPlanSetup[]; notYetAssingedList: EmployeeWorkPlanSetup[];
employees: any[] = []; employees: any[] = [];
lastProcessDate: Date;
processStatus:string = ""; processStatus:string = "";
withEmployee: boolean = false;
constructor(public attnService: AttendanceServices, public datatransferservice: DataTransferService, constructor(public attnService: AttendanceServices, public datatransferservice: DataTransferService,
public loadingPanel: loadingPanelService, public loadingPanel: loadingPanelService,
public notificationService: HRMNotificationService, public notificationService: HRMNotificationService,
@ -48,17 +46,6 @@ export class AttendanceProcessComponent {
}, },
() => { () => {
}); });
this.attnService.getLastAttnProcessDate().subscribe(
(resp) => {
if (resp != null) {
this.lastProcessDate = new Date(resp);
}
},
(x) => {
},
() => {
});
} }
public GetSelectedEmployee(childData) { public GetSelectedEmployee(childData) {
@ -94,7 +81,6 @@ export class AttendanceProcessComponent {
attnRequest.push({ "fromDate": this.fromDate, "toDate": this.toDate, "isWithEmployee": true, "employeeID": 0 }); attnRequest.push({ "fromDate": this.fromDate, "toDate": this.toDate, "isWithEmployee": true, "employeeID": 0 });
if (this.withEmployee) {
if (this.selectedEmployees != undefined && this.selectedEmployees.length > 0) { if (this.selectedEmployees != undefined && this.selectedEmployees.length > 0) {
attnRequest = []; attnRequest = [];
this.selectedEmployees.forEach(x => { this.selectedEmployees.forEach(x => {
@ -102,12 +88,6 @@ export class AttendanceProcessComponent {
}); });
} }
else {
this.notificationService.showWarning('Please Select Employee!');
return;
}
}
this.loadingPanel.ShowLoadingPanel = true; this.loadingPanel.ShowLoadingPanel = true;
this.attnService.dailyAttnProcessManual(attnRequest).subscribe( this.attnService.dailyAttnProcessManual(attnRequest).subscribe(
@ -126,15 +106,4 @@ export class AttendanceProcessComponent {
this.processStatus = "Attendance Process is completed successfully."; this.processStatus = "Attendance Process is completed successfully.";
}); });
} }
public checkBoxChange() {
debugger
if (this.withEmployee) {
this.withEmployee = false;
this.selectedEmployees = [];
}
else
this.withEmployee = true;
}
} }

2
HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.html
View File

@ -66,7 +66,7 @@
</div> </div>
</form> </form>
</div> </div>
<kendo-grid [kendoGridBinding]="empWorkPlanSetupList" [height]="380" [filterable]="true"> <kendo-grid [data]="empWorkPlanSetupList" [height]="380" [filterable]="true" [kendoGridBinding]="empWorkPlanSetupList">
<ng-template kendoGridToolbarTemplate> <ng-template kendoGridToolbarTemplate>
<label>Count: {{ this.empWorkPlanSetupList.length }}</label> <label>Count: {{ this.empWorkPlanSetupList.length }}</label>
<kendo-grid-spacer></kendo-grid-spacer> <kendo-grid-spacer></kendo-grid-spacer>

8
HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.ts
View File

@ -141,7 +141,7 @@ export class EchotexRosterAssignmentComponent implements OnInit {
ewpList.workPlanGroupID = this.selectedWorkPlanID; ewpList.workPlanGroupID = this.selectedWorkPlanID;
var wp = this.workPlanGroupList.find(w => w.id == this.selectedWorkPlanID); var wp = this.workPlanGroupList.find(w => w.id == this.selectedWorkPlanID);
ewpList.workPlanGroupNameView = wp.name; ewpList.workPlanGroupNameView = wp.name;
// debugger; debugger;
if (!this.fixedWorkPlan) { if (!this.fixedWorkPlan) {
ewpList.startDate = this.startDate; ewpList.startDate = this.startDate;
// ewpList.weekEndOn = this.getDayOfWeekEnum(ewpList.startDate); // ewpList.weekEndOn = this.getDayOfWeekEnum(ewpList.startDate);
@ -209,7 +209,7 @@ export class EchotexRosterAssignmentComponent implements OnInit {
loadGroupTypeAndInitialShift(workPlanGroup: WorkPlanGroup) { loadGroupTypeAndInitialShift(workPlanGroup: WorkPlanGroup) {
this.loadingPanel.ShowLoadingPanel = true; this.loadingPanel.ShowLoadingPanel = true;
this.empWorkPlanSetupList = []; this.empWorkPlanSetupList = [];
// debugger; debugger;
// if (workPlanGroup.type != EnumWorkPlanGroup.Fixed && // if (workPlanGroup.type != EnumWorkPlanGroup.Fixed &&
// (workPlanGroup.type != undefined || workPlanGroup.type != null)) { // (workPlanGroup.type != undefined || workPlanGroup.type != null)) {
// this.fixedWorkPlan = false; // this.fixedWorkPlan = false;
@ -227,7 +227,7 @@ export class EchotexRosterAssignmentComponent implements OnInit {
}, },
() => { () => {
//console.log(this.empWorkPlanSetupList); //console.log(this.empWorkPlanSetupList);
// debugger; debugger;
// if (this.empWorkPlanSetupList.length > 0) { // if (this.empWorkPlanSetupList.length > 0) {
// if (this.empWorkPlanSetupList[0].workPlanGroupType != EnumWorkPlanGroup.Fixed && // if (this.empWorkPlanSetupList[0].workPlanGroupType != EnumWorkPlanGroup.Fixed &&
// (this.empWorkPlanSetupList[0].workPlanGroupType != undefined || this.empWorkPlanSetupList[0].workPlanGroupType != null)) { // (this.empWorkPlanSetupList[0].workPlanGroupType != undefined || this.empWorkPlanSetupList[0].workPlanGroupType != null)) {
@ -340,7 +340,7 @@ export class EchotexRosterAssignmentComponent implements OnInit {
} }
public getHolidayDayOfWeek(day: number): string { public getHolidayDayOfWeek(day: number): string {
// debugger; debugger;
day = day + 1; day = day + 1;
switch (day) { switch (day) {
case HolidayDayOfWeek.Sunday: case HolidayDayOfWeek.Sunday:

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

@ -534,12 +534,12 @@
class="bangla-font" pInputText style="width:100%" type="text"> class="bangla-font" pInputText style="width:100%" type="text">
</div> </div>
<!-- <div class="p-col-12 p-md-12 p-lg-12" style="margin: auto;" align="right"> <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)="saveBanglaPersonalInformation()"> (click)="saveBanglaPersonalInformation()">
Save Save
</button> </button>
</div> --> </div>
</div> </div>
</form> </form>
<form [formGroup]="contactForm"> <form [formGroup]="contactForm">

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

@ -578,9 +578,8 @@ export class GeneralComponent implements OnInit {
) )
} }
SaveBanglaContactInformation() { SaveBanglaContactInformation() {
this.saveBanglaPersonalInformation();
const data = { const data = {
employeeID: this.employeeService.hrEmployee.id, employeeNo: this.employeeService.hrEmployee.employeeNo,
presentPOInBangla: this.contact.presentPOInBangla, presentPOInBangla: this.contact.presentPOInBangla,
presentAddressInBangla: this.contact.presentAddressInBangla, presentAddressInBangla: this.contact.presentAddressInBangla,
parmanentPOInBangla: this.contact.parmanentPOInBangla, parmanentPOInBangla: this.contact.parmanentPOInBangla,

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

@ -688,10 +688,7 @@ export class ReportViewerComponent implements OnInit {
this.hiddenToDate = true; this.hiddenToDate = true;
this.hiddenExport = true; this.hiddenExport = true;
this.loadCurrentFiscalYear(); this.loadCurrentFiscalYear();
this.fromDate = new Date();
this.toDate = new Date(); this.toDate = new Date();
this.fromDateFormat = 'MMM yyyy';
this.toDateFormat = 'MMM yyyy';
this.PDFTitle = 'Multiple Employee Job Card'; this.PDFTitle = 'Multiple Employee Job Card';
this.apiService.selectedMenuName = 'Multiple Employee Job Card'; this.apiService.selectedMenuName = 'Multiple Employee Job Card';
} else if (this.reportType === '606') { } else if (this.reportType === '606') {
@ -733,7 +730,7 @@ export class ReportViewerComponent implements OnInit {
} else if (this.reportType === '714') { } else if (this.reportType === '714') {
// debugger; // debugger;
// this.SearchFrom = EnumSearchFrom.Attendance; this.SearchFrom = EnumSearchFrom.Attendance;
this.multiselect = true; this.multiselect = true;
this.hiddenFromDate = true; this.hiddenFromDate = true;
this.hiddenToDate = false; this.hiddenToDate = false;
@ -746,7 +743,7 @@ export class ReportViewerComponent implements OnInit {
this.apiService.selectedMenuName = 'Daily Absent'; this.apiService.selectedMenuName = 'Daily Absent';
} else if (this.reportType === '716') { } else if (this.reportType === '716') {
// debugger; // debugger;
// this.SearchFrom = EnumSearchFrom.Attendance; this.SearchFrom = EnumSearchFrom.Attendance;
this.multiselect = true; this.multiselect = true;
this.hiddenFromDate = true; this.hiddenFromDate = true;
this.hiddenToDate = false; this.hiddenToDate = false;

23
HRM.UI/Controllers/Attendance/AttendanceController.cs
View File

@ -12,7 +12,6 @@ using Microsoft.Extensions.Options;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.SqlTypes;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using static iTextSharp.text.pdf.AcroFields; using static iTextSharp.text.pdf.AcroFields;
@ -958,22 +957,6 @@ namespace HRM.UI.Controllers.Attendance
return Ok(items); return Ok(items);
} }
[HttpGet("getLastAttnProcessDate")]
public ActionResult getLastAttnProcessDate()
{
DateTime? date = new DateTime();
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
try
{
date = new DailyAttnProcessService().GetLastProcessDateUsingPayrollType((int)currentUser.PayrollTypeID);
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return Ok(date);
}
[HttpGet("getEmployeeWorkPlanSetupByWPGroupID/{groupId}")] [HttpGet("getEmployeeWorkPlanSetupByWPGroupID/{groupId}")]
public ActionResult GetEmployeeWorkPlanSetupByWPGroupID(int groupId) public ActionResult GetEmployeeWorkPlanSetupByWPGroupID(int groupId)
@ -2635,12 +2618,6 @@ namespace HRM.UI.Controllers.Attendance
(int)currentUser.PayrollTypeID); (int)currentUser.PayrollTypeID);
count++; count++;
} }
else
{
//employees = new EmployeeService().Get(EnumEmployeeStatus.Live, (int)currentUser.PayrollTypeID)
// .OrderBy(num => num.EmployeeNo.Length).ThenBy(num => Convert.ToInt32(num.EmployeeNo)).ToList();
//count++;
}
for (DateTime attDate = fromDate; attDate <= toDate; attDate = attDate.AddDays(1)) for (DateTime attDate = fromDate; attDate <= toDate; attDate = attDate.AddDays(1))
{ {

17
HRM.UI/Controllers/Employee/EmployeeController.cs
View File

@ -2085,7 +2085,7 @@ namespace HRM.UI.Controllers
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User); CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
var item = Newtonsoft.Json.JsonConvert.DeserializeObject(Convert.ToString(data)); var item = Newtonsoft.Json.JsonConvert.DeserializeObject(Convert.ToString(data));
int employeeID = Convert.ToInt32(item["employeeID"].ToObject<string>()); string employeeNo = (string)item["employeeNo"].ToObject<string>();
string presentPOInBangla = (string)item["presentPOInBangla"].ToObject<string>(); string presentPOInBangla = (string)item["presentPOInBangla"].ToObject<string>();
string presentAddressInBangla = (string)item["presentAddressInBangla"].ToObject<string>(); string presentAddressInBangla = (string)item["presentAddressInBangla"].ToObject<string>();
string parmanentPOInBangla = (string)item["parmanentPOInBangla"].ToObject<string>(); string parmanentPOInBangla = (string)item["parmanentPOInBangla"].ToObject<string>();
@ -2095,7 +2095,7 @@ namespace HRM.UI.Controllers
int ModifiedBy = currentUser.UserID; int ModifiedBy = currentUser.UserID;
List<object> employeBanglaInfo = new List<object>(); List<object> employeBanglaInfo = new List<object>();
employeBanglaInfo.Add(employeeID); employeBanglaInfo.Add(employeeNo);
employeBanglaInfo.Add(presentPOInBangla); employeBanglaInfo.Add(presentPOInBangla);
employeBanglaInfo.Add(presentAddressInBangla); employeBanglaInfo.Add(presentAddressInBangla);
employeBanglaInfo.Add(parmanentPOInBangla); employeBanglaInfo.Add(parmanentPOInBangla);
@ -2105,20 +2105,7 @@ namespace HRM.UI.Controllers
try try
{ {
EmpContact contact = _hrEmployeeService.GetEmpContacts(employeeID).FirstOrDefault();
if(contact != null)
new EmployeeService().UpdateBanglaContactInformation(employeBanglaInfo); new EmployeeService().UpdateBanglaContactInformation(employeBanglaInfo);
else
{
EmpContact ec = new EmpContact();
ec.EmployeeID = employeeID;
ec.PresentPOInBangla = presentPOInBangla;
ec.ParmanentPOInBangla = parmanentPOInBangla;
ec.PresentAddressInBangla = presentAddressInBangla;
ec.PermanentAddressInBangla = presentAddressInBangla;
_hrEmployeeService.SaveContact(ec);
}
} }
catch (Exception ex) catch (Exception ex)
{ {

2
HRM.UI/Controllers/Report/ReportController.cs
View File

@ -699,7 +699,7 @@ namespace HRM.UI.Controllers.Report
case EnumReportType.SalaryReconSummaryEcho: case EnumReportType.SalaryReconSummaryEcho:
break; break;
case EnumReportType.MultipleEmployeeJobCardEcho: case EnumReportType.MultipleEmployeeJobCardEcho:
bytes = new rptEcho().ShowJobCardMultiple(GlobalFunctions.FirstDateOfMonth(fromDate), GlobalFunctions.LastDateOfMonth(toDate), sEmpIDs, reportType, (int)currentUser.PayrollTypeID); bytes = new rptEcho().ShowJobCardMultiple(fromDate, toDate, sEmpIDs, reportType, (int)currentUser.PayrollTypeID);
break; break;
case EnumReportType.DailyPresentEcho: case EnumReportType.DailyPresentEcho:
bytes = new rptEcho().ShowDailyPresent(fromDate, sEmpIDs, reportType, (int)currentUser.PayrollTypeID); bytes = new rptEcho().ShowDailyPresent(fromDate, sEmpIDs, reportType, (int)currentUser.PayrollTypeID);

3
HRM.UI/HRM.UI.csproj
View File

@ -1244,9 +1244,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="RDLC\EmpDailyAttn.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="RDLC\IDCardPrint.rdlc"> <None Update="RDLC\IDCardPrint.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>

4
HRM.UI/RDLC/EmpDailyAttn.rdlc
View File

@ -2002,7 +2002,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>="Festival Holidays: "&amp;sum(cint(iif(Fields!Status.Value="N",1,0)))</Value> <Value>="Festival Holidays: "&amp;sum(cint(iif(Fields!Status.Value="H",1,0)))</Value>
<Style> <Style>
<FontSize>8pt</FontSize> <FontSize>8pt</FontSize>
<FontWeight>Bold</FontWeight> <FontWeight>Bold</FontWeight>
@ -2581,7 +2581,7 @@
<DataSetName>AttendenceDataSet_EmpDailyAttn</DataSetName> <DataSetName>AttendenceDataSet_EmpDailyAttn</DataSetName>
<Top>1.19931in</Top> <Top>1.19931in</Top>
<Height>0.86in</Height> <Height>0.86in</Height>
<Width>7.45202in</Width> <Width>7.45196in</Width>
<ZIndex>1</ZIndex> <ZIndex>1</ZIndex>
<Style> <Style>
<Border> <Border>