Govt service book report, Job card Bug fix

(Task No - 20250317-0072)
2025-03-17 15:04:14 +06:00 · 2025-03-17 15:04:14 +06:00 · 4b7e9c47b1
commit 4b7e9c47b1
parent 38a0a298d1
7 changed files with 6295 additions and 6203 deletions
--- a/HRM.Report/Attendence/RDLC/MultipleJobCardSub.rdlc
+++ b/HRM.Report/Attendence/RDLC/MultipleJobCardSub.rdlc
@ -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>
--- a/HRM.Report/Class/rptDigitalServiceBook.cs
+++ b/HRM.Report/Class/rptDigitalServiceBook.cs
@ -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

--- a/HRM.Report/HRM.Report.csproj
+++ b/HRM.Report/HRM.Report.csproj
@ -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" />
--- a/HRM.Report/RDLC/DigitalServiceBook.rdlc
+++ b/HRM.Report/RDLC/DigitalServiceBook.rdlc
@ -1,5 +1,227 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2008/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
+<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2016/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>
        <ReportItems>
          <Tablix Name="Tablix5">
@ -180,7 +402,7 @@
                                <TextRun>
                                  <Value>=Fields!EMPLOYEENO.Value</Value>
                                  <Style>
-                                <FontFamily>times New Roman</FontFamily>
+                                    <FontFamily>SutonnyMJ</FontFamily>
                                    <FontSize>11pt</FontSize>
                                  </Style>
                                </TextRun>
@ -242,7 +464,7 @@
                                <TextRun>
                                  <Value>=Fields!EMPLOYEENO.Value</Value>
                                  <Style>
-                                <FontFamily>times New Roman</FontFamily>
+                                    <FontFamily>SutonnyMJ</FontFamily>
                                    <FontSize>11pt</FontSize>
                                  </Style>
                                </TextRun>
@ -469,7 +691,7 @@
                                <TextRun>
                                  <Value>=Fields!FATHERNAME.Value</Value>
                                  <Style>
-                                <FontFamily>times New Roman</FontFamily>
+                                    <FontFamily>SutonnyMJ</FontFamily>
                                    <FontSize>11pt</FontSize>
                                  </Style>
                                </TextRun>
@ -510,7 +732,7 @@
                                <TextRun>
                                  <Value>=Fields!FATHERNAME.Value</Value>
                                  <Style>
-                                <FontFamily>times New Roman</FontFamily>
+                                    <FontFamily>SutonnyMJ</FontFamily>
                                    <FontSize>11pt</FontSize>
                                  </Style>
                                </TextRun>
@ -556,7 +778,7 @@
                                <TextRun>
                                  <Value>=Fields!MOTHERNAME.Value</Value>
                                  <Style>
-                                <FontFamily>times New Roman</FontFamily>
+                                    <FontFamily>SutonnyMJ</FontFamily>
                                    <FontSize>11pt</FontSize>
                                  </Style>
                                </TextRun>
@ -597,7 +819,7 @@
                                <TextRun>
                                  <Value>=Fields!MOTHERNAME.Value</Value>
                                  <Style>
-                                <FontFamily>times New Roman</FontFamily>
+                                    <FontFamily>SutonnyMJ</FontFamily>
                                    <FontSize>11pt</FontSize>
                                  </Style>
                                </TextRun>
@ -730,7 +952,7 @@
                                <TextRun>
                                  <Value>=Fields!PRESENTADDRESS.Value</Value>
                                  <Style>
-                                <FontFamily>times New Roman</FontFamily>
+                                    <FontFamily>SutonnyMJ</FontFamily>
                                    <FontSize>11pt</FontSize>
                                  </Style>
                                </TextRun>
@ -771,7 +993,7 @@
                                <TextRun>
                                  <Value>=Fields!PRESENTADDRESS.Value</Value>
                                  <Style>
-                                <FontFamily>times New Roman</FontFamily>
+                                    <FontFamily>SutonnyMJ</FontFamily>
                                    <FontSize>11pt</FontSize>
                                  </Style>
                                </TextRun>
@ -2094,7 +2316,7 @@
                  <TextRun>
                    <Value>=First(Fields!PARMANENTADDRESS.Value, "EMPDigitalServiceBook")</Value>
                    <Style>
-                  <FontFamily>times New Roman</FontFamily>
+                      <FontFamily>SutonnyMJ</FontFamily>
                      <FontSize>11pt</FontSize>
                    </Style>
                  </TextRun>
@ -2165,7 +2387,7 @@
                  <TextRun>
                    <Value>=First(Fields!PARMANENTTHANA.Value, "EMPDigitalServiceBook")</Value>
                    <Style>
-                  <FontFamily>times New Roman</FontFamily>
+                      <FontFamily>SutonnyMJ</FontFamily>
                      <FontSize>11pt</FontSize>
                    </Style>
                  </TextRun>
@ -2274,7 +2496,7 @@
                  <TextRun>
                    <Value>=First(Fields!PARMANENTDISTRICT.Value, "EMPDigitalServiceBook")</Value>
                    <Style>
-                  <FontFamily>times New Roman</FontFamily>
+                      <FontFamily>SutonnyMJ</FontFamily>
                      <FontSize>11pt</FontSize>
                    </Style>
                  </TextRun>
@ -2312,7 +2534,7 @@
                  <TextRun>
                    <Value>=First(Fields!PRESENTADDRESS.Value, "EMPDigitalServiceBook")</Value>
                    <Style>
