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

Govt service book report, Job card Bug fix

Browse Source 
(Task No - 20250317-0072)
This commit is contained in:
mashfiq 2025-03-17 15:04:14 +06:00
parent 38a0a298d1
commit 4b7e9c47b1
7 changed files with 6295 additions and 6203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

12
HRM.Report/HRM.Report.csproj
View File

@ -327,8 +327,12 @@
<EmbeddedResource Include="Attendence\RDLC\MonthlyDetailAttnEcho.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Attendence\RDLC\MultipleJobCard.rdlc" />
<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">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
@ -409,7 +413,9 @@
<EmbeddedResource Include="RDLC\DateRangeMultipleJobCardNew.rdlc" />
<EmbeddedResource Include="RDLC\DateRangeMultipleJobCardSubNew.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\EducationalInfo.rdlc" />
<EmbeddedResource Include="RDLC\EERS.rdlc" />

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

File diff suppressed because it is too large Load Diff

2
HRM.Report/ReportProcessor.cs
View File

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

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

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

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

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