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) .of(context)
.size .size
.width * 0.8, .width * 0.8,
height: MediaQuery height: 200,
.of(context)
.size
.height * 0.3,
child: AppScaffold( child: AppScaffold(
isShowAppBar: false, isShowAppBar: false,
body: Container( body: Container(
@ -422,54 +419,61 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
child: Center( child: Center(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
// SizedBox(height: 20,), // SizedBox(height: 20,),
SizedBox(height: 5,), SizedBox(height: 10,),
AppText( Row(
"Confirm", fontWeight: FontWeight.w600, mainAxisAlignment: MainAxisAlignment.center,
color: Colors.black, children: [
fontSize: 16,), AppText(
SizedBox(height: 5,), "Confirm", fontWeight: FontWeight.w600,
color: Colors.black,
fontSize: 16,),
],
),
SizedBox(height: 10,),
DividerWithSpacesAround(), DividerWithSpacesAround(),
SizedBox(height: 12,),
Container( Container(
padding: EdgeInsets.all(20), padding: EdgeInsets.all(20),
color: Colors.white, color: Colors.white,
child: Expanded( child: AppText(
child: AppText( 'Are you sure you want $actionName this order?',
'Are you sure you want $actionName this order?', fontSize: 15,
fontSize: 15, textAlign: TextAlign.center,
textAlign: TextAlign.center,
),
), ),
), ),
SizedBox(height: 30,), SizedBox(height: 8,),
DividerWithSpacesAround(), DividerWithSpacesAround(),
// SizedBox(height: 30,), FractionallySizedBox(
Row( widthFactor: 0.75,
mainAxisAlignment: MainAxisAlignment.center, child: Row(
children: [ mainAxisAlignment: MainAxisAlignment.spaceBetween,
FlatButton( children: [
child: AppText( FlatButton(
"Cancel", fontWeight: FontWeight.w600, child: AppText(
color: Colors.black, "Cancel", fontWeight: FontWeight.w600,
fontSize: 16,),//Text("Cancel"), color: Colors.black,
onPressed: () { fontSize: 16,),//Text("Cancel"),
Navigator.of(context).pop(); onPressed: () {
}), Navigator.of(context).pop();
FlatButton( }),
child: AppText( FlatButton(
"Confirm", fontWeight: FontWeight.w600, child: AppText(
color: Colors.red.shade700, "Confirm", fontWeight: FontWeight.w600,
fontSize: 16,), //Text("Confirm", ), color: Colors.red.shade700,
onPressed: () async { fontSize: 16,), //Text("Confirm", ),
await confirmFun(); onPressed: () async {
Navigator.of(context).pop(); 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/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/progress_note_request.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/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/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/shared/app_scaffold_widget.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) { if (widget.patientModel.state == ViewState.ErrorLocal) {
Helpers.showErrorToast( Helpers.showErrorToast(
Helpers.generateContactAdminMsg()); widget.patientModel.error );
} else { } else {
ProgressNoteRequest progressNoteRequest = ProgressNoteRequest progressNoteRequest =
ProgressNoteRequest( ProgressNoteRequest(
@ -173,8 +174,8 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
await widget.patientModel.getPatientProgressNote( await widget.patientModel.getPatientProgressNote(
progressNoteRequest.toJson()); progressNoteRequest.toJson());
} }
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
DrAppToastMsg.showSuccesToast("Your Order added Successfully");
Navigator.of(context).pop(); Navigator.of(context).pop();
} }
}), }),

Loading…
Cancel
Save