From 9e60920399331431a22129aa91bb2ed056126d71 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Mon, 23 Dec 2024 11:22:13 +0300 Subject: [PATCH] WD: display diagnosis type on diagnosis item --- lib/core/viewModel/SOAP_view_model.dart | 4 +++ .../assessment/widget/current_diagnosis.dart | 5 +++ .../widgets/SoapDetailItem.dart | 32 +++++++++++++++++-- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 965e984f..f086dfab 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1582,6 +1582,10 @@ class SOAPViewModel extends BaseViewModel { print('the value is ${_SOAPService.conditionTypeMapWithIdAsKey[key.trim()]}'); return _SOAPService.conditionTypeMapWithIdAsKey[key.trim()]; } + + String? getDiagnosisTypeValue(String key){ + return _SOAPService.diagnosisTypeTypeMapWithIdAsKey[key.trim()]; + } String? getConditionID(String key){ print('the value is ${_SOAPService.conditionTypeMapWithIdAsKey[key.trim()]}'); return _SOAPService.conditionTypeList[key.trim()]; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart index dfe432ef..80fc5906 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart @@ -98,6 +98,11 @@ class _CurrentDiagnosisState extends State { .condition ?? '') ?? '', + type: model.getDiagnosisTypeValue(widget + .currentDiagnosisItems[index] + .diagnosisType ?? + '') ?? + '', remarks: widget.currentDiagnosisItems[index].remarks ?? '', diff --git a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart index df5b8c20..d4d9a4b0 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart @@ -10,6 +10,7 @@ class SoapDetailItem extends StatelessWidget { final String condition; final String status; final String remarks; + final String? type; final bool showActions; final OnSoapDetailActionClicked onSoapDetailActionClicked; @@ -20,6 +21,7 @@ class SoapDetailItem extends StatelessWidget { required this.remarks, required this.onSoapDetailActionClicked, required this.status, + this.type, this.showActions = true}); @override @@ -61,6 +63,28 @@ class SoapDetailItem extends StatelessWidget { ), ], ), + Visibility( + visible: type?.isNotEmpty == true, + child: Row( + children: [ + AppText( + "${TranslationBase.of(context).diagnoseType}:", + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + SizedBox( + width: 4, + ), + AppText( + type ?? '', + color: Color(0xff359846), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ), + ), Visibility( visible: remarks.isNotEmpty, child: Column( @@ -180,14 +204,16 @@ class Status extends StatelessWidget { borderRadius: BorderRadius.circular(3), ), // color: Color(0xFF359846), - color: (status.toLowerCase() == 'active' || status.toLowerCase() == 'stable') + color: (status.toLowerCase() == 'active' || + status.toLowerCase() == 'stable') ? Color(0xFFD8E8DB) : Color(0x98d02127), child: Padding( padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6), child: AppText( status, - color: (status.toLowerCase() == 'active' || status.toLowerCase() == 'stable') + color: (status.toLowerCase() == 'active' || + status.toLowerCase() == 'stable') ? Color(0xFF359846) : Colors.white, fontSize: 8, @@ -197,4 +223,4 @@ class Status extends StatelessWidget { } } -enum SoapDetailItemActions { EDIT, RESOLVE, AUDIT, REMOVE,CHANGE_STATUS } +enum SoapDetailItemActions { EDIT, RESOLVE, AUDIT, REMOVE, CHANGE_STATUS }