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

Compare commits

base: CelHRTeam:a4108e671d80282909e2f6893d93cdecac92252a
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_mashfiq
CelHRTeam:dev_chapal
CelHRTeam:main
..
compare: CelHRTeam:1d58361f0237bc8f3c1bdeefd6207af82bdb4c91
Branches Tags
CelHRTeam:dev_mashfiq
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:main

No commits in common. "a4108e671d80282909e2f6893d93cdecac92252a" and "1d58361f0237bc8f3c1bdeefd6207af82bdb4c91" have entirely different histories.
a4108e671d ... 1d58361f02

4 changed files with 98 additions and 118 deletions
Show Stats Expand all files Collapse all files

2
HRM.DA/Service/Basic/SystemInformationService.cs
View File

@ -24,7 +24,7 @@ namespace HRM.DA
oSystemInformation.factoryAddress = oReader.GetString("FACTORYADDRESS");
oSystemInformation.TelephoneNo = oReader.GetString("TELEPHONE");
oSystemInformation.email = oReader.GetString("EMAIL");
//oSystemInformation.webAddress = oReader.GetString("WEBADDRESS");
oSystemInformation.webAddress = oReader.GetString("WEBADDRESS");
oSystemInformation.systemStartDate = oReader.GetDateTime("SYSTEMSTARTDATE").Value;
oSystemInformation.TaxYearEndDate = oReader.GetDateTime("TAXYEARENDDATE").Value;
oSystemInformation.NextPayProcessDate = oReader.GetDateTime("NEXTPAYPROCESSDATE").Value;

111
HRM.DA/Service/Bonus/ProdBonusProcessService.cs
View File

