fix design issue

merge-requests/560/head
Elham Rababah 5 years ago
parent 2d4cb00716
commit 4a6503c2cf

@ -411,10 +411,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
.of(context)
.size
.width * 0.8,
height: MediaQuery
.of(context)
.size
.height * 0.3,
height: 200,
child: AppScaffold(
isShowAppBar: false,
body: Container(
@ -422,54 +419,61 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
// SizedBox(height: 20,),
SizedBox(height: 5,),
AppText(
"Confirm", fontWeight: FontWeight.w600,
color: Colors.black,
fontSize: 16,),
SizedBox(height: 5,),
SizedBox(height: 10,),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
AppText(
"Confirm", fontWeight: FontWeight.w600,
color: Colors.black,
fontSize: 16,),
],
),
SizedBox(height: 10,),
DividerWithSpacesAround(),
SizedBox(height: 12,),
Container(
padding: EdgeInsets.all(20),
color: Colors.white,
child: Expanded(
child: AppText(
'Are you sure you want $actionName this order?',
fontSize: 15,
textAlign: TextAlign.center,
),
child: AppText(
'Are you sure you want $actionName this order?',
fontSize: 15,
textAlign: TextAlign.center,
),
),
SizedBox(height: 30,),
SizedBox(height: 8,),
DividerWithSpacesAround(),
// SizedBox(height: 30,),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
FlatButton(
child: AppText(
"Cancel", fontWeight: FontWeight.w600,
color: Colors.black,
fontSize: 16,),//Text("Cancel"),
onPressed: () {
Navigator.of(context).pop();
}),
FlatButton(
child: AppText(
"Confirm", fontWeight: FontWeight.w600,
color: Colors.red.shade700,
fontSize: 16,), //Text("Confirm", ),
onPressed: () async {
await confirmFun();
Navigator.of(context).pop();
})
FractionallySizedBox(
widthFactor: 0.75,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
FlatButton(
child: AppText(
"Cancel", fontWeight: FontWeight.w600,
color: Colors.black,
fontSize: 16,),//Text("Cancel"),
onPressed: () {
Navigator.of(context).pop();
}),
FlatButton(
child: AppText(
"Confirm", fontWeight: FontWeight.w600,
color: Colors.red.shade700,
fontSize: 16,), //Text("Confirm", ),
onPressed: () async {
await confirmFun();
Navigator.of(context).pop();
})
],
],
),
)
],
),

@ -9,6 +9,7 @@ import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/progress_note_request.dart';
import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
@ -159,7 +160,7 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
if (widget.patientModel.state == ViewState.ErrorLocal) {
Helpers.showErrorToast(
Helpers.generateContactAdminMsg());
widget.patientModel.error );
} else {
ProgressNoteRequest progressNoteRequest =
ProgressNoteRequest(
@ -173,8 +174,8 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
await widget.patientModel.getPatientProgressNote(
progressNoteRequest.toJson());
}
GifLoaderDialogUtils.hideDialog(context);
DrAppToastMsg.showSuccesToast("Your Order added Successfully");
Navigator.of(context).pop();
}
}),

Loading…
Cancel
Save