Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'fix-issues' into 'development'

Browse Source 
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!406
merge-requests/407/merge
Mohammad Aljammal 4 years ago
parent 2cfd62098a b1ec91b20a
commit 4d29cf1c71
7 changed files with 137 additions and 46 deletions
Show Stats Download Patch File Download Diff File

8
lib/screens/medical-file/medical_file_details.dart
Unescape Escape View File

@ -61,10 +61,10 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
this.encounterNumber,
this.pp,
this.patient});
bool isPhysicalExam = false;
bool isProcedureExpand = false;
bool isHistoryExpand = false;
bool isAssessmentExpand = false;
bool isPhysicalExam = true;
bool isProcedureExpand = true;
bool isHistoryExpand = true;
bool isAssessmentExpand = true;
@override
Widget build(BuildContext context) {

59
lib/screens/prescription/add_prescription_form.dart
Unescape Escape View File

@ -218,8 +218,8 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
FocusScope.of(context).requestFocus(new FocusNode());
},
child: DraggableScrollableSheet(
initialChildSize: 0.90,
maxChildSize: 0.90,
initialChildSize: 0.98,
maxChildSize: 0.98,
minChildSize: 0.9,
builder:
(BuildContext context, ScrollController scrollController) {
@ -234,25 +234,30 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
crossAxisAlignment: CrossAxisAlignment.start,
//mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Row(
Column(
children: [
AppText(
'New Prescription Order',
fontWeight: FontWeight.w700,
fontSize: 20,
Row(
children: [
InkWell(
child: Icon(
Icons.close,
size: 24.0,
),
onTap: () {
Navigator.pop(context);
},
),
],
),
SizedBox(
width: MediaQuery.of(context).size.width * 0.32,
Row(
children: [
AppText(
'New Prescription Order',
fontWeight: FontWeight.w700,
fontSize: 20,
),
],
),
InkWell(
child: Icon(
Icons.close,
size: 23.0,
),
onTap: () {
Navigator.pop(context);
},
)
],
),
SizedBox(
@ -511,15 +516,15 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
}
: null,
child: TextField(
decoration:
textFieldSelectorDecoration(
'UNIT',
units != null
? units['description']
: null,
true),
enabled: false,
),
decoration:
textFieldSelectorDecoration(
'UNIT',
units != null
? units[
'description']
: null,
true),
enabled: false),
),
),
],

29
lib/screens/procedures/add-procedure-form.dart
Unescape Escape View File

@ -156,10 +156,31 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
'Please Select Category',
fontWeight: FontWeight.w900,
fontSize: 15.0,
Column(
children: [
Row(
children: [
InkWell(
child: Icon(
Icons.close,
size: 24.0,
),
onTap: () {
Navigator.pop(context);
},
),
],
),
Row(
children: [
AppText(
'Please Select Category',
fontWeight: FontWeight.w700,
fontSize: 20,
),
],
),
],
),
SizedBox(
height: 10.0,

29
lib/screens/procedures/add_lab_orders.dart
Unescape Escape View File

@ -157,10 +157,31 @@ class _AddSelectedLabOrderState extends State<AddSelectedLabOrder> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
'New Lab Order',
fontWeight: FontWeight.w900,
fontSize: 18.0,
Column(
children: [
Row(
children: [
InkWell(
child: Icon(
Icons.close,
size: 24.0,
),
onTap: () {
Navigator.pop(context);
},
),
],
),
Row(
children: [
AppText(
'New Radiology Order',
fontWeight: FontWeight.w700,
fontSize: 20,
),
],
),
],
),
SizedBox(
height: 10.0,

29
lib/screens/procedures/add_radiology_order.dart
Unescape Escape View File

@ -157,10 +157,31 @@ class _AddSelectedRadiologyOrderState extends State<AddSelectedRadiologyOrder> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
'New Radiology Order',
fontWeight: FontWeight.w900,
fontSize: 18.0,
Column(
children: [
Row(
children: [
InkWell(
child: Icon(
Icons.close,
size: 24.0,
),
onTap: () {
Navigator.pop(context);
},
),
],
),
Row(
children: [
AppText(
'New Radiology Order',
fontWeight: FontWeight.w700,
fontSize: 20,
),
],
),
],
),
SizedBox(
height: 10.0,

19
lib/screens/procedures/update-procedure.dart
Unescape Escape View File

@ -279,19 +279,22 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
child: TextFields(
fontSize: 15.0,
controller: widget.remarksController,
hintText: widget.remarksController.text.isEmpty
? 'No Remarks Added'
: '',
maxLines: 3,
minLines: 2,
onChanged: (value) {},
),
),
SizedBox(
height: 50.0,
height: 70.0,
),
Container(
margin:
EdgeInsets.all(SizeConfig.widthMultiplier * 2),
child: Wrap(
alignment: WrapAlignment.center,
child: Column(
//alignment: WrapAlignment.center,
children: <Widget>[
AppButton(
color: Color(0xff359846),
@ -320,6 +323,16 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
// authorizationForm(context);
},
),
SizedBox(
height: 20.0,
),
AppButton(
title: TranslationBase.of(context).cancel,
color: Color(0xFFB9382C),
onPressed: () {
Navigator.pop(context);
},
)
],
),
),

10
lib/widgets/patients/profile/profile_medical_info_widget_search.dart
Unescape Escape View File

@ -134,6 +134,16 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
nameLine1: TranslationBase.of(context).progress,
nameLine2: TranslationBase.of(context).note,
icon: 'patient/Progress_notes.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
patient: patient,
patientType: patientType,
arrivalType: arrivalType,
route: ORDER_PROCEDURE,
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).procedures,
icon: 'patient/Order_Procedures.png'),
],
),
);

Write Preview
Loading…
Cancel
Save