From 64495523aa4d6117df6d24a7168fbd180ac17404 Mon Sep 17 00:00:00 2001 From: Mohaimen Hasan Date: Wed, 18 Nov 2026 17:23:14 +0600 Subject: [PATCH] allowance Deduction --- ...ction-parameterization-details.component.html | 6 +++--- ...eduction-parameterization-entry.component.css | 16 +++++++++++++--- .../src/styles/vendors/kendo/grid/_header.scss | 12 ++++++++++++ HRM.UI/ClientApp/src/version.json | 4 ++-- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/HRM.UI/ClientApp/src/app/payroll/allowance-deduction/allowance-deduction-parameterization/allowance-deduction-parameterization-details/allowance-deduction-parameterization-details.component.html b/HRM.UI/ClientApp/src/app/payroll/allowance-deduction/allowance-deduction-parameterization/allowance-deduction-parameterization-details/allowance-deduction-parameterization-details.component.html index 99728e9..502d09e 100644 --- a/HRM.UI/ClientApp/src/app/payroll/allowance-deduction/allowance-deduction-parameterization/allowance-deduction-parameterization-details/allowance-deduction-parameterization-details.component.html +++ b/HRM.UI/ClientApp/src/app/payroll/allowance-deduction/allowance-deduction-parameterization/allowance-deduction-parameterization-details/allowance-deduction-parameterization-details.component.html @@ -1,6 +1,6 @@
- @@ -17,14 +17,14 @@ - + {{preodicityString(rowIndex)}} - + {{dataItem.isTaxable ? 'Yes' : 'No'}} diff --git a/HRM.UI/ClientApp/src/app/payroll/allowance-deduction/allowance-deduction-parameterization/allowance-deduction-parameterization-entry/allowance-deduction-parameterization-entry.component.css b/HRM.UI/ClientApp/src/app/payroll/allowance-deduction/allowance-deduction-parameterization/allowance-deduction-parameterization-entry/allowance-deduction-parameterization-entry.component.css index 66ad5b0..8f2316f 100644 --- a/HRM.UI/ClientApp/src/app/payroll/allowance-deduction/allowance-deduction-parameterization/allowance-deduction-parameterization-entry/allowance-deduction-parameterization-entry.component.css +++ b/HRM.UI/ClientApp/src/app/payroll/allowance-deduction/allowance-deduction-parameterization/allowance-deduction-parameterization-entry/allowance-deduction-parameterization-entry.component.css @@ -60,7 +60,8 @@ kendo-numerictextbox{ /* 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)); + /* two columns while they fit, one column when the section gets narrow */ + grid-template-columns: repeat(auto-fit, minmax(180px, 1fr)); gap: 8px 12px; margin: 4px 0 0 120px; padding: 10px 12px; @@ -69,16 +70,25 @@ kendo-numerictextbox{ background: #fafbfc; } +/* a long label wraps inside its own column instead of running out of the box */ .adp-check { display: flex; - align-items: center; + align-items: flex-start; gap: 6px; margin: 0; - white-space: nowrap; + min-width: 0; +} + +.adp-check input { + flex: 0 0 auto; + margin-top: 2px; } .adp-check .k-checkbox-label { margin: 0; + min-width: 0; + white-space: normal; + overflow-wrap: anywhere; } /* the tab panels on this page are empty (only the headers are used), so drop their padding */ diff --git a/HRM.UI/ClientApp/src/styles/vendors/kendo/grid/_header.scss b/HRM.UI/ClientApp/src/styles/vendors/kendo/grid/_header.scss index 3625efd..751ca86 100644 --- a/HRM.UI/ClientApp/src/styles/vendors/kendo/grid/_header.scss +++ b/HRM.UI/ClientApp/src/styles/vendors/kendo/grid/_header.scss @@ -9,6 +9,18 @@ padding: 0 !important; } +// Opt-in: keep every column title of a grid on one line (overrides the wrapping default above). +.k-grid.grid-header-nowrap .k-column-title { + white-space: nowrap; +} + +// Opt-in: body cell values wrap inside their column, even a long value with no spaces +// (e.g. "AVP,SPO,PO,FAVP,..."). +.k-grid.grid-cell-wrap .k-grid-content td { + white-space: normal; + overflow-wrap: anywhere; +} + // Compact "dashboard widget" grid header variant (ESS dashboards), scoped under .dashboard-card // so it doesn't change the app-wide default .k-grid-header color set in styles.scss. .dashboard-card .k-grid-header { diff --git a/HRM.UI/ClientApp/src/version.json b/HRM.UI/ClientApp/src/version.json index 087841a..aae01e5 100644 --- a/HRM.UI/ClientApp/src/version.json +++ b/HRM.UI/ClientApp/src/version.json @@ -1,4 +1,4 @@ { - "version": "20261118-01", - "buildTime": "2026-11-18T04:58:16.4380254Z" + "version": "20261118-02", + "buildTime": "2026-11-18T08:51:48.7258631Z" }