@ -642,12 +642,10 @@ namespace HRM.DA
_oProdBonusProcess.ProdBonusProcessEmps = new List<ProdBonusProcessEmp>();
List<ProdBonusAttn> prodAttn = null;
List<ProdBonusProcessEmp> oProcessEmps = new List<ProdBonusProcessEmp>();
//List<Shift> oShifts = new ShiftService().GetAllShift();
List<Shift> oShifts = new ShiftService().GetAllShift();
Shift oShift = null;
ProdBonusProcessEmp oProcessEmp = null;
int setupID = 21;
DateTime? bonusIntime = DateTime.MinValue;
DateTime? bonusOuttime = DateTime.MinValue;
ADParameter _ADParam = new ADParameterService().Get(setupID, payrollTypeId);
List<ProdBonusAttn> prodAttns = new ProdBonusAttnService().GetBySetupIDs(_oProductionBonusSetups.CommaSeparatedIDs());
@ -662,12 +660,10 @@ namespace HRM.DA
foreach (ProductionBonusSetup oProductionBonusSetup in _oProductionBonusSetups)
{
if (oProductionBonusSetup.DesignNo == "C 24 16-30 Sep P A-Com" || oProductionBonusSetup.DesignNo == "C 24 16-30 Sep P B-Com")
if(oProductionBonusSetup.ID == 10302)
{
}
else
{ continue; }
}
prodAttn = prodAttns.Where(x => x.ProdBonusSetupID == oProductionBonusSetup.ID).ToList();//ToObjectsTemplate();
ProdBonusProcessItem oProcessItem = null;
foreach (ProdBonusLine oLine in oProductionBonusSetup.ProductionBonusLinesNew)
@ -691,6 +687,16 @@ namespace HRM.DA
foreach (DataRow dr in foundRows)
{
basicSal = Convert.ToDouble(dr["BASICSALARY"]);
//
int empidtest = Convert.ToInt32(dr["EMPLOYEEID"]);
if(oProductionBonusSetup.SalaryMonth == new DateTime(2023, 10, 31))
{
if (empidtest == 27620)
{
basicSal = 5145;
}
}
}
}
@ -699,10 +705,10 @@ namespace HRM.DA
bool isSuperVisor = allProdBonusSupervisors.FindIndex(x => x.EmployeeID == item.Key
&& x.ProdBonusLineID == oLine.ID) == -1 ? false : true;
List<DailyAttnProcess> dailyAttm = alldailyAttm.FindAll(x => x.EmployeeID == item.Key);
if (item.Key == 65088)
{
//if (oProcessItem.EmployeeID == 36901)
//{
}
//}
if (isSuperVisor == false)
{
@ -711,26 +717,19 @@ namespace HRM.DA
{
DailyAttnProcess dailyAtt = dailyAttm.FirstOrDefault(o => o.AttnDate.Date == tAtt.InTime.Date);
double wh = 0;
if (dailyAtt != null)
{
bonusIntime = dailyAtt.InTime;
bonusOuttime = dailyAtt.OutTime;
if (dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue)
{
// oShift = oShifts.FirstOrDefault(x => x.ID == dailyAtt.ShiftID);
oShift = oShifts.FirstOrDefault(x => x.ID == dailyAtt.ShiftID);
if (oProductionBonusSetup.FromDate.Date == dailyAtt.AttnDate.Date)
bonusIntime = oProductionBonusSetup.FromDate > dailyAtt.InTime ? oProductionBonusSetup.FromDate : dailyAtt.InTime;
else if (dailyAtt.InTime.GetValueOrDefault().TimeOfDay < tAtt.InTime.TimeOfDay)
bonusIntime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(tAtt.InTime.Hour).AddMinutes(tAtt.InTime.Minute);
if (oProductionBonusSetup.ToDate.Date == dailyAtt.AttnDate.Date)
bonusOuttime = oProductionBonusSetup.ToDate < dailyAtt.OutTime ? oProductionBonusSetup.ToDate : dailyAtt.OutTime;
else if (dailyAtt.OutTime.GetValueOrDefault().TimeOfDay > tAtt.OutTime.TimeOfDay)
bonusOuttime = dailyAtt.OutTime.GetValueOrDefault().Date.AddHours(tAtt.OutTime.Hour).AddMinutes(tAtt.OutTime.Minute);
//else if (oShift != null && dailyAtt.InTime.GetValueOrDefault().TimeOfDay < oShift.InTime.TimeOfDay)
// bonusIntime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(oShift.InTime.Hour).AddMinutes(oShift.InTime.Minute);
dailyAtt.InTime = oProductionBonusSetup.FromDate > dailyAtt.InTime ? oProductionBonusSetup.FromDate : dailyAtt.InTime;
else if (oProductionBonusSetup.ToDate.Date == dailyAtt.AttnDate.Date)
dailyAtt.OutTime = oProductionBonusSetup.ToDate < dailyAtt.OutTime ? oProductionBonusSetup.ToDate : dailyAtt.OutTime;
else if (oShift != null && dailyAtt.InTime.GetValueOrDefault().TimeOfDay < oShift.InTime.TimeOfDay)
dailyAtt.InTime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(oShift.InTime.Hour).AddMinutes(oShift.InTime.Minute);
TimeSpan ts = (TimeSpan)(bonusOuttime - bonusIntime);
TimeSpan ts = (TimeSpan)(dailyAtt.OutTime - dailyAtt.InTime);
if (ts.Minutes < 16 && ts.Hours < 5)
wh = ts.Hours;
else if (ts.Minutes < 16)
@ -750,8 +749,22 @@ namespace HRM.DA
oProcessItem = new ProdBonusProcessItem();
oProcessItem.EmployeeID = item.Key;
oProcessItem.OTHour = oth;
if(oProcessItem.EmployeeID == 283)
{
}
//Amount mismatch hude ammount
if (oProcessItem.EmployeeID == 27620 || oProcessItem.EmployeeID == 27620 || oProcessItem.EmployeeID == 31161 || oProcessItem.EmployeeID == 1822
|| oProcessItem.EmployeeID == 36901 || oProcessItem.EmployeeID == 37542 || oProcessItem.EmployeeID == 41160 || oProcessItem.EmployeeID == 44495
|| oProcessItem.EmployeeID == 44495 || oProcessItem.EmployeeID == 46607 || oProcessItem.EmployeeID == 49783 || oProcessItem.EmployeeID == 55041
|| oProcessItem.EmployeeID == 55155 || oProcessItem.EmployeeID == 55388)
{
}
if (oProcessItem.EmployeeID == 27620)
{
}
oProcessItem.Amount = Math.Round(((double)basicSal / 208 * oth) * 2, 2);
//if(oProcessItem.EmployeeID == 55388)
//{
@ -778,22 +791,16 @@ namespace HRM.DA
{
if (dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue)
{
bonusIntime = dailyAtt.InTime;
bonusOuttime = dailyAtt.OutTime;
//oShift = oShifts.FirstOrDefault(x => x.ID == dailyAtt.ShiftID);
oShift = oShifts.FirstOrDefault(x => x.ID == dailyAtt.ShiftID);
if (oProductionBonusSetup.FromDate.Date == dailyAtt.AttnDate.Date)
bonusIntime = oProductionBonusSetup.FromDate > dailyAtt.InTime ? oProductionBonusSetup.FromDate : dailyAtt.InTime;
else if (dailyAtt.InTime.GetValueOrDefault().TimeOfDay < tAtt.InTime.TimeOfDay)
bonusIntime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(tAtt.InTime.Hour).AddMinutes(tAtt.InTime.Minute);
if (oProductionBonusSetup.ToDate.Date == dailyAtt.AttnDate.Date)
bonusOuttime = oProductionBonusSetup.ToDate < dailyAtt.OutTime ? oProductionBonusSetup.ToDate : dailyAtt.OutTime;
else if (dailyAtt.OutTime.GetValueOrDefault().TimeOfDay > tAtt.OutTime.TimeOfDay)
bonusOuttime = dailyAtt.OutTime.GetValueOrDefault().Date.AddHours(tAtt.OutTime.Hour).AddMinutes(tAtt.OutTime.Minute);
//else if (oShift != null && dailyAtt.InTime.GetValueOrDefault().TimeOfDay < oShift.InTime.TimeOfDay)
// bonusIntime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(oShift.InTime.Hour).AddMinutes(oShift.InTime.Minute);
dailyAtt.InTime = oProductionBonusSetup.FromDate > dailyAtt.InTime ? oProductionBonusSetup.FromDate : dailyAtt.InTime;
else if (oProductionBonusSetup.ToDate.Date == dailyAtt.AttnDate.Date)
dailyAtt.OutTime = oProductionBonusSetup.ToDate < dailyAtt.OutTime ? oProductionBonusSetup.ToDate : dailyAtt.OutTime;
else if (oShift != null && dailyAtt.InTime.GetValueOrDefault().TimeOfDay < oShift.InTime.TimeOfDay)
dailyAtt.InTime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(oShift.InTime.Hour).AddMinutes(oShift.InTime.Minute);
TimeSpan ts = (TimeSpan)(bonusOuttime - bonusIntime);
TimeSpan ts = (TimeSpan)(dailyAtt.OutTime - dailyAtt.InTime);
if (ts.Minutes < 16 && ts.Hours < 5)
wh = ts.Hours;
else if (ts.Minutes < 16)
@ -820,17 +827,17 @@ namespace HRM.DA
oLine.ProdBonusSupervisors = allProdBonusSupervisors.FindAll(x => x.ProdBonusSetupID == oProductionBonusSetup.ID
&& x.ProdBonusLineID == oLine.ID);
//Amount mismatch hude ammount
//if (oProcessItem.EmployeeID == 27388 || oProcessItem.EmployeeID == 27620 || oProcessItem.EmployeeID == 31161 || oProcessItem.EmployeeID == 1822
// || oProcessItem.EmployeeID == 36901 || oProcessItem.EmployeeID == 37542 || oProcessItem.EmployeeID == 41160 || oProcessItem.EmployeeID == 44495
// || oProcessItem.EmployeeID == 44495 || oProcessItem.EmployeeID == 46607 || oProcessItem.EmployeeID == 49783 || oProcessItem.EmployeeID == 55041
// || oProcessItem.EmployeeID == 55155 || oProcessItem.EmployeeID == 55388)
//{
if (oProcessItem.EmployeeID == 27388 || oProcessItem.EmployeeID == 27620 || oProcessItem.EmployeeID == 31161 || oProcessItem.EmployeeID == 1822
|| oProcessItem.EmployeeID == 36901 || oProcessItem.EmployeeID == 37542 || oProcessItem.EmployeeID == 41160 || oProcessItem.EmployeeID == 44495
|| oProcessItem.EmployeeID == 44495 || oProcessItem.EmployeeID == 46607 || oProcessItem.EmployeeID == 49783 || oProcessItem.EmployeeID == 55041
|| oProcessItem.EmployeeID == 55155 || oProcessItem.EmployeeID == 55388)
{
//}
//if(oProcessItem.EmployeeID == 27620)
//{
// double x = ((double)oLine.ProdBonusSupervisors.First(o => o.EmployeeID == item.Key).BonusPercent / 100);
//}
}
if(oProcessItem.EmployeeID == 27620)
{
double x = ((double)oLine.ProdBonusSupervisors.First(o => o.EmployeeID == item.Key).BonusPercent / 100);
}
oProcessItem.Amount = Math.Round(((double)basicSal / 208 * (double)oth *
((double)oLine.ProdBonusSupervisors.First(o => o.EmployeeID == item.Key).BonusPercent / 100)) * 2, 2);
oProcessItem.AchievePercent = 0;
@ -865,7 +872,17 @@ namespace HRM.DA
oProcessEmp = new ProdBonusProcessEmp();
oProcessEmp.EmployeeID = item.EmployeeID;
//Amount mismatch hude ammount
if (oProcessEmp.EmployeeID == 27388 || oProcessEmp.EmployeeID == 27620 || oProcessEmp.EmployeeID == 31161 || oProcessEmp.EmployeeID == 1822
|| oProcessEmp.EmployeeID == 36901 || oProcessEmp.EmployeeID == 37542 || oProcessEmp.EmployeeID == 41160 || oProcessEmp.EmployeeID == 44495
|| oProcessEmp.EmployeeID == 44495 || oProcessEmp.EmployeeID == 46607 || oProcessEmp.EmployeeID == 49783 || oProcessEmp.EmployeeID == 55041
|| oProcessEmp.EmployeeID == 55155 || oProcessEmp.EmployeeID == 55388)
{
}
if (oProcessEmp.EmployeeID == 27620)
{
}
oProcessEmp.Amount = Math.Round((double)item.Amount, 2);
oProcessEmp.Description = item.Description;
_oProdBonusProcess.ProdBonusProcessEmps.Add(oProcessEmp);

65
HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.html
View File

@ -1,55 +1,55 @@
<app-loading-panel></app-loading-panel>
<div class="p-grid card">
<div class="p-col-6 p-md-1 label-ailgn">
<div class="p-col-1 label-ailgn">
<label>Design Date</label>
</div>
<div class="p-col-6 p-md-2">
<div class="p-col-2">
<kendo-datepicker [(ngModel)]="selectedSalaryDate" [format]="'dd MMMM yyyy'"
style="width:100%"></kendo-datepicker>
</div>
<div class="p-col-12 p-md-1" align="right">
<button icon="refresh" kendoButton [primary]="true" style="width:fit-content" (click)="Loadlayout()">Refresh</button>
<div class="p-col-1">
<button icon="refresh" kendoButton [primary]="true" style="width:100%" (click)="Loadlayout()">Refresh</button>
</div>
<div class="p-col-6 p-md-1 label-ailgn">
<div class="p-col-1 label-ailgn" align="right">
<label>Design</label>
</div>
<div class="p-col-6 p-md-3">
<div class="p-col-3">
<!-- <app-dynamic-picker [dynamicPickerView]="_departmentPicker"
(onSelectCompleted)="SetFromDescription()"></app-dynamic-picker> -->
<kendo-dropdownlist [data]="filteredProdBSdata" [(ngModel)]="selectedProdBSdata" [filterable]="true"
textField="design" valueField="id" style="width:100%" (filterChange)="handleFilter($event)"
textField="design" valueField="id" style="width:95%" (filterChange)="handleFilter($event)"
[defaultItem]="{ design: 'Select layout no..'}" (valueChange)="loadLines($event)">
</kendo-dropdownlist>
</div>
<!-- <div class="p-col-6 p-md-2">
<!-- <div class="p-col-2">
</div> -->
<div class="p-col-6 p-md-1 label-ailgn">
<div class="p-col-1 label-ailgn" align="right">
<label>Line Name</label>
</div>
<div class="p-col-6 p-md-3">
<div class="p-col-3">
<kendo-dropdownlist [data]="productionBonusSetup.productionBonusLines" [(ngModel)]="selectedLine"
textField="lineName" valueField="id" [defaultItem]="{ lineName: 'Select Line..'}" style="width:100%">
</kendo-dropdownlist>
</div>
<div class="p-col-12 p-md-3 label-ailgn" *ngIf="showScheduleDate">
<div class="p-col-6 label-ailgn" *ngIf="showScheduleDate">
<!-- <div class="p-grid">
<div class="p-col-6 p-md-3 label-ailgn">
<div class="p-col-3 label-ailgn">
<label>Schedule Date From</label>
</div>
<div class="p-col-6 p-md-4">
<div class="p-col-4">
<kendo-datepicker [(ngModel)]="productionBonusSetup.fromDate" [format]="'dd MMMM yyyy'"
style="width:100%" [readonly]="true"></kendo-datepicker>
</div>
<div class="p-col-6 p-md-1 label-ailgn">
<div class="p-col-1 label-ailgn">
<label>Upto</label>
</div>
<div class="p-col-6 p-md-4">
<div class="p-col-4">
<kendo-datepicker [(ngModel)]="productionBonusSetup.toDate" [format]="'dd MMMM yyyy'" style="width:100%"
[readonly]="true"></kendo-datepicker>
</div>
<div class="p-col-6 p-md-12 label-ailgn"></div>
<div class="p-col-12 label-ailgn"></div>
</div> -->
<p style="color: red; font-style: italic;">Select Schedule Date Betweeen {{productionBonusSetup.fromDate | date:
'dd MMMM yyyy'}} and
@ -58,33 +58,18 @@
</div>
<!--
<div class="p-col-6 p-md-6" *ngIf="!showScheduleDate">
</div> -->
<div class="p-col-6 p-md-1 label-ailgn">
<div class="p-col-6" *ngIf="!showScheduleDate">
</div>
<div class="p-col-2 label-ailgn" align="right">
<label>Schedule Date</label>
</div>
<div class="p-col-6 p-md-2">
<div class="p-col-2">
<kendo-datepicker [(ngModel)]="selectedDate" [format]="'dd MMMM yyyy'" style="width:100%"></kendo-datepicker>
</div>
<div class="p-col-6 p-md-1 label-ailgn">
<label>In Time</label>
</div>
<div class="p-col-6 p-md-2">
<kendo-timepicker [(ngModel)]="startTime" style="width:100%"></kendo-timepicker>
</div>
<div class="p-col-6 p-md-1 label-ailgn">
<label>Out Time</label>
</div>
<div class="p-col-6 p-md-2">
<kendo-timepicker [(ngModel)]="endTime" style="width:100%"></kendo-timepicker>
</div>
<div class="p-col-12" align="right">
<button icon="refresh" kendoButton [primary]="true" style="width: fit-content" (click)="onClickRefresh()"
<div class="p-col-2" align="right">
<button icon="refresh" kendoButton [primary]="true" style="width:80%" (click)="onClickRefresh()"
[disabled]="selectedProdBSdata===undefined||selectedLine===undefined||selectedDate===undefined">Refresh</button>
</div>
<div class="p-col-12">
@ -125,8 +110,8 @@
</div>
<div class="p-col-4">
<app-employee-picker (ItemSelected)="GetSelectedEmployee($event)"
[MultiSelect]="false"></app-employee-picker>
<!-- [MultiSelect]="employeeSelection==='commonEmployee'"></app-employee-picker> -->
[MultiSelect]="employeeSelection==='commonEmployee'"></app-employee-picker>
<!-- [setSelectedEmp]="_pickerSelecteEmp" [isActive]="empPickerActive" -->
</div>
<div class="p-col-2"></div>
<div class="p-col-2" align="right">

24
HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.ts
View File

@ -44,9 +44,6 @@ export class ProductionBonusAttendanceComponent implements OnInit {
selectedDate: Date = new Date;
startTime: Date;
endTime: Date;
selectedSalaryDate: Date = new Date();
showScheduleDate: boolean;
@ -346,27 +343,8 @@ export class ProductionBonusAttendanceComponent implements OnInit {
// );
// }
onClickSubmit() {
// console.log(this.prodBonusAttn);
console.log(this.prodBonusAttn);
debugger;
if (this.startTime == undefined || this.endTime == undefined) {
this.notificationService.showWarning('Please Select In/Out Time');
return;
}
this.prodBonusAttn.forEach(element => {
let inTime = new Date(element.inTime);
inTime.setHours(this.startTime.getHours());
inTime.setMinutes(this.startTime.getMinutes());
inTime.setSeconds(this.startTime.getSeconds());
element.inTime = inTime;
let outTime = new Date(element.outTime);
outTime.setHours(this.endTime.getHours());
outTime.setMinutes(this.endTime.getMinutes());
outTime.setSeconds(this.endTime.getSeconds());
element.outTime = outTime;
});
const data = {
prodBonusAttn: this.prodBonusAttn,
setupId: this.productionBonusSetup.id,