Merge branch 'fix-issues' into 'development'

hussam

See merge request Cloud_Solution/doctor_app_flutter!350
merge-requests/351/merge
Mohammad Aljammal 5 years ago
commit 4122b80969

File diff suppressed because it is too large Load Diff

@ -31,123 +31,128 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
body: NetworkBaseView( body: NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container( child: Center(
child: Column( child: Container(
// mainAxisAlignment: model.medicalFileList.length != 0 && color: Colors.white,
// model.medicalFileList != null child: Column(
// ? MainAxisAlignment.start // mainAxisAlignment: model.medicalFileList.length != 0 &&
// : MainAxisAlignment.center, // model.medicalFileList != null
children: [ // ? MainAxisAlignment.start
PatientPageHeaderWidget(patient), // : MainAxisAlignment.center,
Divider( children: [
height: 1.0, PatientPageHeaderWidget(patient),
thickness: 1.0, Divider(
color: Colors.grey, height: 1.0,
), thickness: 1.0,
(model.medicalFileList.length != 0 && color: Colors.grey,
model.medicalFileList != null) ),
? ListView.builder( (model.medicalFileList.length != 0 &&
//physics: , model.medicalFileList != null)
physics: NeverScrollableScrollPhysics(), ? ListView.builder(
scrollDirection: Axis.vertical, //physics: ,
shrinkWrap: true, physics: NeverScrollableScrollPhysics(),
itemCount: model.medicalFileList[0].entityList[0] scrollDirection: Axis.vertical,
.timelines.length, shrinkWrap: true,
itemBuilder: (BuildContext ctxt, int index) { itemCount: model.medicalFileList[0].entityList[0]
return Padding( .timelines.length,
padding: EdgeInsets.symmetric( itemBuilder: (BuildContext ctxt, int index) {
horizontal: 12.0, vertical: 8.0), return Padding(
child: InkWell( padding: EdgeInsets.symmetric(
child: Container( horizontal: 12.0, vertical: 8.0),
child: Column( child: InkWell(
children: [ child: Container(
Row( child: Column(
children: [ children: [
AppText( Row(
TranslationBase.of(context).branch + children: [
": ", AppText(
fontWeight: FontWeight.w700, TranslationBase.of(context)
), .branch +
AppText(model ": ",
.medicalFileList[0]
.entityList[0]
.timelines[index]
.projectName),
],
),
Row(
children: [
AppText(
TranslationBase.of(context)
.doctorName
.toUpperCase() +
": ",
fontWeight: FontWeight.w700,
),
Expanded(
child: AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.doctorName,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
), AppText(model
],
),
Row(
children: [
AppText(
TranslationBase.of(context)
.clinicName +
": ",
fontWeight: FontWeight.w700,
),
AppText(
model
.medicalFileList[0] .medicalFileList[0]
.entityList[0] .entityList[0]
.timelines[index] .timelines[index]
.clinicName, .projectName),
), ],
], ),
), Row(
SizedBox(height: 10.0), children: [
Divider( AppText(
height: 1.0, TranslationBase.of(context)
thickness: 1.0, .doctorName
color: Colors.grey.shade400, .toUpperCase() +
) ": ",
], fontWeight: FontWeight.w700,
),
Expanded(
child: AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.doctorName,
fontWeight: FontWeight.w700,
),
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context)
.clinicName +
": ",
fontWeight: FontWeight.w700,
),
AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.clinicName,
),
],
),
SizedBox(height: 10.0),
Divider(
height: 1.0,
thickness: 1.0,
color: Colors.grey.shade400,
)
],
),
), ),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
MedicalFileDetails(
age: patient.age,
firstName: patient.firstName,
lastName: patient.lastName,
gender:
patient.genderDescription,
encounterNumber: index,
pp: patient.patientId,
)),
);
},
), ),
onTap: () { );
Navigator.push( })
context, : Center(
MaterialPageRoute( child: Container(
builder: (context) => child: AppText(
MedicalFileDetails( 'THERES NO MEDICAL FILE FOR THIS Patient',
age: patient.age,
firstName: patient.firstName,
lastName: patient.lastName,
gender: patient.genderDescription,
encounterNumber: index,
pp: patient.patientId,
)),
);
},
), ),
);
})
: Center(
child: Container(
child: AppText(
'THERES NO MEDICAL FILE FOR THIS Patient',
), ),
), )
) ],
], ),
), ),
), ),
), ),

@ -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(

@ -17,7 +17,6 @@ import '../../../config/size_config.dart';
import '../../shared/app_texts_widget.dart'; import '../../shared/app_texts_widget.dart';
class ProfileMedicalInfoWidget extends StatelessWidget { class ProfileMedicalInfoWidget extends StatelessWidget {
String from; String from;
String to; String to;
PatiantInformtion patient; PatiantInformtion patient;
@ -132,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')

Loading…
Cancel
Save