diff --git a/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart b/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart index d51e57f3..d6d07a6f 100644 --- a/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart +++ b/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart @@ -63,7 +63,8 @@ class _RegisterConfirmationPatientPageState TextEditingController firstName = TextEditingController(text: "Elham"); TextEditingController middleName = TextEditingController(text: "Ali"); TextEditingController lastName = TextEditingController(text: "Rababah"); - TextEditingController emailAddressController = TextEditingController(text: "Elham@Rababah.com"); + TextEditingController emailAddressController = + TextEditingController(text: "Elham@Rababah.com"); setSelectedType(int val) { setState(() { @@ -101,34 +102,41 @@ class _RegisterConfirmationPatientPageState child: Column( children: [ CustomEditableText( - controller: firstName, hint: TranslationBase.of(context).firstName), + controller: firstName, + hint: TranslationBase.of(context).firstName), SizedBox( height: 4, ), CustomEditableText( - controller: middleName, hint: TranslationBase.of(context).middleName), + controller: middleName, + hint: TranslationBase.of(context).middleName), SizedBox( height: 4, ), CustomEditableText( - controller: lastName, hint: TranslationBase.of(context).lastName), + controller: lastName, + hint: TranslationBase.of(context).lastName), SizedBox( height: 20, ), - FractionallySizedBox( widthFactor: .9, child: Center( child: Column( children: [ Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, children: [ - AppText(TranslationBase.of(context).healthID, fontSize: 12, color: Colors.black), + AppText( + TranslationBase.of(context) + .healthID, + fontSize: 12, + color: Colors.black), AppText( "123456", fontSize: 12, @@ -137,9 +145,14 @@ class _RegisterConfirmationPatientPageState ], ), Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, children: [ - AppText(TranslationBase.of(context).identityNumber, fontSize: 12, color: Colors.black), + AppText( + TranslationBase.of(context) + .identityNumber, + fontSize: 12, + color: Colors.black), AppText( "ss", fontSize: 12, @@ -147,20 +160,27 @@ class _RegisterConfirmationPatientPageState ), ], ), - SizedBox(width: 20,) + SizedBox( + width: 20, + ) ], ), SizedBox( height: 20, ), Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, children: [ - AppText(TranslationBase.of(context).nationality, fontSize: 12, color: Colors.black), + AppText( + TranslationBase.of(context) + .nationality, + fontSize: 12, + color: Colors.black), AppText( "Jordanian", fontSize: 12, @@ -169,9 +189,14 @@ class _RegisterConfirmationPatientPageState ], ), Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, children: [ - AppText(TranslationBase.of(context).occupation, fontSize: 12, color: Colors.black), + AppText( + TranslationBase.of(context) + .occupation, + fontSize: 12, + color: Colors.black), AppText( "--", fontSize: 12, @@ -179,21 +204,27 @@ class _RegisterConfirmationPatientPageState ), ], ), - SizedBox(width: 20,) + SizedBox( + width: 20, + ) ], ), SizedBox( height: 20, ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, children: [ - AppText(TranslationBase.of(context).mobileNo, fontSize: 12, color: Colors.black), + AppText( + TranslationBase.of(context) + .mobileNo, + fontSize: 12, + color: Colors.black), AppText( "075XXXXXX", fontSize: 12, @@ -201,7 +232,9 @@ class _RegisterConfirmationPatientPageState ), ], ), - SizedBox(width: 20,) + SizedBox( + width: 20, + ) ], ), SizedBox( @@ -211,48 +244,18 @@ class _RegisterConfirmationPatientPageState ), ), ), - AppTextFieldCustom( height: Helpers.getTextFieldHeight(), enabled: false, onClick: () { - // MasterKeyDailog dialog = - // 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; - // }, - // ); + openMaritalStatusList(context); }, hintText: - TranslationBase.of(context).maritalStatus, + TranslationBase.of(context).maritalStatus, maxLines: 1, minLines: 1, isTextFieldHasSuffix: true, + // controller: doseController, // validationError: isFormSubmitted && // _selectedMedicationDose == null @@ -267,40 +270,9 @@ class _RegisterConfirmationPatientPageState height: Helpers.getTextFieldHeight(), enabled: false, onClick: () { - // MasterKeyDailog dialog = - // 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; - // }, - // ); + openLangList(context); }, - hintText: - TranslationBase.of(context).lanEnglish, + hintText: TranslationBase.of(context).lanEnglish, maxLines: 1, minLines: 1, isTextFieldHasSuffix: true, @@ -322,7 +294,6 @@ class _RegisterConfirmationPatientPageState minLines: 1, hasBorder: true, ), - SizedBox( 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, + ), + ], + ), + ), + + ], + ), + ); + }); + } + } diff --git a/lib/screens/patients/register_patient/RegisterPatientPage.dart b/lib/screens/patients/register_patient/RegisterPatientPage.dart index 3604a943..85e46185 100644 --- a/lib/screens/patients/register_patient/RegisterPatientPage.dart +++ b/lib/screens/patients/register_patient/RegisterPatientPage.dart @@ -107,11 +107,7 @@ class _RegisterPatientPageState extends State ], ), )), - _isLoading - ? Container( - height: 0, - ) - : pagerButtons(model), + pagerButtons(model), ], ), ), @@ -165,7 +161,8 @@ class _RegisterPatientPageState extends State ); default: return Container( - color: Colors.white, + // height: 100, + color: Colors.red, padding: EdgeInsets.symmetric(vertical: 16, horizontal: 16), child: Row( children: [