Merge branch 'hussam' into 'development'

translation 'updates'

See merge request Cloud_Solution/doctor_app_flutter!136
merge-requests/137/head
Elham 6 years ago
commit 7fe2a96065

@ -3,12 +3,15 @@ import 'dart:convert';
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/providers/project_provider.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:provider/provider.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
Helpers helpers = new Helpers(); Helpers helpers = new Helpers();
//ProjectProvider projectsProvider = new ProjectProvider();
/* /*
*@author: Mohammad Aljammal *@author: Mohammad Aljammal
@ -38,6 +41,7 @@ class BaseAppClient {
String token = await sharedPref.getString(TOKEN); String token = await sharedPref.getString(TOKEN);
if (profile != null) { if (profile != null) {
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
body['DoctorID'] = doctorProfile?.doctorID; body['DoctorID'] = doctorProfile?.doctorID;
body['EditedBy'] = doctorProfile?.doctorID; body['EditedBy'] = doctorProfile?.doctorID;
body['ProjectID'] = doctorProfile?.projectID; body['ProjectID'] = doctorProfile?.projectID;
@ -45,7 +49,13 @@ class BaseAppClient {
body['ClinicID'] = doctorProfile?.clinicID; body['ClinicID'] = doctorProfile?.clinicID;
} }
body['TokenID'] = token ?? ''; body['TokenID'] = token ?? '';
body['LanguageID'] = LANGUAGE_ID;
String lang = await sharedPref.getString(APP_Language);
if (lang != null && lang == 'ar')
body['LanguageID'] = 1;
else
body['LanguageID'] = 2;
body['stamp'] = STAMP; body['stamp'] = STAMP;
body['IPAdress'] = IP_ADDRESS; body['IPAdress'] = IP_ADDRESS;
body['VersionID'] = VERSION_ID; body['VersionID'] = VERSION_ID;

@ -59,6 +59,15 @@ var SERVICES_PATIANT_HEADER = [
"Tomorrow", "Tomorrow",
"Referral" "Referral"
]; ];
var SERVICES_PATIANT_HEADER_AR = [
"المريض الخارجي",
"المريض المنوم",
"المريض المعافى",
"المريض المحول الي",
"المريض المحال المعافى",
"مريض الغد",
"المريض المحول مني"
];
//****************** //******************
// Colors ////// by : ibrahim // Colors ////// by : ibrahim

@ -211,4 +211,6 @@ const Map<String, Map<String, String>> localizedValues = {
'en': 'You don\'t have any Orders', 'en': 'You don\'t have any Orders',
'ar': 'لا يوجد لديك اي طلبات' 'ar': 'لا يوجد لديك اي طلبات'
}, },
'beingBad': {'en': 'being bad', 'ar': 'سيء'},
'beingGreat': {'en': 'being great', 'ar': 'راثع'},
}; };

@ -6,7 +6,7 @@ class HospitalProvider with ChangeNotifier {
Future<Map> getProjectsList() async { Future<Map> getProjectsList() async {
const url = GET_PROJECTS; const url = GET_PROJECTS;
var info = { var info = {
"LanguageID": 2, "LanguageID": 1,
"stamp": "2020-02-26T13:51:44.111Z", "stamp": "2020-02-26T13:51:44.111Z",
"IPAdress": "11.11.11.11", "IPAdress": "11.11.11.11",
"VersionID": 1.2, "VersionID": 1.2,
@ -15,17 +15,13 @@ class HospitalProvider with ChangeNotifier {
"SessionID": "i1UJwCTSqt", "SessionID": "i1UJwCTSqt",
"IsLoginForDoctorApp": true "IsLoginForDoctorApp": true
}; };
dynamic localRes ; dynamic localRes;
await BaseAppClient.post(url, await BaseAppClient.post(url, onSuccess: (response, statusCode) async {
onSuccess: ( response, statusCode) async { localRes = response;
localRes= response; }, onFailure: (String error, int statusCode) {
},
onFailure: (String error, int statusCode) {
throw error; throw error;
}, }, body: info);
body: info);
return Future.value(localRes); return Future.value(localRes);
} }
} }

@ -3,6 +3,7 @@ import 'dart:typed_data';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/providers/medicine_provider.dart'; import 'package:doctor_app_flutter/providers/medicine_provider.dart';
import 'package:doctor_app_flutter/providers/project_provider.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
@ -34,6 +35,7 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
var _data; var _data;
Helpers helpers = new Helpers(); Helpers helpers = new Helpers();
MedicineProvider _medicineProvider; MedicineProvider _medicineProvider;
ProjectProvider projectsProvider;
bool _isInit = true; bool _isInit = true;
//bool _isOutOfStuck = false; //bool _isOutOfStuck = false;
@ -50,6 +52,7 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
projectsProvider = Provider.of(context);
return AppScaffold( return AppScaffold(
appBarTitle: TranslationBase.of(context).pharmaciesList, appBarTitle: TranslationBase.of(context).pharmaciesList,
body: Container( body: Container(
@ -150,7 +153,12 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
child: AppText( child: AppText(
TranslationBase.of(context).youCanFindItIn, TranslationBase.of(context).youCanFindItIn,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
))), ),
),
alignment: projectsProvider.isArabic
? Alignment.topRight
: Alignment.topLeft,
),
Expanded( Expanded(
child: Container( child: Container(
width: SizeConfig.screenWidth * 0.99, width: SizeConfig.screenWidth * 0.99,

@ -12,6 +12,7 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart';
import 'package:doctor_app_flutter/models/patient/topten_users_res_model.dart'; import 'package:doctor_app_flutter/models/patient/topten_users_res_model.dart';
import 'package:doctor_app_flutter/providers/patients_provider.dart'; import 'package:doctor_app_flutter/providers/patients_provider.dart';
import 'package:doctor_app_flutter/providers/project_provider.dart';
import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget.dart';
@ -53,7 +54,8 @@ class _PatientsScreenState extends State<PatientsScreen> {
final String assetName = 'assets/image.svg'; final String assetName = 'assets/image.svg';
// List<String> _locations = ['Today', 'Old Date', 'YESTERDAY']; // List<String> _locations = ['Today', 'Old Date', 'YESTERDAY'];
List<String> _locations = ['All', 'Today', 'Tomorrow', 'Next Week']; List<String> _locations = []; //['All', 'Today', 'Tomorrow', 'Next Week'];
int _activeLocation = 0; int _activeLocation = 0;
bool _isInit = true; bool _isInit = true;
@ -63,6 +65,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
bool _isError = true; bool _isError = true;
String error = ""; String error = "";
ProjectProvider projectsProvider;
final _controller = TextEditingController(); final _controller = TextEditingController();
@ -71,12 +74,18 @@ class _PatientsScreenState extends State<PatientsScreen> {
@override @override
void didChangeDependencies() { void didChangeDependencies() {
projectsProvider = Provider.of(context);
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
patient = routeArgs['patientSearchForm']; patient = routeArgs['patientSearchForm'];
patientType = routeArgs['selectedType']; patientType = routeArgs['selectedType'];
if (!projectsProvider.isArabic)
patientTypetitle = SERVICES_PATIANT_HEADER[int.parse(patientType)]; patientTypetitle = SERVICES_PATIANT_HEADER[int.parse(patientType)];
else
patientTypetitle = SERVICES_PATIANT_HEADER_AR[int.parse(patientType)];
print(patientType); print(patientType);
@ -296,6 +305,12 @@ class _PatientsScreenState extends State<PatientsScreen> {
*/ */
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_locations = [
TranslationBase.of(context).all,
TranslationBase.of(context).today,
TranslationBase.of(context).tomorrow,
TranslationBase.of(context).nextWeek,
];
PatientsProvider patientsProv = Provider.of<PatientsProvider>(context); PatientsProvider patientsProv = Provider.of<PatientsProvider>(context);
return AppScaffold( return AppScaffold(
@ -539,7 +554,8 @@ class _PatientsScreenState extends State<PatientsScreen> {
], ],
) )
: AppText( : AppText(
item.nationalityName, item.nationalityName ??
item.nationalityNameN,
fontSize: fontSize:
2.5 * 2.5 *
SizeConfig.textMultiplier, SizeConfig.textMultiplier,

@ -78,8 +78,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
Icons.crop_square, Icons.crop_square,
color: Colors.black, color: Colors.black,
subTitle: doctorProfile.doctorRate == 0 subTitle: doctorProfile.doctorRate == 0
? "being bad" ? TranslationBase.of(context).beingBad
: "being great", : TranslationBase.of(context).beingGreat,
), ),
], ],
), ),

