Merge branch 'development' into soap-objective-feature-re-design

merge-requests/467/head
mosazaid 5 years ago
commit 25c3bf1bb1

@ -322,4 +322,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69 PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69
COCOAPODS: 1.10.1 COCOAPODS: 1.10.0.rc.1

@ -843,4 +843,11 @@ const Map<String, Map<String, String>> localizedValues = {
"en": "Step", "en": "Step",
"ar": "خطوة" "ar": "خطوة"
}, },
"applyOrRescheduleLeave": {
"en": "Apply Or Reschedule Leave",
"ar": "التقدم بطلب أو إعادة جدولة الإجازة"
},"myQRCode": {
"en": "My QR Code",
"ar": "My QR Code"
},
}; };

@ -119,7 +119,7 @@ class _LoginsreenState extends State<Loginsreen> {
children: <Widget>[ children: <Widget>[
AuthHeader(loginType.knownUser), AuthHeader(loginType.knownUser),
SizedBox( SizedBox(
height: 60, height: 40,
), ),
LoginForm( LoginForm(
changeLoadingStata: changeLoadingStata, changeLoadingStata: changeLoadingStata,

@ -141,24 +141,29 @@ class PatientProfileScreen extends StatelessWidget {
if (patient.episodeNo != 0) if (patient.episodeNo != 0)
BorderedButton( BorderedButton(
"${TranslationBase.of(context).update}\n${TranslationBase.of(context).episode}", "${TranslationBase.of(context).update}\n${TranslationBase.of(context).episode}",
backgroundColor: Colors.red.shade700, backgroundColor:
textColor: Colors.white, patient.patientStatusType == 43
vPadding: 8, ? Colors.red.shade700
radius: 30, : Colors.grey.shade700,
hPadding: 20, textColor: Colors.white,
fontWeight: FontWeight.normal, vPadding: 8,
fontSize: 12, radius: 30,
fontFamily: 'Poppins', hPadding: 20,
icon: Image.asset( fontWeight: FontWeight.normal,
"assets/images/modilfy-episode.png", fontSize: 12,
color: Colors.white, fontFamily: 'Poppins',
height: 30, icon: Image.asset(
"assets/images/modilfy-episode.png",
color: Colors.white,
height: 30,
), ),
handler: () { handler: () {
Navigator.of(context).pushNamed( if (patient.patientStatusType == 43) {
UPDATE_EPISODE, Navigator.of(context).pushNamed(
arguments: {'patient': patient}); UPDATE_EPISODE,
}, arguments: {'patient': patient});
}
}
), ),
], ],
), ),

File diff suppressed because it is too large Load Diff

@ -133,47 +133,56 @@ class _EntityListCheckboxSearchWidgetState
child: Row( child: Row(
children: [ children: [
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context)
.orderType), .orderType,
Radio( fontWeight: FontWeight.w700,
activeColor: Color(0xFFB9382C),
value: 0,
groupValue: selectedType,
onChanged: (value) {
historyInfo.type =
setSelectedType(value)
.toString();
historyInfo.type =
value.toString();
},
), ),
Text('routine'), Row(
Radio( children: [
activeColor: Color(0xFFB9382C), Radio(
groupValue: selectedType, activeColor:
value: 1, Color(0xFFB9382C),
onChanged: (value) { value: 0,
historyInfo.type = groupValue: selectedType,
setSelectedType(value) onChanged: (value) {
.toString(); historyInfo.type =
setSelectedType(value)
.toString();
historyInfo.type =
value.toString();
},
),
Text('routine'),
Radio(
activeColor:
Color(0xFFB9382C),
groupValue: selectedType,
value: 1,
onChanged: (value) {
historyInfo.type =
setSelectedType(value)
.toString();
historyInfo.type = historyInfo.type =
value.toString(); value.toString();
}, },
),
Text(TranslationBase.of(
context)
.urgent),
],
), ),
Text(TranslationBase.of(context)
.urgent),
], ],
), ),
), ),
), ),
SizedBox( SizedBox(
height: 15.0, height: 2.0,
), ),
Padding( Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 12), horizontal: 12, vertical: 12.0),
child: TextFields( child: TextFields(
hintText: TranslationBase.of(context) hintText: TranslationBase.of(context)
.remarks, .remarks,

@ -622,6 +622,11 @@ class TranslationBase {
String get rescheduleLeaves => String get rescheduleLeaves =>
localizedValues['reschedule-leave'][locale.languageCode]; localizedValues['reschedule-leave'][locale.languageCode];
String get applyOrRescheduleLeave =>
localizedValues['applyOrRescheduleLeave'][locale.languageCode];
String get myQRCode =>
localizedValues['myQRCode'][locale.languageCode];
String get addMedication => String get addMedication =>
localizedValues['addMedication'][locale.languageCode]; localizedValues['addMedication'][locale.languageCode];

@ -319,7 +319,7 @@ class _KnownUserLoginState extends State<KnownUserLogin> {
} }
navigateToHome() { navigateToHome() {
Navigator.of(context).pushNamed(HOME); Navigator.of(context).pushReplacementNamed(HOME);
} }
showErorrMsg(localMsg) { showErorrMsg(localMsg) {

@ -69,220 +69,232 @@ class _LoginFormState extends State<LoginForm> {
return Form( return Form(
key: loginFormKey, key: loginFormKey,
child: Container( child: Column(
width: SizeConfig.realScreenWidth * 0.90, mainAxisAlignment: MainAxisAlignment.spaceBetween,
child: Column( children: <Widget>[
crossAxisAlignment: CrossAxisAlignment.start, Container(
children: <Widget>[ width: SizeConfig.realScreenWidth * 0.90,
buildSizedBox(), height: SizeConfig.realScreenHeight * 0.65,
Padding( child:
child: AppText( Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
TranslationBase.of(context).enterCredentials, buildSizedBox(),
fontSize: 18, Padding(
fontWeight: FontWeight.w600, child: AppText(
), TranslationBase.of(context).enterCredentials,
padding: EdgeInsets.only(top: 10, bottom: 10)), fontSize: 18,
Container( fontWeight: FontWeight.bold,
decoration: BoxDecoration( ),
borderRadius: BorderRadius.all(Radius.circular(6.0)), padding: EdgeInsets.only(top: 10, bottom: 10)),
border: Border.all( Container(
width: 1.0, decoration: BoxDecoration(
color: HexColor("#CCCCCC"), borderRadius: BorderRadius.all(Radius.circular(6.0)),
), border: Border.all(
color: Colors.white), width: 1.0,
child: Column( color: HexColor("#CCCCCC"),
crossAxisAlignment: CrossAxisAlignment.start, ),
children: [ color: Colors.white),
Padding( child: Column(
padding: EdgeInsets.only(left: 10, top: 10), crossAxisAlignment: CrossAxisAlignment.start,
child: AppText( children: [
TranslationBase.of(context).enterId, Padding(
fontWeight: FontWeight.w600, padding: EdgeInsets.only(left: 10, top: 10),
)), child: AppText(
AppTextFormField( TranslationBase.of(context).enterId,
labelText: '', fontWeight: FontWeight.w800,
borderColor: Colors.white, fontSize: 14,
// keyboardType: TextInputType.number, )),
textInputAction: TextInputAction.next, AppTextFormField(
// decoration: buildInputDecoration( labelText: '',
// context, borderColor: Colors.white,
// TranslationBase.of(context).enterId, // keyboardType: TextInputType.number,
// 'assets/images/user_id_icon.png'), textInputAction: TextInputAction.next,
validator: (value) { // decoration: buildInputDecoration(
if (value != null && value.isEmpty) { // context,
return TranslationBase.of(context) // TranslationBase.of(context).enterId,
.pleaseEnterYourID; // 'assets/images/user_id_icon.png'),
} validator: (value) {
return null; if (value != null && value.isEmpty) {
}, return TranslationBase.of(context)
onSaved: (value) { .pleaseEnterYourID;
if (value != null) userInfo.userID = value.trim(); }
}, return null;
onChanged: (value) { },
if (value != null) userInfo.userID = value.trim(); onSaved: (value) {
}, if (value != null) userInfo.userID = value.trim();
onFieldSubmitted: (_) { },
focusPass.nextFocus(); onChanged: (value) {
}, if (value != null) userInfo.userID = value.trim();
// onEditingComplete: () {}, },
// autofocus: false, onFieldSubmitted: (_) {
) focusPass.nextFocus();
])), },
buildSizedBox(), // onEditingComplete: () {},
Container( // autofocus: false,
decoration: BoxDecoration( )
borderRadius: BorderRadius.all(Radius.circular(6.0)), ])),
border: Border.all( buildSizedBox(),
width: 1.0, Container(
color: HexColor("#CCCCCC"), decoration: BoxDecoration(
), borderRadius: BorderRadius.all(Radius.circular(6.0)),
color: Colors.white), border: Border.all(
child: Column( width: 1.0,
crossAxisAlignment: CrossAxisAlignment.start, color: HexColor("#CCCCCC"),
children: [ ),
Padding( color: Colors.white),
padding: EdgeInsets.only(left: 10, top: 10), child: Column(
child: AppText( crossAxisAlignment: CrossAxisAlignment.start,
TranslationBase.of(context).enterPassword, children: [
fontWeight: FontWeight.w600, Padding(
)), padding: EdgeInsets.only(left: 10, top: 10),
AppTextFormField( child: AppText(
focusNode: focusPass, TranslationBase.of(context).enterPassword,
obscureText: true, fontWeight: FontWeight.w800,
borderColor: Colors.white, fontSize: 14,
textInputAction: TextInputAction.next, )),
// decoration: buildInputDecoration( AppTextFormField(
// context, focusNode: focusPass,
// TranslationBase.of(context).enterPassword, obscureText: true,
// 'assets/images/password_icon.png'), borderColor: Colors.white,
validator: (value) { textInputAction: TextInputAction.next,
if (value != null && value.isEmpty) { // decoration: buildInputDecoration(
return TranslationBase.of(context) // context,
.pleaseEnterPassword; // TranslationBase.of(context).enterPassword,
} // 'assets/images/password_icon.png'),
return null; validator: (value) {
}, if (value != null && value.isEmpty) {
onSaved: (value) { return TranslationBase.of(context)
userInfo.password = value; .pleaseEnterPassword;
}, }
onFieldSubmitted: (_) { return null;
focusPass.nextFocus(); },
helpers.showCupertinoPicker(context, projectsList, onSaved: (value) {
'facilityName', onSelectProject); userInfo.password = value;
}, },
onTap: () { onFieldSubmitted: (_) {
this.getProjects(userInfo.userID); focusPass.nextFocus();
}, helpers.showCupertinoPicker(context, projectsList,
) 'facilityName', onSelectProject);
])), },
buildSizedBox(), onTap: () {
projectsList.length > 0 this.getProjects(userInfo.userID);
? Container( },
decoration: BoxDecoration( )
borderRadius: BorderRadius.all(Radius.circular(6.0)), ])),
border: Border.all( buildSizedBox(),
width: 1.0, projectsList.length > 0
color: HexColor("#CCCCCC"), ? Container(
), decoration: BoxDecoration(
color: Colors.white), borderRadius: BorderRadius.all(Radius.circular(6.0)),
child: Column( border: Border.all(
crossAxisAlignment: CrossAxisAlignment.start, width: 1.0,
children: [ color: HexColor("#CCCCCC"),
Padding( ),
padding: EdgeInsets.only(left: 10, top: 10), color: Colors.white),
child: AppText( child: Column(
TranslationBase.of(context).selectYourProject, crossAxisAlignment: CrossAxisAlignment.start,
fontWeight: FontWeight.w600, children: [
)), Padding(
AppTextFormField( padding: EdgeInsets.only(left: 10, top: 10),
focusNode: focusProject, child: AppText(
controller: projectIdController, TranslationBase.of(context).selectYourProject,
borderColor: Colors.white, fontWeight: FontWeight.w600,
onTap: () { )),
helpers.showCupertinoPicker( AppTextFormField(
context, focusNode: focusProject,
projectsList, controller: projectIdController,
'facilityName', borderColor: Colors.white,
onSelectProject); suffixIcon: Icons.arrow_drop_down,
}, onTap: () {
// showCursor: false, helpers.showCupertinoPicker(
// //readOnly: true, context,
// decoration: buildInputDecoration( projectsList,
// context, 'facilityName',
// TranslationBase.of(context).selectYourProject, onSelectProject);
// 'assets/images/password_icon.png'), },
validator: (value) { // showCursor: false,
if (value != null && value.isEmpty) { // //readOnly: true,
return TranslationBase.of(context) // decoration: buildInputDecoration(
.pleaseEnterYourProject; // context,
} // TranslationBase.of(context).selectYourProject,
return null; // 'assets/images/password_icon.png'),
}) validator: (value) {
])) if (value != null && value.isEmpty) {
: Container( return TranslationBase.of(context)
decoration: BoxDecoration( .pleaseEnterYourProject;
borderRadius: BorderRadius.all(Radius.circular(6.0)), }
border: Border.all( return null;
width: 1.0, })
color: HexColor("#CCCCCC"), ]))
), : Container(
color: Colors.white), decoration: BoxDecoration(
child: Column( borderRadius: BorderRadius.all(Radius.circular(6.0)),
crossAxisAlignment: CrossAxisAlignment.start, border: Border.all(
children: [ width: 1.0,
Padding( color: HexColor("#CCCCCC"),
padding: EdgeInsets.only(left: 10, top: 10), ),
child: AppText( color: Colors.white),
TranslationBase.of(context).selectYourProject, child: Column(
fontWeight: FontWeight.w600, crossAxisAlignment: CrossAxisAlignment.start,
)), children: [
AppTextFormField( Padding(
readOnly: true, borderColor: Colors.white padding: EdgeInsets.only(left: 10, top: 10),
child: AppText(
TranslationBase.of(context).selectYourProject,
fontWeight: FontWeight.w800,
fontSize: 14,
)),
AppTextFormField(
readOnly: true, borderColor: Colors.white,
prefix: IconButton(
icon: Icon(Icons.arrow_drop_down),
iconSize: 30,
padding: EdgeInsets.only(bottom: 30),
),
// decoration: buildInputDecoration( // decoration: buildInputDecoration(
// context, // context,
// TranslationBase.of(context) // TranslationBase.of(context)
// .pleaseEnterYourProject, // .pleaseEnterYourProject,
// 'assets/images/password_icon.png') // 'assets/images/password_icon.png')
)
) ])),
])), ]),
buildSizedBox(), ),
Row(
Row( mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Button( child: Button(
title: TranslationBase.of(context).login, title: TranslationBase.of(context).login,
color: Colors.red[700], color: HexColor('#D02127'),
onTap: () { onTap: () {
login(context, authProv, widget.changeLoadingStata); login(context, authProv, widget.changeLoadingStata);
}, },
)), )),
], ],
) )
// Row( // Row(
// mainAxisAlignment: MainAxisAlignment.end, // mainAxisAlignment: MainAxisAlignment.end,
// children: <Widget>[ // children: <Widget>[
// RaisedButton( // RaisedButton(
// onPressed: () { // onPressed: () {
// login(context, authProv, widget.changeLoadingStata); // login(context, authProv, widget.changeLoadingStata);
// }, // },
// textColor: Colors.white, // textColor: Colors.white,
// elevation: 0.0, // elevation: 0.0,
// padding: const EdgeInsets.all(0.0), // padding: const EdgeInsets.all(0.0),
// shape: RoundedRectangleBorder( // shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(10), // borderRadius: BorderRadius.circular(10),
// side: BorderSide(width: 0.5, color: HexColor('#CCCCCC'))), // side: BorderSide(width: 0.5, color: HexColor('#CCCCCC'))),
// child: Container( // child: Container(
// padding: const EdgeInsets.all(10.0), // padding: const EdgeInsets.all(10.0),
// height: 50, // height: 50,
// width: SizeConfig.realScreenWidth * 0.35, // width: SizeConfig.realScreenWidth * 0.35,
// child: ), // child: ),
// ) // )
// ], // ],
// ), // ),
], ],
),
), ),
); );
} }

