AD Parameter Employee Entry

This commit is contained in:
Mohaimen Hasan 2026-11-15 13:09:32 +06:00
parent 7f1dcadd0c
commit 75e94ddc94
4 changed files with 521 additions and 384 deletions

View File

@ -2,8 +2,179 @@ kendo-numerictextbox{
width: 100%; width: 100%;
} }
.checkBoxGrid.grid { /* .checkBoxGrid.grid {
justify-content: space-evenly; justify-content: space-evenly;
} */
/* ---- Layout only (alignment / spacing); no behaviour depends on these classes ---- */
.adp-card {
padding: 14px 16px;
margin-bottom: 12px;
}
.adp-section-title {
font-weight: 600;
font-size: 13px;
color: #495057;
padding-bottom: 6px;
margin-bottom: 10px;
border-bottom: 1px solid #e9ecef;
}
.adp-required {
color: #dc3545;
}
/* label + control on one line, labels the same width so the controls line up */
.adp-field {
display: flex;
align-items: center;
gap: 10px;
margin-bottom: 8px;
}
.adp-label {
flex: 0 0 110px;
margin: 0;
white-space: nowrap;
}
.adp-control {
flex: 1 1 auto;
min-width: 0;
}
/* every input on the page the same height, so the rows line up */
.adp-page kendo-dropdownlist,
.adp-page kendo-numerictextbox,
.adp-page kendo-datepicker {
height: 32px;
}
.adp-page kendo-dropdownlist.form-control {
padding: 0;
font-size: inherit;
min-height: 0;
}
/* the four check boxes in two even columns, starting under the inputs (label width + gap) */
.adp-checks {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 8px 12px;
margin: 4px 0 0 120px;
padding: 10px 12px;
border: 1px solid #dee2e6;
border-radius: 6px;
background: #fafbfc;
}
.adp-check {
display: flex;
align-items: center;
gap: 6px;
margin: 0;
white-space: nowrap;
}
.adp-check .k-checkbox-label {
margin: 0;
}
/* the tab panels on this page are empty (only the headers are used), so drop their padding */
:host ::ng-deep .adp-card .tab-view-compat-panels {
padding: 0 !important;
}
.adp-detail-text {
margin: 12px 0 8px;
}
/* employee entry: label above each control, all on one row */
.adp-entry-row {
display: flex;
flex-wrap: wrap;
align-items: flex-start;
gap: 12px 16px;
margin-bottom: 10px;
}
.adp-entry-item {
display: flex;
flex-direction: column;
gap: 4px;
flex: 0 1 200px;
min-width: 160px;
}
.adp-entry-emp {
flex-basis: 140px;
min-width: 120px;
}
/* the picker (icon + count) sits in a 32px box like the inputs */
.adp-entry-emp app-employee-picker {
display: flex;
align-items: center;
min-height: 32px;
}
/* the picker sizes its search button and count as 15% of its box; on this page give them a fixed size
(this page only — the picker component itself is unchanged) */
/* direct path only, so the buttons inside the picker's pop-up dialog are not touched */
:host ::ng-deep .adp-entry-emp app-employee-picker > div > div > div > button {
width: 32px !important;
max-width: none !important;
height: 32px;
flex: 0 0 32px;
}
:host ::ng-deep .adp-entry-emp app-employee-picker > div > div > div > label {
width: auto !important;
max-width: none !important;
margin: 0 0 0 8px;
white-space: nowrap;
}
:host ::ng-deep .adp-entry-emp app-employee-picker > div > div > div {
display: flex;
align-items: center;
}
/* every label the same height (the To Date one has a check box), so all inputs start on one line */
.adp-entry-label {
display: flex;
align-items: center;
gap: 4px;
height: 22px;
margin: 0;
white-space: nowrap;
}
.adp-entry-label .k-checkbox-label {
margin: 0;
}
/* Sum on the left, buttons on the right */
.adp-action-bar {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
gap: 8px;
padding: 8px 0;
margin-bottom: 8px;
border-top: 1px solid #e9ecef;
}
.adp-sum {
font-weight: bold;
}
.adp-actions {
display: flex;
flex-wrap: wrap;
gap: 6px;
} }
@media screen and (max-width: 400px) { @media screen and (max-width: 400px) {
@ -17,4 +188,11 @@ kendo-numerictextbox{
flex-flow: column wrap; flex-flow: column wrap;
justify-content: flex-start; justify-content: flex-start;
} }
.adp-checks {
grid-template-columns: 1fr;
margin-left: 0;
}
.adp-entry-item {
flex: 1 1 100%;
}
} }

