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

Compare commits

base: CelHRTeam:e77dbeaf9f3e0aa67b4adfe9b4ec39985f761167
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_sojib
CelHRTeam:main
..
compare: CelHRTeam:62d6ccb45c52adfa5aec88c141f3bcd6d859f0ba
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_sojib
CelHRTeam:main

No commits in common. "e77dbeaf9f3e0aa67b4adfe9b4ec39985f761167" and "62d6ccb45c52adfa5aec88c141f3bcd6d859f0ba" have entirely different histories.
e77dbeaf9f ... 62d6ccb45c

3 changed files with 12 additions and 47 deletions
Show Stats Expand all files Collapse all files

9
HRM.Report/Attendence/Class/AttendanceReport.cs
View File

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

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

@ -10,27 +10,19 @@
<div class="p-col-12"> <div class="p-col-12">
<div style="position: relative; display: inline-block;"> <div style="position: relative; display: inline-block;">
<img id="imgProfilePicture" [src]="employeePhoto" <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()" <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> <span class="editIcon">&#9998;</span>
</button> </button>
</div> </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> </div>
<div class="p-col-12 p-md-12 p-lg-12" align="center"> <div class="p-col-12 p-md-12 p-lg-12" align="center">
<input formControlName="empPhoto" id="fupEmpPhoto" #fileInput <input formControlName="empPhoto" id="fupEmpPhoto" #fileInput
(change)="selectFile($event)" type="file" style="display: none;"> (change)="selectFile($event)" type="file" style="display: none;">
</div> </div>
<div class="p-col-12 p-md-12 p-lg-12" style="height: 76px;"> <div class="p-col-12 p-md-12 p-lg-12" style="height: 76px;"></div>
</div>
</div> </div>
</div> </div>
</div> </div>

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

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