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

dev_mashfiq #9

Merged
chapal merged 2 commits from dev_mashfiq into devqc 2024-10-31 15:38:10 +06:00
Conversation 0 Commits 2 Files Changed 5 +6 -2
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a8b0c5bf9c - Show all commits

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

@ -24,7 +24,7 @@ namespace HRM.DA
{ {
string sql = SQLParser.MakeSQL( string sql = SQLParser.MakeSQL(
"INSERT INTO ProductionBonusSetup(ProductionBonusSetupID, ProgramName, AchivedPercent, OTHour, SalaryMonth, DesignNo, FromDate, ToDate, MaxPerson, CreatedBy, CreationDate, Status)" + "INSERT INTO ProductionBonusSetup(ProductionBonusSetupID, ProgramName, AchivedPercent, OTHour, SalaryMonth, DesignNo, FromDate, ToDate, MaxPerson, CreatedBy, CreationDate, Status)" +
" VALUES(%n, %s, %n, %n, %d, %s, %d, %d, %n, %d, %n)", item.ID, item.ProgramName, item.AchivedPercent, item.OTHour, " VALUES(%n, %s, %n, %n, %d, %s, %d, %d, %n, %n, %d, %n)", item.ID, item.ProgramName, item.AchivedPercent, 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); item.Status);
tc.ExecuteNonQuery(sql); tc.ExecuteNonQuery(sql);

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

@ -13,7 +13,7 @@ export class ApiService {
public isSSO = false; public isSSO = false;
public versionDeployement = false; public versionDeployement = false;
public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2024, 7, 18))}-`+"01"; public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2024, 9, 29))}-`+"01";
public static BASE_URL = ''; public static BASE_URL = '';
public base_url = ''; public base_url = '';
// public currentLink = ''; // public currentLink = '';

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

@ -498,6 +498,10 @@ export class ProductionBonusSetupComponent implements OnInit {
onClickOk() { onClickOk() {
debugger; debugger;
if (this.isNewLine) { if (this.isNewLine) {
if(this._departmentPicker.selectedID == undefined){
this.notificationService.showWarning('Please Select a Line'); return;
}
this.prodBonusLine.lineName = this._departmentPicker.selectedObjects[0]['name'];
this.productionBonusSetup.productionBonusLines.push(this.prodBonusLine); // for new this.productionBonusSetup.productionBonusLines.push(this.prodBonusLine); // for new
this.notificationService.showSuccess('New Line added'); this.notificationService.showSuccess('New Line added');
} }