Skip to content

Sign Up page / Manually - Add ID field #408

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

Open
rotembarsela wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Sign Up page / Manually - Add ID field #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6b4608
id field to coordinator
rotembarsela Sep 24, 2022
90caf83
Merge branch 'master' of https://github.com/startach/ZM-BloodComponen…
rotembarsela Oct 7, 2022
a17570e
style change
rotembarsela Oct 7, 2022
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
3 changes: 3 additions & 0 deletions packages/common/src/LocaleUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ export const getValidationErrorTranslation = (
return "השם המלא ארוך מ-20 תווים";
case PersonalDetailsValidation.PHONE_INVALID:
return "מספר הטלפון אינו תקין";
case PersonalDetailsValidation.PERSONALID_INVALID:
return "מספר תעודת הזהות אינו תקין";
case PersonalDetailsValidation.PHONE_HAS_NANS:
case PersonalDetailsValidation.PERSONALID_HAS_NANS:
return "יש להזין ספרות בלבד";
case PersonalDetailsValidation.REQUIRED_FIELD:
return "שדה חובה";
Expand Down
23 changes: 23 additions & 0 deletions packages/common/src/Validation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ export enum PersonalDetailsValidation {
FULL_NAME_TOO_LONG = "FULL_NAME_TOO_LONG",
PHONE_INVALID = "PHONE_INVALID",
PHONE_HAS_NANS = "PHONE_HAS_NANS",
PERSONALID_INVALID = "PERSONALID_INVALID",
PERSONALID_HAS_NANS = "PERSONALID_HAS_NANS",
REQUIRED_FIELD = "REQUIRED_FIELD",
}

Expand All @@ -25,6 +27,11 @@ export type PhoneValidation =
| PersonalDetailsValidation.PHONE_INVALID
| PersonalDetailsValidation.PHONE_HAS_NANS;

export type PersonalIdValidation =
| FieldValidation
| PersonalDetailsValidation.PERSONALID_INVALID
| PersonalDetailsValidation.PERSONALID_HAS_NANS;

export const ValidateFirstName = (firstName: string): FirstNameValidation => {
if (!firstName) return PersonalDetailsValidation.REQUIRED_FIELD;

Expand Down Expand Up @@ -59,3 +66,19 @@ export const ValidatePhone = (phone: string): PhoneValidation => {
}
return PersonalDetailsValidation.VALID_FIELD;
};

export const ValidatePersonalId = (
personalId: string
): PersonalIdValidation => {
if (!personalId) return PersonalDetailsValidation.REQUIRED_FIELD;

const allNumbersValidator = /^[0-9]*$/;
if (!allNumbersValidator.test(personalId)) {
return PersonalDetailsValidation.PERSONALID_HAS_NANS;
}
const formatValidator = /^[0-9]{8,9}$/;
if (personalId.length > 0 && !formatValidator.test(personalId)) {
return PersonalDetailsValidation.PERSONALID_INVALID;
}
return PersonalDetailsValidation.VALID_FIELD;
};
82 changes: 56 additions & 26 deletions ...screens/bookManualDonationScreen/__snapshots__/BookManualDonationScreen.stories.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-4:focus::-ms-input-p
animation-name: mui-auto-fill;
}

