From a49fa8270386f102f7d5c5dabbfcbe54b5b27322 Mon Sep 17 00:00:00 2001 From: Amey Bhagwat Date: Thu, 5 Nov 2026 17:41:32 +0530 Subject: [PATCH] Added Percent symbol in the Input which accepts Percent value. Updated Doctor list --- files/import/import-doctors-04-11-2026.csv | 2 +- frontend/src/index.css | 44 +++++++ frontend/src/pages/SurveyPage.jsx | 127 ++++++++++++--------- frontend/src/pages/SurveyPage.test.jsx | 3 + 4 files changed, 122 insertions(+), 54 deletions(-) diff --git a/files/import/import-doctors-04-11-2026.csv b/files/import/import-doctors-04-11-2026.csv index edc41e9..84b49d6 100644 --- a/files/import/import-doctors-04-11-2026.csv +++ b/files/import/import-doctors-04-11-2026.csv @@ -205,7 +205,7 @@ Sr NO,TASKFORCE,ZBM Name,RBM Name,ABM Name,HQ,TM ID,TM Name,HCP NAME,LEGACY_CODE 204,Respiratory 2,Shaikh Mohseen Ahmed,Prashant Gakkhar,SURAJ RAWAT,AJMER,162115,HIMANSHU GARG,Dr.PRAMOD DADHICH,CLX0013432,11743902,Chest Physician,A+,100028825,Dr.PRAMOD DADHICH,dadhichrashmi@gmail.com,9829083879 205,Respiratory 2,Shaikh Mohseen Ahmed,Prashant Gakkhar,SURAJ RAWAT,AJMER,162115,HIMANSHU GARG,DR NEERAJ GUPTA,CIR21066,10280704,Chest Physician,A+,100116917,DR NEERAJ GUPTA,drneerajajmer@yahoo.com,9829101942 206,Respiratory 2,Shaikh Mohseen Ahmed,Prashant Gakkhar,SURAJ RAWAT,S MADHOPUR,168610,VIPUL SHARMA,Dr.Umesh Kumar Jatav,CLX0384426,10255366,Chest Physician,A+,100075453,Dr.Umesh Kumar Jatav,jahaji28@gmail.com,9602158647 -207,Respiratory 2,Shaikh Mohseen Ahmed,Prashant Gakkhar,SURAJ RAWAT,S MADHOPUR,168610,VIPUL SHARMA,Dr.Prem raj Singh,CIP610172,7659526,Chest Physician,A+,100037592,Dr.Prem raj Singh,drpremrajsingh@gmail.com,9929460655 &6350474968 +207,Respiratory 2,Shaikh Mohseen Ahmed,Prashant Gakkhar,SURAJ RAWAT,S MADHOPUR,168610,VIPUL SHARMA,Dr.Prem raj Singh,CIP610172,7659526,Chest Physician,A+,100037592,Dr.Prem raj Singh,drpremrajsingh@gmail.com,9929460655 208,Respiratory 2,Amandeep sharma,Umesh garg,Abhinav Sharma,TM-Jalandhar 17089,150541,Ishant Setia,PUNEET SINGH PERHAR,CLX1239048,12632335,Chest Physician,A+,100041086,PUNEET SINGH PERHAR,puneetperhar@yahoo.com,9779149838 209,Respiratory 2,Amandeep sharma,Umesh garg,Abhinav Sharma,TM-AMRITSAR 7465,171383,Arun Kumar,Mandeep Singh,CLX1650772,11311299,Chest Physician,A+,100056055,Mandeep Singh,mandeepsingh27@gmail.com,9811660365 210,Respiratory 2,Amandeep sharma,Umesh garg,Abhinav Sharma,TM-AMRITSAR 23513,171358,Ankush Kapoor,naresh chawla,CIP1067150,15023224,Chest Physician,A,100087159,naresh chawla,dr.nareshchawla@gmail.com,9814104155 diff --git a/frontend/src/index.css b/frontend/src/index.css index 7e8aa27..40aec09 100644 --- a/frontend/src/index.css +++ b/frontend/src/index.css @@ -729,6 +729,14 @@ a:focus-visible { .survey-grid-input input { flex: 1; min-width: 0; + -moz-appearance: textfield; + appearance: textfield; +} + +.survey-grid-input input::-webkit-outer-spin-button, +.survey-grid-input input::-webkit-inner-spin-button { + -webkit-appearance: none; + margin: 0; } .survey-grid-suffix { @@ -737,6 +745,38 @@ a:focus-visible { color: var(--text-muted); } +.percent-input { + position: relative; + display: block; + flex: 1; + min-width: 0; +} + +.site .percent-input input { + padding-right: 2rem; + -moz-appearance: textfield; + appearance: textfield; +} + +.percent-input input::-webkit-outer-spin-button, +.percent-input input::-webkit-inner-spin-button { + -webkit-appearance: none; + margin: 0; +} + +.percent-unit { + position: absolute; + top: 50%; + right: 0.75rem; + transform: translateY(-50%); + color: var(--text-muted); + pointer-events: none; +} + +.survey-grid-percent .survey-grid-value { + width: 7.5rem; +} + .survey-grid td.survey-grid-choice { text-align: center; vertical-align: middle; @@ -880,6 +920,10 @@ a:focus-visible { font-size: 1.25rem; } + .survey-grid-percent .survey-grid-value { + width: auto; + } + .flow-steps li { font-size: 0.68rem; } diff --git a/frontend/src/pages/SurveyPage.jsx b/frontend/src/pages/SurveyPage.jsx index 09cdcdd..27dee7b 100644 --- a/frontend/src/pages/SurveyPage.jsx +++ b/frontend/src/pages/SurveyPage.jsx @@ -126,6 +126,18 @@ function blurOnWheel(event) { event.currentTarget.blur(); } +/** Show a "%" inside a percentage input; the saved value stays a plain number. */ +function PercentInput({ children }) { + return ( + + {children} + + + ); +} + /** * @param {{ messages: string[] }} props */ @@ -213,27 +225,30 @@ function QuestionField({ } if (question.type === 'number' || question.type === 'percentage') { + const input = ( + { + const raw = event.target.value; + if (!inRange(question, raw)) { + return; + } + onChange(raw === '' ? '' : Number(raw)); + }} + /> + ); return (
{errors}
@@ -318,16 +333,17 @@ function QuestionField({ if (question.type === 'grid_percentage' || question.type === 'grid_number') { const grid = value && typeof value === 'object' ? value : {}; + const percent = question.type === 'grid_percentage'; return (
{question.label} - +
{question.columns.map((column) => ( - ))} @@ -337,40 +353,45 @@ function QuestionField({ {question.rows.map((row) => ( - {question.columns.map((column) => ( - - ))} + {question.columns.map((column) => { + const cellInput = ( + { + const raw = event.target.value; + if (!inRange(question, raw)) { + return; + } + onChange({ + ...grid, + [row.id]: { + ...(grid[row.id] ?? {}), + [column.id]: raw === '' ? '' : Number(raw), + }, + }); + }} + /> + ); + return ( + + ); + })} ))} diff --git a/frontend/src/pages/SurveyPage.test.jsx b/frontend/src/pages/SurveyPage.test.jsx index db76f52..c87e9c1 100644 --- a/frontend/src/pages/SurveyPage.test.jsx +++ b/frontend/src/pages/SurveyPage.test.jsx @@ -95,6 +95,7 @@ describe('survey steps', () => { fireEvent.change(field, { target: { value: '100' } }); expect(field).toHaveValue(100); + expect(field.closest('.percent-input')?.querySelector('.percent-unit')).toHaveTextContent('%'); }); it('blocks the minus and exponent keys when the minimum is zero', async () => { @@ -144,6 +145,8 @@ describe('survey steps', () => { fireEvent.change(cell, { target: { value: '-1' } }); expect(cell).toHaveValue(60); + expect(cell.closest('.percent-input')?.querySelector('.percent-unit')).toHaveTextContent('%'); + expect(cell.closest('table')).toHaveClass('survey-grid-percent'); }); it('keeps a missing required answer on the current step', async () => {
Pack type + {column.label}
{row.label} - {column.label} -
- { - const raw = event.target.value; - if (!inRange(question, raw)) { - return; - } - onChange({ - ...grid, - [row.id]: { - ...(grid[row.id] ?? {}), - [column.id]: raw === '' ? '' : Number(raw), - }, - }); - }} - /> - {question.suffix ? ( - {question.suffix} - ) : null} -
- 		+ {column.label} +
+ {percent ? {cellInput} : cellInput} + {question.suffix ? ( + {question.suffix} + ) : null} +
+