Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
add info text for RAT list (#252)
Browse files Browse the repository at this point in the history
  • Loading branch information
ggrund-tsi authored Oct 14, 2021
1 parent b4ec086 commit 6ee8440
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 13 deletions.
4 changes: 4 additions & 0 deletions src/assets/SCSS/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -470,3 +470,7 @@ td {
border: 1px solid #7e7e7e;
font-size: 1rem;
}
.rat-list-info-link{
text-decoration: underline !important;
font-weight: bolder;
}
3 changes: 3 additions & 0 deletions src/assets/i18n/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@
"searchPortalWebsiteTooltip": "Bitte wählen Sie zwischen 'https://' oder 'http://' und tragen sie anschließend hier ihre Website ein. Z. B.: www.example.de",
"searchPortalOpeningHours": "Öffnungszeiten",
"searchPortalAppointmentRequired": "Terminvereinbarung notwendig",
"RAT-list-info": "Die in der DCC-Auswahl gelisteten Tests beruhen auf einer auf EU-Ebene abgestimmten Liste und beinhalten auch Tests, die in Deutschland nicht erstattungsfähig sind. Die Erstattungsfähigkeit muss vom Betreiber selbst geprüft werden. Abgleich mit ",
"RAT-list-info-link": "https://antigentest.bfarm.de/ords/f?p=110:100:12807215185840:::::&tz=2:00",
"RAT-list-info-link-text":"BfArM-Liste",
"no-group-tooltip": "Dieser Benutzer*in kann das Schnelltestportal nicht mehr verwenden, da diesem Benutzer*in keine Teststelle zugewiesen wurde.",
"no-group-error": "Sie sind keiner Teststelle zugeordnet. Bitte kontaktieren Sie ihren Teststellen Administrator."
}
3 changes: 3 additions & 0 deletions src/assets/i18n/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
"searchPortalWebsiteTooltip": "tooltip",
"searchPortalOpeningHours": "Opening Hours",
"searchPortalAppointmentRequired": "Appointment Required",
"RAT-list-info": "The tests listed in the DCC selection are based on a list agreed at EU level and also include tests that are not reimbursable in Germany. The operator himself has to check the eligibility for reimbursement. Comparison with ",
"RAT-list-info-link": "https://antigentest.bfarm.de/ords/f?p=110:100:12807215185840:::::&tz=2:00",
"RAT-list-info-link-text":"BfArM list",
"no-group-tooltip": "This user can no longer use Schnelltestportal until a new testing facility has been assigned.",
"no-group-error": "User has no testing facility assigned"
}
24 changes: 14 additions & 10 deletions src/components/modules/form-group.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -251,16 +251,19 @@ export const FormGroupSelect = (props: any) => {
<Form.Label className='input-label' column xs='5' sm='3'>{props.title + (props.required ? '*' : '')}</Form.Label>

<Col xs='7' sm='9' className='d-flex'>
<Form.Control as="select"
className={!props.value ? 'selection-placeholder qt-input' : 'qt-input'}
value={props.value}
onChange={props.onChange}
placeholder={props.placeholder ? props.placeholder : props.title}
required={props.required}
>
<option disabled={props.required} key={0} value=''>{props.placeholder ? props.placeholder : props.title}</option>
{props.options}
</Form.Control>
<Row className='m-0'>
{props.infoText ? <Form.Label className='text-justify'>{props.infoText}</Form.Label> : <></>}
<Form.Control as="select"
className={!props.value ? 'selection-placeholder qt-input' : 'qt-input'}
value={props.value}
onChange={props.onChange}
placeholder={props.placeholder ? props.placeholder : props.title}
required={props.required}
>
<option disabled={props.required} key={0} value=''>{props.placeholder ? props.placeholder : props.title}</option>
{props.options}
</Form.Control>
</Row>
</Col>
</Form.Group>
)
Expand Down Expand Up @@ -294,6 +297,7 @@ export const FormGroupValueSetSelect = (props: any) => {
? <></>
: <FormGroupSelect controlId={props.controlId}
title={props.title}
infoText={props.infoText}
value={props.value}
hidden={props.hidden}
required={props.required}
Expand Down
7 changes: 4 additions & 3 deletions src/components/modules/test-result-inputs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ const TestResultInputs = (props: any) => {
React.useEffect(() => {
if (testResult) {
const result: ITestResult = {
testBrandId: dccConsent ? undefined :testId,
testBrandName: dccConsent ? undefined: testName,
testBrandId: dccConsent ? undefined : testId,
testBrandName: dccConsent ? undefined : testName,
result: testResult,
dccTestManufacturerId: dccConsent ? testManufacturerId : undefined,
dccTestManufacturerDescription: dccConsent ?testManufacturerDescription : undefined
dccTestManufacturerDescription: dccConsent ? testManufacturerDescription : undefined
}

props.onChange(result);
Expand Down Expand Up @@ -123,6 +123,7 @@ const TestResultInputs = (props: any) => {

{/* combobox testManufacturers */}
<FormGroupValueSetSelect controlId='formTestManufactorersInput' title={t('translation:testManufacturers')}
infoText={<>{t('translation:RAT-list-info')} <a className='rat-list-info-link' href={t('translation:RAT-list-info-link')} target='blank'>{t('translation:RAT-list-info-link-text')}</a></>}
value={testManufacturerId}
required={dccConsent}
hidden={!dccConsent}
Expand Down

0 comments on commit 6ee8440

Please sign in to comment.