Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services

merge-requests/457/head
Mohammad Aljammal 5 years ago
commit 87560250bb

@ -40,7 +40,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
(BuildContext context, MedicalFileViewModel model, Widget child) => (BuildContext context, MedicalFileViewModel model, Widget child) =>
AppScaffold( AppScaffold(
appBar: PatientProfileHeaderNewDesignAppBar( appBar: PatientProfileHeaderNewDesignAppBar(
patient, patientType.toString() ?? "0", patientType), patient, patientType.toString() ?? "0", arrivalType),
isShowAppBar: true, isShowAppBar: true,
appBarTitle: TranslationBase.of(context).medicalReport.toUpperCase(), appBarTitle: TranslationBase.of(context).medicalReport.toUpperCase(),
body: NetworkBaseView( body: NetworkBaseView(

@ -17,6 +17,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.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/borderedButton.dart'; import 'package:doctor_app_flutter/widgets/shared/borderedButton.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';

@ -8,6 +8,7 @@ import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widg
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.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:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../../../routes.dart'; import '../../../../routes.dart';
@ -74,11 +75,8 @@ class MyReferralPatientScreen extends StatelessWidget {
'referral': model.pendingReferral[index] 'referral': model.pendingReferral[index]
}); });
}, },
child: Icon( child: Icon(FontAwesomeIcons.arrowRight,
Icons.info_outline, size: 25, color: Colors.black),
color: Colors.black,
size: 30,
),
), ),
), ),
), ),

@ -33,7 +33,7 @@ class PrescriptionsPage extends StatelessWidget {
baseViewModel: model, baseViewModel: model,
isShowAppBar: true, isShowAppBar: true,
appBar: PatientProfileHeaderNewDesignAppBar( appBar: PatientProfileHeaderNewDesignAppBar(
patient, arrivalType ?? '0', patientType), patient, patientType ?? '0', arrivalType),
body: FractionallySizedBox( body: FractionallySizedBox(
widthFactor: 1.0, widthFactor: 1.0,
child: ListView( child: ListView(

@ -10,8 +10,16 @@ import 'package:provider/provider.dart';
class ProcedureCard extends StatelessWidget { class ProcedureCard extends StatelessWidget {
final Function onTap; final Function onTap;
final EntityList entityList; final EntityList entityList;
final String categoryName;
final int categoryID;
const ProcedureCard({Key key, this.onTap, this.entityList}) : super(key: key); const ProcedureCard(
{Key key,
this.onTap,
this.entityList,
this.categoryID,
this.categoryName})
: super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -37,9 +45,8 @@ class ProcedureCard extends StatelessWidget {
topLeft: Radius.circular(10), topLeft: Radius.circular(10),
bottomLeft: Radius.circular(10), bottomLeft: Radius.circular(10),
), ),
color: entityList.orderType == 1 color:
? Colors.red[500] entityList.orderType == 1 ? Colors.red[500] : Colors.black,
: Colors.black,
), ),
), ),
Expanded( Expanded(
@ -105,12 +112,43 @@ class ProcedureCard extends StatelessWidget {
children: [ children: [
Texts( Texts(
TranslationBase.of(context).orderNo, TranslationBase.of(context).orderNo,
color: Colors.grey, //color: Colors.grey,
fontSize: 12, fontSize: 12,
color: Colors.grey,
), ),
Texts( Texts(
entityList.orderNo.toString(), entityList.orderNo.toString(),
fontSize: 12,
bold: true,
),
],
),
Row(
children: [
Texts(
TranslationBase.of(context).doctorName + ": ",
//color: Colors.grey,
fontSize: 12,
color: Colors.grey, color: Colors.grey,
),
Texts(
entityList.doctorName.toString(),
fontSize: 12,
bold: true,
),
],
),
Row(
children: [
Texts(
TranslationBase.of(context).clinic + ": ",
//color: Colors.grey,
fontSize: 12,
color: Colors.grey,
),
Texts(
entityList.clinicDescription.toString(),
bold: true,
fontSize: 12, fontSize: 12,
), ),
], ],
@ -119,10 +157,12 @@ class ProcedureCard extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts( Texts(
entityList.remarks ?? '', entityList.remarks.toString() ?? '',
fontSize: 12, fontSize: 12,
), ),
Icon(Icons.edit) if (entityList.categoryID == 2 ||
entityList.categoryID == 4)
Icon(Icons.edit)
], ],
) )
], ],

