fix DA-341

lib/config/localized_values.dart

@@ -709,6 +709,7 @@ const Map<String, Map<String, String>> localizedValues = {
   'otherDepartmentsInterventions': {'en': "Other departments interventions", 'ar': "تدخلات الأقسام الأخرى"},
   'otherProcedure': {'en': "Other procedure", 'ar': "إجراء آخر"},
   'admissionRequestSuccessMsg': {'en': "Admission Request Created Successfully", 'ar': "تم إنشاء طلب القبول بنجاح"},
-  // 'icd': {'en': "ICD", 'ar': " "},
   'orderNo': {'en': "Order No : ", 'ar': "رقم الطلب"},
+  'infoStatus': {'en': "Info Status", 'ar': "حالة المعلومات"},
+  'doctorResponse': {'en': "Doctor Response", 'ar': "استجابة الطبيب"},
 };

lib/models/doctor/list_gt_my_patients_question_model.dart

@@ -1,5 +1,7 @@
 import 'package:doctor_app_flutter/util/helpers.dart';
 
+
+
 class ListGtMyPatientsQuestions {
   String setupID;
   int projectID;
@@ -17,11 +19,14 @@ class ListGtMyPatientsQuestions {
   int editedBy;
   String editedOn;
   String patientName;
-  String patientNameN;
+  Null patientNameN;
   int gender;
   String dateofBirth;
   String mobileNumber;
   String emailAddress;
+  String doctorResponse;
+  String infoStatus;
+  Null clinicID;
   String age;
   String genderDescription;
   bool isVidaCall;
@@ -48,6 +53,9 @@ class ListGtMyPatientsQuestions {
         this.dateofBirth,
         this.mobileNumber,
         this.emailAddress,
+        this.doctorResponse,
+        this.infoStatus,
+        this.clinicID,
         this.age,
         this.genderDescription,
         this.isVidaCall});
@@ -61,6 +69,7 @@ class ListGtMyPatientsQuestions {
     doctorID = json['DoctorID'];
     requestType = json['RequestType'];
     requestDate = Helpers.convertStringToDate(json['RequestDate']) ;
+
     requestTime = json['RequestTime'];
     remarks = json['Remarks'];
     status = json['Status'];
@@ -74,6 +83,9 @@ class ListGtMyPatientsQuestions {
     dateofBirth = json['DateofBirth'];
     mobileNumber = json['MobileNumber'];
     emailAddress = json['EmailAddress'];
+    doctorResponse = json['DoctorResponse'];
+    infoStatus = json['InfoStatus'];
+    clinicID = json['ClinicID'];
     age = json['Age'];
     genderDescription = json['GenderDescription'];
     isVidaCall = json['IsVidaCall'];
@@ -102,9 +114,12 @@ class ListGtMyPatientsQuestions {
     data['DateofBirth'] = this.dateofBirth;
     data['MobileNumber'] = this.mobileNumber;
     data['EmailAddress'] = this.emailAddress;
+    data['DoctorResponse'] = this.doctorResponse;
+    data['InfoStatus'] = this.infoStatus;
+    data['ClinicID'] = this.clinicID;
     data['Age'] = this.age;
     data['GenderDescription'] = this.genderDescription;
     data['IsVidaCall'] = this.isVidaCall;
     return data;
   }
-}
+}

lib/util/translations_delegate_base.dart

@@ -1104,6 +1104,8 @@ class TranslationBase {
   String get otherDepartmentsInterventions => localizedValues['otherDepartmentsInterventions'][locale.languageCode];
   String get otherProcedure => localizedValues['otherProcedure'][locale.languageCode];
   String get admissionRequestSuccessMsg => localizedValues['admissionRequestSuccessMsg'][locale.languageCode];
+  String get infoStatus => localizedValues['infoStatus'][locale.languageCode];
+  String get doctorResponse => localizedValues['doctorResponse'][locale.languageCode];
 }
 
 class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

lib/widgets/doctor/doctor_reply_widget.dart

@@ -167,12 +167,58 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
                   children: <Widget>[
                     Divider(color: Colors.grey),
                     SizedBox(height: 5,),
-                    AppText(
-                      widget.reply.remarks,
-                      fontSize: 2.5 * SizeConfig.textMultiplier,
-                      //fontWeight: FontWeight.bold,
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        AppText(
+                          TranslationBase.of(context).remarks + " : ",
+                          fontSize: 2.5 * SizeConfig.textMultiplier,
+                          //fontWeight: FontWeight.bold,
+                        ),Expanded(
+                          child: AppText(
+                            widget.reply.remarks,
+                            fontSize: 2.5 * SizeConfig.textMultiplier,
+                            //fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                      ],
                     ),
-                    SizedBox(height: 10,)
+                    SizedBox(height: 10,),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        AppText(
+                          TranslationBase.of(context).doctorResponse + " : ",
+                          fontSize: 2.5 * SizeConfig.textMultiplier,
+                          //fontWeight: FontWeight.bold,
+                        ),Expanded(
+                          child: AppText(
+                            widget.reply.doctorResponse,
+                            fontSize: 2.5 * SizeConfig.textMultiplier,
+                            //fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                      ],
+                    ),SizedBox(height: 10,),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        AppText(
+                          TranslationBase.of(context).infoStatus + " : ",
+                          fontSize: 2.5 * SizeConfig.textMultiplier,
+                          //fontWeight: FontWeight.bold,
+                        ),Expanded(
+                          child: AppText(
+                            widget.reply.infoStatus,
+                            fontSize: 2.5 * SizeConfig.textMultiplier,
+                            //fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                      ],
+                    )
                   ],
                 ),
               ),