@ -230,6 +230,8 @@ class TranslationBase {
localizedValues['prescriptionInfo'][locale.languageCode]; localizedValues['prescriptionInfo'][locale.languageCode];
String get errorNoOrders => String get errorNoOrders =>
localizedValues['errorNoOrders'][locale.languageCode]; localizedValues['errorNoOrders'][locale.languageCode];
String get beingBad => localizedValues['beingBad'][locale.languageCode];
String get beingGreat => localizedValues['beingGreat'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -127,13 +127,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "7.1.0" version: "7.1.0"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
@ -162,13 +155,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.2" version: "1.0.2"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
code_builder: code_builder:
dependency: transitive dependency: transitive
description: description:
@ -260,13 +246,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "4.1.4" version: "4.1.4"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
fixnum: fixnum:
dependency: transitive dependency: transitive
description: description:
@ -371,6 +350,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.1.4" version: "3.1.4"
image:
dependency: transitive
description:
name: image
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.12"
imei_plugin: imei_plugin:
dependency: "direct main" dependency: "direct main"
description: description:
@ -482,7 +468,7 @@ packages:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.7.0" version: "1.6.4"
pedantic: pedantic:
dependency: transitive dependency: transitive
description: description:
@ -511,6 +497,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.0" version: "2.0.0"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.0"
platform: platform:
dependency: transitive dependency: transitive
description: description:
@ -683,7 +676,7 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.16" version: "0.2.15"
timing: timing:
dependency: transitive dependency: transitive
description: description:
@ -747,6 +740,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.0"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "3.6.1"
yaml: yaml:
dependency: transitive dependency: transitive
description: description:
@ -755,5 +755,5 @@ packages:
source: hosted source: hosted
version: "2.2.1" version: "2.2.1"
sdks: sdks:
dart: ">=2.9.0-14.0.dev <3.0.0" dart: ">=2.7.0 <3.0.0"
flutter: ">=1.12.13+hotfix.5 <2.0.0" flutter: ">=1.12.13+hotfix.5 <2.0.0"

Loading…
Cancel
Save