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

Compare commits

base: CelHRTeam:ba4cdaf6b9f3db292ff4f3e3a29a7e86f7f229d9
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_mashfiq
CelHRTeam:dev_chapal
CelHRTeam:main
..
compare: CelHRTeam:b8f4347f09bf817985ab63eeb65268f83f0e2c07
Branches Tags
CelHRTeam:dev_mashfiq
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:main

5 Commits
ba4cdaf6b9 ... b8f4347f09

Author SHA1 Message Date
chapal
b8f4347f09 Merge pull request 'Break hour' (#14) from dev_chapal into devqc 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/14
 2024-11-19 14:50:30 +06:00
chapal
b2b8f09506 Break hour 2024-11-19 14:47:45 +06:00
chapal
ae83442f57 Merge pull request 'report and process prod' (#13) from dev_chapal into devqc 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/13
 2024-11-18 17:23:10 +06:00
chapal
d897acd8fe report and process prod 2024-11-18 17:21:26 +06:00
chapal
ab1e4bb0e5 Merge pull request 'Production Bonus attn Swing and Printing' (#12) from dev_mashfiq into devqc 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/12
 2024-11-18 15:05:32 +06:00
9 changed files with 53 additions and 28 deletions
Show Stats Expand all files Collapse all files

13
HRM.BO/Bonus/ProductionBonusSetup.cs
View File

@ -16,6 +16,7 @@ namespace HRM.BO
_oTHour = 0; _oTHour = 0;
_salaryMonth = DateTime.MinValue; _salaryMonth = DateTime.MinValue;
_designNo = string.Empty; _designNo = string.Empty;
_breakHour = 1;
} }
#endregion #endregion
@ -46,6 +47,18 @@ namespace HRM.BO
#endregion #endregion
#region BreakHour : double
private double _breakHour;
public double BreakHour
{
get { return _breakHour; }
set { _breakHour = value; }
}
#endregion
#region SalaryMonth : string #region SalaryMonth : string
private DateTime _salaryMonth; private DateTime _salaryMonth;

8
HRM.DA/DA/Bonus/ProductionBonusSetupDA.cs
View File

@ -23,8 +23,8 @@ namespace HRM.DA
internal static void Insert(TransactionContext tc, ProductionBonusSetup item) internal static void Insert(TransactionContext tc, ProductionBonusSetup item)
{ {
string sql = SQLParser.MakeSQL( string sql = SQLParser.MakeSQL(
"INSERT INTO ProductionBonusSetup(ProductionBonusSetupID, ProgramName, AchivedPercent, OTHour, SalaryMonth, DesignNo, FromDate, ToDate, MaxPerson, CreatedBy, CreationDate, Status,ProductionBonusType)" + "INSERT INTO ProductionBonusSetup(ProductionBonusSetupID, ProgramName, AchivedPercent,BreakHour, OTHour, SalaryMonth, DesignNo, FromDate, ToDate, MaxPerson, CreatedBy, CreationDate, Status,ProductionBonusType)" +
" VALUES(%n, %s, %n, %n, %d, %s, %d, %d, %n, %n, %d, %n,%n)", item.ID, item.ProgramName, item.AchivedPercent, item.OTHour, " VALUES(%n, %s, %n, %n,%n, %d, %s, %d, %d, %n, %n, %d, %n,%n)", item.ID, item.ProgramName, item.AchivedPercent, item.BreakHour, item.OTHour,
item.SalaryMonth, item.DesignNo, item.FromDate, item.ToDate, item.MaxPerson, item.CreatedBy, item.CreatedDate, item.SalaryMonth, item.DesignNo, item.FromDate, item.ToDate, item.MaxPerson, item.CreatedBy, item.CreatedDate,
item.Status, (int)item.ProductionBonusType); item.Status, (int)item.ProductionBonusType);
tc.ExecuteNonQuery(sql); tc.ExecuteNonQuery(sql);
@ -37,8 +37,8 @@ namespace HRM.DA
internal static void Update(TransactionContext tc, ProductionBonusSetup item) internal static void Update(TransactionContext tc, ProductionBonusSetup item)
{ {
tc.ExecuteNonQuery( tc.ExecuteNonQuery(
"UPDATE ProductionBonusSetup SET ProgramName=%s, AchivedPercent=%n, OTHour=%n, SalaryMonth=%d, DesignNo=%s, FromDate=%d, ToDate=%d, MaxPerson=%n, Status=%n,ProductionBonusType=%n " + "UPDATE ProductionBonusSetup SET ProgramName=%s, AchivedPercent=%n,BreakHour=%n, OTHour=%n, SalaryMonth=%d, DesignNo=%s, FromDate=%d, ToDate=%d, MaxPerson=%n, Status=%n,ProductionBonusType=%n " +
" WHERE ProductionBonusSetupID=%n", item.ProgramName, item.AchivedPercent, item.OTHour, item.SalaryMonth, item.DesignNo, " WHERE ProductionBonusSetupID=%n", item.ProgramName, item.AchivedPercent, item.BreakHour, item.OTHour, item.SalaryMonth, item.DesignNo,
item.FromDate, item.ToDate, item.MaxPerson, item.Status,(int)item.ProductionBonusType, item.ID); item.FromDate, item.ToDate, item.MaxPerson, item.Status,(int)item.ProductionBonusType, item.ID);
} }

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

@ -717,8 +717,8 @@ namespace HRM.DA
bonusIntime = oProductionBonusSetup.FromDate > dailyAtt.InTime ? oProductionBonusSetup.FromDate : dailyAtt.InTime; bonusIntime = oProductionBonusSetup.FromDate > dailyAtt.InTime ? oProductionBonusSetup.FromDate : dailyAtt.InTime;
else if (dailyAtt.InTime.GetValueOrDefault().TimeOfDay < tAtt.InTime.TimeOfDay) else if (dailyAtt.InTime.GetValueOrDefault().TimeOfDay < tAtt.InTime.TimeOfDay)
bonusIntime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(tAtt.InTime.Hour).AddMinutes(tAtt.InTime.Minute); bonusIntime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(tAtt.InTime.Hour).AddMinutes(tAtt.InTime.Minute);
if (oProductionBonusSetup.ToDate.Date == dailyAtt.AttnDate.Date) //if (oProductionBonusSetup.ToDate.Date == dailyAtt.AttnDate.Date)
bonusOuttime = oProductionBonusSetup.ToDate < dailyAtt.OutTime ? oProductionBonusSetup.ToDate : dailyAtt.OutTime; // bonusOuttime = oProductionBonusSetup.ToDate < dailyAtt.OutTime ? oProductionBonusSetup.ToDate : dailyAtt.OutTime;
else if (dailyAtt.OutTime.GetValueOrDefault().TimeOfDay > tAtt.OutTime.TimeOfDay) else if (dailyAtt.OutTime.GetValueOrDefault().TimeOfDay > tAtt.OutTime.TimeOfDay)
bonusOuttime = dailyAtt.OutTime.GetValueOrDefault().Date.AddHours(tAtt.OutTime.Hour).AddMinutes(tAtt.OutTime.Minute); bonusOuttime = dailyAtt.OutTime.GetValueOrDefault().Date.AddHours(tAtt.OutTime.Hour).AddMinutes(tAtt.OutTime.Minute);
//else if (oShift != null && dailyAtt.InTime.GetValueOrDefault().TimeOfDay < oShift.InTime.TimeOfDay) //else if (oShift != null && dailyAtt.InTime.GetValueOrDefault().TimeOfDay < oShift.InTime.TimeOfDay)
@ -728,11 +728,11 @@ namespace HRM.DA
if (ts.Minutes < 16 && ts.Hours < 5) if (ts.Minutes < 16 && ts.Hours < 5)
wh = ts.Hours; wh = ts.Hours;
else if (ts.Minutes < 16) else if (ts.Minutes < 16)
wh = ts.Hours - 1; wh = ts.Hours - oProductionBonusSetup.BreakHour;
else if (ts.TotalHours < 5) else if (ts.TotalHours < 5)
wh = ts.TotalHours; wh = ts.TotalHours;
else else
wh = ts.TotalHours - 1; wh = ts.TotalHours - oProductionBonusSetup.BreakHour;
hour += wh < 0 ? 0 : wh; hour += wh < 0 ? 0 : wh;
} }
@ -780,8 +780,8 @@ namespace HRM.DA
bonusIntime = oProductionBonusSetup.FromDate > dailyAtt.InTime ? oProductionBonusSetup.FromDate : dailyAtt.InTime; bonusIntime = oProductionBonusSetup.FromDate > dailyAtt.InTime ? oProductionBonusSetup.FromDate : dailyAtt.InTime;
else if (dailyAtt.InTime.GetValueOrDefault().TimeOfDay < tAtt.InTime.TimeOfDay) else if (dailyAtt.InTime.GetValueOrDefault().TimeOfDay < tAtt.InTime.TimeOfDay)
bonusIntime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(tAtt.InTime.Hour).AddMinutes(tAtt.InTime.Minute); bonusIntime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(tAtt.InTime.Hour).AddMinutes(tAtt.InTime.Minute);
if (oProductionBonusSetup.ToDate.Date == dailyAtt.AttnDate.Date) //if (oProductionBonusSetup.ToDate.Date == dailyAtt.AttnDate.Date)
bonusOuttime = oProductionBonusSetup.ToDate < dailyAtt.OutTime ? oProductionBonusSetup.ToDate : dailyAtt.OutTime; // bonusOuttime = oProductionBonusSetup.ToDate < dailyAtt.OutTime ? oProductionBonusSetup.ToDate : dailyAtt.OutTime;
else if (dailyAtt.OutTime.GetValueOrDefault().TimeOfDay > tAtt.OutTime.TimeOfDay) else if (dailyAtt.OutTime.GetValueOrDefault().TimeOfDay > tAtt.OutTime.TimeOfDay)
bonusOuttime = dailyAtt.OutTime.GetValueOrDefault().Date.AddHours(tAtt.OutTime.Hour).AddMinutes(tAtt.OutTime.Minute); bonusOuttime = dailyAtt.OutTime.GetValueOrDefault().Date.AddHours(tAtt.OutTime.Hour).AddMinutes(tAtt.OutTime.Minute);
//else if (oShift != null && dailyAtt.InTime.GetValueOrDefault().TimeOfDay < oShift.InTime.TimeOfDay) //else if (oShift != null && dailyAtt.InTime.GetValueOrDefault().TimeOfDay < oShift.InTime.TimeOfDay)
@ -791,11 +791,11 @@ namespace HRM.DA
if (ts.Minutes < 16 && ts.Hours < 5) if (ts.Minutes < 16 && ts.Hours < 5)
wh = ts.Hours; wh = ts.Hours;
else if (ts.Minutes < 16) else if (ts.Minutes < 16)
wh = ts.Hours - 1; wh = ts.Hours - oProductionBonusSetup.BreakHour;
else if (ts.TotalHours < 5) else if (ts.TotalHours < 5)
wh = ts.TotalHours; wh = ts.TotalHours;
else else
wh = ts.TotalHours - 1; wh = ts.TotalHours - oProductionBonusSetup.BreakHour;
// hour += ts.Hours < 0 ? 0 : ts.Hours; // hour += ts.Hours < 0 ? 0 : ts.Hours;
hour += wh < 0 ? 0 : wh; hour += wh < 0 ? 0 : wh;

2
HRM.DA/Service/Bonus/ProductionBonusSetupService.cs
View File

@ -7,6 +7,7 @@ using System.Collections.Generic;
using Ease.Core.Utility; using Ease.Core.Utility;
using System.Linq; using System.Linq;
using HRM.BO; using HRM.BO;
using static iTextSharp.text.pdf.AcroFields;
namespace HRM.DA namespace HRM.DA
{ {
@ -26,6 +27,7 @@ namespace HRM.DA
oProductionBonusSetup.DesignNo = oReader.GetString("DesignNo"); oProductionBonusSetup.DesignNo = oReader.GetString("DesignNo");
oProductionBonusSetup.ProgramName = oReader.GetString("ProgramName"); oProductionBonusSetup.ProgramName = oReader.GetString("ProgramName");
oProductionBonusSetup.AchivedPercent = oReader.GetDouble("AchivedPercent").GetValueOrDefault(); oProductionBonusSetup.AchivedPercent = oReader.GetDouble("AchivedPercent").GetValueOrDefault();
oProductionBonusSetup.BreakHour = oReader.GetDouble("BreakHour").GetValueOrDefault();
oProductionBonusSetup.OTHour = oReader.GetDouble("OTHour").GetValueOrDefault(); oProductionBonusSetup.OTHour = oReader.GetDouble("OTHour").GetValueOrDefault();
oProductionBonusSetup.FromDate = oReader.GetDateTime("FromDate").Value; oProductionBonusSetup.FromDate = oReader.GetDateTime("FromDate").Value;
oProductionBonusSetup.ToDate = oReader.GetDateTime("ToDate").Value; oProductionBonusSetup.ToDate = oReader.GetDateTime("ToDate").Value;

10
HRM.Report/Class/rptBonus.cs
View File

@ -393,9 +393,9 @@ namespace HRM.Report
bonusIntime = design.FromDate > dailyAtt.InTime ? design.FromDate : dailyAtt.InTime; bonusIntime = design.FromDate > dailyAtt.InTime ? design.FromDate : dailyAtt.InTime;
else if (dailyAtt.InTime.GetValueOrDefault().TimeOfDay < tAtt.InTime.TimeOfDay) else if (dailyAtt.InTime.GetValueOrDefault().TimeOfDay < tAtt.InTime.TimeOfDay)
bonusIntime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(tAtt.InTime.Hour).AddMinutes(tAtt.InTime.Minute); bonusIntime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(tAtt.InTime.Hour).AddMinutes(tAtt.InTime.Minute);
if (design.ToDate.Date == dailyAtt.AttnDate.Date) //if (design.ToDate.Date == dailyAtt.AttnDate.Date)
bonusOuttime = design.ToDate < dailyAtt.OutTime ? design.ToDate : dailyAtt.OutTime; // bonusOuttime = design.ToDate < dailyAtt.OutTime ? design.ToDate : dailyAtt.OutTime;
else if (dailyAtt.OutTime.GetValueOrDefault().TimeOfDay > tAtt.OutTime.TimeOfDay) if (dailyAtt.OutTime.GetValueOrDefault().TimeOfDay > tAtt.OutTime.TimeOfDay)
bonusOuttime = dailyAtt.OutTime.GetValueOrDefault().Date.AddHours(tAtt.OutTime.Hour).AddMinutes(tAtt.OutTime.Minute); bonusOuttime = dailyAtt.OutTime.GetValueOrDefault().Date.AddHours(tAtt.OutTime.Hour).AddMinutes(tAtt.OutTime.Minute);
//else if (oShift != null && dailyAtt.InTime.GetValueOrDefault().TimeOfDay < oShift.InTime.TimeOfDay) //else if (oShift != null && dailyAtt.InTime.GetValueOrDefault().TimeOfDay < oShift.InTime.TimeOfDay)
// bonusIntime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(oShift.InTime.Hour).AddMinutes(oShift.InTime.Minute); // bonusIntime = dailyAtt.InTime.GetValueOrDefault().Date.AddHours(oShift.InTime.Hour).AddMinutes(oShift.InTime.Minute);
@ -405,11 +405,11 @@ namespace HRM.Report
if (ts.Minutes < 16 && ts.Hours < 5) if (ts.Minutes < 16 && ts.Hours < 5)
wh = ts.Hours; wh = ts.Hours;
else if (ts.Minutes < 16) else if (ts.Minutes < 16)
wh = ts.Hours - 1; wh = ts.Hours - design.BreakHour;
else if (ts.TotalHours < 5) else if (ts.TotalHours < 5)
wh = ts.TotalHours; wh = ts.TotalHours;
else else
wh = ts.TotalHours - 1; wh = ts.TotalHours - design.BreakHour;
// hour += ts.Hours < 0 ? 0 : ts.Hours; // hour += ts.Hours < 0 ? 0 : ts.Hours;
hour = wh < 0 ? 0 : wh; hour = wh < 0 ? 0 : wh;

1
HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.js
View File

@ -8,6 +8,7 @@ var ProductionBonusSetup = /** @class */ (function () {
this.achivedPercent = 0; this.achivedPercent = 0;
this.otHour = 0; this.otHour = 0;
this.maxPerson = 0; this.maxPerson = 0;
this.breakHour = 1;
// this.salaryMonth = null; // this.salaryMonth = null;
this.designNo = ''; this.designNo = '';
this.programName = ''; this.programName = '';

2
HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.js.map
View File

@ -1 +1 @@
{"version":3,"file":"productionBonusSetup.js","sourceRoot":"","sources":["productionBonusSetup.ts"],"names":[],"mappings":";;;AAAA,qCAAuE;AAKvE;IAgBE;QACE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;QACZ,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QACnB,2BAA2B;QAC3B,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,wBAAwB;QACxB,sBAAsB;QACtB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,uBAAe,CAAC,IAAI,CAAC;QACnC,IAAI,CAAC,sBAAsB,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,uBAAuB,GAAG,EAAE,CAAC;QAClC,6DAA6D;IAE/D,CAAC;IACH,2BAAC;AAAD,CAAC,AAlCD,IAkCC;AAlCY,oDAAoB"} {"version":3,"file":"productionBonusSetup.js","sourceRoot":"","sources":["productionBonusSetup.ts"],"names":[],"mappings":";;;AAAA,qCAAuE;AAKvE;IAiBE;QACE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;QACZ,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QACd,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QACrB,2BAA2B;QAC3B,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,wBAAwB;QACxB,sBAAsB;QACtB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,uBAAe,CAAC,IAAI,CAAC;QACnC,IAAI,CAAC,sBAAsB,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,uBAAuB,GAAG,EAAE,CAAC;QAClC,6DAA6D;IAE/D,CAAC;IACH,2BAAC;AAAD,CAAC,AApCD,IAoCC;AApCY,oDAAoB"}

2
HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.ts
View File

@ -6,6 +6,7 @@ import { ProdBonusWorkSchedule } from "./prodBonusWorkSchedule";
export class ProductionBonusSetup { export class ProductionBonusSetup {
id: number; id: number;
achivedPercent: number; achivedPercent: number;
breakHour: number;
otHour: number; otHour: number;
maxPerson: number; maxPerson: number;
salaryMonth: Date; salaryMonth: Date;
@ -24,6 +25,7 @@ export class ProductionBonusSetup {
this.achivedPercent = 0; this.achivedPercent = 0;
this.otHour = 0; this.otHour = 0;
this.maxPerson = 0; this.maxPerson = 0;
this.breakHour = 1;
// this.salaryMonth = null; // this.salaryMonth = null;
this.designNo = ''; this.designNo = '';
this.programName = ''; this.programName = '';

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

@ -39,20 +39,27 @@
<div class="p-col-12 p-lg-1 label-ailgn"> <div class="p-col-12 p-lg-1 label-ailgn">
<label>Program Name</label> <label>Program Name</label>
</div> </div>
<div class="p-col-12 p-lg-3"> <div class="p-col-12 p-lg-2">
<input [(ngModel)]="productionBonusSetup.programName" style="width:100%" type="text" pInputText> <input [(ngModel)]="productionBonusSetup.programName" style="width:100%" type="text" pInputText>
</div> </div>
<div class="p-col-12 p-lg-1 label-ailgn"> <div class="p-col-12 p-lg-1 label-ailgn">
<label>Max Persons</label> <label>Max Persons</label>
</div> </div>
<div class="p-col-12 p-lg-3"> <div class="p-col-12 p-lg-2">
<kendo-numerictextbox [(ngModel)]="productionBonusSetup.maxPerson" [decimals]="0" <kendo-numerictextbox [(ngModel)]="productionBonusSetup.maxPerson" [decimals]="0"
style="width:100%"></kendo-numerictextbox> style="width:100%"></kendo-numerictextbox>
</div> </div>
<div class="p-col-12 p-lg-1 label-ailgn">
<label>Break Hour</label>
</div>
<div class="p-col-12 p-lg-2">
<kendo-numerictextbox [(ngModel)]="productionBonusSetup.breakHour" [decimals]="2"
style="width:100%"></kendo-numerictextbox>
</div>
<div class="p-col-12 p-lg-1 label-ailgn"> <div class="p-col-12 p-lg-1 label-ailgn">
<label>Achieved %</label> <label>Achieved %</label>
</div> </div>
<div class="p-col-12 p-lg-3"> <div class="p-col-12 p-lg-2">
<kendo-numerictextbox [(ngModel)]="productionBonusSetup.achivedPercent" [decimals]="2" <kendo-numerictextbox [(ngModel)]="productionBonusSetup.achivedPercent" [decimals]="2"
style="width:100%"></kendo-numerictextbox> style="width:100%"></kendo-numerictextbox>
</div> </div>