Merge branch 'fix_issue_feb' into 'development'

Fix issue feb

See merge request Cloud_Solution/doctor_app_flutter!314
merge-requests/315/merge
Mohammad Aljammal 5 years ago
commit cd6a31f0d5

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

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

@ -209,7 +209,7 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
setState(() { setState(() {
isLoading = false; isLoading = false;
}); });
helpers.showErrorToast(error); helpers.showErrorToast(error.message);
//DrAppToastMsg.showErrorToast(error); //DrAppToastMsg.showErrorToast(error);
}); });
} }

@ -1104,6 +1104,8 @@ class TranslationBase {
String get otherDepartmentsInterventions => localizedValues['otherDepartmentsInterventions'][locale.languageCode]; String get otherDepartmentsInterventions => localizedValues['otherDepartmentsInterventions'][locale.languageCode];
String get otherProcedure => localizedValues['otherProcedure'][locale.languageCode]; String get otherProcedure => localizedValues['otherProcedure'][locale.languageCode];
String get admissionRequestSuccessMsg => localizedValues['admissionRequestSuccessMsg'][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> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -167,12 +167,58 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
children: <Widget>[ children: <Widget>[
Divider(color: Colors.grey), Divider(color: Colors.grey),
SizedBox(height: 5,), SizedBox(height: 5,),
AppText( Row(
widget.reply.remarks, mainAxisAlignment: MainAxisAlignment.start,
fontSize: 2.5 * SizeConfig.textMultiplier, crossAxisAlignment: CrossAxisAlignment.start,
//fontWeight: FontWeight.bold, 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,
),
),
],
)
], ],
), ),
), ),

Loading…
Cancel
Save