Merge branch 'pharmacy_redesign' into 'development'

fix issues in lab order

See merge request Cloud_Solution/doctor_app_flutter!966

lib/core/model/labs/patient_lab_orders.dart

@@ -26,6 +26,7 @@ class PatientLabOrders {
   String nationalityFlagURL;
   int noOfPatientsRate;
   DateTime orderDate;
+  DateTime createdOn;
   String orderNo;
   String patientID;
   String projectID;
@@ -98,6 +99,7 @@ class PatientLabOrders {
     nationalityFlagURL = json['NationalityFlagURL'];
     noOfPatientsRate = json['NoOfPatientsRate'];
     orderDate = AppDateUtils.convertStringToDate(json['OrderDate']);
+    createdOn = AppDateUtils.convertStringToDate(json['CreatedOn']);
     orderNo = json['OrderNo'].toString();
     patientID = json['PatientID'].toString();
     projectID = json['ProjectID'].toString();

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

@@ -16,7 +16,7 @@ class LabResultHistoryPage extends StatelessWidget {
 
   LabResultHistoryPage({this.patientLabOrder, this.filterName, this.patient});
 
-// TODO mosa UI changes
+// TODO Elham* UI changes and add translation
   @override
   Widget build(BuildContext context) {
     return BaseView<LabsViewModel>(

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

@@ -24,12 +24,6 @@ class _VitalSignDetailsWidgetState extends State<LabResultDetailsWidget> {
   Widget build(BuildContext context) {
     ProjectViewModel projectViewModel = Provider.of(context);
     return Container(
-      /*  decoration: BoxDecoration(
-        color: Colors.transparent,
-        borderRadius: BorderRadius.only(
-            topLeft: Radius.circular(10.0), topRight: Radius.circular(10.0)),
-        border: Border.all(color: Colors.grey, width: 1),
-      ),*/
       margin: EdgeInsets.all(0),
       child: Container(
         color: Colors.transparent,

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

@@ -75,7 +75,8 @@ class _LabResultState extends State<LabResult> {
                     CardWithBgWidgetNew(
                         widget: LabResultWidget(
                       labResult: model.labResultList,
-                    ))
+                    ),
+                    )
                   ],
                 ),
               ),

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

@@ -210,7 +210,7 @@ class _LabsHomePageState extends State<LabsHomePage> {
                             clinic: model
                                 .patientLabOrdersList[index].clinicDescription,
                             appointmentDate:
-                                model.patientLabOrdersList[index].orderDate,
+                                model.patientLabOrdersList[index].createdOn,
                             orderNo: model.patientLabOrdersList[index].orderNo,
                             isShowTime: false,
                           ),