@ -155,7 +155,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Flexible( Flexible(
flex: 4, flex: 3,
child: ListTile( child: ListTile(
title: Text( title: Text(
TranslationBase.of( TranslationBase.of(
@ -164,15 +164,17 @@ class _VerificationMethodsState extends State<VerificationMethods> {
overflow: TextOverflow overflow: TextOverflow
.ellipsis, .ellipsis,
style: TextStyle( style: TextStyle(
fontFamily: 'Poppins', fontFamily:
fontWeight: 'Poppins',
FontWeight.w600, fontWeight:
), FontWeight.w800,
fontSize: 14),
), ),
subtitle: AppText( subtitle: AppText(
getType( getType(
user.logInTypeID, user.logInTypeID,
context), context),
fontSize: 14,
) )
// Text( // Text(
// user.editedOn != null // user.editedOn != null
@ -208,6 +210,9 @@ class _VerificationMethodsState extends State<VerificationMethods> {
: '--', : '--',
textAlign: textAlign:
TextAlign.right, TextAlign.right,
fontSize: 14,
fontWeight:
FontWeight.w800,
), ),
subtitle: AppText( subtitle: AppText(
user.editedOn != null user.editedOn != null
@ -223,6 +228,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
: '--', : '--',
textAlign: textAlign:
TextAlign.right, TextAlign.right,
fontSize: 14,
), ),
)) ))
], ],
@ -487,8 +493,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
children: [ children: [
Image.asset( Image.asset(
'assets/images/verify-whtsapp.png', 'assets/images/verify-whtsapp.png',
height: SizeConfig.imageSizeMultiplier * 13, height: 60,
width: SizeConfig.imageSizeMultiplier * 16, width: 60,
), ),
], ],
), ),
@ -497,7 +503,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
), ),
AppText( AppText(
TranslationBase.of(context).verifyWhatsApp, TranslationBase.of(context).verifyWhatsApp,
fontSize: SizeConfig.textMultiplier * 2.2, fontSize: 14,
fontWeight: FontWeight.w600,
) )
], ],
), ),
@ -520,8 +527,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/verify-sms.png', 'assets/images/verify-sms.png',
height: SizeConfig.imageSizeMultiplier * 13, height: 60,
width: SizeConfig.imageSizeMultiplier * 16, width: 60,
), ),
projectsProvider.isArabic projectsProvider.isArabic
? SizedBox( ? SizedBox(
@ -532,9 +539,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
), ),
AppText( AppText(
TranslationBase.of(context).verifySMS, TranslationBase.of(context).verifySMS,
fontSize: projectsProvider.isArabic fontSize: 14,
? SizeConfig.textMultiplier * 1.8 fontWeight: FontWeight.w600,
: SizeConfig.textMultiplier * 2.2,
) )
], ],
), ),
@ -560,15 +566,16 @@ class _VerificationMethodsState extends State<VerificationMethods> {
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/verification_fingerprint_icon.png', 'assets/images/verification_fingerprint_icon.png',
height: SizeConfig.imageSizeMultiplier * 13, height: 60,
width: SizeConfig.imageSizeMultiplier * 16, width: 60,
), ),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
AppText( AppText(
TranslationBase.of(context).verifyFingerprint, TranslationBase.of(context).verifyFingerprint,
fontSize: SizeConfig.textMultiplier * 2.2, fontSize: 14,
fontWeight: FontWeight.w600,
) )
], ],
), ),
@ -602,15 +609,16 @@ class _VerificationMethodsState extends State<VerificationMethods> {
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/verification_faceid_icon.png', 'assets/images/verification_faceid_icon.png',
height: SizeConfig.imageSizeMultiplier * 13, height: 60,
width: SizeConfig.imageSizeMultiplier * 16, width: 60,
), ),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
AppText( AppText(
TranslationBase.of(context).verifyFaceID, TranslationBase.of(context).verifyFaceID,
fontSize: SizeConfig.textMultiplier * 2.2, fontSize: 14,
fontWeight: FontWeight.w600,
) )
], ],
), ),
@ -640,8 +648,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/login/more_icon.png', 'assets/images/login/more_icon.png',
height: SizeConfig.imageSizeMultiplier * 13, height: 60,
width: SizeConfig.imageSizeMultiplier * 16, width: 60,
), ),
projectsProvider.isArabic projectsProvider.isArabic
? SizedBox( ? SizedBox(
@ -652,7 +660,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
), ),
AppText( AppText(
TranslationBase.of(context).moreVerification, TranslationBase.of(context).moreVerification,
fontSize: SizeConfig.textMultiplier * 2.2, fontSize: 14,
fontWeight: FontWeight.w600,
// textAlign: TextAlign.center, // textAlign: TextAlign.center,
) )
], ],

