diff --git a/HRM.Report/Class/rptBonus.cs b/HRM.Report/Class/rptBonus.cs index 4647443..eb8debb 100644 --- a/HRM.Report/Class/rptBonus.cs +++ b/HRM.Report/Class/rptBonus.cs @@ -276,7 +276,9 @@ namespace HRM.Report dSet.Tables.Add(dTable); //string RDLC = "Payroll.Report.RDLC.rptEmpDesignWiseProdBonus.rdlc"; + string RDLC = "rptEmpDesignWiseProdBonus.rdlc"; + //string RDLC = "rptEmpDesignWiseProdBonusOld.rdlc"; List _reportParameters = new List(); ReportParameter rParam = new ReportParameter("Month", dBonusMonth.ToString("MMM yyyy")); diff --git a/HRM.Report/HRM.Report.csproj b/HRM.Report/HRM.Report.csproj index b3b32b4..aae2aa0 100644 --- a/HRM.Report/HRM.Report.csproj +++ b/HRM.Report/HRM.Report.csproj @@ -235,6 +235,7 @@ + @@ -519,7 +520,12 @@ - + + PreserveNewest + + + PreserveNewest + diff --git a/HRM.Report/RDLC/rptEmpDesignWiseProdBonus.rdlc b/HRM.Report/RDLC/rptEmpDesignWiseProdBonus.rdlc index b643db6..7be97f2 100644 --- a/HRM.Report/RDLC/rptEmpDesignWiseProdBonus.rdlc +++ b/HRM.Report/RDLC/rptEmpDesignWiseProdBonus.rdlc @@ -162,7 +162,7 @@ - ="Department: " &Fields!Department.Value + ="Design No: " &Fields!DesignNo.Value + + + + + + + + + 0.59375in + + + 1.47708in + + + 1in + + + 0.80517in + + + 0.75in + + + 0.75in + + + 0.75in + + + 0.55429in + + + 0.51751in + + + 0.5022in + + + 0.46875in + + + + + 0.25in + + + + + true + true + + + + + Employee No + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Name + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Designation + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Design No + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Amount + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Start Date + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + End Date + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Working Hour + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Scheduled Hour + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Bonus Hour + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + OT Hour + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.16667in + + + + + true + true + + + + + =Fields!EmployeeNo.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Name.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Designation.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!DesignNo.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Amount.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!StartDate.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!EndDate.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =CDBL(Fields!WorkingHour.Value) + + + + + + + WorkingHour + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =CDBL(Fields!ScheduledHour.Value) + + + + + + + ScheduledHour + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =CDBL(Fields!BonusHour.Value) + + + + + + + OTHour + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =CDBL(Fields!OTHour.Value) + + + + + + + OTHour1 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.25in + + + + + true + true + + + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Total + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(cdbl(Fields!Amount.Value)) + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + WhiteSmoke + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + + + + + + + After + true + true + + + + Detail + + + + + Detail_Collection + Output + true + + + Before + true + + + + PayrollDataSet_dtEmpDesWiseProdBonus + 0.5in + 0.66667in + 8.16875in + 1 + + + + + + + 1.7in + 0.25in + 6in + + + + External + ="file:///" & Parameters!Logo.Value + image/bmp + Fit + 0.725in + 1.7in + 1 + + + + + + + true + true + + + + + =Parameters!Address.Value + + + + + + + + + + + + + 0.025in + 6.775in + 0.2in + 1.35in + + + + true + true + + + + + ="Print Date & Time: " & Format(Today(), "dd MMM yyyy") + + + + + + + textbox18 + 0.025in + 4.89792in + 0.2in + 1.68542in + 1 + + + +