Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'rig_page' into 'development'

Browse Source 
Rig page

See merge request Cloud_Solution/doctor_app_flutter!874
merge-requests/875/merge
Elham Ali 3 years ago
parent 9de1085b49 cb223be8b3
commit 4d01c74bf8
2 changed files with 265 additions and 98 deletions
Show Stats Download Patch File Download Diff File

354
lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart
Unescape Escape View File

@ -63,7 +63,8 @@ class _RegisterConfirmationPatientPageState
TextEditingController firstName = TextEditingController(text: "Elham"); TextEditingController firstName = TextEditingController(text: "Elham");
TextEditingController middleName = TextEditingController(text: "Ali"); TextEditingController middleName = TextEditingController(text: "Ali");
TextEditingController lastName = TextEditingController(text: "Rababah"); TextEditingController lastName = TextEditingController(text: "Rababah");
TextEditingController emailAddressController = TextEditingController(text: "Elham@Rababah.com"); TextEditingController emailAddressController =
TextEditingController(text: "Elham@Rababah.com");
setSelectedType(int val) { setSelectedType(int val) {
setState(() { setState(() {
@ -101,34 +102,41 @@ class _RegisterConfirmationPatientPageState
child: Column( child: Column(
children: [ children: [
CustomEditableText( CustomEditableText(
controller: firstName, hint: TranslationBase.of(context).firstName), controller: firstName,
hint: TranslationBase.of(context).firstName),
SizedBox( SizedBox(
height: 4, height: 4,
), ),
CustomEditableText( CustomEditableText(
controller: middleName, hint: TranslationBase.of(context).middleName), controller: middleName,
hint: TranslationBase.of(context).middleName),
SizedBox( SizedBox(
height: 4, height: 4,
), ),
CustomEditableText( CustomEditableText(
controller: lastName, hint: TranslationBase.of(context).lastName), controller: lastName,
hint: TranslationBase.of(context).lastName),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
FractionallySizedBox( FractionallySizedBox(
widthFactor: .9, widthFactor: .9,
child: Center( child: Center(
child: Column( child: Column(
children: [ children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
AppText(TranslationBase.of(context).healthID, fontSize: 12, color: Colors.black), AppText(
TranslationBase.of(context)
.healthID,
fontSize: 12,
color: Colors.black),
AppText( AppText(
"123456", "123456",
fontSize: 12, fontSize: 12,
@ -137,9 +145,14 @@ class _RegisterConfirmationPatientPageState
], ],
), ),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
AppText(TranslationBase.of(context).identityNumber, fontSize: 12, color: Colors.black), AppText(
TranslationBase.of(context)
.identityNumber,
fontSize: 12,
color: Colors.black),
AppText( AppText(
"ss", "ss",
fontSize: 12, fontSize: 12,
@ -147,20 +160,27 @@ class _RegisterConfirmationPatientPageState
), ),
], ],
), ),
SizedBox(width: 20,) SizedBox(
width: 20,
)
], ],
), ),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
AppText(TranslationBase.of(context).nationality, fontSize: 12, color: Colors.black), AppText(
TranslationBase.of(context)
.nationality,
fontSize: 12,
color: Colors.black),
AppText( AppText(
"Jordanian", "Jordanian",
fontSize: 12, fontSize: 12,
@ -169,9 +189,14 @@ class _RegisterConfirmationPatientPageState
], ],
), ),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
AppText(TranslationBase.of(context).occupation, fontSize: 12, color: Colors.black), AppText(
TranslationBase.of(context)
.occupation,
fontSize: 12,
color: Colors.black),
AppText( AppText(
"--", "--",
fontSize: 12, fontSize: 12,
@ -179,21 +204,27 @@ class _RegisterConfirmationPatientPageState
), ),
], ],
), ),
SizedBox(width: 20,) SizedBox(
width: 20,
)
], ],
), ),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
AppText(TranslationBase.of(context).mobileNo, fontSize: 12, color: Colors.black), AppText(
TranslationBase.of(context)
.mobileNo,
fontSize: 12,
color: Colors.black),
AppText( AppText(
"075XXXXXX", "075XXXXXX",
fontSize: 12, fontSize: 12,
@ -201,7 +232,9 @@ class _RegisterConfirmationPatientPageState
), ),
], ],
), ),
SizedBox(width: 20,) SizedBox(
width: 20,
)
], ],
), ),
SizedBox( SizedBox(
@ -211,48 +244,18 @@ class _RegisterConfirmationPatientPageState
), ),
), ),
), ),
AppTextFieldCustom( AppTextFieldCustom(
height: Helpers.getTextFieldHeight(), height: Helpers.getTextFieldHeight(),
enabled: false, enabled: false,
onClick: () { onClick: () {
// MasterKeyDailog dialog = openMaritalStatusList(context);
// MasterKeyDailog(
// list:
// model.medicationDoseTimeList,
// okText:
// TranslationBase.of(context)
// .ok,
// selectedValue:
// _selectedMedicationDose,
// okFunction: (selectedValue) {
// setState(() {
// _selectedMedicationDose =
// selectedValue;
//
// doseController
// .text = projectViewModel
// .isArabic
// ? _selectedMedicationDose
// .nameAr
// : _selectedMedicationDose
// .nameEn;
// });
// },
// );
// showDialog(
// barrierDismissible: false,
// context: context,
// builder: (BuildContext context) {
// return dialog;
// },
// );
}, },
hintText: hintText:
TranslationBase.of(context).maritalStatus, TranslationBase.of(context).maritalStatus,
maxLines: 1, maxLines: 1,
minLines: 1, minLines: 1,
isTextFieldHasSuffix: true, isTextFieldHasSuffix: true,
// controller: doseController, // controller: doseController,
// validationError: isFormSubmitted && // validationError: isFormSubmitted &&
// _selectedMedicationDose == null // _selectedMedicationDose == null
@ -267,40 +270,9 @@ class _RegisterConfirmationPatientPageState
height: Helpers.getTextFieldHeight(), height: Helpers.getTextFieldHeight(),
enabled: false, enabled: false,
onClick: () { onClick: () {
// MasterKeyDailog dialog = openLangList(context);
// MasterKeyDailog(
// list:
// model.medicationDoseTimeList,
// okText:
// TranslationBase.of(context)
// .ok,
// selectedValue:
// _selectedMedicationDose,
// okFunction: (selectedValue) {
// setState(() {
// _selectedMedicationDose =
// selectedValue;
//
// doseController
// .text = projectViewModel
// .isArabic
// ? _selectedMedicationDose
// .nameAr
// : _selectedMedicationDose
// .nameEn;
// });
// },
// );
// showDialog(
// barrierDismissible: false,
// context: context,
// builder: (BuildContext context) {
// return dialog;
// },
// );
}, },
hintText: hintText: TranslationBase.of(context).lanEnglish,
TranslationBase.of(context).lanEnglish,
maxLines: 1, maxLines: 1,
minLines: 1, minLines: 1,
isTextFieldHasSuffix: true, isTextFieldHasSuffix: true,
@ -322,7 +294,6 @@ class _RegisterConfirmationPatientPageState
minLines: 1, minLines: 1,
hasBorder: true, hasBorder: true,
), ),
SizedBox( SizedBox(
height: 400, height: 400,
), ),
@ -339,4 +310,203 @@ class _RegisterConfirmationPatientPageState
), ),
); );
} }
openMaritalStatusList(BuildContext context) {
showModalBottomSheet(
backgroundColor: Colors.white,
isDismissible: true,
isScrollControlled: true,
context: context,
builder: (context) {
return FractionallySizedBox(
heightFactor: .3,
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(
"${TranslationBase.of(context).maritalStatus} :",
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 18,
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: InkWell(
onTap: () {
Navigator.of(context).pop();
},
child: Icon(DoctorApp.close_1,
size: SizeConfig.getTextMultiplierBasedOnWidth() *
4.5,
color: Color(0xFF2B353E))),
),
],
),
SizedBox(
height: 10,
),
InkWell(
onTap: () {},
child: Row(
children: [
Radio(
value: 1,
groupValue: 1,
onChanged: (value) {
setState(() {});
},
activeColor: Colors.red,
),
AppText(
"Single",
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 15,
),
],
),
),
InkWell(
onTap: () {},
child: Row(
children: [
Radio(
value: 1,
groupValue: 1,
onChanged: (value) {
setState(() {});
},
activeColor: Colors.red,
),
AppText(
"Married",
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 15,
),
],
),
),
InkWell(
onTap: () {},
child: Row(
children: [
Radio(
value: 1,
groupValue: 1,
onChanged: (value) {
setState(() {});
},
activeColor: Colors.red,
),
AppText(
"Divorce",
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 15,
),
],
),
),
],
),
);
});
}
openLangList(BuildContext context) {
showModalBottomSheet(
backgroundColor: Colors.white,
isDismissible: true,
isScrollControlled: true,
context: context,
builder: (context) {
return FractionallySizedBox(
heightFactor: .3,
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(
"language:",
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 18,
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: InkWell(
onTap: () {
Navigator.of(context).pop();
},
child: Icon(DoctorApp.close_1,
size: SizeConfig.getTextMultiplierBasedOnWidth() *
4.5,
color: Color(0xFF2B353E))),
),
],
),
SizedBox(
height: 10,
),
InkWell(
onTap: () {},
child: Row(
children: [
Radio(
value: 1,
groupValue: 1,
onChanged: (value) {
setState(() {});
},
activeColor: Colors.red,
),
AppText(
TranslationBase.of(context).lanEnglish,
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 15,
),
],
),
),
InkWell(
onTap: () {},
child: Row(
children: [
Radio(
value: 1,
groupValue: 1,
onChanged: (value) {
setState(() {});
},
activeColor: Colors.red,
),
AppText(
TranslationBase.of(context).lanArabic,
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 15,
),
],
),
),
],
),
);
});
}
} }

9
lib/screens/patients/register_patient/RegisterPatientPage.dart
Unescape Escape View File

@ -107,11 +107,7 @@ class _RegisterPatientPageState extends State<RegisterPatientPage>
], ],
), ),
)), )),
_isLoading pagerButtons(model),
? Container(
height: 0,
)
: pagerButtons(model),
], ],
), ),
), ),
@ -165,7 +161,8 @@ class _RegisterPatientPageState extends State<RegisterPatientPage>
); );
default: default:
return Container( return Container(
color: Colors.white, // height: 100,
color: Colors.red,
padding: EdgeInsets.symmetric(vertical: 16, horizontal: 16), padding: EdgeInsets.symmetric(vertical: 16, horizontal: 16),
child: Row( child: Row(
children: [ children: [

Write Preview
Loading…
Cancel
Save