Merge branch 'fix-issues' into 'development'

hot fixes

See merge request Cloud_Solution/doctor_app_flutter!453
merge-requests/456/merge
Mohammad Aljammal 5 years ago
commit 27e469eb71

@ -62,7 +62,7 @@ class ProcedureViewModel extends BaseViewModel {
await _procedureService.getProcedure(mrn: mrn); await _procedureService.getProcedure(mrn: mrn);
if (_procedureService.hasError) { if (_procedureService.hasError) {
error = _procedureService.error; error = _procedureService.error;
setState(ViewState.ErrorLocal); setState(ViewState.Error);
} else } else
setState(ViewState.Idle); setState(ViewState.Idle);
} }

@ -468,10 +468,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
Row( Row(
children: [ children: [
AppText( AppText(
'ICD', 'ICD: ',
fontWeight: fontSize: 13.0,
FontWeight
.w700,
), ),
AppText( AppText(
model model
@ -488,14 +486,20 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
index] index]
.iCD10 .iCD10
.trim(), .trim(),
fontSize: 13.5,
fontWeight:
FontWeight
.w700,
), ),
SizedBox( SizedBox(
width: 35.0), width: 15.0),
],
),
Row(
children: [
AppText( AppText(
'Condition: ', 'Condition: ',
fontWeight: fontSize: 12.5,
FontWeight
.w700,
), ),
Expanded( Expanded(
child: AppText( child: AppText(
@ -514,6 +518,10 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
index] index]
.condition .condition
.trim(), .trim(),
fontSize: 13.0,
fontWeight:
FontWeight
.w700,
), ),
), ),
], ],
@ -539,6 +547,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
fontWeight: fontWeight:
FontWeight FontWeight
.w700, .w700,
fontSize: 15.0,
), ),
) )
], ],
@ -547,24 +556,29 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [ children: [
AppText( AppText(
'Type: ', 'Type: ',
fontWeight: fontSize: 15.5,
FontWeight
.w700,
), ),
Expanded( Expanded(
child: AppText(model child: AppText(
.medicalFileList[ model
0] .medicalFileList[
.entityList[0] 0]
.timelines[ .entityList[
encounterNumber] 0]
.timeLineEvents[ .timelines[
0] encounterNumber]
.consulations[ .timeLineEvents[
0] 0]
.lstAssessments[ .consulations[
index] 0]
.type), .lstAssessments[
index]
.type,
fontSize: 16.0,
fontWeight:
FontWeight
.w700,
),
), ),
], ],
), ),
@ -700,9 +714,6 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [ children: [
AppText( AppText(
'Procedure ID: ', 'Procedure ID: ',
fontWeight:
FontWeight
.w700,
), ),
AppText( AppText(
model model
@ -720,6 +731,11 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
index] index]
.procedureId .procedureId
.trim(), .trim(),
fontSize:
13.5,
fontWeight:
FontWeight
.w700,
), ),
], ],
), ),
@ -729,9 +745,6 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [ children: [
AppText( AppText(
'Order Date: ', 'Order Date: ',
fontWeight:
FontWeight
.w700,
), ),
AppText( AppText(
Helpers.getDateFormatted( Helpers.getDateFormatted(
@ -755,6 +768,9 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
)), )),
fontSize: fontSize:
13.5, 13.5,
fontWeight:
FontWeight
.w700,
), ),
], ],
), ),
@ -792,23 +808,26 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [ children: [
AppText( AppText(
'CPT Code : ', 'CPT Code : ',
),
AppText(
model
.medicalFileList[
0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[
0]
.consulations[
0]
.lstProcedure[
index]
.patientID
.toString(),
fontWeight: fontWeight:
FontWeight FontWeight
.w700, .w700,
), ),
AppText(model
.medicalFileList[
0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[
0]
.consulations[0]
.lstProcedure[
index]
.patientID
.toString()),
], ],
), ),
SizedBox( SizedBox(
@ -924,22 +943,25 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [ children: [
AppText( AppText(
'Exam Type: ', 'Exam Type: ',
),
AppText(
model
.medicalFileList[
0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[
0]
.consulations[
0]
.lstPhysicalExam[
index]
.examDesc,
fontWeight: fontWeight:
FontWeight FontWeight
.w700, .w700,
), ),
AppText(model
.medicalFileList[
0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[
0]
.consulations[0]
.lstPhysicalExam[
index]
.examDesc),
], ],
), ),
Row( Row(
@ -968,22 +990,25 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [ children: [
AppText( AppText(
'Abnormal: ', 'Abnormal: ',
),
AppText(
model
.medicalFileList[
0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[
0]
.consulations[
0]
.lstPhysicalExam[
index]
.abnormal,
fontWeight: fontWeight:
FontWeight FontWeight
.w700, .w700,
), ),
AppText(model
.medicalFileList[
0]
.entityList[0]
.timelines[
encounterNumber]
.timeLineEvents[
0]
.consulations[0]
.lstPhysicalExam[
index]
.abnormal),
], ],
), ),
SizedBox( SizedBox(

@ -162,12 +162,15 @@ class ProcedureCard extends StatelessWidget {
), ),
if (entityList.categoryID == 2 || if (entityList.categoryID == 2 ||
entityList.categoryID == 4) entityList.categoryID == 4)
Icon(Icons.edit) InkWell(
child: Icon(Icons.edit),
onTap: onTap,
)
], ],
) )
], ],
), ),
onTap: onTap, //onTap: onTap,
), ),
), ),
), ),

