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

Merge pull request 'Attn process' (#55) from dev_chapal into devqc

Browse Source 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/55
This commit is contained in:
chapal 2026-05-18 10:29:57 +06:00
commit 7c8340e05e
9 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HRM.BO/Attendance/AttnRawData.cs
View File

@ -49,6 +49,8 @@ namespace HRM.BO
public string EmployeeName { get; set; }
public bool IsMobileOfflineData { get; set; }
public bool isManualEntry { get; set; }
#region AccessCard : AccessCard
private AccessCard _accessCard;

8
HRM.DA/Service/Attendance/AttnRawDataService.cs
View File

@ -402,6 +402,8 @@ namespace HRM.DA
_dtRawData.Columns.Add("EntryMode", typeof(int));
_dtRawData.Columns.Add("DeviceIPAddress", typeof(string));
_dtRawData.Columns.Add("DeviceNo", typeof(string));
_dtRawData.Columns.Add("isManualEntry", typeof(bool));
//_dtRawData.Columns.Add("PUNCHDATE", typeof(DateTime));
foreach (AttnRawData item in attnRawDatas)
@ -422,7 +424,8 @@ namespace HRM.DA
item.PunchTime,
(int)item.EntryMode,
item.DeviceIPAddress,
item.DeviceNo
item.DeviceNo,
item.isManualEntry
);
}
@ -440,7 +443,8 @@ namespace HRM.DA
bulkCopy.ColumnMappings.Add("EntryMode", "EntryMode");
bulkCopy.ColumnMappings.Add("DeviceIPAddress", "DeviceIPAddress");
bulkCopy.ColumnMappings.Add("DeviceNo", "DeviceNo");
// bulkCopy.ColumnMappings.Add("PUNCHDATE", "PUNCHDATE");
bulkCopy.ColumnMappings.Add("isManualEntry", "isManualEntry");
// bulkCopy.ColumnMappings.Add("PUNCHDATE", "PUNCHDATE");
bulkCopy.DestinationTableName = "AttnRawData";
bulkCopy.WriteToServer(_dtRawData);

2
HRM.UI/ClientApp/src/app/_models/Attendance/attnRawData.js.map
View File

@ -1 +1 @@
{"version":3,"file":"attnRawData.js","sourceRoot":"","sources":["attnRawData.ts"],"names":[],"mappings":";;;AAIA;IAAA;IAeA,CAAC;IAAD,kBAAC;AAAD,CAAC,AAfD,IAeC;AAfY,kCAAW"}
{"version":3,"file":"attnRawData.js","sourceRoot":"","sources":["attnRawData.ts"],"names":[],"mappings":";;;AAIA;IAAA;IAgBA,CAAC;IAAD,kBAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBY,kCAAW"}

1
HRM.UI/ClientApp/src/app/_models/Attendance/attnRawData.ts
View File

@ -15,6 +15,7 @@ export class AttnRawData
deviceIPAddress: string;
deviceNo: string;
employeeName: string;
isManualEntry: boolean;
// accessCard: AccessCard[] = [];
}

2
HRM.UI/ClientApp/src/app/app.api.service.ts
View File

@ -14,7 +14,7 @@ export class ApiService {
public isSSO = false;
public versionDeployement = false;
// public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2025, 1, 25))}-`+"01";
public versionNumber = `V-20251008-`+"01";
public versionNumber = `V-20260514-`+"01";
public static BASE_URL = '';
public base_url = '';
// public currentLink = '';

29
HRM.UI/ClientApp/src/app/attendance/read-attendance-rawdata/read-attendance-rawdata.component.ts
View File

@ -69,6 +69,20 @@ export class ReadAttendanceRawdataComponent {
) {
debugger;
this._apiService.selectedMenuName = "Read Raw Data";
//this.readAttendanceRawdataService = readAttendanceRawdataServiceFactory();
}
public ngOnInit(): void {
this.rawDataForm = new FormGroup({
type: new FormControl(),
attachment: new FormControl(),
fromDate: new FormControl(),
toDate: new FormControl()
});
this.loadingService.ShowLoadingPanel = true;
this._empService.getAllEmployees().subscribe(
(resp: any) => {
@ -83,18 +97,6 @@ export class ReadAttendanceRawdataComponent {
}
);
//this.readAttendanceRawdataService = readAttendanceRawdataServiceFactory();
}
public ngOnInit(): void {
this.rawDataForm = new FormGroup({
type: new FormControl(),
attachment: new FormControl(),
fromDate: new FormControl(),
toDate: new FormControl()
});
//this.cardFoundForm = new FormGroup({
// card: new FormControl(),
// FoundDate: new FormControl(),
@ -249,7 +251,8 @@ export class ReadAttendanceRawdataComponent {
item.entryMode = (x.entryMode == undefined || x.entryMode.length <= 0) ? 0 : this.entryModes.find(e => e.name.trim().toLowerCase() == x.entryMode.trim().toLowerCase()).value,
item.cardNo = (x.cardNo !== undefined || x.cardNo !== "" || x.cardNo !== null) ? item.employeeNo : item.cardNo,
item.deviceNo = (x.deviceNo !== undefined || x.deviceNo !== "" || x.deviceNo !== null) ? "" : item.deviceNo,
item.deviceIPAddress = (x.deviceIPAddress !== undefined || x.deviceIPAddress !== "" || x.deviceIPAddress !== null) ? "" : item.deviceIPAddress
item.deviceIPAddress = (x.deviceIPAddress !== undefined || x.deviceIPAddress !== "" || x.deviceIPAddress !== null) ? "" : item.deviceIPAddress
item.isManualEntry = true;
this.attnRawDatas.push(item);
});
//console.log(this.attnRawDatas);

1
HRM.UI/ClientApp/src/app/picker/dynamic-picker/Dynamic-Picker.js
View File

@ -378,6 +378,7 @@ var DynamicPicker = /** @class */ (function () {
this.selectedIDs = [];
this.selecteditemText = '';
this.multiSelect = Multiselect;
this.checkChildren = this.multiSelect ? true : false;
this.pickerType = PickerType;
this.payrollTypeID = undefined;
new DynamicPickerTypeDefination(PickerType, this, Multiselect);

2
HRM.UI/ClientApp/src/app/picker/dynamic-picker/Dynamic-Picker.js.map
View File

File diff suppressed because one or more lines are too long

1
HRM.UI/ClientApp/src/app/picker/employee-picker.component.ts
View File

@ -230,7 +230,6 @@ export class EmployeePickerComponent implements OnInit {
ngOnInit() {
this.checkLive = true;
this.loadingService.ShowLoadingPanel = false;
this.setSelectableSettings();
this.valueChangedSubscription == this.pickerService.dataChanged.subscribe(
x => {