@ -35,9 +35,6 @@ class MyScheduleWidget extends StatelessWidget {
fontFamily: 'Poppins', fontFamily: 'Poppins',
// fontSize: 18 // fontSize: 18
), ),
SizedBox(
height: 10,
),
AppText( AppText(
' ${workingHoursTable.date.day} ${(DateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}', ' ${workingHoursTable.date.day} ${(DateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}',
fontSize: 18, fontSize: 18,

@ -60,20 +60,8 @@ class SMSOTP {
builder: (context) { builder: (context) {
projectProvider = Provider.of(context); projectProvider = Provider.of(context);
return AlertDialog( return AlertDialog(
contentPadding: EdgeInsets.fromLTRB(24.0, 20.0, 0.0, 24.0), contentPadding: EdgeInsets.fromLTRB(24.0, 0.0, 0.0, 24.0),
title: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
IconButton(
icon: Icon(Icons.close),
onPressed: () {
this.isClosed = true;
Navigator.pop(context);
this.onFailure();
},
)
],
),
// shape: RoundedRectangleBorder( // shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.all(Radius.circular(10.0))), // borderRadius: BorderRadius.all(Radius.circular(10.0))),
content: StatefulBuilder(builder: (context, setState) { content: StatefulBuilder(builder: (context, setState) {
@ -89,21 +77,44 @@ class SMSOTP {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
type == 1 Padding(
? Padding( padding: EdgeInsets.all(10),
child: Icon( child: Row(
DoctorApp.verify_sms_1, mainAxisAlignment: MainAxisAlignment.spaceBetween,
size: 40, children: [
), type == 1
padding: EdgeInsets.only(bottom: 20), ? Padding(
) child: Icon(
: Padding( DoctorApp.verify_sms_1,
child: Icon( size: 40,
DoctorApp.verify_whtsapp, ),
size: 40, padding: EdgeInsets.only(bottom: 20),
), )
padding: EdgeInsets.only(bottom: 20), : Padding(
), child: Icon(
DoctorApp.verify_whtsapp,
size: 40,
),
padding: EdgeInsets.only(bottom: 20),
),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Padding(
padding: EdgeInsets.only(
left: 10, right: 10, bottom: 20),
child: IconButton(
icon: Icon(Icons.close),
iconSize: 40,
onPressed: () {
this.isClosed = true;
Navigator.pop(context);
this.onFailure();
},
))
],
)
])),
Padding( Padding(
padding: EdgeInsets.only(top: 5), padding: EdgeInsets.only(top: 5),
child: AppText( child: AppText(
@ -122,7 +133,7 @@ class SMSOTP {
child: Directionality( child: Directionality(
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[ children: <Widget>[
Container( Container(
width: SizeConfig.realScreenWidth * 0.15, width: SizeConfig.realScreenWidth * 0.15,
@ -233,22 +244,23 @@ class SMSOTP {
)), )),
), ),
), ),
Padding( Column(
padding: EdgeInsets.only(top: 10), mainAxisAlignment: MainAxisAlignment.start,
child: Row(children: [ crossAxisAlignment: CrossAxisAlignment.start,
Expanded( children: [
child: AppText( AppText(
TranslationBase.of(context).validationMessage + ' ', TranslationBase.of(context).validationMessage + ' ',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), fontSize: 14,
), ),
AppText( AppText(
displayTime, displayTime,
color: Colors.red, color: Colors.red,
textAlign: TextAlign.center, textAlign: TextAlign.start,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14,
) )
])) ])
], ],
))), ))),
); );

@ -57,7 +57,7 @@ class ProfileWelcomeWidget extends StatelessWidget {
CircleAvatar( CircleAvatar(
// radius: (52) // radius: (52)
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(20),
child: Image.network( child: Image.network(
authProvider.doctorProfile.doctorImageURL, authProvider.doctorProfile.doctorImageURL,
fit: BoxFit.fill, fit: BoxFit.fill,

@ -26,7 +26,7 @@ class StepsWidget extends StatelessWidget {
color: Colors.transparent, color: Colors.transparent,
child: Center( child: Center(
child: Container( child: Container(
width: MediaQuery.of(context).size.width * 0.87, width: MediaQuery.of(context).size.width * 0.86,
child: Divider( child: Divider(
color: Colors.grey, color: Colors.grey,
height: 0.75, height: 0.75,

@ -4,6 +4,7 @@ import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/SOAP/GetGetProgressNoteReqModel.dart'; import 'package:doctor_app_flutter/models/SOAP/GetGetProgressNoteReqModel.dart';
import 'package:doctor_app_flutter/models/SOAP/GetGetProgressNoteResModel.dart'; import 'package:doctor_app_flutter/models/SOAP/GetGetProgressNoteResModel.dart';
import 'package:doctor_app_flutter/models/SOAP/post_progress_note_request_model.dart'; import 'package:doctor_app_flutter/models/SOAP/post_progress_note_request_model.dart';
@ -44,8 +45,7 @@ class UpdatePlanPage extends StatefulWidget {
} }
class _UpdatePlanPageState extends State<UpdatePlanPage> { class _UpdatePlanPageState extends State<UpdatePlanPage> {
bool isProgressNoteExpand = false; bool isAddProgress = true;
TextEditingController progressNoteController = TextEditingController progressNoteController =
TextEditingController(text: null); TextEditingController(text: null);
@ -62,7 +62,17 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
)), )),
); );
} }
TextEditingController typeController = TextEditingController();
@override
void initState() {
super.initState();
if(widget.patientProgressNote.planNote !=null ){
setState(() {
isAddProgress = false;
});
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -83,7 +93,9 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
widget.patientProgressNote.createdOn = model.patientProgressNoteList[0].createdOn; widget.patientProgressNote.createdOn = model.patientProgressNoteList[0].createdOn;
widget.patientProgressNote.editedOn = model.patientProgressNoteList[0].editedOn; widget.patientProgressNote.editedOn = model.patientProgressNoteList[0].editedOn;
widget.patientProgressNote.editedByName = model.patientProgressNoteList[0].editedByName; widget.patientProgressNote.editedByName = model.patientProgressNoteList[0].editedByName;
setState(() {
isAddProgress = false;
});
} }
widget.changeLoadingState(false); widget.changeLoadingState(false);
}, },
@ -111,166 +123,98 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
SizedBox( Column(
height: 10, crossAxisAlignment: CrossAxisAlignment.start,
), children: [
HeaderBodyExpandableNotifier( Container(
headerWidget: Row( margin: EdgeInsets.only(left: 5, right: 5),
mainAxisAlignment: MainAxisAlignment.spaceAround, child: Texts(TranslationBase.of(context).progressNote)),
children: [ if( isAddProgress)
Row( Container(
children: [ margin: EdgeInsets.only(left: 10, right: 10, top: 15),
Texts(TranslationBase child: AppTextFieldCustom(
.of(context) hintText: TranslationBase.of(context).progressNote,
.progressNoteSOAP, controller: progressNoteController,
variant: isProgressNoteExpand ? "bodyText" : '', minLines: 2,
bold: isProgressNoteExpand ? true : false, maxLines: 4,
color: Colors.black), inputType: TextInputType.multiline,
Icon( onChanged: (value){
FontAwesomeIcons.asterisk, widget.patientProgressNote.planNote = value;
color: Colors.black,
size: 12,
)
],
),
InkWell(
onTap: () {
setState(() {
isProgressNoteExpand = !isProgressNoteExpand;
});
}, },
child: Icon(isProgressNoteExpand ),
? Icons.keyboard_arrow_up ),
: Icons.keyboard_arrow_down))
],
),
bodyWidget: Column(children: [
SizedBox( SizedBox(
height: 2, height: 9,
), ),
Column( if ( widget.patientProgressNote.planNote != null && !isAddProgress)
children: [ Container(
if(widget.patientProgressNote.planNote == null) margin:
Container( EdgeInsets.only(left: 5, right: 5,),
margin: child: Column(
EdgeInsets.only(left: 10, right: 10, top: 15), crossAxisAlignment:
CrossAxisAlignment.start,
child: AppTextFieldCustom( children: [
hintText: TranslationBase.of(context).progressNote, Row(
controller: progressNoteController, mainAxisAlignment: MainAxisAlignment.spaceBetween,
minLines: 2, crossAxisAlignment: CrossAxisAlignment.start,
maxLines: 4,
inputType: TextInputType.multiline,
onChanged: (value){
// examination.remark = value;
},
),
),
SizedBox(
height: 20,
),
if ( widget.patientProgressNote.planNote != null)
Container(
margin:
EdgeInsets.only(left: 5, right: 5, top: 15),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
SizedBox(
height: 8,
),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
Row( Texts('Appointment No: ',fontSize: 12,),
children: [ Texts(widget.patientProgressNote.appointmentNo??'',fontWeight: FontWeight.w600,),
Texts('Appointment No: '),
Texts(widget.patientProgressNote.appointmentNo.toString()),
],
),
AppText(
widget.patientProgressNote.createdOn !=null?DateUtils.getDayMonthYearDateFormatted(DateTime.parse(widget.patientProgressNote.createdOn)):DateUtils.getDayMonthYearDateFormatted(DateTime.now()),
fontWeight: FontWeight
.bold,
fontSize: 16,
)
], ],
), ),
Row( Texts(
children: [ widget.patientProgressNote.createdOn !=null?DateUtils.getDayMonthYearDateFormatted(DateTime.parse(widget.patientProgressNote.createdOn)):DateUtils.getDayMonthYearDateFormatted(DateTime.now()),
Texts('Condition: '), fontWeight: FontWeight.w600,
Texts(widget.patientProgressNote.mName.toString()), fontSize: 14,
)
], ],
), ),
if(widget.patientProgressNote.createdByName !=null) Row(
Row( mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
MainAxisAlignment.start, children: [
children: [
AppText(
TranslationBase.of(context).createdBy,
fontWeight: FontWeight.bold,
fontSize: 16,
),
AppText(
widget.patientProgressNote.createdByName??"",
fontSize: 10,
color: Colors.grey,
),
],
),
if(widget.patientProgressNote.editedByName !=null)
Row( Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [ children: [
AppText( Texts('Condition: ',fontSize: 12,),
TranslationBase.of(context).editedBy, Texts(widget.patientProgressNote.mName??'',fontWeight: FontWeight.w600),
fontWeight: FontWeight.bold,
fontSize: 16,
),
AppText(
widget.patientProgressNote.editedByName??"",
fontSize: 10,
color: Colors.grey,
),
], ],
), ),
Row( Texts(
mainAxisAlignment: widget.patientProgressNote.createdOn !=null?DateUtils.getHour(DateTime.parse(widget.patientProgressNote.createdOn)):DateUtils.getHour(DateTime.now()),
MainAxisAlignment.start, fontWeight: FontWeight.w600,
children: [ fontSize: 14,
SizedBox( )
height: 6, ],
), ),
Padding( SizedBox(height: 8,),
padding: const EdgeInsets.all(0.0), Row(
child: Container( mainAxisAlignment: MainAxisAlignment.start,
width: MediaQuery.of(context) children: [
.size Expanded(
.width * child: Texts(
0.6, progressNoteController.text,
child: Texts( fontSize: 10,
progressNoteController.text,
fontSize: 10, ),
color: Colors.grey,
),
),
),
],
), ),
InkWell(
onTap: (){
setState(() {
isAddProgress = true;
widget.changePageViewIndex(3,isChangeState:false);
});
},
child: Icon(DoctorApp.edit,size: 18,))
], ],
), ),
) ],
], ),
) )
]), ],
isExpand: isProgressNoteExpand,
), ),
], ],
@ -281,56 +225,62 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
), ),
bottomSheet: Container( bottomSheet: Container(
width: double.maxFinite, width: double.maxFinite,
height: 70, height: 90,
child: Container( child: Padding(
margin: EdgeInsets.all(6), padding: const EdgeInsets.all(8.0),
child: Column( child: Container(
children: [ margin: EdgeInsets.all(6),
child: Column(
Row( children: [
children: [ Row(
Expanded( children: [
child: AppButton( Expanded(
title: 'Previous', child: AppButton(
color: Colors.white38, title: 'Previous',
fontColor: Colors.black, color: Colors.grey[300],
fontWeight: FontWeight.w700, fontColor: Colors.black,
loading: model.state == ViewState.BusyLocal, fontWeight: FontWeight.w400,
onPressed: () async { loading: model.state == ViewState.BusyLocal,
setState(() { onPressed: () async {
widget.changePageViewIndex(2); setState(() {
}); widget.changePageViewIndex(2);
}, });
},
),
), ),
), SizedBox(width: 5,),
SizedBox(width: 5,), Expanded(
Expanded( child: AppButton(
child: AppButton( title: isAddProgress? TranslationBase.of(context).next: "Finish",
title: TranslationBase.of(context).next, fontWeight: FontWeight.w400,
fontWeight: FontWeight.w700, loading: model.state == ViewState.BusyLocal,
loading: model.state == ViewState.BusyLocal, color: Colors.red[700],
disabled: progressNoteController.text.isEmpty, disabled: progressNoteController.text.isEmpty,
onPressed: () async { onPressed: () async {
if(widget.patientProgressNote.planNote.isEmpty) { if(isAddProgress) {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
setState(() { setState(() {
widget.patientProgressNote.createdByName = widget.patientProgressNote.createdByName ?? doctorProfile.doctorName; widget.patientProgressNote.createdByName = widget.patientProgressNote.createdByName ?? doctorProfile.doctorName;
widget.patientProgressNote.editedByName = doctorProfile.doctorName; widget.patientProgressNote.editedByName = doctorProfile.doctorName;
widget.patientProgressNote.createdOn = DateTime.now().toString(); widget.patientProgressNote.createdOn = DateTime.now().toString();
widget.patientProgressNote.planNote = progressNoteController.text; widget.patientProgressNote.planNote = progressNoteController.text;
}); isAddProgress = !isAddProgress;
});
submitPlan(model);
} else } else{
submitPlan(model); Navigator.of(context).pop();
}, }
},
),
), ),
), ],
], ),
),
], ],
),
), ),
), ),
), ),
@ -361,7 +311,7 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
if (model.state == ViewState.ErrorLocal) { if (model.state == ViewState.ErrorLocal) {
helpers.showErrorToast(model.error); helpers.showErrorToast(model.error);
} else { } else {
Navigator.of(context).pop(); widget.changePageViewIndex(4,isChangeState:false);
} }
} else { } else {
helpers.showErrorToast(TranslationBase.of(context).progressNoteErrorMsg); helpers.showErrorToast(TranslationBase.of(context).progressNoteErrorMsg);

@ -38,9 +38,13 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndex>
GetPatientProgressNoteResModel patientProgressNote = GetPatientProgressNoteResModel patientProgressNote =
GetPatientProgressNoteResModel(); GetPatientProgressNoteResModel();
changePageViewIndex(pageIndex) { changePageViewIndex(pageIndex,{isChangeState = true}) {
if (pageIndex != _currentIndex) changeLoadingState(true); if (pageIndex != _currentIndex && isChangeState)
changeLoadingState(true);
_controller.jumpToPage(pageIndex); _controller.jumpToPage(pageIndex);
setState(() {
_currentIndex = pageIndex;
});
} }
bool _isLoading = true; bool _isLoading = true;
@ -95,7 +99,7 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndex>
child: StepsWidget( child: StepsWidget(
index: _currentIndex, index: _currentIndex,
changeCurrentTab: changePageViewIndex, changeCurrentTab: changePageViewIndex,
height: MediaQuery.of(context).size.height * 0.20, height: 135,//MediaQuery.of(context).size.height * 0.17,
), ),
), ),
Container( Container(

@ -45,18 +45,36 @@ class _AppDrawerState extends State<AppDrawer> {
flex: 4, flex: 4,
child: ListView(padding: EdgeInsets.zero, children: <Widget>[ child: ListView(padding: EdgeInsets.zero, children: <Widget>[
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 20), margin: EdgeInsets.symmetric(horizontal: 15),
// height: SizeConfig.heightMultiplier * 50, // height: SizeConfig.heightMultiplier * 50,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Row(
child: Image.asset( children: [
'assets/images/dr_app_logo.png', Container(
), child: Image.asset(
margin: EdgeInsets.only(top: 10, bottom: 10), 'assets/images/dr_app_logo.png',
),
margin: EdgeInsets.only(top: 10, bottom: 10),
),
Container(
child: InkWell(
onTap: (){
Navigator.pop(context);
},
child: Icon(
DoctorApp.close_1,
size: 20,
),
),
margin: EdgeInsets.only(top: 20, bottom: 10),
)
],
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
), ),
SizedBox(height: 10), SizedBox(height: 5),
if (authProvider.doctorProfile != null) if (authProvider.doctorProfile != null)
InkWell( InkWell(
onTap: () { onTap: () {
@ -80,7 +98,7 @@ class _AppDrawerState extends State<AppDrawer> {
), ),
), ),
Padding( Padding(
padding: EdgeInsets.only(top: 5), padding: EdgeInsets.only(top: 0),
child: AppText( child: AppText(
authProvider.doctorProfile?.clinicDescription, authProvider.doctorProfile?.clinicDescription,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -91,13 +109,10 @@ class _AppDrawerState extends State<AppDrawer> {
], ],
), ),
), ),
SizedBox(height: 10), SizedBox(height: 40),
InkWell( InkWell(
child: DrawerItem( child: DrawerItem(
TranslationBase.of(context).rescheduleLeaves, TranslationBase.of(context).applyOrRescheduleLeave,
// " or " +
// TranslationBase.of(context).leaves,
DoctorApp.reschedule__1, DoctorApp.reschedule__1,
// subTitle: , // subTitle: ,
), ),
@ -111,19 +126,15 @@ class _AppDrawerState extends State<AppDrawer> {
)); ));
}, },
), ),
SizedBox(height: 15),
SizedBox(height: 10),
InkWell( InkWell(
child: DrawerItem( child: DrawerItem(
'My QR Code', TranslationBase.of(context).myQRCode,
// " or " +
// TranslationBase.of(context).leaves,
DoctorApp.qr_code_3, DoctorApp.qr_code_3,
// subTitle: , // subTitle: ,
), ),
), ),
SizedBox(height: 15),
InkWell( InkWell(
child: Container( child: Container(
height: 80, height: 80,
@ -138,14 +149,12 @@ class _AppDrawerState extends State<AppDrawer> {
), ),
), ),
SizedBox( SizedBox(
height: 40, height: 130,
), ),
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 20), margin: EdgeInsets.symmetric(horizontal: 20),
child: Column( child: Column(
children: [ children: [
InkWell( InkWell(
child: DrawerItem( child: DrawerItem(
projectsProvider.isArabic projectsProvider.isArabic
@ -159,6 +168,7 @@ class _AppDrawerState extends State<AppDrawer> {
projectsProvider.changeLanguage('ar'); projectsProvider.changeLanguage('ar');
}, },
), ),
SizedBox(height: 10),
InkWell( InkWell(
child: DrawerItem( child: DrawerItem(
TranslationBase.of(context).logout, DoctorApp.logout_1), TranslationBase.of(context).logout, DoctorApp.logout_1),
@ -193,13 +203,13 @@ class _AppDrawerState extends State<AppDrawer> {
style: TextStyle( style: TextStyle(
color: Color(0xFF989898), color: Color(0xFF989898),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: SizeConfig.textMultiplier * 2, fontSize: 14,
fontFamily: 'Poppins',), fontFamily: 'Poppins',),
children: <TextSpan>[ children: <TextSpan>[
TextSpan(text: ' Cloud Solutions', TextSpan(text: ' Cloud Solutions',
style: TextStyle( style: TextStyle(
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontSize: SizeConfig.textMultiplier * 2, fontSize: 15,
fontFamily: 'Poppins',), fontFamily: 'Poppins',),
) )
] ]

@ -37,23 +37,23 @@ class _BottomNavBarState extends State<BottomNavBar> {
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
BottomNavigationItem( BottomNavigationItem(
icon: DoctorApp.home_icon_active, icon: DoctorApp.home_1,
activeIcon: DoctorApp.home_active, activeIcon: DoctorApp.home_active_1,
changeIndex: _changeIndex, changeIndex: _changeIndex,
index: _index, index: _index,
currentIndex: 0, currentIndex: 0,
name: TranslationBase.of(context).home, name: TranslationBase.of(context).home,
), ),
BottomNavigationItem( BottomNavigationItem(
icon: DoctorApp.schedule_icon, icon: DoctorApp.schedule_1,
activeIcon: DoctorApp.scdedule_icon_active_1, activeIcon: DoctorApp.schedule_active_1,
changeIndex: _changeIndex, changeIndex: _changeIndex,
index: _index, index: _index,
currentIndex: 1, currentIndex: 1,
name: TranslationBase.of(context).mySchedule, name: TranslationBase.of(context).mySchedule,
), ),
BottomNavigationItem( BottomNavigationItem(
icon: DoctorApp.qr_code, icon: DoctorApp.qr_reader,
activeIcon: DoctorApp.qr_reader_active_1, activeIcon: DoctorApp.qr_reader_active_1,
changeIndex: _changeIndex, changeIndex: _changeIndex,
index: _index, index: _index,
@ -61,7 +61,7 @@ class _BottomNavBarState extends State<BottomNavBar> {
name: TranslationBase.of(context).qr, name: TranslationBase.of(context).qr,
), ),
BottomNavigationItem( BottomNavigationItem(
icon: DoctorApp.message_icon, icon: DoctorApp.dr_reply_1,
activeIcon: DoctorApp.dr_reply_active_1, activeIcon: DoctorApp.dr_reply_active_1,
changeIndex: _changeIndex, changeIndex: _changeIndex,
index: _index, index: _index,

@ -34,19 +34,10 @@ class BottomNavigationItem extends StatelessWidget {
children: <Widget>[ children: <Widget>[
SizedBox(height: 15,), SizedBox(height: 15,),
Container( Container(
// decoration: BoxDecoration(boxShadow: [
// BoxShadow(
// color: currentIndex == index
// ? Color.fromRGBO(78, 62, 253, 0.4)
// : Color.fromRGBO(78, 62, 253, 0),
// blurRadius: 9.0,
// spreadRadius: -4.0,
// offset: Offset(0.0, 2.0))
// ]),
child: Icon(currentIndex == index ? activeIcon : icon, child: Icon(currentIndex == index ? activeIcon : icon,
/*color: currentIndex == index color: currentIndex == index
? Theme.of(context).primaryColor ? Color(0xFF333C45)
: Theme.of(context).dividerColor,*/ : Theme.of(context).dividerColor,
size: 22.0), size: 22.0),
), ),
SizedBox(height: 5,), SizedBox(height: 5,),

@ -1,4 +1,5 @@
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -89,7 +90,7 @@ class DoctorCardInsurance extends StatelessWidget {
child: Padding( child: Padding(
padding: const EdgeInsets.all(5.0), padding: const EdgeInsets.all(5.0),
child: Texts( child: Texts(
'$patientOut', '$patientOut'.replaceAll(" ", ""),
color: Colors.white, color: Colors.white,
fontSize: 13.0, fontSize: 13.0,
), ),
@ -102,7 +103,7 @@ class DoctorCardInsurance extends StatelessWidget {
Expanded( Expanded(
child: Texts( child: Texts(
doctorName, doctorName,
bold: true, fontWeight: FontWeight.w700,
)), )),
], ],
), ),
@ -153,11 +154,13 @@ class DoctorCardInsurance extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Clinic: ', 'Clinic: ',
color: Colors.grey[500], //fontWeight: FontWeight.w600,
//color: Colors.grey[500],
), ),
Expanded( Expanded(
child: Texts( child: Texts(
clinic, clinic,
fontWeight: FontWeight.w700,
), ),
) )
], ],
@ -167,19 +170,24 @@ class DoctorCardInsurance extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Approval No: ', 'Approval No: ',
color: Colors.grey[500], //color: Colors.grey[500],
), ),
Texts( Texts(
branch, branch,
fontWeight: FontWeight.w700,
) )
], ],
) )
]), ]),
), ),
), ),
Icon( Padding(
EvaIcons.eye, padding:
size: 38.0, const EdgeInsets.symmetric(horizontal: 15.0),
child: Icon(
DoctorApp.view,
size: 22.0,
),
) )
], ],
), ),

