finish clinic exept design

merge-requests/120/head
Elham Rababah 6 years ago
parent 165d697e33
commit 574a951fcf

@ -9,6 +9,7 @@ class ChangePasswordScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
isShowAppBar: false,
body: SafeArea( body: SafeArea(
child: ListView(children: <Widget>[ child: ListView(children: <Widget>[
Container( Container(

@ -12,8 +12,8 @@ import '../../widgets/auth/login_form.dart';
import '../../widgets/shared/app_scaffold_widget.dart'; import '../../widgets/shared/app_scaffold_widget.dart';
import '../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; import '../../widgets/shared/dr_app_circular_progress_Indeicator.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
class Loginsreen extends StatefulWidget { class Loginsreen extends StatefulWidget {
@override @override
_LoginsreenState createState() => _LoginsreenState(); _LoginsreenState createState() => _LoginsreenState();
@ -56,10 +56,10 @@ class _LoginsreenState extends State<Loginsreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
getSharedPref(); getSharedPref();
return AppScaffold( return AppScaffold(
isLoading: _isLoading, isLoading: _isLoading,
isShowAppBar: false,
body: SafeArea( body: SafeArea(
child: ListView(children: <Widget>[ child: ListView(children: <Widget>[
FutureBuilder( FutureBuilder(
@ -80,24 +80,24 @@ class _LoginsreenState extends State<Loginsreen> {
children: <Widget>[ children: <Widget>[
(platformImei == null) (platformImei == null)
? Column( ? Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AuthHeader(loginType.knownUser), AuthHeader(loginType.knownUser),
LoginForm( LoginForm(
changeLoadingStata: changeLoadingStata:
changeLoadingStata, changeLoadingStata,
), ),
], ],
) )
: Column( : Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AuthHeader(loginType.unknownUser), AuthHeader(loginType.unknownUser),
KnownUserLogin(), KnownUserLogin(),
], ],
), ),
])); ]));
} }
} }

@ -38,6 +38,7 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
isLoading: _isLoading, isLoading: _isLoading,
isShowAppBar: false,
body: ListView(children: <Widget>[ body: ListView(children: <Widget>[
Container( Container(
margin: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), margin: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0),

@ -30,6 +30,7 @@ class _VerifyAccountScreenState extends State<VerifyAccountScreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
isLoading: _isLoading, isLoading: _isLoading,
isShowAppBar: false,
body: SafeArea( body: SafeArea(
child: ListView(children: <Widget>[ child: ListView(children: <Widget>[
Container( Container(

@ -13,6 +13,7 @@ import 'package:doctor_app_flutter/screens/medicine/medicine_search_screen.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/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:percent_indicator/circular_percent_indicator.dart'; import 'package:percent_indicator/circular_percent_indicator.dart';
@ -26,6 +27,7 @@ import '../widgets/shared/rounded_container_widget.dart';
import 'doctor/doctor_reply_screen.dart'; import 'doctor/doctor_reply_screen.dart';
import 'doctor/my_referral_patient_screen.dart'; import 'doctor/my_referral_patient_screen.dart';
import 'doctor/my_referred_patient_screen.dart'; import 'doctor/my_referred_patient_screen.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
Helpers helpers = Helpers(); Helpers helpers = Helpers();
@ -41,20 +43,21 @@ class DashboardScreen extends StatefulWidget {
class _DashboardScreenState extends State<DashboardScreen> { class _DashboardScreenState extends State<DashboardScreen> {
HospitalProvider hospitalProvider; HospitalProvider hospitalProvider;
AuthProvider authProvider; AuthProvider authProvider;
bool isLoading = false;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
hospitalProvider = Provider.of(context); hospitalProvider = Provider.of(context);
authProvider = Provider.of(context); authProvider = Provider.of(context);
print(authProvider.doctorsClinicList); print(authProvider.doctorsClinicList);
FocusScopeNode currentFocus = FocusScope.of(context); FocusScopeNode currentFocus = FocusScope.of(context);
if (!currentFocus.hasPrimaryFocus) { if (!currentFocus.hasPrimaryFocus) {
currentFocus.unfocus(); currentFocus.unfocus();
} }
return SafeArea( return SafeArea(
bottom: true, bottom: true,
child: Scaffold( child: AppScaffold(
isShowAppBar: false,
isLoading: isLoading,
body: SingleChildScrollView( body: SingleChildScrollView(
child: SizedBox( child: SizedBox(
height: MediaQuery.of(context).size.height * 1.09, height: MediaQuery.of(context).size.height * 1.09,
@ -434,11 +437,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
), ),
), ),
); );
} }
showCupertinoPicker( showCupertinoPicker(
{context, List<ClinicModel> actionList, decKey, onSelectFun}) { {context, List<ClinicModel> actionList, decKey, onSelectFun}) {
showModalBottomSheet( showModalBottomSheet(
@ -487,11 +487,12 @@ class _DashboardScreenState extends State<DashboardScreen> {
children: actionList children: actionList
.map((e) => Container( .map((e) => Container(
child: InkWell( child: InkWell(
onTap: ()=>changeClinic(e.clinicID,context), onTap: () =>
changeClinic(e.clinicID, context),
child: Text( child: Text(
e.clinicName, e.clinicName,
style: TextStyle(fontSize: 15), style: TextStyle(fontSize: 15),
)), )),
)) ))
.toList(), .toList(),
)) ))
@ -501,10 +502,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
}); });
} }
changeClinic(clinicId , BuildContext context) async{ changeClinic(clinicId, BuildContext context) async {
Navigator.pop(context);
changeIsLoading(true);
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel doctorProfile = DoctorProfileModel doctorProfile = new DoctorProfileModel.fromJson(profile);
new DoctorProfileModel.fromJson(profile);
ProfileReqModel docInfo = new ProfileReqModel( ProfileReqModel docInfo = new ProfileReqModel(
doctorID: doctorProfile.doctorID, doctorID: doctorProfile.doctorID,
clinicID: clinicId, clinicID: clinicId,
@ -513,16 +515,21 @@ class _DashboardScreenState extends State<DashboardScreen> {
tokenID: '', tokenID: '',
languageID: 2); languageID: 2);
// authProvider.getDocProfiles(docInfo) // authProvider.getDocProfiles(docInfo)
authProvider.getDocProfiles(docInfo.toJson()).then((res)async { authProvider.getDocProfiles(docInfo.toJson()).then((res) async {
sharedPref.setObj(DOCTOR_PROFILE, res['DoctorProfileList'][0]);
Navigator.pop(context); changeIsLoading(false);
sharedPref.setObj(DOCTOR_PROFILE, res['DoctorProfileList'][0]);
}).catchError((err) {
// changeLoadingStata(false); }).catchError((err) {
changeIsLoading(false);
helpers.showErrorToast(err); helpers.showErrorToast(err);
}); });
} }
changeIsLoading(bool val) {
setState(() {
this.isLoading = val;
});
}
} }

@ -1,11 +1,11 @@
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class MessagesScreen extends StatelessWidget { class MessagesScreen extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return AppScaffold(
isShowAppBar: false,
body: Center( body: Center(
child: Text('Messages heeer'), child: Text('Messages heeer'),
), ),

@ -1,6 +1,7 @@
import 'package:doctor_app_flutter/providers/schedule_provider.dart'; import 'package:doctor_app_flutter/providers/schedule_provider.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/doctor/my_schedule_widget.dart'; import 'package:doctor_app_flutter/widgets/doctor/my_schedule_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -13,7 +14,8 @@ class MyScheduleScreen extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
scheduleProvider = Provider.of(context); scheduleProvider = Provider.of(context);
return Scaffold( return AppScaffold(
isShowAppBar: false,
body: scheduleProvider.isLoading body: scheduleProvider.isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: scheduleProvider.isError : scheduleProvider.isError

@ -4,7 +4,8 @@ import 'package:flutter/material.dart';
class ServicesScreen extends StatelessWidget { class ServicesScreen extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return AppScaffold(
isShowAppBar: false,
body: Center( body: Center(
child: Text('Services heeer'), child: Text('Services heeer'),
), ),

@ -98,7 +98,8 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
}); });
} }
} catch (err) { } catch (err) {
handelCatchErrorCase(err); error = err;
// handelCatchErrorCase(err);
} }
} }

@ -106,7 +106,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
setState(() { setState(() {
_isError = true; _isError = true;
_isLoading = false; _isLoading = false;
this.error = helpers.generateContactAdminMsg(error); this.error = error;
}); });
}); });
} }

@ -359,12 +359,9 @@ class _VerifyAccountState extends State<VerifyAccount> {
loginProcessCompleted( loginProcessCompleted(
res['List_DoctorProfile'][0], changeLoadingStata); res['List_DoctorProfile'][0], changeLoadingStata);
} else { } else {
_asyncSimpleDialog(context, res['List_DoctorsClinic'], 'ClinicName', ClinicModel clinic =
'Please Select Clinic') ClinicModel.fromJson(res['List_DoctorsClinic'][0]);
.then((clinicInfo) { getDocProfiles(clinic, changeLoadingStata);
ClinicModel clinic = ClinicModel.fromJson(clinicInfo);
getDocProfiles(clinic, changeLoadingStata);
});
} }
} else { } else {
changeLoadingStata(false); changeLoadingStata(false);
@ -372,9 +369,7 @@ class _VerifyAccountState extends State<VerifyAccount> {
} }
}).catchError((err) { }).catchError((err) {
changeLoadingStata(false); changeLoadingStata(false);
helpers.showErrorToast(err);
print('$err');
helpers.showErrorToast();
}); });
} else { } else {
// changeLoadingStata(false); // changeLoadingStata(false);
@ -440,7 +435,6 @@ class _VerifyAccountState extends State<VerifyAccount> {
helpers.showErrorToast(res['ErrorEndUserMessage']); helpers.showErrorToast(res['ErrorEndUserMessage']);
} }
}).catchError((err) { }).catchError((err) {
changeLoadingStata(false); changeLoadingStata(false);
helpers.showErrorToast(err); helpers.showErrorToast(err);
}); });

@ -9,15 +9,16 @@ class AppScaffold extends StatelessWidget {
String appBarTitle; String appBarTitle;
Widget body; Widget body;
bool isLoading; bool isLoading;
bool isShowAppBar;
AppScaffold({this.appBarTitle ='', this.body, this.isLoading = false}); AppScaffold({this.appBarTitle ='', this.body, this.isLoading = false, this.isShowAppBar = true});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
AppGlobal.CONTEX = context; AppGlobal.CONTEX = context;
return Scaffold( return Scaffold(
backgroundColor: Hexcolor('#F5F5F5'), backgroundColor: Hexcolor('#F5F5F5'),
appBar: appBarTitle != '' appBar: isShowAppBar
? AppBar( ? AppBar(
elevation: 0, elevation: 0,
backgroundColor: Hexcolor('#515B5D'), backgroundColor: Hexcolor('#515B5D'),

Loading…
Cancel
Save