@ -29,7 +29,8 @@ class ProcedureScreen extends StatelessWidget {
builder: (BuildContext context, ProcedureViewModel model, Widget child) => builder: (BuildContext context, ProcedureViewModel model, Widget child) =>
AppScaffold( AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBar: PatientProfileHeaderNewDesignAppBar(patient, arrivalType ?? '0', patientType), appBar: PatientProfileHeaderNewDesignAppBar(
patient, arrivalType ?? '0', patientType),
body: NetworkBaseView( body: NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: SingleChildScrollView( child: SingleChildScrollView(
@ -110,36 +111,38 @@ class ProcedureScreen extends StatelessWidget {
...List.generate( ...List.generate(
model.procedureList[0].rowcount, model.procedureList[0].rowcount,
(index) => ProcedureCard( (index) => ProcedureCard(
categoryID:
model.procedureList[0].entityList[index].categoryID,
entityList: model.procedureList[0].entityList[index], entityList: model.procedureList[0].entityList[index],
onTap: () { onTap: () {
if (model.procedureList[0].entityList[index] // if (model.procedureList[0].entityList[index]
.categoryID == // .categoryID ==
2 || // 2 ||
model.procedureList[0].entityList[index] // model.procedureList[0].entityList[index]
.categoryID == // .categoryID ==
4) { // 4) {
updateProcedureForm(context, updateProcedureForm(context,
model: model, model: model,
patient: patient, patient: patient,
remarks: model remarks: model
.procedureList[0].entityList[index].remarks, .procedureList[0].entityList[index].remarks,
orderType: model.procedureList[0] orderType: model
.entityList[index].orderType .procedureList[0].entityList[index].orderType
.toString(), .toString(),
orderNo: model orderNo: model
.procedureList[0].entityList[index].orderNo, .procedureList[0].entityList[index].orderNo,
procedureName: model.procedureList[0] procedureName: model.procedureList[0]
.entityList[index].procedureName, .entityList[index].procedureName,
categoreId: model.procedureList[0] categoreId: model
.entityList[index].categoryID .procedureList[0].entityList[index].categoryID
.toString(), .toString(),
procedureId: model.procedureList[0] procedureId: model.procedureList[0]
.entityList[index].procedureId, .entityList[index].procedureId,
limetNo: model.procedureList[0] limetNo: model.procedureList[0].entityList[index]
.entityList[index].lineItemNo); .lineItemNo);
} else // } else
helpers.showErrorToast( // helpers.showErrorToast(
'You Cant Update This Procedure'); // 'You Cant Update This Procedure');
}, },
), ),
), ),

@ -463,36 +463,41 @@ class PatientReferralItemWidget extends StatelessWidget {
width: 30, width: 30,
height: 30, height: 30,
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: projectViewModel.isArabic ? 10 : 10 /*10:85*/, left:
right: projectViewModel.isArabic ? 10 : 10 /*85:10*/, projectViewModel.isArabic ? 10 : 10 /*10:85*/,
right:
projectViewModel.isArabic ? 10 : 10 /*85:10*/,
top: 5), top: 5),
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
border: Border( border: Border(
bottom: bottom: BorderSide(
BorderSide(color: Colors.grey[400], width: 2.5), color: Colors.grey[400], width: 2.5),
left: left: BorderSide(
BorderSide(color: Colors.grey[400], width: 2.5), color: Colors.grey[400], width: 2.5),
)), )),
), ),
Expanded( Expanded(
flex: 4, flex: 4,
child: Container( child: Container(
margin: EdgeInsets.only(left: 10, top: 25, right : 10, bottom: 0), margin: EdgeInsets.only(
left: 10, top: 25, right: 10, bottom: 0),
child: Column( child: Column(
children: [ children: [
RichText( RichText(
text: TextSpan( text: TextSpan(
style: TextStyle( style: TextStyle(
fontSize: 2.0 * SizeConfig.textMultiplier, fontSize:
2.0 * SizeConfig.textMultiplier,
color: Colors.black), color: Colors.black),
children: <TextSpan>[ children: <TextSpan>[
TextSpan( TextSpan(
text: TranslationBase.of(context) text: TranslationBase.of(context)
.referralDoctor + .referralDoctor +
" : ", " : ",
style: TextStyle( style: TextStyle(
fontSize: 14, fontFamily: 'Poppins')), fontSize: 14,
fontFamily: 'Poppins')),
TextSpan( TextSpan(
text: referralDoctorName, text: referralDoctorName,
style: TextStyle( style: TextStyle(
@ -511,8 +516,7 @@ class PatientReferralItemWidget extends StatelessWidget {
Container( Container(
width: double.infinity, width: double.infinity,
alignment: Alignment.centerRight, alignment: Alignment.centerRight,
child: Icon(FontAwesomeIcons.arrowRight, child: infoIcon ?? Container())
size: 25, color: Colors.black))
], ],
), ),
// onTap: onTap, // onTap: onTap,

@ -116,7 +116,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 12, fontSize: 12,
), ),
arrivalType == '1' arrivalType == '1'|| patient.arrivedOn == null
? AppText( ? AppText(
patient.startTime != null patient.startTime != null
? patient.startTime ? patient.startTime

@ -116,7 +116,7 @@ class PatientProfileHeaderNewDesign extends StatelessWidget {
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 12, fontSize: 12,
), ),
arrivalType == '1' arrivalType == '1' || patient.arrivedOn == null
? AppText( ? AppText(
patient.startTime != null patient.startTime != null
? patient.startTime ? patient.startTime

@ -150,7 +150,7 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
'Poppins', 'Poppins',
fontSize: 12, fontSize: 12,
), ),
arrivalType == '1' arrivalType == '1' || patient.arrivedOn == null
? AppText( ? AppText(
patient.startTime != patient.startTime !=
null null

@ -150,7 +150,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
'Poppins', 'Poppins',
fontSize: 12, fontSize: 12,
), ),
arrivalType == '1' arrivalType == '1' || patient.arrivedOn == null
? AppText( ? AppText(
patient.startTime != patient.startTime !=
null null

@ -43,34 +43,6 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
childAspectRatio: 1 / 1.0, childAspectRatio: 1 / 1.0,
crossAxisCount: 3, crossAxisCount: 3,
children: [ children: [
/*if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
patient: patient,
isDisable: patient.episodeNo != 0 ? true : false,
nameLine1: TranslationBase.of(context).createNew,
nameLine2: TranslationBase.of(context).episode,
route: CREATE_EPISODE,
onTap: () async {
PostEpisodeReqModel postEpisodeReqModel = PostEpisodeReqModel(
appointmentNo: patient.appointmentNo,
patientMRN: patient.patientMRN);
await model.postEpisode(postEpisodeReqModel);
patient.episodeNo = model.episodeID;
Navigator.of(context).pushNamed(CREATE_EPISODE,
arguments: {'patient': patient});
},
isLoading: model.state == ViewState.BusyLocal,
icon: 'create-episod.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
patient: patient,
isDisable: patient.episodeNo == 0 ? true : false,
nameLine1: TranslationBase.of(context).update,
nameLine2: TranslationBase.of(context).episode,
route: UPDATE_EPISODE,
icon: 'modilfy-episode.png'),*/
if (int.parse(patientType) == 7 || int.parse(patientType) == 6) if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton( PatientProfileButton(
key: key, key: key,
@ -89,61 +61,38 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: LAB_RESULT, route: MEDICAL_FILE,
nameLine1: TranslationBase.of(context).lab, nameLine1: TranslationBase.of(context).previewHealth,
nameLine2: TranslationBase.of(context).result, nameLine2: TranslationBase.of(context).summaryReport,
icon: 'patient/lab_results.png'), icon: 'patient/health_summary.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: MEDICAL_FILE, route: LAB_RESULT,
nameLine1: TranslationBase.of(context).previewHealth, nameLine1: TranslationBase.of(context).lab,
nameLine2: TranslationBase.of(context).summaryReport, nameLine2: TranslationBase.of(context).result,
icon: 'patient/health_summary.png'), icon: 'patient/lab_results.png'),
if (selectedPatientType != 0 &&
selectedPatientType != 5 &&
selectedPatientType != 7)
PatientProfileButton(
key: key,
patient: patient,
patientType: patientType,
arrivalType: arrivalType,
route: PROGRESS_NOTE,
nameLine1: TranslationBase.of(context).progress,
nameLine2: TranslationBase.of(context).note,
icon: 'patient/Progress_notes.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6) if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: PATIENT_ADMISSION_REQUEST, route: RADIOLOGY_PATIENT,
isDisable: patient.patientStatusType != 43 ? true : false, nameLine1: TranslationBase.of(context).radiology,
nameLine1: TranslationBase.of(context).admission, nameLine2: TranslationBase.of(context).service,
nameLine2: TranslationBase.of(context).request, icon: 'patient/health_summary.png'),
icon: 'patient/admission_req.png'), PatientProfileButton(
// (int.parse(patientType) == 7 || int.parse(patientType) == 6) key: key,
// ? PatientProfileButton( patient: patient,
// key: key, patientType: patientType,
// patient: patient, arrivalType: arrivalType,
// patientType: patientType, route: PATIENT_ECG,
// arrivalType: arrivalType, nameLine1: TranslationBase.of(context).patient,
// route: ORDER_PRESCRIPTION, nameLine2: "ECG",
// nameLine1: TranslationBase.of(context).orders, icon: 'patient/patient_sick_leave.png'),
// nameLine2: TranslationBase.of(context).prescription,
// icon: 'patient/order_prescription.png')
// : PatientProfileButton(
// key: key,
// patient: patient,
// patientType: patientType,
// arrivalType: arrivalType,
// route: ORDER_PRESCRIPTION_HISTORY,
// nameLine1: TranslationBase.of(context).orders,
// nameLine2: TranslationBase.of(context).prescription,
// icon: 'patient/order_prescription.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
@ -169,11 +118,10 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: REFER_PATIENT_TO_DOCTOR, route: PATIENT_INSURANCE_APPROVALS_NEW,
isDisable: patient.patientStatusType != 43 ? true : false, nameLine1: TranslationBase.of(context).insurance,
nameLine1: TranslationBase.of(context).myReferral, nameLine2: TranslationBase.of(context).service,
nameLine2: TranslationBase.of(context).patient, icon: 'patient/vital_signs.png'),
icon: 'patient/refer_patient.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6) if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton( PatientProfileButton(
key: key, key: key,
@ -201,29 +149,34 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: RADIOLOGY_PATIENT, route: REFER_PATIENT_TO_DOCTOR,
nameLine1: TranslationBase.of(context).radiology, isDisable: patient.patientStatusType != 43 ? true : false,
nameLine2: TranslationBase.of(context).service, nameLine1: TranslationBase.of(context).myReferral,
icon: 'patient/health_summary.png'), nameLine2: TranslationBase.of(context).patient,
icon: 'patient/refer_patient.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6) if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: PATIENT_INSURANCE_APPROVALS_NEW, route: PATIENT_ADMISSION_REQUEST,
nameLine1: TranslationBase.of(context).insurance, isDisable: patient.patientStatusType != 43 ? true : false,
nameLine2: TranslationBase.of(context).service, nameLine1: TranslationBase.of(context).admission,
icon: 'patient/vital_signs.png'), nameLine2: TranslationBase.of(context).request,
PatientProfileButton( icon: 'patient/admission_req.png'),
key: key, if (selectedPatientType != 0 &&
patient: patient, selectedPatientType != 5 &&
patientType: patientType, selectedPatientType != 7)
arrivalType: arrivalType, PatientProfileButton(
route: PATIENT_ECG, key: key,
nameLine1: TranslationBase.of(context).patient, patient: patient,
nameLine2: "ECG", patientType: patientType,
icon: 'patient/patient_sick_leave.png'), arrivalType: arrivalType,
route: PROGRESS_NOTE,
nameLine1: TranslationBase.of(context).progress,
nameLine2: TranslationBase.of(context).note,
icon: 'patient/Progress_notes.png'),
], ],
), ),
); );

@ -39,19 +39,21 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: RADIOLOGY_PATIENT, from: from,
nameLine1: TranslationBase.of(context).radiology, to: to,
nameLine2: TranslationBase.of(context).service, nameLine1: TranslationBase.of(context).vital,
icon: 'patient/health_summary.png'), nameLine2: TranslationBase.of(context).signs,
route: VITAL_SIGN_DETAILS,
icon: 'patient/vital_signs.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: PATIENT_INSURANCE_APPROVALS_NEW, route: MEDICAL_FILE,
nameLine1: TranslationBase.of(context).insurance, nameLine1: TranslationBase.of(context).previewHealth,
nameLine2: TranslationBase.of(context).service, nameLine2: TranslationBase.of(context).summaryReport,
icon: 'patient/vital_signs.png'), icon: 'patient/health_summary.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
@ -66,19 +68,19 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
from: from, route: RADIOLOGY_PATIENT,
to: to, nameLine1: TranslationBase.of(context).radiology,
nameLine1: TranslationBase.of(context).vital, nameLine2: TranslationBase.of(context).service,
nameLine2: TranslationBase.of(context).signs, icon: 'patient/health_summary.png'),
route: VITAL_SIGN_DETAILS, PatientProfileButton(
icon: 'patient/vital_signs.png'), key: key,
// PatientProfileButton( patient: patient,
// key: key, patientType: patientType,
// patient: patient, arrivalType: arrivalType,
// route: PATIENT_ADMISSION_REQUEST, route: PATIENT_ECG,
// nameLine1: TranslationBase.of(context).admission, nameLine1: TranslationBase.of(context).patient,
// nameLine2: TranslationBase.of(context).request, nameLine2: "ECG",
// icon: 'heartbeat.png'), icon: 'patient/patient_sick_leave.png'),
(int.parse(patientType) == 7 || int.parse(patientType) == 6) (int.parse(patientType) == 7 || int.parse(patientType) == 6)
? PatientProfileButton( ? PatientProfileButton(
key: key, key: key,
@ -103,19 +105,10 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient: patient, patient: patient,
patientType: patientType, patientType: patientType,
arrivalType: arrivalType, arrivalType: arrivalType,
route: MEDICAL_FILE, route: PATIENT_INSURANCE_APPROVALS_NEW,
nameLine1: TranslationBase.of(context).previewHealth, nameLine1: TranslationBase.of(context).insurance,
nameLine2: TranslationBase.of(context).summaryReport, nameLine2: TranslationBase.of(context).service,
icon: 'patient/health_summary.png'), icon: 'patient/vital_signs.png'),
PatientProfileButton(
key: key,
patient: patient,
patientType: patientType,
arrivalType: arrivalType,
route: PATIENT_ECG,
nameLine1: TranslationBase.of(context).patient,
nameLine2: "ECG",
icon: 'patient/patient_sick_leave.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
@ -125,6 +118,13 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
nameLine1: TranslationBase.of(context).patientSick, nameLine1: TranslationBase.of(context).patientSick,
nameLine2: TranslationBase.of(context).leave, nameLine2: TranslationBase.of(context).leave,
icon: 'patient/patient_sick_leave.png'), icon: 'patient/patient_sick_leave.png'),
// PatientProfileButton(
// key: key,
// patient: patient,
// route: PATIENT_ADMISSION_REQUEST,
// nameLine1: TranslationBase.of(context).admission,
// nameLine2: TranslationBase.of(context).request,
// icon: 'heartbeat.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,

@ -134,7 +134,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
HeaderBodyExpandableNotifier( HeaderBodyExpandableNotifier(
headerWidget: Row( headerWidget: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
children: [ children: [
Row( Row(
children: [ children: [
@ -142,7 +142,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
"${TranslationBase.of(context).physicalSystemExamination}", "${TranslationBase.of(context).physicalSystemExamination}",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: fontSize:
SizeConfig.textMultiplier * 2.0, SizeConfig.textMultiplier * 2.0,
fontWeight: isSysExaminationExpand fontWeight: isSysExaminationExpand
? FontWeight.w700 ? FontWeight.w700
: FontWeight.normal, : FontWeight.normal,
@ -158,7 +158,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
onTap: () { onTap: () {
setState(() { setState(() {
isSysExaminationExpand = isSysExaminationExpand =
!isSysExaminationExpand; !isSysExaminationExpand;
}); });
}, },
child: Icon(isSysExaminationExpand child: Icon(isSysExaminationExpand
@ -176,7 +176,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
vertical: 8, horizontal: 8.0), vertical: 8, horizontal: 8.0),
margin: margin:
EdgeInsets.symmetric(vertical: 8), EdgeInsets.symmetric(vertical: 8),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: Colors.grey.shade400, color: Colors.grey.shade400,
@ -188,33 +188,33 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
), ),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.center, CrossAxisAlignment.center,
children: [ children: [
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
"${TranslationBase.of(context).addExamination}", "${TranslationBase.of(context).addExamination}",
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
1.8, 1.8,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
AppText( AppText(
"${TranslationBase.of(context).searchHere}", "${TranslationBase.of(context).searchHere}",
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
1.8, 1.8,
color: Colors.grey.shade700, color: Colors.grey.shade700,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
], ],
)), )),
Icon( Icon(
Icons.add_box_rounded, Icons.add_box_rounded,
size: 25, size: 25,
@ -223,7 +223,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
), ),
), ),
), ),
/* ...List.generate( /* ...List.generate(
widget.mySelectedExamination.length, widget.mySelectedExamination.length,
(index) => Container( (index) => Container(
child: ExaminationIitemCard( child: ExaminationIitemCard(
@ -278,8 +278,16 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
child: AppButton( child: AppButton(
title: TranslationBase.of(context).next, title: TranslationBase.of(context).next,
loading: model.state == ViewState.BusyLocal, loading: model.state == ViewState.BusyLocal,
color: HexColor("#A5A5A5"), color: widget.mySelectedExamination != null &&
fontColor: HexColor("#5A5A5A"), widget.mySelectedExamination.length > 0
? HexColor("#D02127")
: HexColor("#A5A5A5"),
fontColor: widget.mySelectedExamination != null &&
widget.mySelectedExamination.length > 0 ? Colors.white : HexColor("#5A5A5A"),
disabled: widget.mySelectedExamination != null &&
widget.mySelectedExamination.length > 0
? false
: true,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
onPressed: () async { onPressed: () async {
await submitUpdateObjectivePage(model); await submitUpdateObjectivePage(model);

Loading…
Cancel
Save