Merge branch 'schedule' into 'development'

Schedule

See merge request Cloud_Solution/doctor_app_flutter!386
merge-requests/388/merge
Mohammad Aljammal 4 years ago
commit 130d1442ea

@ -1,13 +1,13 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
class DoctorReplyWidget extends StatefulWidget { class DoctorReplyWidget extends StatefulWidget {
final ListGtMyPatientsQuestions reply; final ListGtMyPatientsQuestions reply;
@ -22,224 +22,434 @@ class DoctorReplyWidget extends StatefulWidget {
class _DoctorReplyWidgetState extends State<DoctorReplyWidget> { class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Stack( return Container(
children: <Widget>[ child: CardWithBgWidget(
Container( bgColor:
margin: EdgeInsets.symmetric(vertical: 10.0), widget.reply.status == 1
width: double.infinity, ? Color(0xffc4aa54)
decoration: BoxDecoration( : Colors.red[700],
color: HexColor('#FFFFFF'), hasBorder: false,
borderRadius: BorderRadius.all( widget: Container(
Radius.circular(20.0), // padding: EdgeInsets.only(left: 20, right: 0, bottom: 0),
), child: InkWell(
),
child: Container(
margin: EdgeInsets.all(5),
child: Column(
children: <Widget>[
SizedBox(height: 18,),
Container(
margin: EdgeInsets.only(right: 15),
child: Row(
children: <Widget>[
SizedBox(width: 5,),
//LargeAvatar(icon: widget.reply.gender == 0 ? DoctorApp.male : DoctorApp.femaleicon ,),
Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment(-1, -1),
end: Alignment(1, 1),
colors: [
Colors.grey[100],
Colors.grey[200],
]),
boxShadow: [
BoxShadow(
color: Color.fromRGBO(0, 0, 0, 0.08),
offset: Offset(0.0, 5.0),
blurRadius: 16.0)
],
borderRadius: BorderRadius.all(Radius.circular(50.0)),
),
width: 80,
height: 80,
child: Icon(widget.reply.gender == 1 ? DoctorApp.male : DoctorApp.female_icon,size: 80,)),
SizedBox(width: 15,),
Expanded(
child: Container(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText(
widget.reply.patientName,
fontSize: 1.5 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
SizedBox(
height: 5,
),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
AppText( RichText(
TranslationBase.of(context).fileNo, text: new TextSpan(
fontSize: 1.7 * SizeConfig.textMultiplier, style: new TextStyle(
fontWeight: FontWeight.bold, fontSize: 2.0 * SizeConfig.textMultiplier,
), color: Colors.black),
Container( children: <TextSpan>[
margin: EdgeInsets.only(left: 5), new TextSpan(
child: AppText( text: widget.reply.infoStatus!=null ? widget.reply.infoStatus :'',
'${widget.reply.patientID}', style: TextStyle(
fontSize: 1.7 * SizeConfig.textMultiplier, color: widget.reply.status != null
fontWeight: FontWeight.bold, ? widget.reply.status == 1
? Color(0xffc4aa54)
: widget.reply.status == 2
? Colors.green[700]
: Colors.red[700]
: Colors.grey[500],
fontWeight: FontWeight.w700,
fontFamily: 'Poppins',
fontSize: 2.0 * SizeConfig.textMultiplier)),
],
), ),
), ),
AppText(
DateUtils.getDateTimeFromServerFormat(
widget.reply.createdOn)
.day
.toString() +
" " +
DateUtils.getMonth(
DateUtils.getDateTimeFromServerFormat(
widget.reply.createdOn)
.month)
.toString()
.substring(0, 3) +
' ' +
DateUtils.getDateTimeFromServerFormat(
widget.reply.createdOn)
.year
.toString(),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
)
], ],
), ),
SizedBox(
height: 5,
),
Row( Row(
children: [ children: [
AppText( Expanded(
TranslationBase.of(context).mobileNo,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
Container(
margin: EdgeInsets.only(left: 5),
child: AppText( child: AppText(
widget.reply.mobileNumber, Helpers.capitalize( widget.reply.patientName),
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: SizeConfig.textMultiplier * 2.5,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
), ),
), ),
SizedBox(
width: 4,
),
widget.reply.gender == 1
? Icon(
DoctorApp.male_2,
color: Colors.blue,
)
: Icon(
DoctorApp.female_1,
color: Colors.pink,
),
], ],
), ),
SizedBox( SizedBox(
height: 5, height: 20,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Column(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Container( Container(
width: 70, margin: EdgeInsets.only(top: 5),
height: 20, width: 60,
decoration: BoxDecoration( height: 60,
borderRadius: BorderRadius.all(Radius.circular(60.0)), child: Image.asset(
color: Colors.green[600] widget.reply.gender == 1
), ? 'assets/images/male_avatar.png'
child: Center( : 'assets/images/female_avatar.png',
child: AppText( fit: BoxFit.cover,
widget.reply.requestTime,
fontSize: 1.5 * SizeConfig.textMultiplier,
color: Colors.white,
), ),
), ),
),
Container(
child: AppText(
'${Helpers.getDate(widget.reply.requestDate)}',
fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
],
),
],
),
),
)
], ],
), ),
SizedBox(
width: 20,
), ),
Column(
!widget.isShowMore ? SizedBox(height: 18,) :
AnimatedContainer(
duration: Duration(milliseconds: 200),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: [
Divider(color: Colors.grey), // SizedBox(height: 10,),
SizedBox(height: 5,),
Row( Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( Column(
TranslationBase.of(context).remarks + " : ",
fontSize: 2.5 * SizeConfig.textMultiplier,
//fontWeight: FontWeight.bold,
),Expanded(
child: AppText(
widget.reply.remarks,
fontSize: 2.5 * SizeConfig.textMultiplier,
//fontWeight: FontWeight.bold,
),
),
],
),
SizedBox(height: 10,),
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText(
TranslationBase.of(context).doctorResponse + " : ", RichText(
fontSize: 2.5 * SizeConfig.textMultiplier, text: new TextSpan(
//fontWeight: FontWeight.bold, style: new TextStyle(
),Expanded( fontSize: 2.0 * SizeConfig.textMultiplier,
child: AppText( color: Colors.black),
widget.reply.doctorResponse, children: <TextSpan>[
fontSize: 2.5 * SizeConfig.textMultiplier, new TextSpan(
//fontWeight: FontWeight.bold, text: TranslationBase.of(context).fileNumber,
style: TextStyle(
fontSize: 14,color: Color(0xFF575757),fontWeight: FontWeight.bold, fontFamily: 'Poppins')),
new TextSpan(
text: widget.reply.patientID.toString(),
style: TextStyle(
fontWeight: FontWeight.w700,
fontFamily: 'Poppins',
fontSize: 15)),
],
), ),
), ),
Container(
width: MediaQuery.of(context).size.width*0.45,
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: 2.0 * SizeConfig.textMultiplier,
color: Colors.black,
fontFamily: 'Poppins',
),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(context).age +
" : ",
style: TextStyle(fontSize: 14,color: Color(0xFF575757),fontWeight: FontWeight.bold)),
new TextSpan(
text:
"${DateUtils.getAgeByBirthday(widget.reply.dateofBirth, context)}",
style: TextStyle(
fontWeight: FontWeight.w700,
fontSize: 15)),
], ],
),SizedBox(height: 10,),
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).infoStatus + " : ",
fontSize: 2.5 * SizeConfig.textMultiplier,
//fontWeight: FontWeight.bold,
),Expanded(
child: AppText(
widget.reply.infoStatus,
fontSize: 2.5 * SizeConfig.textMultiplier,
//fontWeight: FontWeight.bold,
), ),
), ),
],
) )
], ],
), ),
),
], ],
), ),
Container(
width: MediaQuery.of(context).size.width * 0.5,
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: 2.0 * SizeConfig.textMultiplier,
color: Colors.black),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(context).doctorResponse + " : ",
style:
TextStyle(fontSize: 14, fontFamily: 'Poppins', color: Color(0xFF575757),fontWeight: FontWeight.bold)),
new TextSpan(
text: widget.reply.remarks,
style: TextStyle(
fontFamily: 'Poppins',
color: Color(0xFF575757),
fontSize: 15)),
],
), ),
), ),
Positioned( ),
right: 5, ],)
top: 20,
child: InkWell(
onTap: (){
setState(() {
widget.isShowMore = !widget.isShowMore;
});
},
child: Icon(widget.isShowMore? Icons.keyboard_arrow_up : Icons.keyboard_arrow_down)),
)
], ],
),
SizedBox(
height: 20,
),
],
),
// onTap: onTap,
)),
),
); );
// Stack(
// children: <Widget>[
// Container(
// margin: EdgeInsets.symmetric(vertical: 10.0),
// width: double.infinity,
// decoration: BoxDecoration(
// color: HexColor('#FFFFFF'),
// borderRadius: BorderRadius.all(
// Radius.circular(20.0),
// ),
// ),
// child: Container(
// margin: EdgeInsets.all(5),
// child: Column(
// children: <Widget>[
// SizedBox(height: 18,),
// Container(
// margin: EdgeInsets.only(right: 15),
// child: Row(
// children: <Widget>[
// SizedBox(width: 5,),
// //LargeAvatar(icon: widget.reply.gender == 0 ? DoctorApp.male : DoctorApp.femaleicon ,),
// Container(
// decoration: BoxDecoration(
// gradient: LinearGradient(
// begin: Alignment(-1, -1),
// end: Alignment(1, 1),
// colors: [
// Colors.grey[100],
// Colors.grey[200],
// ]),
// boxShadow: [
// BoxShadow(
// color: Color.fromRGBO(0, 0, 0, 0.08),
// offset: Offset(0.0, 5.0),
// blurRadius: 16.0)
// ],
// borderRadius: BorderRadius.all(Radius.circular(50.0)),
// ),
// width: 80,
// height: 80,
// child: Icon(widget.reply.gender == 1 ? DoctorApp.male : DoctorApp.female_icon,size: 80,)),
//
// SizedBox(width: 15,),
// Expanded(
// child: Container(
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// AppText(
// widget.reply.patientName,
// fontSize: 1.5 * SizeConfig.textMultiplier,
// fontWeight: FontWeight.bold,
// ),
// SizedBox(
// height: 5,
// ),
//
// Row(
// children: [
// AppText(
// TranslationBase.of(context).fileNo,
// fontSize: 1.7 * SizeConfig.textMultiplier,
// fontWeight: FontWeight.bold,
// ),
// Container(
// margin: EdgeInsets.only(left: 5),
// child: AppText(
// '${widget.reply.patientID}',
// fontSize: 1.7 * SizeConfig.textMultiplier,
// fontWeight: FontWeight.bold,
// ),
// ),
// ],
// ),
// SizedBox(
// height: 5,
// ),
// Row(
// children: [
// AppText(
// TranslationBase.of(context).mobileNo,
// fontSize: 1.7 * SizeConfig.textMultiplier,
// fontWeight: FontWeight.bold,
// ),
// Container(
// margin: EdgeInsets.only(left: 5),
// child: AppText(
// widget.reply.mobileNumber,
// fontSize: 1.7 * SizeConfig.textMultiplier,
// fontWeight: FontWeight.bold,
// ),
// ),
// ],
// ),
// SizedBox(
// height: 5,
// ),
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// Container(
// width: 70,
// height: 20,
// decoration: BoxDecoration(
// borderRadius: BorderRadius.all(Radius.circular(60.0)),
// color: Colors.green[600]
// ),
// child: Center(
// child: AppText(
// widget.reply.requestTime,
// fontSize: 1.5 * SizeConfig.textMultiplier,
// color: Colors.white,
// ),
// ),
// ),
// Container(
//
// child: AppText(
// '${Helpers.getDate(widget.reply.requestDate)}',
// fontSize: 1.7 * SizeConfig.textMultiplier,
// fontWeight: FontWeight.bold,
// color: Colors.black,
// ),
// ),
// ],
// ),
//
// ],
// ),
// ),
// )
//
// ],
// ),
// ),
//
// !widget.isShowMore ? SizedBox(height: 18,) :
// AnimatedContainer(
// duration: Duration(milliseconds: 200),
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: <Widget>[
// Divider(color: Colors.grey),
// SizedBox(height: 5,),
// Row(
// mainAxisAlignment: MainAxisAlignment.start,
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// AppText(
// TranslationBase.of(context).remarks + " : ",
// fontSize: 2.5 * SizeConfig.textMultiplier,
// //fontWeight: FontWeight.bold,
// ),Expanded(
// child: AppText(
// widget.reply.remarks,
// fontSize: 2.5 * SizeConfig.textMultiplier,
// //fontWeight: FontWeight.bold,
// ),
// ),
// ],
// ),
// SizedBox(height: 10,),
// Row(
// mainAxisAlignment: MainAxisAlignment.start,
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// AppText(
// TranslationBase.of(context).doctorResponse + " : ",
// fontSize: 2.5 * SizeConfig.textMultiplier,
// //fontWeight: FontWeight.bold,
// ),Expanded(
// child: AppText(
// widget.reply.doctorResponse,
// fontSize: 2.5 * SizeConfig.textMultiplier,
// //fontWeight: FontWeight.bold,
// ),
// ),
// ],
// ),SizedBox(height: 10,),
// Row(
// mainAxisAlignment: MainAxisAlignment.start,
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// AppText(
// TranslationBase.of(context).infoStatus + " : ",
// fontSize: 2.5 * SizeConfig.textMultiplier,
// //fontWeight: FontWeight.bold,
// ),Expanded(
// child: AppText(
// widget.reply.infoStatus,
// fontSize: 2.5 * SizeConfig.textMultiplier,
// //fontWeight: FontWeight.bold,
// ),
// ),
// ],
// )
// ],
// ),
// ),
//
// ],
// ),
// ),
// ),
// Positioned(
// right: 5,
// top: 20,
// child: InkWell(
// onTap: (){
// setState(() {
// widget.isShowMore = !widget.isShowMore;
// });
// },
// child: Icon(widget.isShowMore? Icons.keyboard_arrow_up : Icons.keyboard_arrow_down)),
// )
// ],
//
// );
} }
} }

Loading…
Cancel
Save