Translation & UI updates

merge-update-with-lab-changes
haroon amjad 4 years ago
parent 90843252c3
commit 03882c166c

@ -1072,8 +1072,8 @@ const Map localizedValues = {
"added-child": {"en": "The request was successful. You have added a child to the vaccination schedule subscription service.", "ar": "تمت الاضافة بنجاح."},
"appUpdate": {"en": "UPDATE THE APP", "ar": "تحديث التطبيق"},
"ereferralSaveSuccess": {
"en": "The referral request has been submitted successfully, you will be contacted ASAP to complete the process. Referral request no is ",
"ar": " تم إرسال طلب الإحالة بنجاح ، وسيتم الاتصال بك في أسرع وقت ممكن لإكمال العملية. رقم طلب الإحالة"
"en": "The referral request has been submitted successfully, you will be contacted ASAP to complete the process.",
"ar": " تم إرسال طلب الإحالة بنجاح ، وسيتم الاتصال بك في أسرع وقت ممكن لإكمال العملية."
},
"help": {"en": "Help", "ar": "مساعدة"},
"habibRobotText": {

@ -120,10 +120,11 @@ class BaseAppClient {
// if(body.containsKey("patientOutSa"))
// body.remove("PatientOutSA");
//
// body['PatientID'] = 1018977;
// body['TokenID'] = "@dm!n";
// body['IdentificationNo'] = "1009199553";
// body['MobileNo'] = "966545156035";
body['PatientID'] = 1018977;
body['TokenID'] = "@dm!n";
body['IdentificationNo'] = "1009199553";
body['MobileNo'] = "966545156035";
body['PatientMobileNumber'] = "966545156035";
print("URL : $url");
final jsonBody = json.encode(body);

@ -8,10 +8,8 @@ import 'package:diplomaticquarterapp/core/viewModels/all_habib_medical_services/
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/E-Referral/dialogs/select_country_ingo_Dialog.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/E-Referral/dialogs/select_relation_type_dialog.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/medical/balance/new_text_Field.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
@ -19,7 +17,6 @@ import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/otp/sms-popup.dart';
@ -107,7 +104,7 @@ class _NewEReferralStepOnePageState extends State<NewEReferralStepOnePage> {
SizedBox(
height: 12,
),
Directionality(textDirection: TextDirection.ltr, child: inputWidget(TranslationBase.of(context).enterReferralRequesterName, "", _nameTextController, isInputTypeNum: true)),
inputWidget(TranslationBase.of(context).enterReferralRequesterName, "", _nameTextController, isInputTypeNum: false),
SizedBox(
height: 12,
),
@ -187,17 +184,17 @@ class _NewEReferralStepOnePageState extends State<NewEReferralStepOnePage> {
(_nameTextController.text.isEmpty || _selectedRelation == null || mobileNo.isEmpty)
? null
: () async {
Future.delayed(new Duration(milliseconds: 300)).then((value) async {
GifLoaderDialogUtils.showMyDialog(context);
SendActivationCodeForEReferralRequestModel sendActivationCodeForEReferralRequestModel = SendActivationCodeForEReferralRequestModel(
zipCode: _selectedCountry['code'],
patientMobileNumber: int.parse(mobileNo),
);
await model.sendActivationCodeForEReferral(sendActivationCodeForEReferralRequestModel);
GifLoaderDialogUtils.hideDialog(context);
showSMSDialog(model);
});
},
Future.delayed(new Duration(milliseconds: 300)).then((value) async {
GifLoaderDialogUtils.showMyDialog(context);
SendActivationCodeForEReferralRequestModel sendActivationCodeForEReferralRequestModel = SendActivationCodeForEReferralRequestModel(
zipCode: _selectedCountry['code'],
patientMobileNumber: int.parse(mobileNo),
);
await model.sendActivationCodeForEReferral(sendActivationCodeForEReferralRequestModel);
GifLoaderDialogUtils.hideDialog(context);
showSMSDialog(model);
});
},
disabledColor: Colors.grey,
),
),

@ -238,7 +238,7 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
height: 12,
),
Container(
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
// decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
child: Column(
children: [
Row(
@ -248,17 +248,19 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
children: [
Checkbox(
value: isPatientInsured,
activeColor: Colors.black38,
activeColor: CustomColors.accentColor,
onChanged: (bool newValue) {
setState(() {
isPatientInsured = newValue;
});
}),
Padding(
padding: const EdgeInsets.all(20.0),
child: Texts(
TranslationBase.of(context).insuredPatientReferral,
fontSize: 17,
padding: const EdgeInsets.all(5.0),
child: Text(
TranslationBase.of(context).insuredPatientReferral, style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600
),
),
),
],
@ -385,7 +387,7 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
Utils.showErrorToast(model.error);
} else {
GifLoaderDialogUtils.hideDialog(context);
AppToast.showSuccessToast(message: "Referral sent successfully");
AppToast.showSuccessToast(message: TranslationBase.of(context).ereferralSaveSuccess);
}
});
},

@ -41,7 +41,7 @@ class _NewEReferralStepTowPageState extends State<NewEReferralStepTowPage> {
// todo create a model for Country
// todo use country from the json
dynamic _selectedCountry = {"name": "Saudi Arabia", "name_ar": "المملكة العربية السعودية", "code": "+966", "countryCode": "SA", "pattern": "5xxxxxxxx", "maxLength": 9};
dynamic _selectedCountry = {"name": "Saudi Arabia", "name_ar": "المملكة العربية السعودية", "code": "966", "countryCode": "SA", "pattern": "5xxxxxxxx", "maxLength": 9};
AppSharedPreferences sharedPref = AppSharedPreferences();
AuthenticatedUser authUser;
@ -85,7 +85,7 @@ class _NewEReferralStepTowPageState extends State<NewEReferralStepTowPage> {
SizedBox(
height: 12,
),
inputWidget(TranslationBase.of(context).patientName, "", _patientNameTextController, isInputTypeNum: true),
inputWidget(TranslationBase.of(context).patientName, "", _patientNameTextController, isInputTypeNum: false),
SizedBox(
height: 12,
),

@ -30,7 +30,7 @@ class _ReferralDetailsState extends State<ReferralDetails> {
Container(
width: double.infinity,
child: Card(
elevation: 3.0,
elevation: 0.0,
shape: cardRadius(12),
margin:
EdgeInsets.only(left: 16, top: 8, right: 16, bottom: 16),

@ -140,7 +140,7 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
height: 12,
),
inputWidget(selectedCriteria.value == 1 ? "Enter Patient Identification No" : "Enter Referral Number", "", _searchTextController, isInputTypeNum: true),
inputWidget(selectedCriteria.value == 1 ? TranslationBase.of(context).enterIdentificationNumber : TranslationBase.of(context).referralNumber, "", _searchTextController, isInputTypeNum: true),
SizedBox(
height: 12,
@ -203,8 +203,8 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
);
},
child: Card(
elevation: 0.0,
shape: cardRadius(12),
margin: EdgeInsets.all(10),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Row(

Loading…
Cancel
Save