Lab order & results enhancements

lib/core/api/api_client.dart

@@ -174,7 +174,7 @@ class ApiClientImp implements ApiClient {
       }
 
       // body['TokenID'] = "@dm!n";
-      // body['PatientID'] = 1018977;
+      // body['PatientID'] = 4767477;
       // body['PatientTypeID'] = 1;
       //
       // body['PatientOutSA'] = 0;

lib/core/api_consts.dart

@@ -727,7 +727,7 @@ const FAMILY_FILES= 'Services/Authentication.svc/REST/GetAllSharedRecordsByStatu
 class ApiConsts {
   static const maxSmallScreen = 660;
 
-  static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod;
+  static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat;
 
   // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT
 

lib/presentation/book_appointment/book_appointment_page.dart

@@ -9,6 +9,7 @@ import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
+import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart';
 import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart';
 import 'package:hmg_patient_app_new/features/immediate_livecare/immediate_livecare_view_model.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/appointment_via_region_viewmodel.dart';
@@ -22,6 +23,7 @@ import 'package:hmg_patient_app_new/presentation/book_appointment/search_doctor_
 import 'package:hmg_patient_app_new/presentation/book_appointment/select_clinic_page.dart';
 import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
+import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
 import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart' show showCommonBottomSheetWithoutHeight;
 import 'package:hmg_patient_app_new/widgets/custom_tab_bar.dart';
 import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
@@ -43,9 +45,11 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
   late AppointmentViaRegionViewmodel regionalViewModel;
   late BookAppointmentsViewModel bookAppointmentsViewModel;
   late ImmediateLiveCareViewModel immediateLiveCareViewModel;
+  late final AuthenticationViewModel authVM;
 
   @override
   void initState() {
+    authVM = context.read<AuthenticationViewModel>();
     scheduleMicrotask(() {
       bookAppointmentsViewModel.selectedTabIndex = 0;
       bookAppointmentsViewModel.initBookAppointmentViewModel();
@@ -204,11 +208,12 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
         ).paddingSymmetrical(24.h, 0.h);
       case 1:
         //TODO: Get LiveCare type Select UI from Hussain
-        return Column(
+        return appState.isAuthenticated
-          children: [
+            ? Column(
-            Container(
+                children: [
-              decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+                  Container(
-                color: AppColors.whiteColor,
+                    decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+                      color: AppColors.whiteColor,
                 borderRadius: 24.h,
                 hasShadow: false,
               ),
@@ -318,7 +323,8 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
               ),
             ),
           ],
-        ).paddingSymmetrical(24.h, 0.h);
+              ).paddingSymmetrical(24.h, 0.h)
+            : getLiveCareNotLoggedInUI();
       default:
         SizedBox.shrink();
     }
@@ -375,4 +381,93 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
       });
     }
   }
+
+  Widget getLiveCareNotLoggedInUI() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          children: [
+            Utils.buildSvgWithAssets(icon: AppAssets.immediate_service_icon, width: 58.h, height: 58.h),
+            SizedBox(width: 18.h),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  "Immediate service".needTranslation.toText18(color: AppColors.textColor, isBold: true),
+                  "No need to wait, you will get medical consultation immediately via video call".needTranslation.toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+                ],
+              ),
+            ),
+          ],
+        ),
+        SizedBox(height: 24.h),
+        Row(
+          children: [
+            Utils.buildSvgWithAssets(icon: AppAssets.no_visit_icon, width: 58.h, height: 58.h),
+            SizedBox(width: 18.h),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  "No visit required".needTranslation.toText18(color: AppColors.textColor, isBold: true),
+                  LocaleKeys.livecarePoint5.tr(context: context).toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+                ],
+              ),
+            ),
+          ],
+        ),
+        SizedBox(height: 24.h),
+        Row(
+          children: [
+            Utils.buildSvgWithAssets(icon: AppAssets.doctor_contact_icon, width: 58.h, height: 58.h),
+            SizedBox(width: 18.h),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  "Doctor will contact".needTranslation.toText18(color: AppColors.textColor, isBold: true),
+                  "A specialised doctor will contact you and will be able to view your medical history".needTranslation.toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+                ],
+              ),
+            ),
+          ],
+        ),
+        SizedBox(height: 24.h),
+        Row(
+          children: [
+            Utils.buildSvgWithAssets(icon: AppAssets.free_med_delivery_icon, width: 58.h, height: 58.h),
+            SizedBox(width: 18.h),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  "Free medicine delivery".needTranslation.toText18(color: AppColors.textColor, isBold: true),
+                  "Offers free medicine delivery for the LiveCare appointment".needTranslation.toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+                ],
+              ),
+            ),
+          ],
+        ),
+        SizedBox(height: 36.h),
+        CustomButton(
+          text: "Login to use this service".needTranslation,
+          onPressed: () async {
+            await authVM.onLoginPressed();
+          },
+          backgroundColor: AppColors.primaryRedColor,
+          borderColor: AppColors.primaryRedColor,
+          textColor: AppColors.whiteColor,
+          fontSize: 16,
+          fontWeight: FontWeight.w500,
+          borderRadius: 12,
+          padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
+          height: 50.h,
+          icon: AppAssets.login1,
+          iconColor: AppColors.whiteColor,
+          iconSize: 24.h,
+        ),
+      ],
+    ).paddingSymmetrical(24.h, 0.h);
+  }
 }