@ -115,31 +115,28 @@ class ProcedureScreen extends StatelessWidget {
model.procedureList[0].entityList[index].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].categoryID == 4)
// model.procedureList[0].entityList[index] updateProcedureForm(context,
// .categoryID == model: model,
// 4) { patient: patient,
updateProcedureForm(context, remarks: model
model: model, .procedureList[0].entityList[index].remarks,
patient: patient, orderType: model.procedureList[0]
remarks: model .entityList[index].orderType
.procedureList[0].entityList[index].remarks, .toString(),
orderType: model orderNo: model
.procedureList[0].entityList[index].orderType .procedureList[0].entityList[index].orderNo,
.toString(), procedureName: model.procedureList[0]
orderNo: model .entityList[index].procedureName,
.procedureList[0].entityList[index].orderNo, categoreId: model.procedureList[0]
procedureName: model.procedureList[0] .entityList[index].categoryID
.entityList[index].procedureName, .toString(),
categoreId: model procedureId: model.procedureList[0]
.procedureList[0].entityList[index].categoryID .entityList[index].procedureId,
.toString(), limetNo: model.procedureList[0]
procedureId: model.procedureList[0] .entityList[index].lineItemNo);
.entityList[index].procedureId,
limetNo: model.procedureList[0].entityList[index]
.lineItemNo);
// } else // } else
// helpers.showErrorToast( // helpers.showErrorToast(
// 'You Cant Update This Procedure'); // 'You Cant Update This Procedure');

@ -37,8 +37,8 @@ class _BottomNavBarState extends State<BottomNavBar> {
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
BottomNavigationItem( BottomNavigationItem(
icon: DoctorApp.home_icon, icon: DoctorApp.home_icon_active,
activeIcon: DoctorApp.home_icon_active, activeIcon: DoctorApp.home_active,
changeIndex: _changeIndex, changeIndex: _changeIndex,
index: _index, index: _index,
currentIndex: 0, currentIndex: 0,
@ -46,7 +46,7 @@ class _BottomNavBarState extends State<BottomNavBar> {
), ),
BottomNavigationItem( BottomNavigationItem(
icon: DoctorApp.schedule_icon, icon: DoctorApp.schedule_icon,
activeIcon: DoctorApp.scdedule_icon_active, activeIcon: DoctorApp.scdedule_icon_active_1,
changeIndex: _changeIndex, changeIndex: _changeIndex,
index: _index, index: _index,
currentIndex: 1, currentIndex: 1,
@ -54,7 +54,7 @@ class _BottomNavBarState extends State<BottomNavBar> {
), ),
BottomNavigationItem( BottomNavigationItem(
icon: DoctorApp.qr_code, icon: DoctorApp.qr_code,
activeIcon: DoctorApp.qr_code, activeIcon: DoctorApp.qr_reader_active_1,
changeIndex: _changeIndex, changeIndex: _changeIndex,
index: _index, index: _index,
currentIndex: 2, currentIndex: 2,
@ -62,7 +62,7 @@ class _BottomNavBarState extends State<BottomNavBar> {
), ),
BottomNavigationItem( BottomNavigationItem(
icon: DoctorApp.message_icon, icon: DoctorApp.message_icon,
activeIcon: DoctorApp.message_icon_active, activeIcon: DoctorApp.dr_reply_active_1,
changeIndex: _changeIndex, changeIndex: _changeIndex,
index: _index, index: _index,
currentIndex: 3, currentIndex: 3,

Loading…
Cancel
Save