Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(feat) Enable reverse order for name fields in registration form via configuration #744

Merged
merged 6 commits into from
Jul 3, 2023
Merged

(feat) Enable reverse order for name fields in registration form via configuration #744

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
030a9c2
Display family name before the first name as per configuration
vasharma05 Jun 28, 2023
e22c321
Merge branch 'main' into swap-given-family-name-fields
vasharma05 Jun 29, 2023
7b3384b
Merge branch 'main' into swap-given-family-name-fields
denniskigen Jun 30, 2023
29218d4
Review changes
vasharma05 Jul 3, 2023
d07aa3a
Merge branch 'main' into swap-given-family-name-fields
vasharma05 Jul 3, 2023
d69291a
Merge branch 'swap-given-family-name-fields' of https://www.github.co…
vasharma05 Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/esm-patient-registration-app/src/config-schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export interface RegistrationConfig {
defaultUnknownGivenName: string;
defaultUnknownFamilyName: string;
displayCapturePhoto: boolean;
displayFamilyNameFieldFirst: boolean;
};
gender: Array<Gender>;
address: {
Expand Down Expand Up @@ -220,6 +221,11 @@ export const esmPatientRegistrationSchema = {
_default: true,
_description: 'Whether to display capture patient photo slot on name field',
},
displayFamilyNameFieldFirst: {
denniskigen marked this conversation as resolved.
Show resolved Hide resolved
_type: Type.Boolean,
_default: false,
_description: "Whether to display the name fields in the order 'Family name' -> 'Middle name' -> 'First name'",
},
},
gender: {
_type: Type.Array,
Expand Down
73 changes: 45 additions & 28 deletions ...esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function checkNumber(value: string) {
export const NameField = () => {
const {
fieldConfigurations: {
name: { displayCapturePhoto },
name: { displayCapturePhoto, displayFamilyNameFieldFirst },
},
} = useConfig() as RegistrationConfig;
const { t } = useTranslation();
Expand Down Expand Up @@ -55,6 +55,36 @@ export const NameField = () => {
}
};

const firstNameField = (
<Input
id="givenName"
name="givenName"
labelText={t('givenNameLabelText', 'First Name')}
checkWarning={checkNumber}
required
/>
);

const middleNameField = (
<Input
id="middleName"
name="middleName"
labelText={t('middleNameLabelText', 'Middle Name')}
light
checkWarning={checkNumber}
/>
);

const familyNameField = (
<Input
id="familyName"
name="familyName"
labelText={t('familyNameLabelText', 'Family Name')}
checkWarning={checkNumber}
required
/>
);
denniskigen marked this conversation as resolved.
Show resolved Hide resolved

return (
<div>
<h4 className={styles.productiveHeading02Light}>{t('fullNameLabelText', 'Full Name')}</h4>
Expand All @@ -75,33 +105,20 @@ export const NameField = () => {
<Switch name="known" text={t('yes', 'Yes')} />
<Switch name="unknown" text={t('no', 'No')} />
</ContentSwitcher>
{nameKnown && (
<>
<Input
id="givenName"
name="givenName"
labelText={t('givenNameLabelText', 'First Name')}
checkWarning={checkNumber}
required
/>
{fieldConfigs.displayMiddleName && (
<Input
id="middleName"
name="middleName"
labelText={t('middleNameLabelText', 'Middle Name')}
light
checkWarning={checkNumber}
/>
)}
<Input
id="familyName"
name="familyName"
labelText={t('familyNameLabelText', 'Family Name')}
checkWarning={checkNumber}
required
/>
</>
)}
{nameKnown &&
(!displayFamilyNameFieldFirst ? (
<>
{firstNameField}
{fieldConfigs.displayMiddleName && middleNameField}
{familyNameField}
</>
) : (
<>
{familyNameField}
{fieldConfigs.displayMiddleName && middleNameField}
{firstNameField}
</>
))}
</div>
</div>
</div>
Expand Down
Loading