-                  <FontFamily>times New Roman</FontFamily>
+                      <FontFamily>SutonnyMJ</FontFamily>
                      <FontSize>11pt</FontSize>
                    </Style>
                  </TextRun>
@ -2641,8 +2863,7 @@
                                <TextRun>
                                  <Value>=Fields!NAME.Value</Value>
                                  <Style>
-                                <FontFamily>times New Roman</FontFamily>
-                                <FontSize>9pt</FontSize>
+                                    <FontFamily>SutonnyMJ</FontFamily>
                                  </Style>
                                </TextRun>
                              </TextRuns>
@ -2655,8 +2876,7 @@
                                <TextRun>
                                  <Value>=Fields!CORPORATEADDRESS.Value</Value>
                                  <Style>
-                                <FontFamily>times New Roman</FontFamily>
-                                <FontSize>9pt</FontSize>
+                                    <FontFamily>SutonnyMJ</FontFamily>
                                  </Style>
                                </TextRun>
                              </TextRuns>
@ -5669,7 +5889,7 @@
                  <TextRun>
                    <Value>=First(Fields!FATHERNAME.Value, "EMPDigitalServiceBook")</Value>
                    <Style>
-                  <FontFamily>times New Roman</FontFamily>
+                      <FontFamily>SutonnyMJ</FontFamily>
                      <FontSize>11pt</FontSize>
                    </Style>
                  </TextRun>
@ -5705,7 +5925,7 @@
                  <TextRun>
                    <Value>=First(Fields!MOTHERNAME.Value, "EMPDigitalServiceBook")</Value>
                    <Style>
-                  <FontFamily>times New Roman</FontFamily>
+                      <FontFamily>SutonnyMJ</FontFamily>
                      <FontSize>11pt</FontSize>
                    </Style>
                  </TextRun>
@ -5741,7 +5961,7 @@
                  <TextRun>
                    <Value>=First(Fields!SPOUSENAME.Value, "EMPDigitalServiceBook")</Value>
                    <Style>
-                  <FontFamily>times New Roman</FontFamily>
+                      <FontFamily>SutonnyMJ</FontFamily>
                      <FontSize>11pt</FontSize>
                    </Style>
                  </TextRun>
@ -5813,7 +6033,7 @@
                  <TextRun>
                    <Value>=First(Fields!NIDNO.Value, "EMPDigitalServiceBook")</Value>
                    <Style>
-                  <FontFamily>times New Roman</FontFamily>
+                      <FontFamily>SutonnyMJ</FontFamily>
                      <FontSize>11pt</FontSize>
                    </Style>
                  </TextRun>
@ -6188,226 +6408,84 @@
        <BottomMargin>0.29in</BottomMargin>
        <Style />
      </Page>
-  <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>
+    </ReportSection>
+  </ReportSections>
+  <ReportParameters>
+    <ReportParameter Name="CompanyInfo">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+    <ReportParameter Name="Logo">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+    <ReportParameter Name="Address">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+    <ReportParameter Name="SearchCriteria">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+    <ReportParameter Name="Phone">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+    <ReportParameter Name="Photo">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+  </ReportParameters>
+  <ReportParametersLayout>
+    <GridLayoutDefinition>
+      <NumberOfColumns>4</NumberOfColumns>
+      <NumberOfRows>2</NumberOfRows>
+      <CellDefinitions>
+        <CellDefinition>
+          <ColumnIndex>0</ColumnIndex>
+          <RowIndex>0</RowIndex>
+          <ParameterName>CompanyInfo</ParameterName>
+        </CellDefinition>
+        <CellDefinition>
+          <ColumnIndex>1</ColumnIndex>
+          <RowIndex>0</RowIndex>
+          <ParameterName>Logo</ParameterName>
+        </CellDefinition>
+        <CellDefinition>
+          <ColumnIndex>2</ColumnIndex>
+          <RowIndex>0</RowIndex>
+          <ParameterName>Address</ParameterName>
+        </CellDefinition>
+        <CellDefinition>
+          <ColumnIndex>3</ColumnIndex>
+          <RowIndex>0</RowIndex>
+          <ParameterName>SearchCriteria</ParameterName>
+        </CellDefinition>
+        <CellDefinition>
+          <ColumnIndex>0</ColumnIndex>
+          <RowIndex>1</RowIndex>
+          <ParameterName>Phone</ParameterName>
+        </CellDefinition>
+        <CellDefinition>
+          <ColumnIndex>1</ColumnIndex>
+          <RowIndex>1</RowIndex>
+          <ParameterName>Photo</ParameterName>
+        </CellDefinition>
+      </CellDefinitions>
+    </GridLayoutDefinition>
+  </ReportParametersLayout>
  <rd:ReportUnitType>Inch</rd:ReportUnitType>
  <rd:ReportID>d4372a4e-ecfa-4ddb-8c60-7a03e554d1d6</rd:ReportID>
 </Report>
--- a/HRM.Report/ReportProcessor.cs
+++ b/HRM.Report/ReportProcessor.cs
@ -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";
--- a/HRM.UI/HRM.UI.csproj
+++ b/HRM.UI/HRM.UI.csproj
@ -1244,6 +1244,9 @@
 	</ItemGroup>

 	<ItemGroup>
+	  <None Update="RDLC\EmpDailyAttn.rdlc">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
 	  <None Update="RDLC\IDCardPrint.rdlc">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </None>
--- a/HRM.UI/RDLC/EmpDailyAttn.rdlc
+++ b/HRM.UI/RDLC/EmpDailyAttn.rdlc
@ -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>