diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart index 78376dda..1df5714c 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart @@ -28,68 +28,77 @@ class PreviousDiagnosis extends StatelessWidget { ); return BaseView( - onModelReady: (model) async {}, - builder: (_, model, w) { - if(model.showAudit){ - WidgetsBinding.instance.addPostFrameCallback((_){ - showAuditBottomSheet(context,model.auditDiagnosislist,model.toggleShowBottomSheetValue); - model.toggleShowBottomSheetValue(false); - }); - } + onModelReady: (model) async {}, + builder: (_, model, w) { + if (model.showAudit) { + WidgetsBinding.instance.addPostFrameCallback((_) { + showAuditBottomSheet(context, model.auditDiagnosislist, + model.toggleShowBottomSheetValue); + model.toggleShowBottomSheetValue(false); + }); + } - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - Flexible( - child: ListView.separated( - itemBuilder: (_, index) { - return PreviousDiagnosisItem( - title: diagnosisItems[index].selectedDisease ?? '', - status: diagnosisItems[index].status ?? '', - condition: diagnosisItems[index].condition ?? '', - remarks: diagnosisItems[index].remarks ?? '', - isPreviousAddedToCurrent:diagnosisItems[index].visitWiseSelected == true , - onSoapDetailActionClicked: (action) { - switch (action) { - case SoapDetailItemActions.AUDIT: - model.getAuditOfDiagnosis( - patientInfo, - diagnosisItems[index] - .patientProblemRevisionId - ?.toString() ?? - ''); - break; - case SoapDetailItemActions.CHANGE_STATUS: - model.convertPreviousDiagnosisCurrent(patientInfo, diagnosisItems[index]); - default: - } + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Flexible( + child: ListView.separated( + itemBuilder: (_, index) { + return PreviousDiagnosisItem( + title: diagnosisItems[index].selectedDisease ?? '', + status: diagnosisItems[index].status ?? '', + condition: diagnosisItems[index].condition ?? '', + remarks: diagnosisItems[index].remarks ?? '', + type: model.getDiagnosisTypeValue( + diagnosisItems[index].diagnosisType ?? '') ?? + '', + isPreviousAddedToCurrent: + diagnosisItems[index].visitWiseSelected == true, + onSoapDetailActionClicked: (action) { + switch (action) { + case SoapDetailItemActions.AUDIT: + model.getAuditOfDiagnosis( + patientInfo, + diagnosisItems[index] + .patientProblemRevisionId + ?.toString() ?? + ''); + break; + case SoapDetailItemActions.CHANGE_STATUS: + model.convertPreviousDiagnosisCurrent( + patientInfo, diagnosisItems[index]); + default: + } + }, + ); }, - ); - }, - separatorBuilder: (_, index) => Divider(), - itemCount: diagnosisItems.length), - ) - ], - ), - );} - ); + separatorBuilder: (_, index) => Divider(), + itemCount: diagnosisItems.length), + ) + ], + ), + ); + }); } void showAuditBottomSheet( BuildContext context, - List diagnosis, void Function(bool status) toggleShowBottomSheetValue, + List diagnosis, + void Function(bool status) toggleShowBottomSheetValue, ) { showModalBottomSheet( isDismissible: true, context: context, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20))), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(20), topRight: Radius.circular(20))), builder: (_) { return AuditListBottomSheet( auditList: diagnosis, ); }, - ).then((value)=>toggleShowBottomSheetValue(false)); + ).then((value) => toggleShowBottomSheetValue(false)); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart index 81e1837b..1bab8dcf 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart @@ -13,6 +13,7 @@ class PreviousDiagnosisItem extends StatelessWidget { final String condition; final String status; final String remarks; + final String? type; final bool isPreviousAddedToCurrent; final OnSoapDetailActionClicked onSoapDetailActionClicked; @@ -23,6 +24,7 @@ class PreviousDiagnosisItem extends StatelessWidget { required this.remarks, required this.onSoapDetailActionClicked, required this.status, + this.type, required this.isPreviousAddedToCurrent}); @override