.emotion-13 {
.emotion-17 {
display: -webkit-inline-box;
display: -webkit-inline-flex;
display: -ms-inline-flexbox;
Expand Down Expand Up @@ -373,66 +373,66 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-4:focus::-ms-input-p
box-shadow: none;
}

.emotion-13::-moz-focus-inner {
.emotion-17::-moz-focus-inner {
border-style: none;
}

.emotion-13.Mui-disabled {
.emotion-17.Mui-disabled {
pointer-events: none;
cursor: default;
}

@media print {
.emotion-13 {
.emotion-17 {
-webkit-print-color-adjust: exact;
color-adjust: exact;
}
}

.emotion-13:hover {
.emotion-17:hover {
-webkit-text-decoration: none;
text-decoration: none;
background-color: rgb(53, 122, 56);
box-shadow: 0px 2px 4px -1px rgba(0,0,0,0.2),0px 4px 5px 0px rgba(0,0,0,0.14),0px 1px 10px 0px rgba(0,0,0,0.12);
}

@media (hover: none) {
.emotion-13:hover {
.emotion-17:hover {
background-color: #4caf51;
}
}

.emotion-13:active {
.emotion-17:active {
box-shadow: 0px 5px 5px -3px rgba(0,0,0,0.2),0px 8px 10px 1px rgba(0,0,0,0.14),0px 3px 14px 2px rgba(0,0,0,0.12);
}

.emotion-13.Mui-focusVisible {
.emotion-17.Mui-focusVisible {
box-shadow: 0px 3px 5px -1px rgba(0,0,0,0.2),0px 6px 10px 0px rgba(0,0,0,0.14),0px 1px 18px 0px rgba(0,0,0,0.12);
}

.emotion-13.Mui-disabled {
.emotion-17.Mui-disabled {
color: #7E7E7E;
box-shadow: none;
background-color: #dadee0;
}

.emotion-13:hover {
.emotion-17:hover {
box-shadow: none;
}

.emotion-13.Mui-focusVisible {
.emotion-17.Mui-focusVisible {
box-shadow: none;
}

.emotion-13:active {
.emotion-17:active {
box-shadow: none;
}

.emotion-13.Mui-disabled {
.emotion-17.Mui-disabled {
box-shadow: none;
}

.emotion-14 {
.emotion-18 {
display: -webkit-inline-box;
display: -webkit-inline-flex;
display: -ms-inline-flexbox;
Expand Down Expand Up @@ -481,53 +481,53 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-4:focus::-ms-input-p
box-shadow: none;
}

.emotion-14::-moz-focus-inner {
.emotion-18::-moz-focus-inner {
border-style: none;
}

.emotion-14.Mui-disabled {
.emotion-18.Mui-disabled {
pointer-events: none;
cursor: default;
}

@media print {
.emotion-14 {
.emotion-18 {
-webkit-print-color-adjust: exact;
color-adjust: exact;
}
}

.emotion-14:hover {
.emotion-18:hover {
-webkit-text-decoration: none;
text-decoration: none;
background-color: rgba(76, 175, 81, 0.04);
border: 1px solid #4caf51;
}

@media (hover: none) {
.emotion-14:hover {
.emotion-18:hover {
background-color: transparent;
}
}

.emotion-14.Mui-disabled {
.emotion-18.Mui-disabled {
color: #7E7E7E;
border: 1px solid #dadee0;
}

.emotion-14:hover {
.emotion-18:hover {
box-shadow: none;
}

.emotion-14.Mui-focusVisible {
.emotion-18.Mui-focusVisible {
box-shadow: none;
}

.emotion-14:active {
.emotion-18:active {
box-shadow: none;
}

.emotion-14.Mui-disabled {
.emotion-18.Mui-disabled {
box-shadow: none;
}

Expand Down Expand Up @@ -690,6 +690,36 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-4:focus::-ms-input-p
/>
</div>

</div>
<div
className="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root input emotion-1"
onKeyPress={[Function]}
>
<label
className="MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-standard MuiFormLabel-root MuiFormLabel-colorPrimary emotion-2"
data-shrink={false}
>
תעודת זהות
</label>
<div
className="MuiInput-root MuiInput-underline MuiInputBase-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl emotion-3"
onClick={[Function]}
>
<input
aria-invalid={false}
autoFocus={false}
className="MuiInput-input MuiInputBase-input emotion-4"
disabled={false}
onAnimationStart={[Function]}
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
required={false}
type="text"
value=""
/>
</div>

</div>
<div>
<div
Expand Down Expand Up @@ -806,7 +836,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-4:focus::-ms-input-p
>
<div>
<button
className="MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-disableElevation MuiButton-fullWidth MuiButtonBase-root Mui-disabled button disabledButton emotion-13"
className="MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-disableElevation MuiButton-fullWidth MuiButtonBase-root Mui-disabled button disabledButton emotion-17"
disabled={true}
onBlur={[Function]}
onClick={[Function]}
Expand All @@ -833,7 +863,7 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-4:focus::-ms-input-p
</div>
<div>
<button
className="MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeMedium MuiButton-outlinedSizeMedium MuiButton-disableElevation MuiButton-fullWidth MuiButtonBase-root button outlinedButton emotion-14"
className="MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeMedium MuiButton-outlinedSizeMedium MuiButton-disableElevation MuiButton-fullWidth MuiButtonBase-root button outlinedButton emotion-18"
disabled={false}
onBlur={[Function]}
onClick={[Function]}
Expand Down
69 changes: 69 additions & 0 deletions ...test__/src/screens/bookedDonation/__snapshots__/BookedAppointmentScreen.stories.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,29 @@ exports[`Storyshots Screens/Booked Appointment Appointment Not Passed 1`] = `
</div>
</div>
</div>
<div
className="infoBar"
>
<div
className="icon"
>
<svg>
id-card.svg
</svg>
</div>
<div
className="titleContent"
>
<div>
תעודת זהות
</div>
<div
className="values"
>
donorId
</div>
</div>
</div>
<div
className="infoBar"
>
Expand Down Expand Up @@ -464,6 +487,29 @@ exports[`Storyshots Screens/Booked Appointment Cant Remove Donor 1`] = `
</div>
</div>
</div>
<div
className="infoBar"
>
<div
className="icon"
>
<svg>
id-card.svg
</svg>
</div>
<div
className="titleContent"
>
<div>
תעודת זהות
</div>
<div
className="values"
>
donorId
</div>
</div>
</div>
<div
className="infoBar"
>
Expand Down Expand Up @@ -727,6 +773,29 @@ exports[`Storyshots Screens/Booked Appointment Default 1`] = `
</div>
</div>
</div>
<div
className="infoBar"
>
<div
className="icon"
>
<svg>
id-card.svg
</svg>
</div>
<div
className="titleContent"
>
<div>
תעודת זהות
</div>
<div
className="values"
>
donorId
</div>
</div>
</div>
<div
className="infoBar"
>
Expand Down
Loading