diff --git a/HRM.Report/Class/rptDigitalServiceBook.cs b/HRM.Report/Class/rptDigitalServiceBook.cs
index 83bd4d2..019a5b3 100644
--- a/HRM.Report/Class/rptDigitalServiceBook.cs
+++ b/HRM.Report/Class/rptDigitalServiceBook.cs
@@ -1,11 +1,13 @@
-using System;
+using HRM.BO;
+using HRM.DA;
+using System;
 using System.Collections.Generic;
+using System.Data;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Data;
-using HRM.BO;
-using HRM.DA;
+using static HRM.Report.PayrollDataSet.PayrollDataSet;
 
 namespace HRM.Report
 {
@@ -19,6 +21,10 @@ namespace HRM.Report
             if (sEmpIDs != null)
                 empID = Convert.ToInt32(sEmpIDs);
 
+            //string TargetFolder = @"Documents\EMPPHOTO\";
+            //string currentDirectory = Directory.GetCurrentDirectory();
+            string TargetFolder = System.IO.Path.Combine(System.Environment.CurrentDirectory + @"\Documents\EMPPHOTO\");
+
             #region Employee general info
 
             DataSet oEmp = new EmployeeService().GetEmpDigitalServiceBook(empID);
@@ -75,6 +81,9 @@ namespace HRM.Report
                 oDR["ROADNOTA"] = oDRow["ROADNOTA"];
                 oDR["WARDNOTA"] = oDRow["WARDNOTA"];
 
+                oDR["PHOTO"] = System.IO.Path.Combine(TargetFolder + string.Format("Image-{0}.jpg", oDRow["EMPLOYEENO"]));
+                oDR["SIGNATURE"] = System.IO.Path.Combine(TargetFolder + string.Format("Signature-{0}.jpg", oDRow["EMPLOYEENO"]));
+
 
                 dTable.Rows.Add(oDR);
                 //count++;
diff --git a/HRM.Report/PayrollDataSet/DigitalServiceBookDataSet.Designer.cs b/HRM.Report/PayrollDataSet/DigitalServiceBookDataSet.Designer.cs
index 542fac9..6fa7d05 100644
--- a/HRM.Report/PayrollDataSet/DigitalServiceBookDataSet.Designer.cs
+++ b/HRM.Report/PayrollDataSet/DigitalServiceBookDataSet.Designer.cs
@@ -479,6 +479,8 @@ namespace HRM.Report.PayrollDataSet {
             
             private global::System.Data.DataColumn columnWARDNOTA;
             
+            private global::System.Data.DataColumn columnSIGNATURE;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public EMPDigitalServiceBookDataTable() {
@@ -746,6 +748,14 @@ namespace HRM.Report.PayrollDataSet {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn SIGNATUREColumn {
+                get {
+                    return this.columnSIGNATURE;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -812,7 +822,8 @@ namespace HRM.Report.PayrollDataSet {
                         string THANATA, 
                         string VILLAGETA, 
                         string ROADNOTA, 
-                        string WARDNOTA) {
+                        string WARDNOTA, 
+                        string SIGNATURE) {
                 EMPDigitalServiceBookRow rowEMPDigitalServiceBookRow = ((EMPDigitalServiceBookRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         EMPLOYEEID,
@@ -843,7 +854,8 @@ namespace HRM.Report.PayrollDataSet {
                         THANATA,
                         VILLAGETA,
                         ROADNOTA,
-                        WARDNOTA};
+                        WARDNOTA,
+                        SIGNATURE};
                 rowEMPDigitalServiceBookRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowEMPDigitalServiceBookRow);
                 return rowEMPDigitalServiceBookRow;
@@ -895,6 +907,7 @@ namespace HRM.Report.PayrollDataSet {
                 this.columnVILLAGETA = base.Columns["VILLAGETA"];
                 this.columnROADNOTA = base.Columns["ROADNOTA"];
                 this.columnWARDNOTA = base.Columns["WARDNOTA"];
+                this.columnSIGNATURE = base.Columns["SIGNATURE"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -958,6 +971,8 @@ namespace HRM.Report.PayrollDataSet {
                 base.Columns.Add(this.columnROADNOTA);
                 this.columnWARDNOTA = new global::System.Data.DataColumn("WARDNOTA", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnWARDNOTA);
+                this.columnSIGNATURE = new global::System.Data.DataColumn("SIGNATURE", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnSIGNATURE);
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2687,6 +2702,22 @@ namespace HRM.Report.PayrollDataSet {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string SIGNATURE {
+                get {
+                    try {
+                        return ((string)(this[this.tableEMPDigitalServiceBook.SIGNATUREColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'SIGNATURE\' in table \'EMPDigitalServiceBook\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableEMPDigitalServiceBook.SIGNATUREColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IsEMPLOYEEIDNull() {
@@ -3034,6 +3065,18 @@ namespace HRM.Report.PayrollDataSet {
             public void SetWARDNOTANull() {
                 this[this.tableEMPDigitalServiceBook.WARDNOTAColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsSIGNATURENull() {
+                return this.IsNull(this.tableEMPDigitalServiceBook.SIGNATUREColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetSIGNATURENull() {
+                this[this.tableEMPDigitalServiceBook.SIGNATUREColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
diff --git a/HRM.Report/PayrollDataSet/DigitalServiceBookDataSet.xsd b/HRM.Report/PayrollDataSet/DigitalServiceBookDataSet.xsd
index 2ba45f5..e40fd38 100644
--- a/HRM.Report/PayrollDataSet/DigitalServiceBookDataSet.xsd
+++ b/HRM.Report/PayrollDataSet/DigitalServiceBookDataSet.xsd
@@ -44,6 +44,7 @@
               <xs:element name="VILLAGETA" msprop:Generator_ColumnPropNameInRow="VILLAGETA" msprop:Generator_ColumnPropNameInTable="VILLAGETAColumn" msprop:Generator_ColumnVarNameInTable="columnVILLAGETA" msprop:Generator_UserColumnName="VILLAGETA" type="xs:string" minOccurs="0" />
               <xs:element name="ROADNOTA" msprop:Generator_ColumnPropNameInRow="ROADNOTA" msprop:Generator_ColumnPropNameInTable="ROADNOTAColumn" msprop:Generator_ColumnVarNameInTable="columnROADNOTA" msprop:Generator_UserColumnName="ROADNOTA" type="xs:string" minOccurs="0" />
               <xs:element name="WARDNOTA" msprop:Generator_ColumnPropNameInRow="WARDNOTA" msprop:Generator_ColumnPropNameInTable="WARDNOTAColumn" msprop:Generator_ColumnVarNameInTable="columnWARDNOTA" msprop:Generator_UserColumnName="WARDNOTA" type="xs:string" minOccurs="0" />
+              <xs:element name="SIGNATURE" msprop:Generator_ColumnPropNameInRow="SIGNATURE" msprop:Generator_ColumnPropNameInTable="SIGNATUREColumn" msprop:Generator_ColumnVarNameInTable="columnSIGNATURE" msprop:Generator_UserColumnName="SIGNATURE" type="xs:string" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
diff --git a/HRM.Report/RDLC/DigitalServiceBook.rdlc b/HRM.Report/RDLC/DigitalServiceBook.rdlc
index bcbbe7b..237ff0e 100644
--- a/HRM.Report/RDLC/DigitalServiceBook.rdlc
+++ b/HRM.Report/RDLC/DigitalServiceBook.rdlc
@@ -133,6 +133,10 @@
           <DataField>WARDNOTA</DataField>
           <rd:TypeName>System.String</rd:TypeName>
         </Field>
+        <Field Name="SIGNATURE">
+          <DataField>SIGNATURE</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
       </Fields>
       <rd:DataSetInfo>
         <rd:DataSetName>DigitalServiceBookDataSet</rd:DataSetName>
@@ -905,7 +909,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox21</rd:DefaultName>
-            <Top>8.88506in</Top>
+            <Top>9.38506in</Top>
             <Left>0.71685in</Left>
             <Height>0.25in</Height>
             <Width>0.8125in</Width>
@@ -938,7 +942,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox21</rd:DefaultName>
-            <Top>8.88506in</Top>
+            <Top>9.38506in</Top>
             <Left>4.7911in</Left>
             <Height>0.25in</Height>
             <Width>1.88541in</Width>
@@ -4545,8 +4549,8 @@
             </Style>
           </Tablix>
           <Image Name="image2">
-            <Source>Database</Source>
-            <Value>=First(Fields!PHOTO.Value, "EMPDigitalServiceBook")</Value>
+            <Source>External</Source>
+            <Value>="file:///" &amp; First(Fields!PHOTO.Value, "EMPDigitalServiceBook")</Value>
             <MIMEType>image/jpeg</MIMEType>
             <Sizing>Fit</Sizing>
             <Top>1.93056in</Top>
@@ -4554,7 +4558,6 @@
             <Height>1.20833in</Height>
             <Width>0.99361in</Width>
             <ZIndex>38</ZIndex>
-            <ToolTip>=First(Fields!PHOTO.Value, "EMPDigitalServiceBook")</ToolTip>
             <Style>
               <Border>
                 <Style>Solid</Style>
@@ -5339,6 +5342,22 @@
               <PaddingBottom>2pt</PaddingBottom>
             </Style>
           </Textbox>
+          <Image Name="image3">
+            <Source>External</Source>
+            <Value>="file:///" &amp; First(Fields!SIGNATURE.Value, "EMPDigitalServiceBook")</Value>
+            <MIMEType>image/bmp</MIMEType>
+            <Sizing>Fit</Sizing>
+            <Top>8.78145in</Top>
+            <Left>0.70849in</Left>
+            <Height>0.49153in</Height>
+            <Width>1.1646in</Width>
+            <ZIndex>62</ZIndex>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+            </Style>
+          </Image>
         </ReportItems>
         <Height>20.35496in</Height>
         <Style />