fix DA-220

lib/config/localized_values.dart

@@ -698,5 +698,5 @@ const Map<String, Map<String, String>> localizedValues = {
   'referralResponse': {'en': "Referral Response : ", 'ar': " : استجابة الإحالة"},
   'estimatedCost': {'en': "Estimated Cost", 'ar': "التكلفة المتوقعة"},
   'diagnosisDetail': {'en': "Diagnosis Detail : ", 'ar': "تفاصيل التشخيص"},
-  // 'icd': {'en': "ICD", 'ar': " "},
+  'orderNo': {'en': "Order No : ", 'ar': "رقم الطلب"},
 };

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

@@ -143,6 +143,9 @@ class _LabOrdersScreenState extends State<LabOrdersScreen> {
                                         crossAxisAlignment:
                                         CrossAxisAlignment.start,
                                         children: <Widget>[
+                                          if(model
+                                              .patientLabResultOrdersList[index]
+                                              .doctorName != null )
                                           AppText(
                                             '${model
                                                 .patientLabResultOrdersList[index]
@@ -171,7 +174,7 @@ class _LabOrdersScreenState extends State<LabOrdersScreen> {
                                             MainAxisAlignment.start,
                                             children: <Widget>[
                                               AppText(
-                                                ' Invoice No :',
+                                                TranslationBase.of(context).invoiceNo,
                                                 fontSize: 2 *
                                                     SizeConfig
                                                         .textMultiplier,
@@ -187,6 +190,30 @@ class _LabOrdersScreenState extends State<LabOrdersScreen> {
                                                 color: Colors.grey[800],
                                               ),
                                             ],
+                                          ),SizedBox(
+                                            height: 8,
+                                          ),
+                                          Row(
+                                            mainAxisAlignment:
+                                            MainAxisAlignment.start,
+                                            children: <Widget>[
+                                              AppText(
+                                                TranslationBase.of(context).orderNo,
+                                                fontSize: 2 *
+                                                    SizeConfig
+                                                        .textMultiplier,
+                                                color: Colors.grey[800],
+                                              ),
+                                              AppText(
+                                                ' ${model
+                                                    .patientLabResultOrdersList[index]
+                                                    .orderNo}',
+                                                fontSize: 2 *
+                                                    SizeConfig
+                                                        .textMultiplier,
+                                                color: Colors.grey[800],
+                                              ),
+                                            ],
                                           )
                                         ],
                                       ),

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

@@ -37,19 +37,39 @@ class _LabResultState extends State<LabResult> {
                 child: ListView(
                   children: <Widget>[
                     CardWithBgWidgetNew(
-                      widget: Row(
-                        mainAxisAlignment: MainAxisAlignment.start,
-                        children: <Widget>[
-                          AppText(
-                            TranslationBase.of(context).invoiceNo,
-                            fontSize: 2 * SizeConfig.textMultiplier,
-                            color: Colors.grey[800],
+                      widget: Column(
+                        children: [
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.start,
+                            children: <Widget>[
+                              AppText(
+                                TranslationBase.of(context).orderNo,
+                                fontSize: 2 * SizeConfig.textMultiplier,
+                                color: Colors.grey[800],
+                              ),
+                              AppText(
+                                ' ${widget.labOrders.orderNo}',
+                                fontSize: 2 * SizeConfig.textMultiplier,
+                                color: Colors.grey[800],
+                              ),
+                            ],
                           ),
-                          AppText(
-                            ' ${widget.labOrders.invoiceNo}',
-                            fontSize: 2 * SizeConfig.textMultiplier,
-                            color: Colors.grey[800],
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.start,
+                            children: <Widget>[
+                              AppText(
+                                TranslationBase.of(context).invoiceNo,
+                                fontSize: 2 * SizeConfig.textMultiplier,
+                                color: Colors.grey[800],
+                              ),
+                              AppText(
+                                ' ${widget.labOrders.invoiceNo}',
+                                fontSize: 2 * SizeConfig.textMultiplier,
+                                color: Colors.grey[800],
+                              ),
+                            ],
                           ),
+
                         ],
                       ),
                     ),

lib/util/translations_delegate_base.dart

@@ -248,6 +248,7 @@ class TranslationBase {
       localizedValues['errorNoProgressNote'][locale.languageCode];
 
   String get invoiceNo => localizedValues['invoiceNo:'][locale.languageCode];
+  String get orderNo => localizedValues['orderNo'][locale.languageCode];
 
   String get generalResult =>
       localizedValues['generalResult'][locale.languageCode];

lib/widgets/doctor/lab_result_widget.dart

@@ -27,7 +27,7 @@ class _LabResultWidgetState extends State<LabResultWidget> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           Row(
-            mainAxisAlignment: MainAxisAlignment.spaceAround,
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
               AppText(

lib/widgets/patients/profile/large_avatar.dart

@@ -1,3 +1,4 @@
+import 'package:doctor_app_flutter/config/size_config.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -24,16 +25,20 @@ class LargeAvatar extends StatelessWidget {
 
   Widget _getAvatar() {
     if (url != null && url.isNotEmpty && Uri.parse(url).isAbsolute) {
-      return Center(
+      return CircleAvatar(
+        radius:
+        SizeConfig.imageSizeMultiplier * 12,
+        //     radius: (52)
         child: ClipRRect(
-          borderRadius: BorderRadius.all(Radius.circular(radius)),
+          borderRadius:BorderRadius.circular(50),
+
           child: Image.network(
-            url.trim(),
-            fit: BoxFit.cover,
-            width: width,
-            height: height,
+           url,
+            fit: BoxFit.fill,
+            width: 700,
           ),
         ),
+        backgroundColor: Colors.transparent,
       );
     } else if (name == null || name.isEmpty) {
       return Center(