@ -26,7 +26,7 @@ class _DrawerItemState extends State<DrawerItem> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
margin: EdgeInsets.only(top: 5, bottom: 5, left: 0, right: 0), margin: EdgeInsets.only(top: 0, bottom: 5, left: 0, right: 0),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
@ -49,16 +49,9 @@ class _DrawerItemState extends State<DrawerItem> {
color:widget.color ??Color(0xFF2E303A), color:widget.color ??Color(0xFF2E303A),
fontSize: 14, fontSize: 14,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.bold, fontWeight: FontWeight.w600,
), ),
), ),
AppText(
widget.subTitle,
visibility: !widget.subTitle.isNullOrEmpty(),
color: widget.color ?? Colors.black,
marginLeft: 5,
fontSize: SizeConfig.textMultiplier * 2.5,
),
], ],
), ),
), ),

@ -18,14 +18,14 @@ class HeaderBodyExpandableNotifier extends StatefulWidget {
class _HeaderBodyExpandableNotifierState class _HeaderBodyExpandableNotifierState
extends State<HeaderBodyExpandableNotifier> { extends State<HeaderBodyExpandableNotifier> {
@override
void initState() {
super.initState();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
setState(() {
if (widget.isExpand == true) {
widget.expandFlag = widget.isExpand;
widget.controller.expanded = true;
}
});
return ExpandableNotifier( return ExpandableNotifier(
child: Padding( child: Padding(

@ -137,14 +137,29 @@ class _MasterKeyCheckboxSearchAllergiesWidgetState
items[index]), items[index]),
activeColor: Colors.red[800], activeColor: Colors.red[800],
onChanged: (bool newValue) { onChanged: (bool newValue) {
// setState(() { setState(() {
// if (widget if (widget
// .isServiceSelected(items[index])) { .isServiceSelected(
// widget.removeHistory(items[index]); items[index])) {
// } else { widget.removeAllergy(
// widget.addHistory(items[index]); items[index]);
// } } else {
// }); // TODO add Allergy
MySelectedAllergy
mySelectedAllergy =
new MySelectedAllergy(
selectedAllergy:
items[index],
selectedAllergySeverity:
_selectedAllergySeverity,
remark: null,
isChecked: true,
isExpanded: true);
widget.addAllergy(
mySelectedAllergy);
}
});
}), }),
InkWell( InkWell(
onTap: () { onTap: () {

Loading…
Cancel
Save