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

Compare commits

base: CelHRTeam:a74f3dafee52020778071ad37a550f20392046f4
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_Mohaimen
CelHRTeam:dev_sojib
CelHRTeam:main
..
compare: CelHRTeam:f34d5f83bc49c08e30c27bc341ee87c0248937f9
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_Mohaimen
CelHRTeam:dev_sojib
CelHRTeam:main

No commits in common. "a74f3dafee52020778071ad37a550f20392046f4" and "f34d5f83bc49c08e30c27bc341ee87c0248937f9" have entirely different histories.
a74f3dafee ... f34d5f83bc

2 changed files with 13 additions and 26 deletions
Show Stats Expand all files Collapse all files

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

@ -381,7 +381,7 @@ namespace HRM.DA
try try
{ {
tc = TransactionContext.Begin(true); tc = TransactionContext.Begin(true);
// int nAttnRawDataID = tc.GenerateID("AttnRawData", "ATTNRAWDATAID"); int nAttnRawDataID = tc.GenerateID("AttnRawData", "ATTNRAWDATAID");
if (attnRawDatas != null && attnRawDatas.Count > 0) if (attnRawDatas != null && attnRawDatas.Count > 0)
{ {
foreach (AttnRawData item in attnRawDatas) foreach (AttnRawData item in attnRawDatas)
@ -394,7 +394,7 @@ namespace HRM.DA
AttnRawDataDA.Delete(tc, dMinValue, empIDs); AttnRawDataDA.Delete(tc, dMinValue, empIDs);
DataTable _dtRawData = null; DataTable _dtRawData = null;
_dtRawData = new DataTable("AttnRawData"); _dtRawData = new DataTable("AttnRawData");
// _dtRawData.Columns.Add("ATTNRAWDATAID", typeof(int)); _dtRawData.Columns.Add("ATTNRAWDATAID", typeof(int));
_dtRawData.Columns.Add("CARDID", typeof(int)); _dtRawData.Columns.Add("CARDID", typeof(int));
_dtRawData.Columns.Add("EMPLOYEEID", typeof(int)); _dtRawData.Columns.Add("EMPLOYEEID", typeof(int));
_dtRawData.Columns.Add("CARDNO", typeof(string)); _dtRawData.Columns.Add("CARDNO", typeof(string));
@ -406,24 +406,15 @@ namespace HRM.DA
foreach (AttnRawData item in attnRawDatas) foreach (AttnRawData item in attnRawDatas)
{ {
//_dtRawData.Rows.Add(nAttnRawDataID++, _dtRawData.Rows.Add(nAttnRawDataID++,
// null, null,
// item.EmployeeID, item.EmployeeID,
// item.CardNo.Trim(), item.CardNo.Trim(),
// item.PunchTime, item.PunchTime,
// (int)item.EntryMode, (int)item.EntryMode,
// item.DeviceIPAddress, item.DeviceIPAddress,
// item.DeviceNo, item.DeviceNo,
// item.PunchTime); item.PunchTime);
_dtRawData.Rows.Add(
null,
item.EmployeeID,
item.CardNo.Trim(),
item.PunchTime,
(int)item.EntryMode,
item.DeviceIPAddress,
item.DeviceNo,
item.PunchTime);
} }
using (SqlBulkCopy bulkCopy = new SqlBulkCopy((SqlConnection)tc.Connection, using (SqlBulkCopy bulkCopy = new SqlBulkCopy((SqlConnection)tc.Connection,
@ -432,7 +423,7 @@ namespace HRM.DA
bulkCopy.BulkCopyTimeout = 600; // in seconds bulkCopy.BulkCopyTimeout = 600; // in seconds
bulkCopy.BatchSize = 5000; bulkCopy.BatchSize = 5000;
// bulkCopy.ColumnMappings.Add("ATTNRAWDATAID", "ATTNRAWDATAID"); bulkCopy.ColumnMappings.Add("ATTNRAWDATAID", "ATTNRAWDATAID");
bulkCopy.ColumnMappings.Add("CARDID", "CARDID"); bulkCopy.ColumnMappings.Add("CARDID", "CARDID");
bulkCopy.ColumnMappings.Add("EMPLOYEEID", "EMPLOYEEID"); bulkCopy.ColumnMappings.Add("EMPLOYEEID", "EMPLOYEEID");
bulkCopy.ColumnMappings.Add("CARDNO", "CARDNO"); bulkCopy.ColumnMappings.Add("CARDNO", "CARDNO");

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

@ -67,7 +67,6 @@ export class ReadAttendanceRawdataComponent {
public _attendanceServices: AttendanceServices, public _attendanceServices: AttendanceServices,
public loadingService: loadingPanelService public loadingService: loadingPanelService
) { ) {
debugger;
this._apiService.selectedMenuName = "Read Raw Data"; this._apiService.selectedMenuName = "Read Raw Data";
this.loadingService.ShowLoadingPanel = true; this.loadingService.ShowLoadingPanel = true;
this._empService.getAllEmployees().subscribe( this._empService.getAllEmployees().subscribe(
@ -115,7 +114,6 @@ export class ReadAttendanceRawdataComponent {
} }
fileUpload(event) { fileUpload(event) {
debugger;
this.loadingService.ShowLoadingPanel = true; this.loadingService.ShowLoadingPanel = true;
this.file = undefined; this.file = undefined;
this.attnRawDatas = []; this.attnRawDatas = [];
@ -132,7 +130,7 @@ export class ReadAttendanceRawdataComponent {
} }
performReading(reader: any) { performReading(reader: any) {
debugger;
var text = undefined; var text = undefined;
//this.attnRawDatas = []; //this.attnRawDatas = [];
//this.mandatoryItems = []; //this.mandatoryItems = [];
@ -190,8 +188,6 @@ export class ReadAttendanceRawdataComponent {
} }
fileUploadChange(event) { fileUploadChange(event) {
debugger;
this.loadingService.ShowLoadingPanel = true; this.loadingService.ShowLoadingPanel = true;
this.file = undefined; this.file = undefined;
this.attnRawDatas = []; this.attnRawDatas = [];