diff --git a/HRM.BO/Bonus/ProductionBonusSetup.cs b/HRM.BO/Bonus/ProductionBonusSetup.cs index 62ea6b6..125470f 100644 --- a/HRM.BO/Bonus/ProductionBonusSetup.cs +++ b/HRM.BO/Bonus/ProductionBonusSetup.cs @@ -16,6 +16,7 @@ namespace HRM.BO _oTHour = 0; _salaryMonth = DateTime.MinValue; _designNo = string.Empty; + _breakHour = 1; } #endregion @@ -46,6 +47,18 @@ namespace HRM.BO #endregion + #region BreakHour : double + + private double _breakHour; + + public double BreakHour + { + get { return _breakHour; } + set { _breakHour = value; } + } + + #endregion + #region SalaryMonth : string private DateTime _salaryMonth; diff --git a/HRM.DA/DA/Bonus/ProductionBonusSetupDA.cs b/HRM.DA/DA/Bonus/ProductionBonusSetupDA.cs index a8117b8..0462592 100644 --- a/HRM.DA/DA/Bonus/ProductionBonusSetupDA.cs +++ b/HRM.DA/DA/Bonus/ProductionBonusSetupDA.cs @@ -23,8 +23,8 @@ namespace HRM.DA internal static void Insert(TransactionContext tc, ProductionBonusSetup item) { string sql = SQLParser.MakeSQL( - "INSERT INTO ProductionBonusSetup(ProductionBonusSetupID, ProgramName, AchivedPercent, 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, + "INSERT INTO ProductionBonusSetup(ProductionBonusSetupID, ProgramName, AchivedPercent,BreakHour, OTHour, SalaryMonth, DesignNo, FromDate, ToDate, MaxPerson, CreatedBy, CreationDate, Status,ProductionBonusType)" + + " 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.Status, (int)item.ProductionBonusType); tc.ExecuteNonQuery(sql); @@ -37,8 +37,8 @@ namespace HRM.DA internal static void Update(TransactionContext tc, ProductionBonusSetup item) { 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 " + - " WHERE ProductionBonusSetupID=%n", item.ProgramName, item.AchivedPercent, item.OTHour, item.SalaryMonth, item.DesignNo, + "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.BreakHour, item.OTHour, item.SalaryMonth, item.DesignNo, item.FromDate, item.ToDate, item.MaxPerson, item.Status,(int)item.ProductionBonusType, item.ID); } diff --git a/HRM.DA/Service/Bonus/ProdBonusProcessService.cs b/HRM.DA/Service/Bonus/ProdBonusProcessService.cs index 65dca7c..ff1d0dc 100644 --- a/HRM.DA/Service/Bonus/ProdBonusProcessService.cs +++ b/HRM.DA/Service/Bonus/ProdBonusProcessService.cs @@ -728,11 +728,11 @@ namespace HRM.DA if (ts.Minutes < 16 && ts.Hours < 5) wh = ts.Hours; else if (ts.Minutes < 16) - wh = ts.Hours - 1; + wh = ts.Hours - oProductionBonusSetup.BreakHour; else if (ts.TotalHours < 5) wh = ts.TotalHours; else - wh = ts.TotalHours - 1; + wh = ts.TotalHours - oProductionBonusSetup.BreakHour; hour += wh < 0 ? 0 : wh; } @@ -791,11 +791,11 @@ namespace HRM.DA if (ts.Minutes < 16 && ts.Hours < 5) wh = ts.Hours; else if (ts.Minutes < 16) - wh = ts.Hours - 1; + wh = ts.Hours - oProductionBonusSetup.BreakHour; else if (ts.TotalHours < 5) wh = ts.TotalHours; else - wh = ts.TotalHours - 1; + wh = ts.TotalHours - oProductionBonusSetup.BreakHour; // hour += ts.Hours < 0 ? 0 : ts.Hours; hour += wh < 0 ? 0 : wh; diff --git a/HRM.DA/Service/Bonus/ProductionBonusSetupService.cs b/HRM.DA/Service/Bonus/ProductionBonusSetupService.cs index 21e39a5..a15f723 100644 --- a/HRM.DA/Service/Bonus/ProductionBonusSetupService.cs +++ b/HRM.DA/Service/Bonus/ProductionBonusSetupService.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using Ease.Core.Utility; using System.Linq; using HRM.BO; +using static iTextSharp.text.pdf.AcroFields; namespace HRM.DA { @@ -26,6 +27,7 @@ namespace HRM.DA oProductionBonusSetup.DesignNo = oReader.GetString("DesignNo"); oProductionBonusSetup.ProgramName = oReader.GetString("ProgramName"); oProductionBonusSetup.AchivedPercent = oReader.GetDouble("AchivedPercent").GetValueOrDefault(); + oProductionBonusSetup.BreakHour = oReader.GetDouble("BreakHour").GetValueOrDefault(); oProductionBonusSetup.OTHour = oReader.GetDouble("OTHour").GetValueOrDefault(); oProductionBonusSetup.FromDate = oReader.GetDateTime("FromDate").Value; oProductionBonusSetup.ToDate = oReader.GetDateTime("ToDate").Value; diff --git a/HRM.Report/Class/rptBonus.cs b/HRM.Report/Class/rptBonus.cs index 28bb627..4647443 100644 --- a/HRM.Report/Class/rptBonus.cs +++ b/HRM.Report/Class/rptBonus.cs @@ -405,11 +405,11 @@ namespace HRM.Report if (ts.Minutes < 16 && ts.Hours < 5) wh = ts.Hours; else if (ts.Minutes < 16) - wh = ts.Hours - 1; + wh = ts.Hours - design.BreakHour; else if (ts.TotalHours < 5) wh = ts.TotalHours; else - wh = ts.TotalHours - 1; + wh = ts.TotalHours - design.BreakHour; // hour += ts.Hours < 0 ? 0 : ts.Hours; hour = wh < 0 ? 0 : wh; diff --git a/HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.js b/HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.js index 1e89ac3..ea84049 100644 --- a/HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.js +++ b/HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.js @@ -8,6 +8,7 @@ var ProductionBonusSetup = /** @class */ (function () { this.achivedPercent = 0; this.otHour = 0; this.maxPerson = 0; + this.breakHour = 1; // this.salaryMonth = null; this.designNo = ''; this.programName = ''; diff --git a/HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.js.map b/HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.js.map index 0afdfde..0e4d21a 100644 --- a/HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.js.map +++ b/HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.js.map @@ -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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.ts b/HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.ts index e225568..fd107f9 100644 --- a/HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.ts +++ b/HRM.UI/ClientApp/src/app/_models/Payroll/ProductionBonus/productionBonusSetup.ts @@ -6,6 +6,7 @@ import { ProdBonusWorkSchedule } from "./prodBonusWorkSchedule"; export class ProductionBonusSetup { id: number; achivedPercent: number; + breakHour: number; otHour: number; maxPerson: number; salaryMonth: Date; @@ -23,7 +24,8 @@ export class ProductionBonusSetup { this.id = 0; this.achivedPercent = 0; this.otHour = 0; - this.maxPerson = 0; + this.maxPerson = 0; + this.breakHour = 1; // this.salaryMonth = null; this.designNo = ''; this.programName = ''; diff --git a/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.html b/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.html index 2cc62d8..005413c 100644 --- a/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.html +++ b/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.html @@ -39,29 +39,36 @@
-
+
-
+
+ style="width:100%"> +
+
+ +
+
+
-
+
+ style="width:100%">
+ [defaultItem]="{ label: 'Select Bonus Type...', value: null }" [valueField]="'value'" style="width:100%">
@@ -69,7 +76,7 @@
+ style="width:100%">
@@ -77,14 +84,14 @@
+ style="width:100%">
+ style="width:100%">