Merge branch 'replay_taps' into 'development'

fix cashing issue

See merge request Cloud_Solution/doctor_app_flutter!838
merge-requests/840/head
Mohammad Aljammal 5 years ago
commit b2ce970195

@ -29,12 +29,7 @@ class _AllDoctorQuestionsState extends State<AllDoctorQuestions> {
onModelReady: (model) { onModelReady: (model) {
model.getDoctorReply(isLocalBusy: false); model.getDoctorReply(isLocalBusy: false);
}, },
builder: (_, model, w) => WillPopScope( builder: (_, model, w) => AppScaffold(
onWillPop: () async {
widget.changeCurrentTab();
return false;
},
child: AppScaffold(
baseViewModel: model, baseViewModel: model,
appBarTitle: TranslationBase.of(context).replay2, appBarTitle: TranslationBase.of(context).replay2,
isShowAppBar: false, isShowAppBar: false,
@ -95,7 +90,6 @@ class _AllDoctorQuestionsState extends State<AllDoctorQuestions> {
], ],
), ),
), ),
),
); );
} }
} }

@ -202,9 +202,11 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
CustomRow( CustomRow(
label: TranslationBase.of(context).fileNumber, label: TranslationBase.of(context).fileNumber,
value: widget.reply.patientID.toString(), value: widget.reply.patientID.toString(),
isCopyable:false,
), ),
CustomRow( CustomRow(
label: TranslationBase.of(context).age + " : ", label: TranslationBase.of(context).age + " : ",
isCopyable:false,
value: value:
"${AppDateUtils.getAgeByBirthday(widget.reply.dateofBirth, context)}", "${AppDateUtils.getAgeByBirthday(widget.reply.dateofBirth, context)}",
), ),

@ -31,12 +31,7 @@ class _NotRepliedDoctorQuestionsState extends State<NotRepliedDoctorQuestions> {
onModelReady: (model) { onModelReady: (model) {
model.getDoctorReply(isLocalBusy: false, isGettingNotReply: true); model.getDoctorReply(isLocalBusy: false, isGettingNotReply: true);
}, },
builder: (_, model, w) => WillPopScope( builder: (_, model, w) => AppScaffold(
onWillPop: () async {
widget.changeCurrentTab();
return false;
},
child: AppScaffold(
baseViewModel: model, baseViewModel: model,
appBarTitle: TranslationBase.of(context).replay2, appBarTitle: TranslationBase.of(context).replay2,
isShowAppBar: false, isShowAppBar: false,
@ -104,7 +99,6 @@ class _NotRepliedDoctorQuestionsState extends State<NotRepliedDoctorQuestions> {
], ],
), ),
), ),
),
); );
} }
} }

@ -7,7 +7,7 @@ class CustomRow extends StatelessWidget {
const CustomRow({ const CustomRow({
Key key, Key key,
this.label, this.label,
this.value, this.labelSize, this.valueSize, this.width, this.value, this.labelSize, this.valueSize, this.width, this.isCopyable= true,
}) : super(key: key); }) : super(key: key);
final String label; final String label;
@ -15,6 +15,7 @@ class CustomRow extends StatelessWidget {
final double labelSize; final double labelSize;
final double valueSize; final double valueSize;
final double width; final double width;
final bool isCopyable;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -35,7 +36,7 @@ class CustomRow extends StatelessWidget {
fontSize: valueSize??SizeConfig.getTextMultiplierBasedOnWidth() * 3, fontSize: valueSize??SizeConfig.getTextMultiplierBasedOnWidth() * 3,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
isCopyable: true, isCopyable: isCopyable,
), ),
], ],
); );

Loading…
Cancel
Save