WD: display diagnosis type on diagnosis item

update_flutter_3.24_vida_plus_episode
taha.alam 1 year ago
parent ced8e7976f
commit 9e60920399

@ -1582,6 +1582,10 @@ class SOAPViewModel extends BaseViewModel {
print('the value is ${_SOAPService.conditionTypeMapWithIdAsKey[key.trim()]}'); print('the value is ${_SOAPService.conditionTypeMapWithIdAsKey[key.trim()]}');
return _SOAPService.conditionTypeMapWithIdAsKey[key.trim()]; return _SOAPService.conditionTypeMapWithIdAsKey[key.trim()];
} }
String? getDiagnosisTypeValue(String key){
return _SOAPService.diagnosisTypeTypeMapWithIdAsKey[key.trim()];
}
String? getConditionID(String key){ String? getConditionID(String key){
print('the value is ${_SOAPService.conditionTypeMapWithIdAsKey[key.trim()]}'); print('the value is ${_SOAPService.conditionTypeMapWithIdAsKey[key.trim()]}');
return _SOAPService.conditionTypeList[key.trim()]; return _SOAPService.conditionTypeList[key.trim()];

@ -98,6 +98,11 @@ class _CurrentDiagnosisState extends State<CurrentDiagnosis> {
.condition ?? .condition ??
'') ?? '') ??
'', '',
type: model.getDiagnosisTypeValue(widget
.currentDiagnosisItems[index]
.diagnosisType ??
'') ??
'',
remarks: remarks:
widget.currentDiagnosisItems[index].remarks ?? widget.currentDiagnosisItems[index].remarks ??
'', '',

@ -10,6 +10,7 @@ class SoapDetailItem extends StatelessWidget {
final String condition; final String condition;
final String status; final String status;
final String remarks; final String remarks;
final String? type;
final bool showActions; final bool showActions;
final OnSoapDetailActionClicked onSoapDetailActionClicked; final OnSoapDetailActionClicked onSoapDetailActionClicked;
@ -20,6 +21,7 @@ class SoapDetailItem extends StatelessWidget {
required this.remarks, required this.remarks,
required this.onSoapDetailActionClicked, required this.onSoapDetailActionClicked,
required this.status, required this.status,
this.type,
this.showActions = true}); this.showActions = true});
@override @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( Visibility(
visible: remarks.isNotEmpty, visible: remarks.isNotEmpty,
child: Column( child: Column(
@ -180,14 +204,16 @@ class Status extends StatelessWidget {
borderRadius: BorderRadius.circular(3), borderRadius: BorderRadius.circular(3),
), ),
// color: Color(0xFF359846), // color: Color(0xFF359846),
color: (status.toLowerCase() == 'active' || status.toLowerCase() == 'stable') color: (status.toLowerCase() == 'active' ||
status.toLowerCase() == 'stable')
? Color(0xFFD8E8DB) ? Color(0xFFD8E8DB)
: Color(0x98d02127), : Color(0x98d02127),
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6), padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
child: AppText( child: AppText(
status, status,
color: (status.toLowerCase() == 'active' || status.toLowerCase() == 'stable') color: (status.toLowerCase() == 'active' ||
status.toLowerCase() == 'stable')
? Color(0xFF359846) ? Color(0xFF359846)
: Colors.white, : Colors.white,
fontSize: 8, 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 }

Loading…
Cancel
Save