Unit column position changed

merge-update-with-lab-changes
haroon amjad 2 years ago
parent 7d2744d29c
commit faf3bbdd9e

@ -160,8 +160,8 @@ class LabResultWidget extends StatelessWidget {
children: [ children: [
Utils.tableColumnTitle(TranslationBase.of(context).description, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).description, showDivider: false),
Utils.tableColumnTitle(TranslationBase.of(context).value, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).value, showDivider: false),
Utils.tableColumnTitle(TranslationBase.of(context).range, showDivider: false),
Utils.tableColumnTitle(TranslationBase.of(context).unit, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).unit, showDivider: false),
Utils.tableColumnTitle(TranslationBase.of(context).range, showDivider: false),
], ],
), ),
); );
@ -185,8 +185,9 @@ class LabResultWidget extends StatelessWidget {
padding: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 12, right: projectViewModel.isArabic ? 12 : 0), padding: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 12, right: projectViewModel.isArabic ? 12 : 0),
child: Utils.tableColumnValue(labResultList[i].description ?? "", isLast: true, mProjectViewModel: projectViewModel), child: Utils.tableColumnValue(labResultList[i].description ?? "", isLast: true, mProjectViewModel: projectViewModel),
), ),
Utils.tableColumnValue(labResultList[i].resultValue + " " + labResultList[i].uOM, isHighLow: (labResultList[i].resultValueFlag.toLowerCase() == "h" || labResultList[i].resultValueFlag.toLowerCase() == "l"), isLast: true, mProjectViewModel: projectViewModel), Utils.tableColumnValue(labResultList[i].resultValue + " " + labResultList[i].uOM,
Utils.tableColumnValue(labResultList[i].referanceRange, isLast: true, isCapitable: false, mProjectViewModel: projectViewModel), isHighLow: (labResultList[i].resultValueFlag.toLowerCase() == "h" || labResultList[i].resultValueFlag.toLowerCase() == "l"), isLast: true, mProjectViewModel: projectViewModel),
Utils.tableColumnValue(labResultList[i].uOM, isLast: true, isCapitable: false),
!checkIfCovidLab(patientLabResultList) !checkIfCovidLab(patientLabResultList)
? InkWell( ? InkWell(
onTap: () { onTap: () {
@ -202,8 +203,7 @@ class LabResultWidget extends StatelessWidget {
}, },
child: Padding( child: Padding(
padding: EdgeInsets.only(left: !projectViewModel.isArabic ? 0 : 12, right: !projectViewModel.isArabic ? 12 : 0), padding: EdgeInsets.only(left: !projectViewModel.isArabic ? 0 : 12, right: !projectViewModel.isArabic ? 12 : 0),
// child: Utils.tableColumnValueWithUnderLine(TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false), child: Utils.tableColumnValueWithFlowChart(labResultList[i].referanceRange, TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false),
child: Utils.tableColumnValueWithFlowChart(labResultList[i].uOM, TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false),
), ),
) )
: Container(), : Container(),

Loading…
Cancel
Save