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

 Conflicts:
	lib/screens/patients/profile/patient_profile_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
merge-requests/353/head
Mohammad Aljammal 5 years ago
commit ee25102c2d

@ -41,7 +41,7 @@ class VitalSignsService extends BaseService {
patientVitalSigns = null; patientVitalSigns = null;
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['PatientMRN'] = patient.patientMRN; body['PatientMRN'] = patient.patientId; // patient.patientMRN
body['AppointmentNo'] = patient.appointmentNo; body['AppointmentNo'] = patient.appointmentNo;
// body['EpisodeID'] = patient.episodeNo; // body['EpisodeID'] = patient.episodeNo;
body['PatientTypeID'] = 1; body['PatientTypeID'] = 1;

@ -202,16 +202,19 @@ class AuthViewModel extends BaseViewModel {
*@return:Future<Map> *@return:Future<Map>
*@desc: getDocProfiles *@desc: getDocProfiles
*/ */
Future<dynamic> getDocProfiles(docInfo) async { Future<dynamic> getDocProfiles(docInfo, {bool allowChangeProfile = true}) async {
try { try {
dynamic localRes; dynamic localRes;
await baseAppClient.post(GET_DOC_PROFILES, await baseAppClient.post(GET_DOC_PROFILES,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
localRes = response; localRes = response;
if(allowChangeProfile) {
doctorProfile = doctorProfile =
DoctorProfileModel.fromJson(response['DoctorProfileList'][0]); DoctorProfileModel.fromJson(response['DoctorProfileList'][0]);
selectedClinicName = selectedClinicName =
response['DoctorProfileList'][0]['ClinicDescription']; response['DoctorProfileList'][0]['ClinicDescription'];
}
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
throw error; throw error;
}, body: docInfo); }, body: docInfo);

@ -70,7 +70,9 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
body: NetworkBaseView( body: NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Center(
child: Container( child: Container(
color: Colors.white,
child: Column( child: Column(
children: [ children: [
Padding( Padding(
@ -207,7 +209,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
Row( Row(
children: [ children: [
AppText( AppText(
TranslationBase.of(context).clinicName + TranslationBase.of(context)
.clinicName +
": ", ": ",
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
@ -338,7 +341,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.entityList[0] .entityList[0]
.timelines[ .timelines[
encounterNumber] encounterNumber]
.timeLineEvents[0] .timeLineEvents[
0]
.consulations[0] .consulations[0]
.lstCheifComplaint[ .lstCheifComplaint[
index] index]
@ -438,7 +442,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
), ),
AppText( AppText(
model model
.medicalFileList[0] .medicalFileList[
0]
.entityList[0] .entityList[0]
.timelines[ .timelines[
encounterNumber] encounterNumber]
@ -457,7 +462,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
), ),
AppText( AppText(
model model
.medicalFileList[0] .medicalFileList[
0]
.entityList[0] .entityList[0]
.timelines[ .timelines[
encounterNumber] encounterNumber]
@ -474,7 +480,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [ children: [
AppText( AppText(
model model
.medicalFileList[0] .medicalFileList[
0]
.entityList[0] .entityList[0]
.timelines[ .timelines[
encounterNumber] encounterNumber]
@ -502,7 +509,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
encounterNumber] encounterNumber]
.timeLineEvents[0] .timeLineEvents[0]
.consulations[0] .consulations[0]
.lstAssessments[index] .lstAssessments[
index]
.type), .type),
], ],
), ),
@ -589,7 +597,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
], ],
), ),
bodyWidget: ListView.builder( bodyWidget: ListView.builder(
physics: NeverScrollableScrollPhysics(), physics:
NeverScrollableScrollPhysics(),
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
itemCount: model itemCount: model
@ -618,13 +627,15 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
), ),
AppText( AppText(
model model
.medicalFileList[0] .medicalFileList[
0]
.entityList[0] .entityList[0]
.timelines[ .timelines[
encounterNumber] encounterNumber]
.timeLineEvents[0] .timeLineEvents[0]
.consulations[0] .consulations[0]
.lstProcedure[index] .lstProcedure[
index]
.procedureId .procedureId
.trim(), .trim(),
), ),
@ -642,7 +653,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.entityList[0] .entityList[0]
.timelines[ .timelines[
encounterNumber] encounterNumber]
.timeLineEvents[0] .timeLineEvents[
0]
.consulations[0] .consulations[0]
.lstProcedure[ .lstProcedure[
index] index]
@ -662,7 +674,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
.entityList[0] .entityList[0]
.timelines[ .timelines[
encounterNumber] encounterNumber]
.timeLineEvents[0] .timeLineEvents[
0]
.consulations[0] .consulations[0]
.lstProcedure[ .lstProcedure[
index] index]
@ -763,7 +776,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
], ],
), ),
bodyWidget: ListView.builder( bodyWidget: ListView.builder(
physics: NeverScrollableScrollPhysics(), physics:
NeverScrollableScrollPhysics(),
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
itemCount: model itemCount: model
@ -804,7 +818,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [ children: [
AppText( AppText(
model model
.medicalFileList[0] .medicalFileList[
0]
.entityList[0] .entityList[0]
.timelines[ .timelines[
encounterNumber] encounterNumber]
@ -848,7 +863,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
encounterNumber] encounterNumber]
.timeLineEvents[0] .timeLineEvents[0]
.consulations[0] .consulations[0]
.lstPhysicalExam[index] .lstPhysicalExam[
index]
.remarks, .remarks,
), ),
Divider( Divider(
@ -885,6 +901,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
), ),
), ),
), ),
),
); );
} }
} }