lib/presentation/book_appointment/select_clinic_page.dart

@@ -215,6 +215,7 @@ class _SelectClinicPageState extends State<SelectClinicPage> {
     }
   }
 
+  // ClinicID 17 & Clinic ID 253
   void handleDoctorScreen() {
     if (widget.isFromRegionFlow) {
       Navigator.of(context).push(

lib/presentation/book_appointment/select_livecare_clinic_page.dart

@@ -6,12 +6,9 @@ import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
-import 'package:hmg_patient_app_new/presentation/book_appointment/select_doctor_page.dart';
 import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
-import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
-import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart';
 
 class SelectLivecareClinicPage extends StatelessWidget {
 

lib/presentation/lab/lab_order_by_test.dart

@@ -35,41 +35,43 @@ class LabOrderByTest extends StatelessWidget {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              // ...labOrder!.testDetails!.map((detail) {
+              '${tests!.description}'.toText16(isBold: true),
-              Padding(
+              SizedBox(height: 4.h),
-                padding: EdgeInsets.only(bottom: 8.h),
+              //TODO: Add test long description from the Lab Order API
-                child: '${tests!.description}'.toText14(weight: FontWeight.w500),
+              "Measurement of ALT (alanine aminotransferase) level in blood used to assess liver functions".toText12(fontWeight: FontWeight.w500),
-              ),
+              SizedBox(height: 8.h),
-
-              SizedBox(height: 12.h),
-
               Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
                   AppCustomChipWidget(
-                    richText: '${"Last Tested:".needTranslation} ${ DateUtil.formatDateToDate(DateUtil.convertStringToDate(tests!.createdOn), false)}'.toText12(isBold: true),
+                    richText: '${"Last Tested:".needTranslation} ${DateUtil.formatDateToDate(DateUtil.convertStringToDate(tests!.createdOn), false)}'.toText12(fontWeight: FontWeight.w500),
-                    // chipType: ChipTypeEnum.lightBg,
                     backgroundColor: AppColors.greyLightColor,
                     textColor: AppColors.textColor,
-                    // borderRadius: 5,
-
                   ),
-                  CustomButton(
+                ],
-                    icon: AppAssets.view_report_icon,
+              ),
-                    iconColor: AppColors.primaryRedColor,
+              SizedBox(height: 16.h),
-                    iconSize: 16.h,
+              Row(
-                    text: LocaleKeys.viewReport.tr(context: context),
+                children: [
-                    onPressed: () {
+                  Expanded(child: Container()),
+                  Expanded(
+                    child: CustomButton(
+                      icon: AppAssets.view_report_icon,
+                      iconColor: AppColors.primaryRedColor,
+                      iconSize: 16.h,
+                      text: LocaleKeys.viewReport.tr(context: context),
+                      onPressed: () {
                         onTap();
-                    },
+                      },
-                    backgroundColor: AppColors.secondaryLightRedColor,
+                      backgroundColor: AppColors.secondaryLightRedColor,
-                    borderColor: AppColors.secondaryLightRedColor,
+                      borderColor: AppColors.secondaryLightRedColor,
-                    textColor: AppColors.primaryRedColor,
+                      textColor: AppColors.primaryRedColor,
-                    fontSize: 14,
+                      fontSize: 14,
-                    fontWeight: FontWeight.bold,
+                      fontWeight: FontWeight.w500,
-                    borderRadius: 12,
+                      borderRadius: 12,
-                    padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
+                      padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
-                    height: 40.h,
+                      height: 40.h,
+                    ),
                   ),
                 ],
               ),

lib/presentation/lab/lab_result_item_view.dart

@@ -81,8 +81,10 @@ class LabResultItemView extends StatelessWidget {
                           AppCustomChipWidget(labelText: isLoading ? "null" : labOrder!.clinicDescription!).toShimmer2(isShow: isLoading, width: 100),
                         ],
                       ),
-                      Utils.buildSvgWithAssets(
+                      isLoading
-                        icon: AppAssets.forward_arrow_icon_small,
+                          ? SizedBox.shrink()
+                          : Utils.buildSvgWithAssets(
+                              icon: AppAssets.forward_arrow_icon_small,
                         iconColor: AppColors.textColor,
                         width: 20.h,
                         height: 14.h,