Fix prescription items

merge-requests/372/head
Mohammad Aljammal 5 years ago
parent de48ae2bff
commit a167db7651

@ -15,6 +15,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/refer_patient_screen
import 'package:doctor_app_flutter/screens/patients/profile/prescriptions/in_patient_prescription_details_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/prescriptions/in_patient_prescription_details_screen.dart';
import 'package:doctor_app_flutter/screens/live_care/video_call.dart'; import 'package:doctor_app_flutter/screens/live_care/video_call.dart';
import 'package:doctor_app_flutter/screens/prescription/prescription_screen_history.dart'; import 'package:doctor_app_flutter/screens/prescription/prescription_screen_history.dart';
import 'package:doctor_app_flutter/screens/prescription/prescriptions_page.dart';
import 'package:doctor_app_flutter/screens/sick-leave/add-sickleave.dart'; import 'package:doctor_app_flutter/screens/sick-leave/add-sickleave.dart';
import 'package:doctor_app_flutter/screens/sick-leave/show-sickleave.dart'; import 'package:doctor_app_flutter/screens/sick-leave/show-sickleave.dart';
import 'package:doctor_app_flutter/screens/sick-leave/sick_leave.dart'; import 'package:doctor_app_flutter/screens/sick-leave/sick_leave.dart';
@ -108,6 +109,7 @@ const String IN_PATIENT_PRESCRIPTIONS_DETAILS = 'patients/prescription-details';
// const String VIDEO_CALL = 'video-call'; // const String VIDEO_CALL = 'video-call';
const String LIVECARE_PENDING_LIST = 'livecare-pendinglist'; const String LIVECARE_PENDING_LIST = 'livecare-pendinglist';
const String ORDER_PRESCRIPTION = 'prescription/prescriptionsss'; const String ORDER_PRESCRIPTION = 'prescription/prescriptionsss';
const String ORDER_PRESCRIPTION_NEW = 'prescription/prescription_new';
const String ORDER_PRESCRIPTION_HISTORY = 'prescription/prescriptionsssH'; const String ORDER_PRESCRIPTION_HISTORY = 'prescription/prescriptionsssH';
const String ORDER_PROCEDURE = 'procedure/procedure'; const String ORDER_PROCEDURE = 'procedure/procedure';
// const String LIVECARE_END_DIALOG = 'video-call/EndCallDialogBox'; // const String LIVECARE_END_DIALOG = 'video-call/EndCallDialogBox';
@ -173,6 +175,7 @@ var routes = {
ADD_SICKLEAVE: (_) => AddSickLeavScreen(), ADD_SICKLEAVE: (_) => AddSickLeavScreen(),
SHOW_SICKLEAVE: (_) => ShowSickLeaveScreen(), SHOW_SICKLEAVE: (_) => ShowSickLeaveScreen(),
ORDER_PRESCRIPTION: (_) => NewPrescriptionScreen(), ORDER_PRESCRIPTION: (_) => NewPrescriptionScreen(),
ORDER_PRESCRIPTION_NEW: (_) => PrescriptionsPage(),
ORDER_PRESCRIPTION_HISTORY: (_) => NewPrescriptionHistoryScreen(), ORDER_PRESCRIPTION_HISTORY: (_) => NewPrescriptionHistoryScreen(),
ORDER_PROCEDURE: (_) => ProcedureScreen(), ORDER_PROCEDURE: (_) => ProcedureScreen(),

@ -11,7 +11,6 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class PrescriptionItemsPage extends StatelessWidget { class PrescriptionItemsPage extends StatelessWidget {
final Prescriptions prescriptions; final Prescriptions prescriptions;
@ -27,153 +26,155 @@ class PrescriptionItemsPage extends StatelessWidget {
isShowAppBar: true, isShowAppBar: true,
appBarTitle: TranslationBase.of(context).prescriptions, appBarTitle: TranslationBase.of(context).prescriptions,
baseViewModel: model, baseViewModel: model,
body: Container( body: SingleChildScrollView(
height: MediaQuery.of(context).size.height * 0.8, child: Container(
child: Column( child: Column(
children: [ children: [
if (!prescriptions.isInOutPatient) if (!prescriptions.isInOutPatient)
...List.generate( ...List.generate(
model.prescriptionReportList.length, model.prescriptionReportList.length,
(index) => InkWell( (index) => InkWell(
onTap: () => Navigator.push( onTap: () => Navigator.push(
context, context,
FadePage( FadePage(
page: PrescriptionDetailsPage( page: PrescriptionDetailsPage(
prescriptionReport: prescriptionReport:
model.prescriptionReportList[index], model.prescriptionReportList[index],
),
), ),
), ),
), child: Container(
child: Container( width: double.infinity,
width: double.infinity, margin:
margin: EdgeInsets.only(top: 10, left: 10, right: 10),
EdgeInsets.only(top: 10, left: 10, right: 10), padding: EdgeInsets.all(8.0),
padding: EdgeInsets.all(8.0), decoration: BoxDecoration(
decoration: BoxDecoration( color: Colors.white,
color: Colors.white, borderRadius: BorderRadius.all(
borderRadius: BorderRadius.all( Radius.circular(10.0),
Radius.circular(10.0), ),
border: Border.all(
color: Colors.grey[200], width: 0.5),
), ),
border: Border.all( child: Row(
color: Colors.grey[200], width: 0.5), children: <Widget>[
), ClipRRect(
child: Row( borderRadius:
children: <Widget>[ BorderRadius.all(Radius.circular(5)),
ClipRRect( child: Image.network(
borderRadius: model.prescriptionReportList[index]
BorderRadius.all(Radius.circular(5)), .imageSRCUrl,
child: Image.network( fit: BoxFit.cover,
model.prescriptionReportList[index] width: 60,
.imageSRCUrl, height: 70,
fit: BoxFit.cover, ),
width: 60,
height: 70,
), ),
), SizedBox(
SizedBox( width: 10,
width: 10, ),
), Expanded(
Expanded( child: Padding(
child: Padding( padding: const EdgeInsets.all(8.0),
padding: const EdgeInsets.all(8.0), child: Center(
child: Center( child: Texts(model
child: Texts(model .prescriptionReportList[index]
.prescriptionReportList[index] .itemDescription
.itemDescription .isNotEmpty
.isNotEmpty ? model.prescriptionReportList[index]
? model.prescriptionReportList[index] .itemDescription
.itemDescription : model.prescriptionReportList[index]
: model.prescriptionReportList[index] .itemDescriptionN)),
.itemDescriptionN)), )),
)), Icon(
Icon( Icons.arrow_forward_ios,
Icons.arrow_forward_ios, size: 18,
size: 18, color: Colors.grey[500],
color: Colors.grey[500], )
) ],
], ),
), ),
), ))
)) else
else ...List.generate(
...List.generate( model.prescriptionReportEnhList.length,
model.prescriptionReportEnhList.length, (index) => InkWell(
(index) => InkWell( onTap: () {
onTap: () { PrescriptionReport prescriptionReport =
PrescriptionReport prescriptionReport = PrescriptionReport(
PrescriptionReport( imageSRCUrl: model
imageSRCUrl: model .prescriptionReportEnhList[index].imageSRCUrl,
.prescriptionReportEnhList[index].imageSRCUrl, itemDescription: model
itemDescription: model .prescriptionReportEnhList[index]
.prescriptionReportEnhList[index] .itemDescription,
.itemDescription, itemDescriptionN: model
itemDescriptionN: model .prescriptionReportEnhList[index]
.prescriptionReportEnhList[index] .itemDescription,
.itemDescription, routeN:
routeN: model.prescriptionReportEnhList[index].route,
model.prescriptionReportEnhList[index].route, frequency: model
frequency: model .prescriptionReportEnhList[index].frequency,
.prescriptionReportEnhList[index].frequency, frequencyN: model
frequencyN: model .prescriptionReportEnhList[index].frequency,
.prescriptionReportEnhList[index].frequency, doseDailyQuantity: model
doseDailyQuantity: model .prescriptionReportEnhList[index]
.prescriptionReportEnhList[index] .doseDailyQuantity,
.doseDailyQuantity, days: model.prescriptionReportEnhList[index].days,
days: model.prescriptionReportEnhList[index].days, itemID:
itemID: model.prescriptionReportEnhList[index].itemID,
model.prescriptionReportEnhList[index].itemID, remarks: model
remarks: model .prescriptionReportEnhList[index].remarks);
.prescriptionReportEnhList[index].remarks); Navigator.push(
Navigator.push( context,
context, FadePage(
FadePage( page: PrescriptionDetailsPage(
page: PrescriptionDetailsPage( prescriptionReport: prescriptionReport,
prescriptionReport: prescriptionReport,
),
),
);
},
child: Container(
margin: EdgeInsets.all(8.0),
color: Colors.white,
child: Row(
children: <Widget>[
ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(5)),
child: Image.network(
model
.prescriptionReportEnhList[index].imageSRCUrl,
fit: BoxFit.cover,
width: 60,
height: 70,
), ),
), ),
SizedBox( );
width: 10, },
), child: Container(
Expanded( margin: EdgeInsets.all(8.0),
child: Padding( color: Colors.white,
padding: const EdgeInsets.all(8.0), child: Row(
child: Column( children: <Widget>[
crossAxisAlignment: CrossAxisAlignment.start, ClipRRect(
children: <Widget>[ borderRadius: BorderRadius.all(Radius.circular(5)),
Texts(model.prescriptionReportEnhList[index] child: Image.network(
.itemDescription), model
], .prescriptionReportEnhList[index].imageSRCUrl,
fit: BoxFit.cover,
width: 60,
height: 70,
), ),
), ),
), SizedBox(
Icon( width: 10,
Icons.arrow_forward_ios, ),
size: 18, Expanded(
color: Colors.grey[500], child: Padding(
) padding: const EdgeInsets.all(8.0),
], child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Texts(model.prescriptionReportEnhList[index]
.itemDescription),
],
),
),
),
Icon(
Icons.arrow_forward_ios,
size: 18,
color: Colors.grey[500],
)
],
),
), ),
), ),
), ),
)
], ],
),
), ),
), ),
), ),

@ -88,6 +88,7 @@ class PrescriptionsPage extends StatelessWidget {
FadePage( FadePage(
page: PrescriptionItemsPage( page: PrescriptionItemsPage(
prescriptions: prescriptions, prescriptions: prescriptions,
patient: patient,
), ),
), ),
), ),

@ -69,14 +69,14 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
? PatientProfileButton( ? PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
route: ORDER_PRESCRIPTION, route: ORDER_PRESCRIPTION_NEW,
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')
: PatientProfileButton( : PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
route: ORDER_PRESCRIPTION_HISTORY, route: ORDER_PRESCRIPTION_NEW,
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