Merge branch 'fix_bugs_new' into 'development'

working on lab result detail page

See merge request Cloud_Solution/doctor_app_flutter!804

lib/config/config.dart

@@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]";
 const ONLY_LETTERS = "[a-zA-Z &'\"]";
 const ONLY_DATE = "[0-9/]";
 const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
-const BASE_URL = 'https://hmgwebservices.com/';
-// const BASE_URL = 'https://uat.hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
+const BASE_URL = 'https://uat.hmgwebservices.com/';
 const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
 const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
 const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";

lib/screens/patients/profile/lab_result/LabResultWidget.dart

@@ -45,25 +45,6 @@ class LabResultWidget extends StatelessWidget {
               Row(
                 children: [
                   AppText(filterName),
-                  InkWell(
-                    onTap: (){
-                      Navigator.push(
-                        context,
-                        FadePage(
-                          page: LabResultHistoryPage(
-                            filterName: filterName,
-                            patientLabOrder: patientLabOrder,
-                            patient: patient,
-                          ),
-                        ),
-                      );
-                    },
-                    child: AppText(
-                      " (show details)",
-                      color: Colors.blue,
-                      fontSize: 12,
-                    ),
-                  ),
                 ],
               ),
               InkWell(
@@ -138,7 +119,27 @@ class LabResultWidget extends StatelessWidget {
           ...List.generate(
               patientLabResultList.length,
               (index) => Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
+                      InkWell(
+                        onTap: (){
+                          Navigator.push(
+                            context,
+                            FadePage(
+                              page: LabResultHistoryPage(
+                                filterName: patientLabResultList[index].description,
+                                patientLabOrder: patientLabOrder,
+                                patient: patient,
+                              ),
+                            ),
+                          );
+                        },
+                        child: AppText(
+                          " (show details)",
+                          color: Colors.blue,
+                          fontSize: 12,
+                        ),
+                      ),
                       Row(
                         children: [
                           Expanded(

lib/screens/patients/profile/medical_report/MedicalReportDetailPage.dart

@@ -75,6 +75,8 @@ class MedicalReportDetailPage extends StatelessWidget {
                     ),
                   ),
                   child: Html(
+
+
                       data: medicalReport.reportDataHtml ?? ""
                   ),
                 ) : Container(