@ -31,7 +31,9 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
body: NetworkBaseView( body: NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Center(
child: Container( child: Container(
color: Colors.white,
child: Column( child: Column(
// mainAxisAlignment: model.medicalFileList.length != 0 && // mainAxisAlignment: model.medicalFileList.length != 0 &&
// model.medicalFileList != null // model.medicalFileList != null
@ -64,7 +66,8 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
Row( Row(
children: [ children: [
AppText( AppText(
TranslationBase.of(context).branch + TranslationBase.of(context)
.branch +
": ", ": ",
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
@ -131,7 +134,8 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
age: patient.age, age: patient.age,
firstName: patient.firstName, firstName: patient.firstName,
lastName: patient.lastName, lastName: patient.lastName,
gender: patient.genderDescription, gender:
patient.genderDescription,
encounterNumber: index, encounterNumber: index,
pp: patient.patientId, pp: patient.patientId,
)), )),
@ -153,6 +157,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
), ),
), ),
), ),
),
); );
} }
} }

@ -91,7 +91,8 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
}); });
Navigator.of(context).pushNamed(PATIENTS, arguments: { Navigator.of(context).pushNamed(PATIENTS, arguments: {
"patientSearchForm": _patientSearchFormValues, "patientSearchForm": _patientSearchFormValues,
"selectedType": _selectedType "selectedType": _selectedType,
"isSearch": true,
}); });
} }
} else { } else {

@ -1,19 +1,22 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/models/doctor/profile_req_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/patient_arrival/get_patient_arrival_list_request_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_arrival/get_patient_arrival_list_request_model.dart';
import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart';
import 'package:doctor_app_flutter/models/patient/topten_users_res_model.dart'; import 'package:doctor_app_flutter/models/patient/topten_users_res_model.dart';
import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/date-utils.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/patients/PatientCard.dart'; import 'package:doctor_app_flutter/widgets/patients/PatientCard.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/dr_app_circular_progress_Indeicator.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -39,6 +42,9 @@ class _PatientsScreenState extends State<PatientsScreen> {
List date; List date;
List unFilterDate; List unFilterDate;
var clinicId;
AuthViewModel authProvider;
Color sideColor = Colors.black; Color sideColor = Colors.black;
List<PatiantInformtion> responseModelList; List<PatiantInformtion> responseModelList;
List<PatiantInformtion> responseModelList2; List<PatiantInformtion> responseModelList2;
@ -53,6 +59,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
bool _isInit = true; bool _isInit = true;
String patientType; String patientType;
bool isSearch = false;
String patientTypeTitle; String patientTypeTitle;
var _isLoading = true; var _isLoading = true;
@ -64,6 +71,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
PatientModel patient; PatientModel patient;
searchData(String str) { searchData(String str) {
this.responseModelList = this.responseModelList2; this.responseModelList = this.responseModelList2;
var strExist = str.length > 0 ? true : false; var strExist = str.length > 0 ? true : false;
@ -191,14 +199,26 @@ class _PatientsScreenState extends State<PatientsScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
authProvider = Provider.of(context);
_locations = [ _locations = [
TranslationBase.of(context).all, TranslationBase
TranslationBase.of(context).today, .of(context)
TranslationBase.of(context).tomorrow, .all,
TranslationBase.of(context).nextWeek, TranslationBase
.of(context)
.today,
TranslationBase
.of(context)
.tomorrow,
TranslationBase
.of(context)
.nextWeek,
]; ];
projectsProvider = Provider.of(context); projectsProvider = Provider.of(context);
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute
.of(context)
.settings
.arguments as Map;
patient = widget.patientSearchForm != null patient = widget.patientSearchForm != null
? widget.patientSearchForm ? widget.patientSearchForm
@ -208,6 +228,10 @@ class _PatientsScreenState extends State<PatientsScreen> {
? widget.selectedType ? widget.selectedType
: routeArgs['selectedType']; : routeArgs['selectedType'];
if(routeArgs != null && routeArgs.containsKey("isSearch")){
isSearch = routeArgs['isSearch'];
}
if (!projectsProvider.isArabic) if (!projectsProvider.isArabic)
patientTypeTitle = SERVICES_PATIANT_HEADER[int.parse(patientType)]; patientTypeTitle = SERVICES_PATIANT_HEADER[int.parse(patientType)];
else else
@ -338,13 +362,89 @@ class _PatientsScreenState extends State<PatientsScreen> {
}, },
decoration: buildInputDecoration( decoration: buildInputDecoration(
context, context,
TranslationBase.of(context) TranslationBase
.of(context)
.searchPatient), .searchPatient),
), ),
), ),
SizedBox( SizedBox(
height: 10.0, height: 10.0,
), ),
if(int.parse(patientType)==7)
projectsProvider
.doctorClinicsList.length >
0
? FractionallySizedBox(
widthFactor: 0.9,
child: Column(
children: [
Container(
width: MediaQuery.of(context).size.width *0.8,
child: Center(
child: DropdownButtonHideUnderline(
child: DropdownButton(
dropdownColor:
Colors.white,
iconEnabledColor:
Colors.black,
isExpanded: true,
value: clinicId == null
? projectsProvider
.doctorClinicsList[
0]
.clinicID
: clinicId,
iconSize: 25,
elevation: 16,
selectedItemBuilder:
(BuildContext
context) {
return projectsProvider
.doctorClinicsList
.map((item) {
return Row(
mainAxisSize:
MainAxisSize
.max,
children: <Widget>[
AppText(
item.clinicName,
fontSize: SizeConfig
.textMultiplier *
2.1,
color: Colors
.black,
),
],
);
}).toList();
},
onChanged: (newValue) {
clinicId = newValue;
changeClinic(newValue, context, model);
},
items: projectsProvider
.doctorClinicsList
.map((item) {
return DropdownMenuItem(
child: Text(
item.clinicName,
textAlign:
TextAlign.end,
),
value: item.clinicID,
);
}).toList(),
)),
),
),
],
),
)
: AppText(
TranslationBase
.of(context)
.noClinic),
Divider( Divider(
thickness: 0.8, thickness: 0.8,
color: Color(0xffCCCCCC), color: Color(0xffCCCCCC),
@ -362,8 +462,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
children: responseModelList children: responseModelList
.map((PatiantInformtion .map((PatiantInformtion
item) { item) {
return PatientCard( return PatientCard(patientInfo: item,
patientInfo: item,
patientType: patientType, patientType: patientType,
onTap: () { onTap: () {
Navigator.of(context) Navigator.of(context)
@ -371,15 +470,11 @@ class _PatientsScreenState extends State<PatientsScreen> {
PATIENTS_PROFILE, PATIENTS_PROFILE,
arguments: { arguments: {
"patient": item, "patient": item,
"patientType": "patientType":patientType,
patientType, "from" : patient.getFrom,
"from": patient "to" : patient.getTo,"isSearch" : isSearch,
.getFrom,
"to":
patient.getTo,
}); });
}, },);
);
}).toList(), }).toList(),
) )
: Center( : Center(
@ -399,6 +494,88 @@ class _PatientsScreenState extends State<PatientsScreen> {
); );
} }
changeClinic(clinicId, BuildContext context, model) async {
GifLoaderDialogUtils.showMyDialog(context);
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel doctorProfile = new DoctorProfileModel.fromJson(profile);
ProfileReqModel docInfo = new ProfileReqModel(
doctorID: doctorProfile.doctorID,
clinicID: clinicId,
license: true,
projectID: doctorProfile.projectID,
tokenID: '',
languageID: 2);
authProvider.getDocProfiles(docInfo.toJson(), allowChangeProfile: false)
.then((profileList) async {
print(profileList['DoctorProfileList'][0]);
int val2 = int.parse(patientType);
GetPatientArrivalListRequestModel
getPatientArrivalListRequestModel = GetPatientArrivalListRequestModel(
from: patient.From,
to: patient.To,
clinicID: profileList['DoctorProfileList'][0]['ClinicID'],
doctorID: profileList['DoctorProfileList'][0]['DoctorID'].toString(),
patientMRN: patient.getPatientID,
pageIndex: 0,
pageSize: 0);
model
.getPatientList(
getPatientArrivalListRequestModel.toJson(),
patientType)
.then((res) {
setState(() {
if (res != null && res['MessageStatus'] == 1) {
if (val2 == 7) {
if (res[SERVICES_PATIANT2[val2]] == null) {
_isError = true;
_isLoading = false;
this.error = error.toString();
} else {
var localList = [];
if (res["patientArrivalList"]["entityList"] == null) {
res["patientArrivalList"]["entityList"] = [];
}
res["patientArrivalList"]["entityList"].forEach((v) {
Map<String, dynamic> mergedPatient = {
...v,
...v["patientDetails"]
};
localList.add(mergedPatient);
});
lItems = localList;
}
}
parsed = lItems;
responseModelList = new ModelResponse.fromJson(parsed).list;
responseModelList2 = responseModelList;
_isError = false;
} else {
_isError = true;
error = model.error ?? res['ErrorEndUserMessage'] ??
res['ErrorMessage'];
}
_isLoading = false;
});
GifLoaderDialogUtils.hideDialog(context);
}).catchError((error) {
helpers.showErrorToast(error.toString());
GifLoaderDialogUtils.hideDialog(context);
});
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
helpers.showErrorToast(err);
});
}
InputDecoration buildInputDecoration(BuildContext context, hint) { InputDecoration buildInputDecoration(BuildContext context, hint) {
return InputDecoration( return InputDecoration(
prefixIcon: Icon(Icons.search, color: Colors.grey), prefixIcon: Icon(Icons.search, color: Colors.grey),

@ -9,12 +9,12 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.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/patients/profile/profile_medical_info_widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget_search.dart';
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:provider/provider.dart'; import 'package:provider/provider.dart';
/* /*
*@author: Elham Rababah *@author: Elham Rababah
*@Date:22/4/2020 *@Date:22/4/2020
@ -25,8 +25,7 @@ import 'package:provider/provider.dart';
// ignore: must_be_immutable // ignore: must_be_immutable
class PatientProfileScreen extends StatelessWidget { class PatientProfileScreen extends StatelessWidget {
PatiantInformtion patient; PatiantInformtion patient;
bool isFromSearch = false;
//TODO change it //TODO change it
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -37,11 +36,14 @@ class PatientProfileScreen extends StatelessWidget {
String patientType = routeArgs['patientType']; String patientType = routeArgs['patientType'];
String from = routeArgs['from']; String from = routeArgs['from'];
String to = routeArgs['to']; String to = routeArgs['to'];
if (routeArgs.containsKey("isSearch")) {
isFromSearch = routeArgs['isSearch'];
}
return BaseView<SOAPViewModel>( return BaseView<SOAPViewModel>(
onModelReady: (model) async { onModelReady: (model) async {
GeneralGetReqForSOAP generalGetReqForSOAP = GeneralGetReqForSOAP( GeneralGetReqForSOAP generalGetReqForSOAP = GeneralGetReqForSOAP(
patientMRN: patient.patientMRN??patient.patientId, patientMRN: patient.patientMRN ?? patient.patientId,
doctorID: '', doctorID: '',
editedBy: ''); editedBy: '');
await model.getPatientAllergy(generalGetReqForSOAP); await model.getPatientAllergy(generalGetReqForSOAP);
@ -51,13 +53,10 @@ class PatientProfileScreen extends StatelessWidget {
if (model.allergySeverityList.length == 0) { if (model.allergySeverityList.length == 0) {
await model.getMasterLookup(MasterKeysService.AllergySeverity); await model.getMasterLookup(MasterKeysService.AllergySeverity);
} }
}, },
builder: (_, model, w) =>AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
appBarTitle: TranslationBase.of(context).patientProfile, appBarTitle: TranslationBase.of(context).patientProfile,
body: Container( body: Container(
color: Color(0XFFF2F2F2), color: Color(0XFFF2F2F2),
child: CustomScrollView(primary: false, slivers: <Widget>[ child: CustomScrollView(primary: false, slivers: <Widget>[
@ -93,17 +92,21 @@ class PatientProfileScreen extends StatelessWidget {
width: 20, width: 20,
), ),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
patient.firstName + ' ' + patient.lastName, patient.firstName +
' ' +
patient.lastName,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
Row( Row(
children: [ children: [
AppText( AppText(
TranslationBase.of(context).fileNo, TranslationBase.of(context)
.fileNo,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@ -115,21 +118,37 @@ class PatientProfileScreen extends StatelessWidget {
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
), ),
], ],
), ),
model.patientAllergiesList.isNotEmpty && model.getAllergicNames(projectViewModel.isArabic)!='' ?Container( model.patientAllergiesList
width: MediaQuery.of(context).size.width *0.65, .isNotEmpty &&
model.getAllergicNames(
projectViewModel
.isArabic) !=
''
? Container(
width: MediaQuery.of(context)
.size
.width *
0.65,
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8), padding: const EdgeInsets
.symmetric(vertical: 8),
child: AppText( child: AppText(
TranslationBase.of(context).allergicTO +" : "+model.getAllergicNames(projectViewModel.isArabic), TranslationBase.of(
context)
.allergicTO +
" : " +
model.getAllergicNames(
projectViewModel
.isArabic),
color: Color(0xFFB9382C), color: Color(0xFFB9382C),
fontWeight: FontWeight.bold, fontWeight:
FontWeight.bold,
), ),
), ),
) : AppText(''), )
: AppText(''),
], ],
) )
], ],
@ -149,20 +168,23 @@ class PatientProfileScreen extends StatelessWidget {
padding: const EdgeInsets.fromLTRB( padding: const EdgeInsets.fromLTRB(
16.0, 8.0, 8.0, 8.0), 16.0, 8.0, 8.0, 8.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
TranslationBase.of(context).age, TranslationBase.of(context).age,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 2 * SizeConfig.textMultiplier, fontSize: 2 *
SizeConfig.textMultiplier,
), ),
SizedBox( SizedBox(
height: 4, height: 4,
), ),
AppText( AppText(
"${DateUtils.convertDateFromServerFormat(patient.dateofBirth, 'dd-MM-yyyy')} / ${DateUtils.getAgeByBirthday(patient.dateofBirth, context)/*patient.age*/}", "${DateUtils.convertDateFromServerFormat(patient.dateofBirth, 'dd-MM-yyyy')} / ${DateUtils.getAgeByBirthday(patient.dateofBirth, context) /*patient.age*/}",
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: 1.6 * SizeConfig.textMultiplier, fontSize: 1.6 *
SizeConfig.textMultiplier,
), ),
], ],
), ),
@ -177,20 +199,25 @@ class PatientProfileScreen extends StatelessWidget {
padding: const EdgeInsets.fromLTRB( padding: const EdgeInsets.fromLTRB(
16.0, 8.0, 8.0, 8.0), 16.0, 8.0, 8.0, 8.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
TranslationBase.of(context).nationality, TranslationBase.of(context)
.nationality,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 2 * SizeConfig.textMultiplier, fontSize: 2 *
SizeConfig.textMultiplier,
), ),
SizedBox( SizedBox(
height: 4, height: 4,
), ),
AppText( AppText(
patient.nationalityName ??patient.nationality , patient.nationalityName ??
patient.nationality,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: 1.7 *
SizeConfig.textMultiplier,
), ),
], ],
), ),
@ -205,20 +232,26 @@ class PatientProfileScreen extends StatelessWidget {
padding: const EdgeInsets.fromLTRB( padding: const EdgeInsets.fromLTRB(
16.0, 8.0, 8.0, 8.0), 16.0, 8.0, 8.0, 8.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
TranslationBase.of(context).gender, TranslationBase.of(context)
.gender,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 2 * SizeConfig.textMultiplier, fontSize: 2 *
SizeConfig.textMultiplier,
), ),
SizedBox( SizedBox(
height: 4, height: 4,
), ),
AppText( AppText(
patient.gender.toString() == '1' ? 'Male' : 'Female', patient.gender.toString() == '1'
? 'Male'
: 'Female',
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: 1.8 * SizeConfig.textMultiplier, fontSize: 1.8 *
SizeConfig.textMultiplier,
), ),
], ],
), ),
@ -241,7 +274,8 @@ class PatientProfileScreen extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
TranslationBase.of(context).admissionDetail, TranslationBase.of(context)
.admissionDetail,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 1.8 * SizeConfig.textMultiplier, fontSize: 1.8 * SizeConfig.textMultiplier,
@ -254,7 +288,8 @@ class PatientProfileScreen extends StatelessWidget {
color: Colors.white, color: Colors.white,
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
border: Border.fromBorderSide(BorderSide( border:
Border.fromBorderSide(BorderSide(
color: Color(0xffBBBBBB), color: Color(0xffBBBBBB),
width: 1, width: 1,
)), )),
@ -268,26 +303,33 @@ class PatientProfileScreen extends StatelessWidget {
Row( Row(
children: [ children: [
Container( Container(
width: width: 14 *
14 * SizeConfig.textMultiplier, SizeConfig
.textMultiplier,
child: AppText( child: AppText(
TranslationBase.of(context) TranslationBase.of(
context)
.dateTime, .dateTime,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight:
FontWeight.bold,
fontSize: 1.6 * fontSize: 1.6 *
SizeConfig.textMultiplier, SizeConfig
.textMultiplier,
), ),
), ),
Expanded( Expanded(
child: AppText( child: AppText(
patient.createdOn != null patient.createdOn !=
null
? "${DateUtils.convertDateFromServerFormat(patient.createdOn, 'EEEE dd, MMMM yyyy hh:mm a')}" ? "${DateUtils.convertDateFromServerFormat(patient.createdOn, 'EEEE dd, MMMM yyyy hh:mm a')}"
: "", : "",
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.normal, fontWeight:
fontSize: FontWeight.normal,
1.6 * SizeConfig.textMultiplier, fontSize: 1.6 *
SizeConfig
.textMultiplier,
), ),
), ),
], ],
@ -298,25 +340,32 @@ class PatientProfileScreen extends StatelessWidget {
Row( Row(
children: [ children: [
Container( Container(
width: width: 14 *
14 * SizeConfig.textMultiplier, SizeConfig
.textMultiplier,
child: AppText( child: AppText(
TranslationBase.of(context) TranslationBase.of(
context)
.admissionNo, .admissionNo,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight:
FontWeight.bold,
fontSize: 1.6 * fontSize: 1.6 *
SizeConfig.textMultiplier, SizeConfig
.textMultiplier,
), ),
), ),
AppText( AppText(
patient.admissionNo != null patient.admissionNo !=
null
? patient.admissionNo ? patient.admissionNo
: '', : '',
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.normal, fontWeight:
fontSize: FontWeight.normal,
1.6 * SizeConfig.textMultiplier, fontSize: 1.6 *
SizeConfig
.textMultiplier,
), ),
], ],
), ),
@ -326,26 +375,35 @@ class PatientProfileScreen extends StatelessWidget {
Row( Row(
children: [ children: [
Container( Container(
width: width: 14 *
14 * SizeConfig.textMultiplier, SizeConfig
.textMultiplier,
child: AppText( child: AppText(
TranslationBase.of(context).losNo, TranslationBase.of(
context)
.losNo,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight:
FontWeight.bold,
fontSize: 1.6 * fontSize: 1.6 *
SizeConfig.textMultiplier, SizeConfig
.textMultiplier,
), ),
), ),
AppText( AppText(
patient.createdOn != null patient.createdOn != null
? DateUtils ? DateUtils
.differenceBetweenServerDateAndCurrent( .differenceBetweenServerDateAndCurrent(
patient.createdOn, context) patient
.createdOn,
context)
: "", : "",
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.normal, fontWeight:
fontSize: FontWeight.normal,
1.6 * SizeConfig.textMultiplier, fontSize: 1.6 *
SizeConfig
.textMultiplier,
), ),
], ],
), ),
@ -360,32 +418,41 @@ class PatientProfileScreen extends StatelessWidget {
endIndent: 0, endIndent: 0,
), ),
Container( Container(
height: 10 * SizeConfig.textMultiplier, height:
10 * SizeConfig.textMultiplier,
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.fromLTRB( padding: const EdgeInsets
.fromLTRB(
16.0, 8.0, 8.0, 8.0), 16.0, 8.0, 8.0, 8.0),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment
.start,
children: [ children: [
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(
context)
.area, .area,
fontWeight: FontWeight.bold, fontWeight:
FontWeight.bold,
fontSize: 1.6 * fontSize: 1.6 *
SizeConfig.textMultiplier, SizeConfig
.textMultiplier,
), ),
SizedBox( SizedBox(
height: 4, height: 4,
), ),
AppText( AppText(
patient.clinicDescription, patient
fontWeight: FontWeight.normal, .clinicDescription,
fontWeight:
FontWeight.normal,
fontSize: 1.6 * fontSize: 1.6 *
SizeConfig.textMultiplier, SizeConfig
.textMultiplier,
), ),
], ],
), ),
@ -397,25 +464,30 @@ class PatientProfileScreen extends StatelessWidget {
), ),
Expanded( Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.fromLTRB( padding: const EdgeInsets
.fromLTRB(
16.0, 8.0, 8.0, 8.0), 16.0, 8.0, 8.0, 8.0),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment
.start,
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceEvenly, MainAxisAlignment
.spaceEvenly,
children: [ children: [
Expanded( Expanded(
child: Row( child: Row(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment
.start,
children: [ children: [
AppText( AppText(
TranslationBase.of( TranslationBase.of(
context) context)
.room, .room,
fontWeight: fontWeight:
FontWeight.bold, FontWeight
.bold,
fontSize: 1.6 * fontSize: 1.6 *
SizeConfig SizeConfig
.textMultiplier, .textMultiplier,
@ -427,7 +499,8 @@ class PatientProfileScreen extends StatelessWidget {
child: AppText( child: AppText(
"${patient.nursingStationName}\n${patient.roomId}", "${patient.nursingStationName}\n${patient.roomId}",
fontWeight: fontWeight:
FontWeight.normal, FontWeight
.normal,
fontSize: 1.4 * fontSize: 1.4 *
SizeConfig SizeConfig
.textMultiplier, .textMultiplier,
@ -442,14 +515,16 @@ class PatientProfileScreen extends StatelessWidget {
Expanded( Expanded(
child: Row( child: Row(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment
.start,
children: [ children: [
AppText( AppText(
TranslationBase.of( TranslationBase.of(
context) context)
.bed, .bed,
fontWeight: fontWeight:
FontWeight.bold, FontWeight
.bold,
fontSize: 1.6 * fontSize: 1.6 *
SizeConfig SizeConfig
.textMultiplier, .textMultiplier,
@ -460,7 +535,8 @@ class PatientProfileScreen extends StatelessWidget {
AppText( AppText(
"${patient.bedId}", "${patient.bedId}",
fontWeight: fontWeight:
FontWeight.normal, FontWeight
.normal,
fontSize: 1.6 * fontSize: 1.6 *
SizeConfig SizeConfig
.textMultiplier, .textMultiplier,
@ -488,9 +564,20 @@ class PatientProfileScreen extends StatelessWidget {
), ),
SliverPadding( SliverPadding(
padding: const EdgeInsets.all(16.0), padding: const EdgeInsets.all(16.0),
sliver: ProfileMedicalInfoWidget( sliver: isFromSearch
patient: patient, patientType:patientType, from: from, to: to, ? ProfileMedicalInfoWidgetSearch(
)) patient: patient,
patientType: patientType,
from: from,
to: to,
)
: ProfileMedicalInfoWidget(
patient: patient,
patientType: patientType,
from: from,
to: to,
),
)
]), ]),
), ),
)); ));

@ -35,7 +35,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
patient = routeArgs['patient']; patient = routeArgs['patient'];
return BaseView<PrescriptionViewModel>( return BaseView<PrescriptionViewModel>(
onModelReady: (model) => model.getPrescription(mrn: patient.patientMRN), onModelReady: (model) => model.getPrescription(mrn: 0),
builder: builder:
(BuildContext context, PrescriptionViewModel model, Widget child) => (BuildContext context, PrescriptionViewModel model, Widget child) =>
AppScaffold( AppScaffold(
@ -45,6 +45,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
baseViewModel: model, baseViewModel: model,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container( child: Container(
color: Colors.white,
child: Column( child: Column(
children: [ children: [
PatientPageHeaderWidget(patient), PatientPageHeaderWidget(patient),
@ -135,6 +136,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
height: 50.0, height: 50.0,
width: 450.0, width: 450.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white,
border: Border.all( border: Border.all(
color: Colors.grey), color: Colors.grey),
borderRadius: borderRadius:
@ -174,12 +176,13 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
}, },
), ),
SizedBox( SizedBox(
height: 15.0, height: 10.0,
), ),
...List.generate( ...List.generate(
model.prescriptionList[0] model.prescriptionList[0]
.rowcount, .rowcount,
(index) => Container( (index) => Container(
color: Colors.white,
child: Column( child: Column(
children: [ children: [
SizedBox( SizedBox(
@ -197,6 +200,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
// CrossAxisAlignment.start, // CrossAxisAlignment.start,
children: [ children: [
Container( Container(
color: Colors.white,
height: MediaQuery.of( height: MediaQuery.of(
context) context)
.size .size
@ -260,6 +264,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
), ),
), ),
Container( Container(
color: Colors.white,
// height: MediaQuery.of( // height: MediaQuery.of(
// context) // context)
// .size // .size
@ -324,6 +329,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
Row( Row(
children: [ children: [
Container( Container(
color: Colors
.white,
child: child:
Expanded( Expanded(
child: child:
@ -533,6 +540,8 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
Expanded( Expanded(
child: child:
Container( Container(
color: Colors
.white,
// height: MediaQuery.of(context).size.height * // height: MediaQuery.of(context).size.height *
// 0.038, // 0.038,
child: child:
@ -567,6 +576,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
), ),
), ),
Container( Container(
color: Colors.white,
height: MediaQuery.of( height: MediaQuery.of(
context) context)
.size .size

@ -47,6 +47,7 @@ class _NewPrescriptionHistoryScreenState
baseViewModel: model, baseViewModel: model,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container( child: Container(
color: Colors.white,
child: Column( child: Column(
children: [ children: [
PatientPageHeaderWidget(patient), PatientPageHeaderWidget(patient),
@ -83,6 +84,7 @@ class _NewPrescriptionHistoryScreenState
model.prescriptionList[0] model.prescriptionList[0]
.rowcount, .rowcount,
(index) => Container( (index) => Container(
color: Colors.white,
child: Column( child: Column(
children: [ children: [
SizedBox( SizedBox(

@ -34,7 +34,7 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
patient = routeArgs['patient']; patient = routeArgs['patient'];
return BaseView<ProcedureViewModel>( return BaseView<ProcedureViewModel>(
onModelReady: (model) => model.getProcedure(mrn: patient.patientMRN), onModelReady: (model) => model.getProcedure(mrn: 0),
builder: (BuildContext context, ProcedureViewModel model, Widget child) => builder: (BuildContext context, ProcedureViewModel model, Widget child) =>
AppScaffold( AppScaffold(
isShowAppBar: true, isShowAppBar: true,
@ -43,6 +43,7 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
baseViewModel: model, baseViewModel: model,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container( child: Container(
color: Colors.white,
child: Column( child: Column(
children: [ children: [
PatientPageHeaderWidget(patient), PatientPageHeaderWidget(patient),
@ -130,6 +131,7 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
height: 50.0, height: 50.0,
width: 450.0, width: 450.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white,
border: Border.all( border: Border.all(
color: Colors.grey), color: Colors.grey),
borderRadius: borderRadius:
@ -189,11 +191,12 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
// ), // ),
// ), // ),
SizedBox( SizedBox(
height: 35.0, height: 10.0,
), ),
...List.generate( ...List.generate(
model.procedureList[0].rowcount, model.procedureList[0].rowcount,
(index) => Container( (index) => Container(
color: Colors.white,
child: Column( child: Column(
children: [ children: [
SizedBox( SizedBox(

@ -1,6 +1,8 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.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/util/date-utils.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/dr_app_circular_progress_Indeicator.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class PatientProfileButton extends StatelessWidget { class PatientProfileButton extends StatelessWidget {
@ -9,24 +11,44 @@ class PatientProfileButton extends StatelessWidget {
final String icon; final String icon;
final dynamic route; final dynamic route;
final PatiantInformtion patient; final PatiantInformtion patient;
String from;
String to;
final String url = "assets/images/"; final String url = "assets/images/";
final bool isDisable;
final bool isLoading;
final Function onTap;
PatientProfileButton( PatientProfileButton(
{Key key, this.patient, this.nameLine1, this.nameLine2, this.icon, this.route}) {Key key,
this.patient,
this.nameLine1,
this.nameLine2,
this.icon,
this.route,
this.isDisable = false,
this.onTap,
this.isLoading = false,
this.from,
this.to})
: super(key: key); : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return new Container( return new Container(
margin: new EdgeInsets.symmetric(horizontal: 4.0), margin: new EdgeInsets.symmetric(horizontal: 4.0),
child: InkWell( child: InkWell(
onTap: () { onTap: isDisable
? null
: onTap != null
? onTap
: () {
navigator(context, this.route); navigator(context, this.route);
}, },
child: Column(children: <Widget>[ child: Column(children: <Widget>[
Container( Container(
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: child: Column(
Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
@ -43,6 +65,7 @@ class PatientProfileButton extends StatelessWidget {
textAlign: TextAlign.left, textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 2, fontSize: SizeConfig.textMultiplier * 2,
), ),
if (isLoading) DrAppCircularProgressIndeicator()
], ],
), ),
), ),
@ -61,7 +84,7 @@ class PatientProfileButton extends StatelessWidget {
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
// border: Border.all(), // border: Border.all(),
color: Colors.white, color: isDisable ? Colors.grey.withOpacity(0.4) : Colors.white,
borderRadius: BorderRadius.all(Radius.circular(10)), borderRadius: BorderRadius.all(Radius.circular(10)),
border: Border.fromBorderSide(BorderSide( border: Border.fromBorderSide(BorderSide(
color: Color(0xffBBBBBB), color: Color(0xffBBBBBB),
@ -81,6 +104,13 @@ class PatientProfileButton extends StatelessWidget {
} }
void navigator(BuildContext context, route) { void navigator(BuildContext context, route) {
Navigator.of(context).pushNamed(route, arguments: {'patient': patient}); if (from == null) {
from = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
}
if (to == null) {
to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
}
Navigator.of(context).pushNamed(route,
arguments: {'patient': patient, 'from': from, 'to': to});
} }
} }

@ -7,6 +7,7 @@ import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.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/patients/profile/PatientProfileButton.dart';
import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -15,22 +16,15 @@ import 'package:hexcolor/hexcolor.dart';
import '../../../config/size_config.dart'; import '../../../config/size_config.dart';
import '../../shared/app_texts_widget.dart'; import '../../shared/app_texts_widget.dart';
/*
*@author: Elham Rababah
*@Date:22/4/2020
*@param:
*@return:ProfileMedicalInfoWidget
*@desc: Profile Medical Info Widget
*/
class ProfileMedicalInfoWidget extends StatelessWidget { class ProfileMedicalInfoWidget extends StatelessWidget {
ProfileMedicalInfoWidget(
{Key key, this.patient, this.patientType, this.from, this.to});
String from; String from;
String to; String to;
//TODO change it
PatiantInformtion patient; PatiantInformtion patient;
String patientType; String patientType;
ProfileMedicalInfoWidget(
{Key key, this.patient, this.patientType, this.from, this.to});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<SOAPViewModel>( return BaseView<SOAPViewModel>(
@ -137,7 +131,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
? PatientProfileButton( ? PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
route: ORDER_PRESCRIPTION, route: ORDER_PRESCRIPTION_HISTORY,
nameLine1: TranslationBase.of(context).orders, nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).prescription, nameLine2: TranslationBase.of(context).prescription,
icon: 'lab.png') icon: 'lab.png')
@ -185,162 +179,3 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
); );
} }
} }
class CircleAvatarWidget extends StatelessWidget {
const CircleAvatarWidget(
{Key key,
@required this.url,
@required this.des,
this.height,
this.width})
: super(key: key);
final String url;
final String des;
final double height;
final double width;
@override
Widget build(BuildContext context) {
return Container(
child: Column(
children: <Widget>[
Container(
height: height,
width: width,
// width: 50,
// height: 50,
decoration: new BoxDecoration(
// color: Colors.green, // border color
shape: BoxShape.circle,
border: Border.all(color: HexColor('#B7831A'), width: 1.5)),
child: CircleAvatar(
radius: SizeConfig.imageSizeMultiplier * 12,
child: Image.asset(url),
backgroundColor: Colors.transparent,
),
),
SizedBox(
height: 10,
),
AppText(
des,
fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
)
],
),
);
}
}
class PatientProfileButton extends StatelessWidget {
final String nameLine1;
final String nameLine2;
final String icon;
final dynamic route;
final PatiantInformtion patient;
String from;
String to;
final String url = "assets/images/";
final bool isDisable;
final bool isLoading;
final Function onTap;
PatientProfileButton(
{Key key,
this.patient,
this.nameLine1,
this.nameLine2,
this.icon,
this.route,
this.isDisable = false,
this.onTap,
this.isLoading = false,
this.from,
this.to})
: super(key: key);
@override
Widget build(BuildContext context) {
return new Container(
margin: new EdgeInsets.symmetric(horizontal: 4.0),
child: InkWell(
onTap: isDisable
? null
: onTap != null
? onTap
: () {
navigator(context, this.route);
},
child: Column(children: <Widget>[
Container(
alignment: Alignment.topLeft,
padding: EdgeInsets.all(5),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
this.nameLine1,
color: Color(0xFFB9382C),
fontWeight: FontWeight.w600,
textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 2,
),
AppText(
this.nameLine2,
color: Colors.black,
fontWeight: FontWeight.w600,
textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 2,
),
if (isLoading) DrAppCircularProgressIndeicator()
],
),
),
Expanded(
child: Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Container(
padding: EdgeInsets.all(10),
child: new Image.asset(url + icon))
],
)),
)
]),
),
decoration: BoxDecoration(
// border: Border.all(),
color: isDisable ? Colors.grey.withOpacity(0.4) : Colors.white,
borderRadius: BorderRadius.all(Radius.circular(10)),
border: Border.fromBorderSide(BorderSide(
color: Color(0xffBBBBBB),
width: 1,
)),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.2),
spreadRadius: 5,
blurRadius: 7,
offset: Offset(0, 3), // changes position of shadow
),
],
),
padding: EdgeInsets.fromLTRB(5, 10, 5, 5),
);
}
void navigator(BuildContext context, route) {
if (from == null) {
from = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
}
if (to == null) {
to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
}
Navigator.of(context).pushNamed(route,
arguments: {'patient': patient, 'from': from, 'to': to});
}
}

@ -0,0 +1,94 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
import 'package:doctor_app_flutter/models/SOAP/PostEpisodeReqModel.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/PatientProfileButton.dart';
import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import '../../../config/size_config.dart';
import '../../shared/app_texts_widget.dart';
class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
String from;
String to;
PatiantInformtion patient;
String patientType;
ProfileMedicalInfoWidgetSearch(
{Key key, this.patient, this.patientType, this.from, this.to});
@override
Widget build(BuildContext context) {
return BaseView<SOAPViewModel>(
onModelReady: (model) async {},
builder: (_, model, w) => SliverGrid.count(
crossAxisSpacing: 10,
mainAxisSpacing: 20,
crossAxisCount: 2,
childAspectRatio: 1.5,
children: [
PatientProfileButton(
key: key,
patient: patient,
from: from,
to: to,
nameLine1: TranslationBase.of(context).vital,
nameLine2: TranslationBase.of(context).signs,
route: VITAL_SIGN_DETAILS,
icon: 'heartbeat.png'),
PatientProfileButton(
key: key,
patient: patient,
route: PATIENT_INSURANCE_APPROVALS,
nameLine1: TranslationBase.of(context).insurance,
nameLine2: TranslationBase.of(context).service,
icon: 'lab.png'),
PatientProfileButton(
key: key,
patient: patient,
route: PATIENT_ADMISSION_REQUEST,
nameLine1: TranslationBase.of(context).admission,
nameLine2: TranslationBase.of(context).request,
icon: 'heartbeat.png'),
(int.parse(patientType) == 7 || int.parse(patientType) == 6)
? PatientProfileButton(
key: key,
patient: patient,
route: ORDER_PRESCRIPTION,
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).prescription,
icon: 'lab.png')
: PatientProfileButton(
key: key,
patient: patient,
route: ORDER_PRESCRIPTION_HISTORY,
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).prescription,
icon: 'lab.png'),
PatientProfileButton(
key: key,
patient: patient,
route: ADD_SICKLEAVE,
nameLine1: TranslationBase.of(context).patientSick,
nameLine2: TranslationBase.of(context).leave,
icon: 'sick_leaves_icons.png'),
PatientProfileButton(
key: key,
patient: patient,
route: MEDICAL_FILE,
nameLine1: TranslationBase.of(context).previewHealth,
nameLine2: TranslationBase.of(context).summaryReport,
icon: 'radiology-1.png'),
],
),
);
}
}
Loading…
Cancel
Save