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

Compare commits

base: CelHRTeam:5935a91c457623e8cd3050c8285cb9fc6fd1caa5
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_mashfiq
CelHRTeam:dev_chapal
CelHRTeam:main
..
compare: CelHRTeam:bb8c875a8e2a655c485e7974d6635f720b1c8b66
Branches Tags
CelHRTeam:dev_mashfiq
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:main

No commits in common. "5935a91c457623e8cd3050c8285cb9fc6fd1caa5" and "bb8c875a8e2a655c485e7974d6635f720b1c8b66" have entirely different histories.
5935a91c45 ... bb8c875a8e

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

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,