View File

@ -1,13 +1,14 @@
<app-loading-panel></app-loading-panel> <app-loading-panel></app-loading-panel>
<form [formGroup]="_fromValidator"> <form [formGroup]="_fromValidator" class="adp-page">
<div class="card" style="padding: 1%"> <!-- Setup: layout only was tidied; every control, binding and event is the same as before. -->
<div class="card adp-card">
<div class="topGrid grid"> <div class="topGrid grid">
<div class="col-5"> <!-- General -->
<div class="grid"> <div class="col-12 lg:col-5 adp-section">
<div class="col-4" style="margin: auto;"> <div class="adp-section-title">General</div>
<label class="form-control-label" for="ddlAllowance">Allowance *</label> <div class="adp-field">
</div> <label class="adp-label form-control-label" for="ddlAllowance">Allowance <span class="adp-required">*</span></label>
<div class="col-8"> <div class="adp-control">
<kendo-dropdownlist <kendo-dropdownlist
style="width: 100%" style="width: 100%"
class="form-control form-control-sm input-sm" class="form-control form-control-sm input-sm"
@ -30,11 +31,9 @@
</kendo-dropdownlist> </kendo-dropdownlist>
</div> </div>
</div> </div>
<div class="grid"> <div class="adp-field">
<div class="col-4" style="margin: auto;"> <label class="adp-label" for="ddlPeriodicity">Periodicity <span class="adp-required">*</span></label>
<label for="ddlPeriodicity">Periodicity *</label> <div class="adp-control">
</div>
<div class="col-8">
<kendo-dropdownlist <kendo-dropdownlist
class="form-control form-control-sm input-sm" class="form-control form-control-sm input-sm"
style="width: 100%" style="width: 100%"
@ -54,11 +53,9 @@
</kendo-dropdownlist> </kendo-dropdownlist>
</div> </div>
</div> </div>
<div class="grid"> <div class="adp-field">
<div class="col-4" style="margin: auto;"> <label class="adp-label" for="ddlGender">Gender</label>
<label for="ddlGender">Gender</label> <div class="adp-control">
</div>
<div class="col-8">
<kendo-dropdownlist <kendo-dropdownlist
class="form-control form-control-sm input-sm" class="form-control form-control-sm input-sm"
style="width: 100%" style="width: 100%"
@ -76,9 +73,8 @@
</kendo-dropdownlist> </kendo-dropdownlist>
</div> </div>
</div> </div>
<div class="checkBoxGrid" class="grid" style="margin-top: 0px;"> <div class="checkBoxGrid adp-checks">
<div class="col-6" style="margin: auto;"> <label class="k-form-field right adp-check">
<label class="k-form-field right">
<input <input
type="checkbox" type="checkbox"
formControlName="isForConfirmOnly" formControlName="isForConfirmOnly"
@ -87,9 +83,7 @@
kendoCheckBox/> kendoCheckBox/>
<label class="k-checkbox-label" for="enableConfirmCheck">Confirmation Required</label> <label class="k-checkbox-label" for="enableConfirmCheck">Confirmation Required</label>
</label> </label>
</div> <label class="k-form-field right adp-check">
<div class="col-6" style="margin: auto;">
<label class="k-form-field right">
<input <input
type="checkbox" type="checkbox"
formControlName="isDependsOnAttendance" formControlName="isDependsOnAttendance"
@ -98,9 +92,7 @@
kendoCheckBox/> kendoCheckBox/>
<label class="k-checkbox-label" for="enableDepandentCheck">Is Dependence on Attendance</label> <label class="k-checkbox-label" for="enableDepandentCheck">Is Dependence on Attendance</label>
</label> </label>
</div> <label class="k-form-field right adp-check">
<div class="col-6" style="margin: auto;">
<label class="k-form-field right">
<input <input
type="checkbox" type="checkbox"
formControlName="isFractionateApplicable" formControlName="isFractionateApplicable"
@ -109,9 +101,7 @@
kendoCheckBox/> kendoCheckBox/>
<label class="k-checkbox-label" for="enableFractionateCheck">Is fractionate Available</label> <label class="k-checkbox-label" for="enableFractionateCheck">Is fractionate Available</label>
</label> </label>
</div> <label class="k-form-field right adp-check">
<div class="col-6" style="margin: auto;">
<label class="k-form-field right">
<input <input
type="checkbox" type="checkbox"
formControlName="isTaxable" formControlName="isTaxable"
@ -122,13 +112,13 @@
</label> </label>
</div> </div>
</div> </div>
</div>
<div class="col-3"> <!-- Amount -->
<div class="grid"> <div class="col-12 md:col-6 lg:col-3 adp-section">
<div class="col-4" style="margin: auto;"> <div class="adp-section-title">Amount</div>
<label for="txtFlatAmount">Flat Amount</label> <div class="adp-field">
</div> <label class="adp-label" for="txtFlatAmount">Flat Amount</label>
<div class="col-8"> <div class="adp-control">
<kendo-numerictextbox <kendo-numerictextbox
[min]="-10000000" [min]="-10000000"
[max]="10000000" [max]="10000000"
@ -138,11 +128,9 @@
</kendo-numerictextbox> </kendo-numerictextbox>
</div> </div>
</div> </div>
<div class="grid"> <div class="adp-field">
<div class="col-4" style="margin: auto;"> <label class="adp-label" for="txtBasic">% of Basic</label>
<label for="txtBasic">% of Basic</label> <div class="adp-control">
</div>
<div class="col-8">
<kendo-numerictextbox <kendo-numerictextbox
[min]="-1000" [min]="-1000"
[max]="1000" [max]="1000"
@ -152,11 +140,9 @@
</kendo-numerictextbox> </kendo-numerictextbox>
</div> </div>
</div> </div>
<div class="grid"> <div class="adp-field">
<div class="col-4" style="margin: auto;"> <label class="adp-label" for="txtGross">% of Gross</label>
<label for="txtGross">% of Gross</label> <div class="adp-control">
</div>
<div class="col-8">
<kendo-numerictextbox <kendo-numerictextbox
[min]="-1000" [min]="-1000"
[max]="1000" [max]="1000"
@ -166,11 +152,9 @@
</kendo-numerictextbox> </kendo-numerictextbox>
</div> </div>
</div> </div>
<div class="grid"> <div class="adp-field">
<div class="col-4" style="margin: auto;"> <label class="adp-label" for="txtMininmum">Mininmum</label>
<label for="txtMininmum" style="margin: auto;">Mininmum</label> <div class="adp-control">
</div>
<div class="col-8">
<kendo-numerictextbox <kendo-numerictextbox
[min]="-10000000" [min]="-10000000"
[max]="10000000" [max]="10000000"
@ -180,11 +164,9 @@
</kendo-numerictextbox> </kendo-numerictextbox>
</div> </div>
</div> </div>
<div class="grid"> <div class="adp-field">
<div class="col-4" style="margin: auto;"> <label class="adp-label" for="txtMaximum">Maximum</label>
<label for="txtMaximum" style="margin: auto;">Maximum</label> <div class="adp-control">
</div>
<div class="col-8">
<kendo-numerictextbox <kendo-numerictextbox
[min]="-10000000" [min]="-10000000"
[max]="10000000" [max]="10000000"
@ -195,10 +177,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-4">
<!-- Grades -->
<div class="col-12 md:col-6 lg:col-4 adp-section">
<div class="adp-section-title">Grade <span class="adp-required">*</span></div>
<kendo-grid <kendo-grid
[data]="_grades" [data]="_grades"
height="180" height="220"
[(selectedKeys)]="_selectedgrades" [(selectedKeys)]="_selectedgrades"
[kendoGridSelectBy]="'id'" [kendoGridSelectBy]="'id'"
> >
@ -355,9 +340,9 @@
</div> </div>
</div> </div>
</div> --> </div> -->
<div class="card" style="padding: 1%">
<div class="grid"> <!-- Employees -->
<div class="col-12"> <div class="card adp-card">
<app-tab-view (onChange)="IndividualChecked($event)"> <app-tab-view (onChange)="IndividualChecked($event)">
@if (_selectedPeriodicity == 1) { @if (_selectedPeriodicity == 1) {
<app-tab-panel <app-tab-panel
@ -387,35 +372,24 @@
</app-tab-panel> </app-tab-panel>
} }
</app-tab-view> </app-tab-view>
<div class="grid">
<div class="col-12"> <div class="adp-detail-text">
<b> {{ _detailLevelText }}</b> <b> {{ _detailLevelText }}</b>
</div> </div>
</div>
<div class="grid" style="margin-top: 5px;"> <div class="adp-entry-row">
<div class="col-2"> <div class="adp-entry-item adp-entry-emp">
<div class="grid"> <label class="adp-entry-label" for="txtEmp">Select Emp</label>
<div class="col-5" style="margin: auto;">
<label for="txtEmp"> Select Emp</label>
</div>
<div class="col-7" align="left">
<app-employee-picker [MultiSelect]="true" <app-employee-picker [MultiSelect]="true"
[fixedGrades]="_selectedgrades" [fixedGrades]="_selectedgrades"
(ItemSelected)="GetSelectedEmployee($event)" (ItemSelected)="GetSelectedEmployee($event)"
style="width: 80%;"></app-employee-picker> ></app-employee-picker>
<!-- <app-employee-picker for="chkIsnew" id="idself" [isActive]="!newEmployee" [setSelectedEmp]="selectedEmployee" <!-- <app-employee-picker for="chkIsnew" id="idself" [isActive]="!newEmployee" [setSelectedEmp]="selectedEmployee"
(ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker> --> (ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker> -->
</div> </div>
</div>
</div>
@if (!_ischecknotapplicable) { @if (!_ischecknotapplicable) {
<div class="col-10"> <div class="adp-entry-item">
<div class="grid"> <label class="adp-entry-label" for="txtEmp">Amount</label>
<div class="col-1" style="margin: auto;" align="right">
<label for="txtEmp">Amount</label>
</div>
<div class="col-3">
<kendo-numerictextbox <kendo-numerictextbox
[min]="-10000000" [min]="-10000000"
[max]="10000000" [max]="10000000"
@ -425,10 +399,8 @@
</kendo-numerictextbox> </kendo-numerictextbox>
</div> </div>
@if (!_ischeckException) { @if (!_ischeckException) {
<div class="col-1" style="margin: auto;" align="right"> <div class="adp-entry-item">
<label for="dtpFromDate">From Date</label> <label class="adp-entry-label" for="dtpFromDate">From Date</label>
</div>
<div class="col-3">
<kendo-datepicker <kendo-datepicker
id="dtpFromDate" id="dtpFromDate"
[format]="'dd-MMM-yyyy'" [format]="'dd-MMM-yyyy'"
@ -438,8 +410,8 @@
style="width: 100%" style="width: 100%"
></kendo-datepicker> ></kendo-datepicker>
</div> </div>
<div class="col-1" style="margin: auto;" align="right"> <div class="adp-entry-item">
<label class="k-form-field right"> <label class="k-form-field right adp-entry-label">
<input <input
type="checkbox" type="checkbox"
[(ngModel)]="_checkedToDate" [(ngModel)]="_checkedToDate"
@ -453,8 +425,6 @@
To Date To Date
</label> </label>
</label> </label>
</div>
<div class="col-3">
<kendo-datepicker <kendo-datepicker
id="dtpToDate" id="dtpToDate"
[format]="'dd-MMM-yyyy'" [format]="'dd-MMM-yyyy'"
@ -468,29 +438,25 @@
></kendo-datepicker> ></kendo-datepicker>
</div> </div>
} }
</div>
</div>
} }
</div> </div>
<div class="grid">
<div class="col-2" style="font-weight: bold;"> <div class="adp-action-bar">
<div class="adp-sum">
Sum: {{get2FloatingPoint(sumofIndividualAmount())}} Sum: {{get2FloatingPoint(sumofIndividualAmount())}}
</div> </div>
<div class="col-10" align="right"> <div class="adp-actions">
<button kendoButton <button kendoButton
[svgIcon]="apiService.KendoSVGIcon['plus']" [svgIcon]="apiService.KendoSVGIcon['plus']"
class="k-button k-primary" class="k-button k-primary"
(click)="AddEmployee()"> (click)="AddEmployee()">
Add Add
</button> </button>
<button kendoButton style="margin-left:3px" [svgIcon]="apiService.KendoSVGIcon['delete']" class="kt-delete" (click)="RemoveAll()">Remove All</button> <button kendoButton [svgIcon]="apiService.KendoSVGIcon['delete']" class="kt-delete" (click)="RemoveAll()">Remove All</button>
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['save']" themeColor="primary" style="margin-left:3px" (click)="Save()" >Save</button> <button kendoButton [svgIcon]="apiService.KendoSVGIcon['save']" themeColor="primary" (click)="Save()" >Save</button>
</div>
</div>
</div>
</div>
</div>
<div class="grid">
<div class="col-12">
<kendo-grid [data]="_individualEmplyees" <kendo-grid [data]="_individualEmplyees"
height="300" height="300"
(remove)="removeHandler($event)"> (remove)="removeHandler($event)">
@ -538,7 +504,7 @@
{{ statusString(dataItem.approvalStatus)}} {{ statusString(dataItem.approvalStatus)}}
</ng-template> </ng-template>
</kendo-grid-column> </kendo-grid-column>
<kendo-grid-command-column title="Action" width="220"> <kendo-grid-command-column title="Action" width="120">
<ng-template kendoGridCellTemplate <ng-template kendoGridCellTemplate
let-dataItem let-dataItem
let-rowIndex="rowIndex"> let-rowIndex="rowIndex">
@ -547,11 +513,4 @@
</kendo-grid-command-column> </kendo-grid-command-column>
</kendo-grid> </kendo-grid>
</div> </div>
</div> </form>
</div>
</div>
<div class="grid">
<div class="col-12" align="right">
</div>
</div>
</form>

View File

@ -262,10 +262,16 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit
} }
RemoveAll() { RemoveAll() {
if (!confirm("Are you sure to delete all employees allowance entry")) { // if (!confirm("Are you sure to delete all employees allowance entry")) {
return; // return;
} // }
// this._individualEmplyees.splice(0, this._individualEmplyees.length);
this.notificationService.showActiveConfirm('Confirmation', "Are you sure to delete all employees allowance entry?").then((isConfirmed) => {
if (isConfirmed)
{
this._individualEmplyees.splice(0, this._individualEmplyees.length); this._individualEmplyees.splice(0, this._individualEmplyees.length);
}
});
} }
AddEmployee() { AddEmployee() {
@ -277,7 +283,6 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit
this.notificationService.showWarning("Please enter an Amount"); this.notificationService.showWarning("Please enter an Amount");
return; return;
} }
if (this._selectedEmps == undefined) return; if (this._selectedEmps == undefined) return;
this._selectedEmps.forEach(x => { this._selectedEmps.forEach(x => {
let newItem: ADParameterEmployee = this._individualEmplyees.find(e => e.employeeID == x.employeeID); let newItem: ADParameterEmployee = this._individualEmplyees.find(e => e.employeeID == x.employeeID);
@ -301,19 +306,14 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit
newItem.tillDate = this._individualToDate; newItem.tillDate = this._individualToDate;
newItem.monthlyAmount = this._individualAmount; newItem.monthlyAmount = this._individualAmount;
newItem.adEmpType = this._adEmpType; newItem.adEmpType = this._adEmpType;
} }
}); });
} }
public GetSelectedEmployee(searchEmp: SearchEmployee[]) { public GetSelectedEmployee(searchEmp: SearchEmployee[]) {
if (searchEmp != null) { if (searchEmp != null) {
this._selectedEmps = []; this._selectedEmps = [];
searchEmp.forEach(x => { searchEmp.forEach(x => { this._selectedEmps.push(x); });
this._selectedEmps.push(x);
});
} }
} }
PrepareGradeData(usedGrades: ADParameterGrade[]) { PrepareGradeData(usedGrades: ADParameterGrade[]) {

View File

@ -55,7 +55,7 @@ export class DiscontinueEmployeeDetailsComponent implements OnInit {
this.notificationService.showWarning('From Date cannot be after To Date.', 'Warning'); this.notificationService.showWarning('From Date cannot be after To Date.', 'Warning');
return; return;
} }
debugger; // debugger;
this.grid.load({ fromDate: this.fromDate, toDate: this.toDate }); this.grid.load({ fromDate: this.fromDate, toDate: this.toDate });
} }