Merge pull request 'dev_chapal' (#29) from dev_chapal into devqc

Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/29

HRM.Report/Attendence/Class/AttendanceReport.cs

@@ -1242,6 +1242,7 @@ namespace HRM.Report
             string shortAttnType = "";
             if (!(dAttnProcessess == null || dAttnProcessess.Count <= 0))
             {
+                dAttnProcessess= dAttnProcessess.OrderBy(x => x.AttnDate).ToList();   
                 foreach (DailyAttnProcess dAttnProcess in dAttnProcessess)
                 {
                     sLeaveName = string.Empty;
@@ -1413,10 +1414,10 @@ namespace HRM.Report
                     dTable.Rows.Add(Rowbody);
                 }
             }
-            DataView dv = dTable.DefaultView;
+            //DataView dv = dTable.DefaultView;
-            dv.Sort = "Date ASC";
+            //dv.Sort = "Date ASC";
-            DataTable sortedDT = dv.ToTable();
+            //DataTable sortedDT = dv.ToTable();
-            return sortedDT;
+            return dTable;
         }
 
         public DataTable GetEmpDailyAttn(int EmpID, DateTime dFromDate, DateTime dToDate, int PayrollTypeID)

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

@@ -10,19 +10,27 @@
                                 <div class="p-col-12">
                                     <div style="position: relative; display: inline-block;">
                                         <img id="imgProfilePicture" [src]="employeePhoto"
-                                            style="height: 180px; width: 180px; border-radius: 50%; border: 1px solid #52527A;" />
+                                             style="height: 180px; width: 180px; border-radius: 50%; border: 1px solid #52527A;" />
                                         <button class="editImage" (click)="fileInput.click()"
-                                            style="position: absolute; bottom: 18px; right: 18px;">
+                                                style="position: absolute; bottom: 18px; right: 18px;">
                                             <span class="editIcon">&#9998;</span>
                                         </button>
                                     </div>
+                                    <div style="position: relative; display: inline-block;">
+                                        <img id="imgEmpSigneture" [src]="empSigneture"
+                                             style="height: 60px; width: 180px; border-radius: 10px; border: 1px solid #52527A;" />
+                                        
+                                    </div>
+                                    
                                 </div>
                             </div>
                             <div class="p-col-12 p-md-12 p-lg-12" align="center">
                                 <input formControlName="empPhoto" id="fupEmpPhoto" #fileInput
                                     (change)="selectFile($event)" type="file" style="display: none;">
                             </div>
-                            <div class="p-col-12 p-md-12 p-lg-12" style="height: 76px;"></div>
+                            <div class="p-col-12 p-md-12 p-lg-12" style="height: 76px;">
+                                
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -601,4 +609,4 @@
         Access Card
     </kendo-dialog-titlebar>
     <app-access-card-management [SetEmployee]="pickerEmployee" ></app-access-card-management>
-</kendo-dialog>
+</kendo-dialog>

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

@@ -104,6 +104,7 @@ export class GeneralComponent implements OnInit {
     selectedFiles?: FileList;
     currentFile?: File;
     employeePhoto: any;
+    empSigneture: any;
     occupations: Occupation[];
     newUser: boolean = false;
     userid: number;
@@ -229,7 +230,7 @@ export class GeneralComponent implements OnInit {
             maxValue: new FormControl(),
             insuranceId: new FormControl(''),
             inclusionDate: new FormControl(),
-            //signature: new FormControl()
+            empSigneture: new FormControl(),
             dateOfRetirement: new FormControl(),
             spouseNameBangla: new FormControl(),
             spouseName: new FormControl(),
@@ -246,6 +247,7 @@ export class GeneralComponent implements OnInit {
             (resp: any) => {
                 this.hrEmployee = resp;
                 //console.log(this.hrEmployee);
+                debugger;
                 if (this.hrEmployee.id !== undefined && this.hrEmployee.id !== 0) {
                     this.showEmpImage();
                     this.userid = undefined;
@@ -253,6 +255,7 @@ export class GeneralComponent implements OnInit {
                     emp.employeeID = this.employeeService.hrEmployee.id;
                     emp.employeeNo = this.employeeService.hrEmployee.employeeNo;
                     emp.name = this.employeeService.hrEmployee.name;
+                    //this.employeePhoto = this.employeeService.hrEmployee.photoPath;
                     this.pickerEmployee = emp;
                     if (this.hrEmployee.lineManagerID > 0) {
                         this.getLineManager();
@@ -363,6 +366,7 @@ export class GeneralComponent implements OnInit {
         this.employeeService.GetuploadEmpFile(this.hrEmployee.id, this.hrEmployee.id, enumEmpFileUploadType.Profile_Picture).subscribe(
             (resp: any) => {
                 if (resp) {
+                   
                     this.employeePhoto = this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp}`);
                 } else {
                     this.employeePhoto = this.defaultPhoto;
@@ -372,6 +376,26 @@ export class GeneralComponent implements OnInit {
             (err: any) => {
 
 
+                this.loadingPanel.ShowLoadingPanel = false;
+                this.notificationService.showError(err.error);
+            },
+            () => {
+                this.loadingPanel.ShowLoadingPanel = false;
+            }
+        );
+        this.employeeService.GetuploadEmpFile(this.hrEmployee.id, this.hrEmployee.id, enumEmpFileUploadType.signature).subscribe(
+            (resp: any) => {
+                if (resp) {
+
+                    this.empSigneture = this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp}`);
+                } else {
+                    this.employeePhoto = this.defaultPhoto;
+                }
+
+            },
+            (err: any) => {
+
+
                 this.loadingPanel.ShowLoadingPanel = false;
                 this.notificationService.showError(err.error);
             },
@@ -489,6 +513,7 @@ export class GeneralComponent implements OnInit {
 
     }
     saveFile(feferenceID: number, selectedFiles: any, type: enumEmpFileUploadType) {
+        debugger;
         if (selectedFiles != undefined && selectedFiles.length > 0) {
             const file: File | null = selectedFiles.item(0);
             this.currentFile = file;
@@ -587,18 +612,19 @@ export class GeneralComponent implements OnInit {
         if (confirm('Are you sure change the profile picture? selected picture will be store in database as well as will be used as profile picture.') == false) {
             return;
         }
-
+        debugger;
         this.selectedFiles = event.target.files;
 
         if (this.selectedFiles.length > 0) {
             const file: File | null = this.selectedFiles.item(0);
             this.currentFile = file;
+            debugger;
             this.employeeService.uploadEmpFile(this.currentFile, this.hrEmployee.id, this.hrEmployee.id, enumEmpFileUploadType.Profile_Picture).subscribe(
                 (resp: any) => {
                     console.log('image data');
                     // console.log(resp.body);
-
+                    //this.employeePhoto = resp;
-                    this.employeePhoto = resp;// this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp.body}`);
+                    this.employeePhoto = this.sanitizer.bypassSecurityTrustResourceUrl(`data:image/png;base64, ${resp.body}`);
                 },
                 (err: any) => {
                     this.notificationService.showError(err.error);