Merge branch 'tasks-translation' into 'development'

Prescription & procedure body update

See merge request Cloud_Solution/doctor_app_flutter!257
merge-requests/258/merge
Mohammad Aljammal 5 years ago
commit 007adea6ec

@ -56,8 +56,7 @@ postProcedure(
postProcedureReqModel.clinicID = patient.clinicId; postProcedureReqModel.clinicID = patient.clinicId;
postProcedureReqModel.episodeID = patient.episodeNo; postProcedureReqModel.episodeID = patient.episodeNo;
postProcedureReqModel.patientMRN = patient.patientMRN; postProcedureReqModel.patientMRN = patient.patientMRN;
postProcedureReqModel.vidaAuthTokenID =
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMDAyIiwianRpIjoiOGFjNDRjZGQtOWE0Mi00M2YxLWE2YTQtMWQ4NzBmZmYwNTUyIiwiZW1haWwiOiIiLCJpZCI6IjEwMDIiLCJOYW1lIjoiVEVNUCAtIERPQ1RPUiIsIkVtcGxveWVlSWQiOiI0NzA5IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiI0NzA5IiwiU0VTU0lPTklEIjoiMjE1OTU2NDkiLCJDbGluaWNJZCI6IjEiLCJyb2xlIjpbIkRPQ1RPUlMiLCJIRUFEIERPQ1RPUlMiLCJBRE1JTklTVFJBVE9SUyIsIlJFQ0VQVElPTklTVCIsIkVSIE5VUlNFIiwiRVIgUkVDRVBUSU9OSVNUIiwiUEhBUk1BQ1kgQUNDT1VOVCBTVEFGRiIsIlBIQVJNQUNZIE5VUlNFIiwiSU5QQVRJRU5UIFBIQVJNQUNJU1QiLCJBRE1JU1NJT04gU1RBRkYiLCJBUFBST1ZBTCBTVEFGRiIsIkNPTlNFTlQgIiwiTUVESUNBTCBSRVBPUlQgLSBTSUNLIExFQVZFIE1BTkFHRVIiXSwibmJmIjoxNjA4NzM2NjY5LCJleHAiOjE2MDk2MDA2NjksImlhdCI6MTYwODczNjY2OX0.9EDgYrbe5fQA2CvgLdFT4s_PL7hD5R_Qggfpv4lDtUY";
sss.add(PrescriptionRequestModel( sss.add(PrescriptionRequestModel(
covered: true, covered: true,
dose: 1, dose: 1,

@ -745,8 +745,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
updatePrescriptionReqModel.clinicID = patient.clinicId; updatePrescriptionReqModel.clinicID = patient.clinicId;
updatePrescriptionReqModel.episodeID = patient.episodeNo; updatePrescriptionReqModel.episodeID = patient.episodeNo;
updatePrescriptionReqModel.patientMRN = patient.patientMRN; updatePrescriptionReqModel.patientMRN = patient.patientMRN;
updatePrescriptionReqModel.vidaAuthTokenID =
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMDAyIiwianRpIjoiOGFjNDRjZGQtOWE0Mi00M2YxLWE2YTQtMWQ4NzBmZmYwNTUyIiwiZW1haWwiOiIiLCJpZCI6IjEwMDIiLCJOYW1lIjoiVEVNUCAtIERPQ1RPUiIsIkVtcGxveWVlSWQiOiI0NzA5IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiI0NzA5IiwiU0VTU0lPTklEIjoiMjE1OTU2NDkiLCJDbGluaWNJZCI6IjEiLCJyb2xlIjpbIkRPQ1RPUlMiLCJIRUFEIERPQ1RPUlMiLCJBRE1JTklTVFJBVE9SUyIsIlJFQ0VQVElPTklTVCIsIkVSIE5VUlNFIiwiRVIgUkVDRVBUSU9OSVNUIiwiUEhBUk1BQ1kgQUNDT1VOVCBTVEFGRiIsIlBIQVJNQUNZIE5VUlNFIiwiSU5QQVRJRU5UIFBIQVJNQUNJU1QiLCJBRE1JU1NJT04gU1RBRkYiLCJBUFBST1ZBTCBTVEFGRiIsIkNPTlNFTlQgIiwiTUVESUNBTCBSRVBPUlQgLSBTSUNLIExFQVZFIE1BTkFHRVIiXSwibmJmIjoxNjA4NzM2NjY5LCJleHAiOjE2MDk2MDA2NjksImlhdCI6MTYwODczNjY2OX0.9EDgYrbe5fQA2CvgLdFT4s_PL7hD5R_Qggfpv4lDtUY";
sss.add(PrescriptionRequestModel( sss.add(PrescriptionRequestModel(
covered: true, covered: true,
dose: 9, //frequency.isNotEmpty ? int.parse(dose) : 1, dose: 9, //frequency.isNotEmpty ? int.parse(dose) : 1,

@ -115,227 +115,273 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
thickness: 1.0, thickness: 1.0,
color: Colors.grey, color: Colors.grey,
), ),
if (model.procedureList.length != 0) (model.procedureList.length != 0)
SizedBox( ? SizedBox(
height: model.procedureList[0].rowcount == 0 height: model.procedureList[0].rowcount == 0
? 200.0 ? 200.0
: 10.0), : 10.0)
: SizedBox(height: 200.0),
//model.prescriptionList == null //model.prescriptionList == null
if (model.procedureList.length != 0) (model.procedureList.length != 0)
model.procedureList[0].rowcount == 0 ? model.procedureList[0].rowcount == 0
? Column( ? Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.stretch, CrossAxisAlignment.stretch,
children: [ children: [
InkWell( InkWell(
onTap: () { onTap: () {
model model
.getProcedureCategory() .getProcedureCategory()
.then((value) { .then((value) {
addSelectedProcedure( addSelectedProcedure(
context, model, patient); context, model, patient);
}); });
//model.postPrescription(); //model.postPrescription();
}, },
child: CircleAvatar(
radius: 65,
backgroundColor: Color(0XFFB8382C),
child: CircleAvatar( child: CircleAvatar(
radius: 60, radius: 65,
backgroundColor: Colors.white, backgroundColor: Color(0XFFB8382C),
child: Icon( child: CircleAvatar(
Icons.add, radius: 60,
color: Colors.black, backgroundColor: Colors.white,
size: 45.0, child: Icon(
Icons.add,
color: Colors.black,
size: 45.0,
),
), ),
), ),
), ),
), SizedBox(
SizedBox( height: 15.0,
height: 15.0, ),
), Row(
Row( mainAxisAlignment:
mainAxisAlignment: MainAxisAlignment.center,
MainAxisAlignment.center, children: [
children: [ AppText(
AppText( 'NO ORDER FOR PROCEDURE LISTED',
'NO ORDER FOR PROCEDURE LISTED', color: Colors.black,
color: Colors.black, fontWeight: FontWeight.w900,
fontWeight: FontWeight.w900,
),
],
),
Row(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
AppText(
TranslationBase.of(context).addNow,
color: Color(0XFFB8382C),
fontWeight: FontWeight.w700,
),
],
),
],
)
: Padding(
padding: EdgeInsets.all(16.0),
child: NetworkBaseView(
baseViewModel: model,
child: Column(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
InkWell(
child: Container(
height: 50.0,
width: 450.0,
decoration: BoxDecoration(
border: Border.all(
color: Colors.grey),
borderRadius:
BorderRadius.circular(10.0),
),
child: Padding(
padding: EdgeInsets.all(8.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
children: [
AppText(
TranslationBase.of(context)
.addMoreProcedure,
fontWeight: FontWeight.w100,
fontSize: 12.5,
),
Icon(
Icons.add,
color: Color(0XFFB8382C),
)
],
),
),
), ),
onTap: () { ],
model ),
.getProcedureCategory() Row(
.then((value) { mainAxisAlignment:
addSelectedProcedure( MainAxisAlignment.center,
context, model, patient); children: [
}); AppText(
TranslationBase.of(context).addNow,
//model.postPrescription(); color: Color(0XFFB8382C),
}, fontWeight: FontWeight.w700,
), ),
// Container( ],
// decoration: BoxDecoration( ),
// borderRadius: BorderRadius.all( ],
// Radius.circular(6.0)), )
// border: Border.all( : Padding(
// width: 1.0, padding: EdgeInsets.all(16.0),
// color: HexColor("#CCCCCC"))), child: NetworkBaseView(
// child: AppTextFormField( baseViewModel: model,
// labelText: 'Add more procedure', child: Column(
// borderColor: Colors.white, mainAxisAlignment:
// //suffixIcon: Icons.search, MainAxisAlignment.start,
// children: [
// //textInputType: TextInputType.number, InkWell(
// inputFormatter: ONLY_NUMBERS, child: Container(
// onTap: () { height: 50.0,
// addSelectedProcedure(context); width: 450.0,
// }, decoration: BoxDecoration(
// ), border: Border.all(
// ), color: Colors.grey),
SizedBox( borderRadius:
height: 35.0, BorderRadius.circular(10.0),
), ),
...List.generate( child: Padding(
model.procedureList[0].rowcount, padding: EdgeInsets.all(8.0),
(index) => Container( child: Row(
child: Column(
children: [
Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment MainAxisAlignment
.spaceBetween, .spaceBetween,
children: [ children: [
Container( AppText(
height: 120.0, TranslationBase.of(
width: 45.0, context)
child: Column( .addMoreProcedure,
children: [ fontWeight:
AppText( FontWeight.w100,
'8\nDEC', fontSize: 12.5,
color: Colors.green,
)
],
),
), ),
Expanded( Icon(
child: Container( Icons.add,
height: 120, color: Color(0XFFB8382C),
width: 325.0, )
],
),
),
),
onTap: () {
model
.getProcedureCategory()
.then((value) {
addSelectedProcedure(
context, model, patient);
});
//model.postPrescription();
},
),
// Container(
// decoration: BoxDecoration(
// borderRadius: BorderRadius.all(
// Radius.circular(6.0)),
// border: Border.all(
// width: 1.0,
// color: HexColor("#CCCCCC"))),
// child: AppTextFormField(
// labelText: 'Add more procedure',
// borderColor: Colors.white,
// //suffixIcon: Icons.search,
//
// //textInputType: TextInputType.number,
// inputFormatter: ONLY_NUMBERS,
// onTap: () {
// addSelectedProcedure(context);
// },
// ),
// ),
SizedBox(
height: 35.0,
),
...List.generate(
model.procedureList[0].rowcount,
(index) => Container(
child: Column(
children: [
Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
children: [
Container(
height: 120.0,
width: 45.0,
child: Column( child: Column(
children: [ children: [
Row( AppText(
children: [ '8\nDEC',
AppText( color:
TranslationBase.of( Colors.green,
context) )
.codeNo + ],
" : ", ),
fontWeight: ),
FontWeight Expanded(
.w700, child: Container(
fontSize: height: 120,
15.0, width: 325.0,
), child: Column(
AppText( children: [
model Row(
.procedureList[ children: [
0] AppText(
.entityList[ TranslationBase.of(context)
index] .codeNo +
.procedureId " : ",
.toString(), fontWeight:
fontSize: FontWeight
13.0, .w700,
), fontSize:
SizedBox( 15.0,
width: 12.0, ),
), AppText(
AppText( model
TranslationBase.of( .procedureList[
context) 0]
.orderType + .entityList[
" : ", index]
fontWeight: .procedureId
FontWeight .toString(),
.w700, fontSize:
fontSize: 13.0,
15.0, ),
), SizedBox(
AppText( width: 12.0,
model.procedureList[0].entityList[index] ),
.orderType == AppText(
1 TranslationBase.of(context)
? 'Regular' .orderType +
: 'Urgent', " : ",
fontSize: fontWeight:
13.0, FontWeight
color: Color( .w700,
0xFFB9382C), fontSize:
), 15.0,
], ),
), AppText(
Row( model.procedureList[0].entityList[index].orderType ==
children: [ 1
Container( ? 'Regular'
child: : 'Urgent',
Expanded( fontSize:
13.0,
color: Color(
0xFFB9382C),
),
],
),
Row(
children: [
Container(
child:
Expanded(
child:
AppText(
model
.procedureList[0]
.entityList[index]
.procedureName,
fontWeight:
FontWeight.w800,
),
),
)
],
),
Row(
children: [
AppText(
TranslationBase.of(context)
.price +
" : ",
fontWeight:
FontWeight
.w700,
),
// Expanded(
// child: AppText(
// model
// .procedureList[
// 0]
// .entityList[
// index]
// .price
// .toString(),
// fontSize:
// 13.0),
// )
],
),
SizedBox(
height: 10.0,
),
Row(
children: [
Expanded(
child: child:
AppText( AppText(
model model
@ -343,131 +389,136 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
0] 0]
.entityList[ .entityList[
index] index]
.procedureName, .remarks
fontWeight: .toString(),
FontWeight fontSize:
.w800, 13.5,
), ),
), ),
) ],
], ),
), SizedBox(
height: 10.0,
),
Row( Divider(
children: [ height: 5.0,
AppText( thickness: 1.0,
TranslationBase.of( color:
context) Colors.grey,
.price + )
" : ", // SizedBox(
fontWeight: // height: 40,
FontWeight // ),
.w700, ],
), ),
// Expanded( ),
// child: AppText( ),
// model Container(
// .procedureList[ child: Column(
// 0] children: [
// .entityList[ InkWell(
// index] child: Icon(
// .price Icons.edit),
// .toString(), onTap: () {
// fontSize: updateProcedureForm(
// 13.0), context,
// ) remarks: model
],
),
SizedBox(
height: 10.0,
),
Row(
children: [
Expanded(
child:
AppText(
model
.procedureList[ .procedureList[
0] 0]
.entityList[ .entityList[
index] index]
.remarks .remarks,
.toString(), procedureName: model
fontSize: .procedureList[
13.5, 0]
), .entityList[
), index]
], .procedureName,
), patient:
SizedBox( patient,
height: 10.0, procedureId: model
), .procedureList[
0]
Divider( .entityList[
height: 5.0, index]
thickness: 1.0, .procedureId,
color: categoreId: model
Colors.grey, .procedureList[
0]
.entityList[
index]
.categoryID
.toString());
},
) )
// SizedBox(
// height: 40,
// ),
], ],
), ),
), )
), ],
Container( ),
child: Column( ],
children: [ ),
InkWell(
child: Icon(
Icons.edit),
onTap: () {
updateProcedureForm(
context,
remarks: model
.procedureList[
0]
.entityList[
index]
.remarks,
procedureName: model
.procedureList[
0]
.entityList[
index]
.procedureName,
patient:
patient,
procedureId: model
.procedureList[
0]
.entityList[
index]
.procedureId,
categoreId: model
.procedureList[
0]
.entityList[
index]
.categoryID
.toString());
},
)
],
),
)
],
),
],
), ),
), ),
],
),
),
)
: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
InkWell(
onTap: () {
model
.getProcedureCategory()
.then((value) {
addSelectedProcedure(
context, model, patient);
});
//model.postPrescription();
},
child: CircleAvatar(
radius: 65,
backgroundColor: Color(0XFFB8382C),
child: CircleAvatar(
radius: 60,
backgroundColor: Colors.white,
child: Icon(
Icons.add,
color: Colors.black,
size: 45.0,
), ),
], ),
), ),
), ),
) SizedBox(
height: 15.0,
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
AppText(
'NO ORDER FOR PROCEDURE LISTED',
color: Colors.black,
fontWeight: FontWeight.w900,
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
AppText(
TranslationBase.of(context).addNow,
color: Color(0XFFB8382C),
fontWeight: FontWeight.w700,
),
],
),
],
)
], ],
), ),
), ),
@ -593,8 +644,6 @@ postProcedure(
postProcedureReqModel.episodeID = patient.episodeNo; postProcedureReqModel.episodeID = patient.episodeNo;
postProcedureReqModel.patientMRN = patient.patientMRN; postProcedureReqModel.patientMRN = patient.patientMRN;
postProcedureReqModel.vidaAuthTokenID =
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxNDg1IiwianRpIjoiZjQ4YTk0OTQtYTczZS00MDI3LWI2MjgtNzc4MjAwMzUyYWEzIiwiZW1haWwiOiJNb2hhbWVkLlJlc3dhbkBjbG91ZHNvbHV0aW9uLXNhLmNvbSIsImlkIjoiMTQ4NSIsIk5hbWUiOiJTSEFLRVJBIFBBUlZFRU4gKFVTRUQgQlkgRVNFUlZJQ0VTKSIsIkVtcGxveWVlSWQiOiIxNDg1IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiIxNDg1IiwiU0VTU0lPTklEIjoiMjE1ODUyMTAiLCJDbGluaWNJZCI6IjMiLCJyb2xlIjoiRE9DVE9SUyIsIm5iZiI6MTYwODM2NDU2OCwiZXhwIjoxNjA5MjI4NTY4LCJpYXQiOjE2MDgzNjQ1Njh9.YLbvq5nxPn8o9ZYkcbc5YAX7Jy23Mm0s33oRmE8GHDI';
controls.add( controls.add(
Controls( Controls(
@ -632,8 +681,6 @@ updateProcedure(
updateProcedureReqModel.episodeID = patient.episodeNo; updateProcedureReqModel.episodeID = patient.episodeNo;
updateProcedureReqModel.patientMRN = patient.patientMRN; updateProcedureReqModel.patientMRN = patient.patientMRN;
updateProcedureReqModel.vidaAuthTokenID =
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxNDg1IiwianRpIjoiZjQ4YTk0OTQtYTczZS00MDI3LWI2MjgtNzc4MjAwMzUyYWEzIiwiZW1haWwiOiJNb2hhbWVkLlJlc3dhbkBjbG91ZHNvbHV0aW9uLXNhLmNvbSIsImlkIjoiMTQ4NSIsIk5hbWUiOiJTSEFLRVJBIFBBUlZFRU4gKFVTRUQgQlkgRVNFUlZJQ0VTKSIsIkVtcGxveWVlSWQiOiIxNDg1IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiIxNDg1IiwiU0VTU0lPTklEIjoiMjE1ODUyMTAiLCJDbGluaWNJZCI6IjMiLCJyb2xlIjoiRE9DVE9SUyIsIm5iZiI6MTYwODM2NDU2OCwiZXhwIjoxNjA5MjI4NTY4LCJpYXQiOjE2MDgzNjQ1Njh9.YLbvq5nxPn8o9ZYkcbc5YAX7Jy23Mm0s33oRmE8GHDI';
controls.add( controls.add(
Controls( Controls(

Loading…
Cancel
Save