Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
2
22_23-J 16
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
22_23-J 16
22_23-J 16
Commits
59b88213
Commit
59b88213
authored
May 18, 2023
by
Dayan Marasinghe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
button changes
parent
a249a58e
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
84 additions
and
29 deletions
+84
-29
emma-frontend/components/patientscreens/consent.js
emma-frontend/components/patientscreens/consent.js
+1
-1
emma-frontend/components/patientscreens/registration/regEight.js
...ontend/components/patientscreens/registration/regEight.js
+17
-7
emma-frontend/components/patientscreens/registration/regFive.js
...rontend/components/patientscreens/registration/regFive.js
+4
-3
emma-frontend/components/patientscreens/registration/regFour.js
...rontend/components/patientscreens/registration/regFour.js
+9
-3
emma-frontend/components/patientscreens/registration/regFourOptional.js
...components/patientscreens/registration/regFourOptional.js
+9
-2
emma-frontend/components/patientscreens/registration/regSeven.js
...ontend/components/patientscreens/registration/regSeven.js
+8
-2
emma-frontend/components/patientscreens/registration/regSix.js
...frontend/components/patientscreens/registration/regSix.js
+9
-2
emma-frontend/components/patientscreens/registration/regThree.js
...ontend/components/patientscreens/registration/regThree.js
+12
-4
emma-frontend/components/patientscreens/registration/regTwo.js
...frontend/components/patientscreens/registration/regTwo.js
+9
-3
emma-frontend/components/shared/sharedLogin.js
emma-frontend/components/shared/sharedLogin.js
+3
-1
emma-frontend/components/shared/sharedRegistration.js
emma-frontend/components/shared/sharedRegistration.js
+3
-1
No files found.
emma-frontend/components/patientscreens/consent.js
View file @
59b88213
...
@@ -97,7 +97,7 @@ export default function PatientConsentForm({ navigation, route }) {
...
@@ -97,7 +97,7 @@ export default function PatientConsentForm({ navigation, route }) {
<Button title="Cancel" onPress={handleCancel} /> */}
<Button title="Cancel" onPress={handleCancel} /> */}
<View style={{ marginTop: 10 }}>
<View style={{ marginTop: 10 }}>
<Button title="Agree" onPress={handleAgree} />
<Button title="Agree" onPress={handleAgree}
color="#703BE7"
/>
</View>
</View>
<View style={{ marginTop: 10, marginBottom: 10 }}>
<View style={{ marginTop: 10, marginBottom: 10 }}>
<Button title="Cancel" onPress={handleCancel} color="red" />
<Button title="Cancel" onPress={handleCancel} color="red" />
...
...
emma-frontend/components/patientscreens/registration/regEight.js
View file @
59b88213
...
@@ -168,6 +168,7 @@ export default function PatientRegEight({ navigation, route }) {
...
@@ -168,6 +168,7 @@ export default function PatientRegEight({ navigation, route }) {
return
(
return
(
<
View
style
=
{
styles
.
container
}
>
<
View
style
=
{
styles
.
container
}
>
<
Text
>
Highest
Education
Level
:
<
/Text
>
<
Text
>
Highest
Education
Level
:
<
/Text
>
<
View
style
=
{
styles
.
separator
}
/
>
<
RadioForm
animation
=
{
true
}
>
<
RadioForm
animation
=
{
true
}
>
{
educationLevelOptions
.
map
((
option
,
index
)
=>
(
{
educationLevelOptions
.
map
((
option
,
index
)
=>
(
<
RadioButton
<
RadioButton
...
@@ -180,9 +181,9 @@ export default function PatientRegEight({ navigation, route }) {
...
@@ -180,9 +181,9 @@ export default function PatientRegEight({ navigation, route }) {
index
=
{
index
}
index
=
{
index
}
isSelected
=
{
educationLevel
===
option
.
value
}
isSelected
=
{
educationLevel
===
option
.
value
}
onPress
=
{()
=>
setEducationLevel
(
option
.
value
)}
onPress
=
{()
=>
setEducationLevel
(
option
.
value
)}
buttonInnerColor
=
{
"
#
2196f3
"
}
buttonInnerColor
=
{
"
#
703BE7
"
}
buttonOuterColor
=
{
buttonOuterColor
=
{
educationLevel
===
option
.
value
?
"
#
2196f3
"
:
"
#000
"
educationLevel
===
option
.
value
?
"
#
703BE7
"
:
"
#703BE7
"
}
}
buttonSize
=
{
15
}
buttonSize
=
{
15
}
buttonOuterSize
=
{
25
}
buttonOuterSize
=
{
25
}
...
@@ -199,8 +200,9 @@ export default function PatientRegEight({ navigation, route }) {
...
@@ -199,8 +200,9 @@ export default function PatientRegEight({ navigation, route }) {
<
/RadioButton
>
<
/RadioButton
>
))}
))}
<
/RadioForm
>
<
/RadioForm
>
<
View
style
=
{
styles
.
separator
}
/
>
<
Text
>
Employed
:
<
/Text
>
<
Text
>
Employed
:
<
/Text
>
<
View
style
=
{
styles
.
separator
}
/
>
<
RadioForm
animation
=
{
true
}
>
<
RadioForm
animation
=
{
true
}
>
{
employedOptions
.
map
((
option
,
index
)
=>
(
{
employedOptions
.
map
((
option
,
index
)
=>
(
<
RadioButton
<
RadioButton
...
@@ -213,9 +215,9 @@ export default function PatientRegEight({ navigation, route }) {
...
@@ -213,9 +215,9 @@ export default function PatientRegEight({ navigation, route }) {
index
=
{
index
}
index
=
{
index
}
isSelected
=
{
employedStatus
===
option
.
value
}
isSelected
=
{
employedStatus
===
option
.
value
}
onPress
=
{()
=>
setEmployedStatus
(
option
.
value
)}
onPress
=
{()
=>
setEmployedStatus
(
option
.
value
)}
buttonInnerColor
=
{
"
#
2196f3
"
}
buttonInnerColor
=
{
"
#
703BE7
"
}
buttonOuterColor
=
{
buttonOuterColor
=
{
employedStatus
===
option
.
value
?
"
#
2196f3
"
:
"
#000
"
employedStatus
===
option
.
value
?
"
#
703BE7
"
:
"
#703BE7
"
}
}
buttonSize
=
{
15
}
buttonSize
=
{
15
}
buttonOuterSize
=
{
25
}
buttonOuterSize
=
{
25
}
...
@@ -232,8 +234,9 @@ export default function PatientRegEight({ navigation, route }) {
...
@@ -232,8 +234,9 @@ export default function PatientRegEight({ navigation, route }) {
<
/RadioButton
>
<
/RadioButton
>
))}
))}
<
/RadioForm
>
<
/RadioForm
>
<
View
style
=
{
styles
.
buttonContainer
}
>
<
Button
title
=
"
All Done
"
onPress
=
{
handleSave
}
/
>
<
Button
title
=
"
All Done
"
onPress
=
{
handleSave
}
color
=
"
#703BE7
"
/>
<
/View
>
<
/View
>
<
/View
>
);
);
}
}
...
@@ -243,4 +246,11 @@ const styles = StyleSheet.create({
...
@@ -243,4 +246,11 @@ const styles = StyleSheet.create({
alignItems
:
"
center
"
,
alignItems
:
"
center
"
,
justifyContent
:
"
center
"
,
justifyContent
:
"
center
"
,
},
},
buttonContainer
:
{
width
:
"
80%
"
,
marginTop
:
10
,
},
separator
:
{
height
:
20
,
},
});
});
emma-frontend/components/patientscreens/registration/regFive.js
View file @
59b88213
...
@@ -54,7 +54,8 @@ export default function PatientRegFive({ navigation, route }) {
...
@@ -54,7 +54,8 @@ export default function PatientRegFive({ navigation, route }) {
onPress
=
{
handleRelationshipStatusChange
}
onPress
=
{
handleRelationshipStatusChange
}
formHorizontal
=
{
false
}
formHorizontal
=
{
false
}
labelHorizontal
=
{
true
}
labelHorizontal
=
{
true
}
buttonColor
=
{
"
#2196f3
"
}
buttonColor
=
{
"
#703BE7
"
}
selectedButtonColor
=
{
"
#703BE7
"
}
/
>
/
>
<
Text
style
=
{
styles
.
label
}
>
Number
of
Children
:
<
/Text
>
<
Text
style
=
{
styles
.
label
}
>
Number
of
Children
:
<
/Text
>
...
@@ -64,8 +65,8 @@ export default function PatientRegFive({ navigation, route }) {
...
@@ -64,8 +65,8 @@ export default function PatientRegFive({ navigation, route }) {
onChangeText
=
{
handleNumberOfChildrenChange
}
onChangeText
=
{
handleNumberOfChildrenChange
}
keyboardType
=
"
numeric
"
keyboardType
=
"
numeric
"
/>
/>
<
View
style
=
{
styles
.
buttonContainer
}
><
/View
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
/
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
color
=
"
#703BE7
"
/>
<
/View
>
<
/View
>
);
);
}
}
...
...
emma-frontend/components/patientscreens/registration/regFour.js
View file @
59b88213
...
@@ -50,12 +50,14 @@ export default function PatientRegFour({ navigation, route }) {
...
@@ -50,12 +50,14 @@ export default function PatientRegFour({ navigation, route }) {
onPress
=
{
handleParentStatusChange
}
onPress
=
{
handleParentStatusChange
}
formHorizontal
=
{
false
}
formHorizontal
=
{
false
}
labelHorizontal
=
{
true
}
labelHorizontal
=
{
true
}
buttonColor
=
{
"
#
2196f3
"
}
buttonColor
=
{
"
#
703BE7
"
}
selectedButtonColor
=
{
"
#
2196f3
"
}
selectedButtonColor
=
{
"
#
703BE7
"
}
labelStyle
=
{{
fontSize
:
16
,
marginHorizontal
:
10
}}
labelStyle
=
{{
fontSize
:
16
,
marginHorizontal
:
10
}}
style
=
{{
marginVertical
:
10
}}
style
=
{{
marginVertical
:
10
}}
/
>
/
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
/
>
<
View
style
=
{
styles
.
buttonContainer
}
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
color
=
"
#703BE7
"
/>
<
/View
>
<
/View
>
<
/View
>
);
);
}
}
...
@@ -65,4 +67,8 @@ const styles = StyleSheet.create({
...
@@ -65,4 +67,8 @@ const styles = StyleSheet.create({
alignItems
:
"
center
"
,
alignItems
:
"
center
"
,
justifyContent
:
"
center
"
,
justifyContent
:
"
center
"
,
},
},
buttonContainer
:
{
width
:
"
80%
"
,
marginTop
:
10
,
},
});
});
emma-frontend/components/patientscreens/registration/regFourOptional.js
View file @
59b88213
...
@@ -28,7 +28,9 @@ export default function PatientRegFourOptional({ navigation, route }) {
...
@@ -28,7 +28,9 @@ export default function PatientRegFourOptional({ navigation, route }) {
value
=
{
siblingCount
.
toString
()}
value
=
{
siblingCount
.
toString
()}
keyboardType
=
"
numeric
"
keyboardType
=
"
numeric
"
/>
/>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
/
>
<
View
style
=
{
styles
.
buttonContainer
}
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
color
=
"
#703BE7
"
/>
<
/View
>
<
/View
>
<
/View
>
);
);
}
}
...
@@ -39,7 +41,7 @@ const styles = StyleSheet.create({
...
@@ -39,7 +41,7 @@ const styles = StyleSheet.create({
justifyContent
:
"
center
"
,
justifyContent
:
"
center
"
,
},
},
inputContainer
:
{
inputContainer
:
{
marginTop
:
2
0
,
marginTop
:
3
0
,
},
},
input
:
{
input
:
{
height
:
40
,
height
:
40
,
...
@@ -47,5 +49,10 @@ const styles = StyleSheet.create({
...
@@ -47,5 +49,10 @@ const styles = StyleSheet.create({
borderColor
:
"
gray
"
,
borderColor
:
"
gray
"
,
borderWidth
:
1
,
borderWidth
:
1
,
paddingHorizontal
:
10
,
paddingHorizontal
:
10
,
marginTop
:
20
,
},
buttonContainer
:
{
width
:
"
80%
"
,
marginTop
:
20
,
},
},
});
});
emma-frontend/components/patientscreens/registration/regSeven.js
View file @
59b88213
...
@@ -53,8 +53,9 @@ export default function PatientRegSeven({ navigation, route }) {
...
@@ -53,8 +53,9 @@ export default function PatientRegSeven({ navigation, route }) {
onChangeText
=
{
setNationality
}
onChangeText
=
{
setNationality
}
maxLength
=
{
64
}
maxLength
=
{
64
}
/
>
/
>
<
View
style
=
{
styles
.
buttonContainer
}
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
/
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
color
=
"
#703BE7
"
/>
<
/View
>
<
/View
>
<
/View
>
);
);
}
}
...
@@ -69,5 +70,10 @@ const styles = StyleSheet.create({
...
@@ -69,5 +70,10 @@ const styles = StyleSheet.create({
borderWidth
:
1
,
borderWidth
:
1
,
borderColor
:
"
gray
"
,
borderColor
:
"
gray
"
,
marginBottom
:
10
,
marginBottom
:
10
,
marginTop
:
10
,
},
buttonContainer
:
{
width
:
"
80%
"
,
marginTop
:
10
,
},
},
});
});
emma-frontend/components/patientscreens/registration/regSix.js
View file @
59b88213
...
@@ -49,9 +49,12 @@ export default function PatientRegSix({ navigation, route }) {
...
@@ -49,9 +49,12 @@ export default function PatientRegSix({ navigation, route }) {
onPress
=
{
handleOptionSelect
}
onPress
=
{
handleOptionSelect
}
formHorizontal
=
{
false
}
formHorizontal
=
{
false
}
labelHorizontal
=
{
true
}
labelHorizontal
=
{
true
}
buttonColor
=
{
"
#2196f3
"
}
buttonColor
=
{
"
#703BE7
"
}
selectedButtonColor
=
{
"
#703BE7
"
}
/
>
/
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
/
>
<
View
style
=
{
styles
.
buttonContainer
}
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
color
=
"
#703BE7
"
/>
<
/View
>
<
/View
>
<
/View
>
);
);
}
}
...
@@ -67,4 +70,8 @@ const styles = StyleSheet.create({
...
@@ -67,4 +70,8 @@ const styles = StyleSheet.create({
fontSize
:
18
,
fontSize
:
18
,
marginBottom
:
10
,
marginBottom
:
10
,
},
},
buttonContainer
:
{
width
:
"
80%
"
,
marginTop
:
10
,
},
});
});
emma-frontend/components/patientscreens/registration/regThree.js
View file @
59b88213
...
@@ -61,7 +61,9 @@ export default function PatientRegThree({ navigation, route }) {
...
@@ -61,7 +61,9 @@ export default function PatientRegThree({ navigation, route }) {
return
(
return
(
<
View
style
=
{
styles
.
container
}
>
<
View
style
=
{
styles
.
container
}
>
<
Text
>
Date
of
Birth
<
/Text
>
<
Text
>
Date
of
Birth
<
/Text
>
<
Button
title
=
"
Pick a date
"
onPress
=
{()
=>
setShowDatePicker
(
true
)}
/
>
<
View
style
=
{
styles
.
buttonContainer
}
>
<
Button
title
=
"
Pick a date
"
onPress
=
{()
=>
setShowDatePicker
(
true
)}
color
=
"
#703BE7
"
/>
<
/View
>
{
showDatePicker
&&
(
{
showDatePicker
&&
(
<
DateTimePicker
<
DateTimePicker
value
=
{
birthday
}
value
=
{
birthday
}
...
@@ -78,12 +80,14 @@ export default function PatientRegThree({ navigation, route }) {
...
@@ -78,12 +80,14 @@ export default function PatientRegThree({ navigation, route }) {
onPress
=
{(
value
)
=>
setGender
(
value
)}
onPress
=
{(
value
)
=>
setGender
(
value
)}
formHorizontal
=
{
true
}
formHorizontal
=
{
true
}
labelHorizontal
=
{
false
}
labelHorizontal
=
{
false
}
buttonColor
=
{
"
#
2196f3
"
}
buttonColor
=
{
"
#
703BE7
"
}
selectedButtonColor
=
{
"
#
2196f3
"
}
selectedButtonColor
=
{
"
#
703BE7
"
}
labelStyle
=
{{
fontSize
:
16
,
marginHorizontal
:
10
}}
labelStyle
=
{{
fontSize
:
16
,
marginHorizontal
:
10
}}
style
=
{{
marginVertical
:
10
}}
style
=
{{
marginVertical
:
10
}}
/
>
/
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
/
>
<
View
style
=
{
styles
.
buttonContainer
}
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
color
=
"
#703BE7
"
/>
<
/View
>
<
/View
>
<
/View
>
);
);
}
}
...
@@ -129,4 +133,8 @@ const styles = StyleSheet.create({
...
@@ -129,4 +133,8 @@ const styles = StyleSheet.create({
btnTextCancel
:
{
btnTextCancel
:
{
color
:
"
#666
"
,
color
:
"
#666
"
,
},
},
buttonContainer
:
{
width
:
"
80%
"
,
marginTop
:
10
,
},
});
});
emma-frontend/components/patientscreens/registration/regTwo.js
View file @
59b88213
...
@@ -47,12 +47,14 @@ export default function PatientRegTwo() {
...
@@ -47,12 +47,14 @@ export default function PatientRegTwo() {
onPress
=
{(
value
)
=>
setPronoun
(
value
)}
onPress
=
{(
value
)
=>
setPronoun
(
value
)}
formHorizontal
=
{
true
}
formHorizontal
=
{
true
}
labelHorizontal
=
{
false
}
labelHorizontal
=
{
false
}
buttonColor
=
{
"
#
2196f3
"
}
buttonColor
=
{
"
#
703BE7
"
}
selectedButtonColor
=
{
"
#
2196f3
"
}
selectedButtonColor
=
{
"
#
703BE7
"
}
labelStyle
=
{{
fontSize
:
16
,
marginHorizontal
:
10
}}
labelStyle
=
{{
fontSize
:
16
,
marginHorizontal
:
10
}}
style
=
{{
marginVertical
:
10
}}
style
=
{{
marginVertical
:
10
}}
/
>
/
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
/
>
<
View
style
=
{
styles
.
buttonContainer
}
>
<
Button
title
=
"
Next
"
onPress
=
{
handleNext
}
color
=
"
#703BE7
"
/>
<
/View
>
<
/View
>
<
/View
>
);
);
}
}
...
@@ -77,4 +79,8 @@ const styles = StyleSheet.create({
...
@@ -77,4 +79,8 @@ const styles = StyleSheet.create({
fontWeight
:
"
bold
"
,
fontWeight
:
"
bold
"
,
marginVertical
:
10
,
marginVertical
:
10
,
},
},
buttonContainer
:
{
width
:
"
80%
"
,
marginTop
:
10
,
},
});
});
emma-frontend/components/shared/sharedLogin.js
View file @
59b88213
...
@@ -8,11 +8,13 @@ export default function SharedLogin({ navigation }) {
...
@@ -8,11 +8,13 @@ export default function SharedLogin({ navigation }) {
<
Button
<
Button
title
=
"
I am here to get help
"
title
=
"
I am here to get help
"
onPress
=
{()
=>
navigation
.
navigate
(
"
PatientLogin
"
)}
onPress
=
{()
=>
navigation
.
navigate
(
"
PatientLogin
"
)}
color
=
"
#703BE7
"
/>
/>
<
View
style
=
{
styles
.
separator
}
/
>
<
View
style
=
{
styles
.
separator
}
/
>
<
Button
<
Button
title
=
"
I am here to help
"
title
=
"
I am here to help
"
onPress
=
{()
=>
navigation
.
navigate
(
"
PractitionerLogin
"
)}
onPress
=
{()
=>
navigation
.
navigate
(
"
PractitionerLogin
"
)}
color
=
"
#703BE7
"
/>
/>
<
/View
>
<
/View
>
<
/View
>
<
/View
>
...
@@ -26,10 +28,10 @@ const styles = StyleSheet.create({
...
@@ -26,10 +28,10 @@ const styles = StyleSheet.create({
justifyContent
:
"
center
"
,
justifyContent
:
"
center
"
,
},
},
buttonContainer
:
{
buttonContainer
:
{
flexDirection
:
"
row
"
,
marginVertical
:
20
,
marginVertical
:
20
,
},
},
separator
:
{
separator
:
{
width
:
10
,
width
:
10
,
height
:
20
,
},
},
});
});
emma-frontend/components/shared/sharedRegistration.js
View file @
59b88213
...
@@ -11,6 +11,7 @@ export default function SharedRegisterScreen({ navigation }) {
...
@@ -11,6 +11,7 @@ export default function SharedRegisterScreen({ navigation }) {
console
.
log
(
"
Patient registration
"
);
console
.
log
(
"
Patient registration
"
);
navigation
.
navigate
(
"
PatientConsentForm
"
);
navigation
.
navigate
(
"
PatientConsentForm
"
);
}}
}}
color
=
"
#703BE7
"
/>
/>
<
View
style
=
{
styles
.
separator
}
/
>
<
View
style
=
{
styles
.
separator
}
/
>
<
Button
<
Button
...
@@ -19,6 +20,7 @@ export default function SharedRegisterScreen({ navigation }) {
...
@@ -19,6 +20,7 @@ export default function SharedRegisterScreen({ navigation }) {
console
.
log
(
"
PractitionerRegistration
"
);
console
.
log
(
"
PractitionerRegistration
"
);
navigation
.
navigate
(
"
PractitionerRegistration
"
);
navigation
.
navigate
(
"
PractitionerRegistration
"
);
}}
}}
color
=
"
#703BE7
"
/>
/>
<
/View
>
<
/View
>
<
/View
>
<
/View
>
...
@@ -31,10 +33,10 @@ const styles = StyleSheet.create({
...
@@ -31,10 +33,10 @@ const styles = StyleSheet.create({
justifyContent
:
"
center
"
,
justifyContent
:
"
center
"
,
},
},
buttonContainer
:
{
buttonContainer
:
{
flexDirection
:
"
row
"
,
marginVertical
:
20
,
marginVertical
:
20
,
},
},
separator
:
{
separator
:
{
width
:
10
,
width
:
10
,
height
:
20
,
},
},
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment