Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon

merge-update-with-lab-changes
haroon amjad 5 years ago
commit 9096ccd4d4

@ -5,7 +5,6 @@ import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResu
import 'package:diplomaticquarterapp/pages/MyAppointments/models/AppointmentType.dart'; import 'package:diplomaticquarterapp/pages/MyAppointments/models/AppointmentType.dart';
import 'package:diplomaticquarterapp/pages/MyAppointments/widgets/AppointmentCardView.dart'; import 'package:diplomaticquarterapp/pages/MyAppointments/widgets/AppointmentCardView.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
@ -36,7 +35,8 @@ class _MyAppointmentsState extends State<MyAppointments>
bool isDataLoaded = false; bool isDataLoaded = false;
var sharedPref = new AppSharedPreferences(); var sharedPref = new AppSharedPreferences();
AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>(); AuthenticatedUserObject authenticatedUserObject =
locator<AuthenticatedUserObject>();
@override @override
void initState() { void initState() {
@ -241,33 +241,6 @@ class _MyAppointmentsState extends State<MyAppointments>
Widget getBookedAppointments() { Widget getBookedAppointments() {
return Container( return Container(
child: widget.bookedAppoList.length != 0
? new ListView.builder(
itemCount: widget.bookedAppoList.length,
itemBuilder: (context, i) {
return AppointmentCard(
appo: widget.bookedAppoList[i],
onReloadAppointmentHistory: getPatientAppointmentHistory,
);
},
)
: Container(
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
// Image.asset(
// "assets/images/new-design/noAppointmentIcon.png"),
// Container(
// margin: EdgeInsets.only(top: 10.0),
// child: Text(TranslationBase.of(context).noBookedAppointments,
// style: TextStyle(
// fontSize: 16.0,
// )),
// ),
Container(
margin: EdgeInsets.only(top: 10.0),
child: Container( child: Container(
child: widget.bookedAppoList.length != 0 child: widget.bookedAppoList.length != 0
? SingleChildScrollView( ? SingleChildScrollView(
@ -275,21 +248,16 @@ class _MyAppointmentsState extends State<MyAppointments>
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
...List.generate( ...List.generate(
widget._patientBookedAppointmentListHospital widget._patientBookedAppointmentListHospital.length,
.length,
(index) => AppExpandableNotifier( (index) => AppExpandableNotifier(
title: widget title: widget
._patientBookedAppointmentListHospital[ ._patientBookedAppointmentListHospital[index]
index]
.filterName, .filterName,
bodyWidget: Column( bodyWidget: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: widget children: widget
._patientBookedAppointmentListHospital[ ._patientBookedAppointmentListHospital[index]
index]
.patientDoctorAppointmentList .patientDoctorAppointmentList
.map((doctor) { .map((doctor) {
return AppointmentCard( return AppointmentCard(
@ -323,9 +291,7 @@ class _MyAppointmentsState extends State<MyAppointments>
), ),
), ),
), ),
) );
],
))));
} }
Widget getConfirmedAppointments() { Widget getConfirmedAppointments() {

@ -1,9 +1,18 @@
import 'dart:async'; import 'dart:async';
import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'config/shared_pref_kay.dart';
import 'core/service/AuthenticatedUserObject.dart'; import 'core/service/AuthenticatedUserObject.dart';
import 'core/viewModels/project_view_model.dart';
import 'locator.dart'; import 'locator.dart';
import 'models/Authentication/authenticated_user.dart';
AppSharedPreferences sharedPref = new AppSharedPreferences();
AuthenticatedUserObject authenticatedUserObject =
locator<AuthenticatedUserObject>();
class SplashScreen extends StatefulWidget { class SplashScreen extends StatefulWidget {
@override @override
@ -11,17 +20,34 @@ class SplashScreen extends StatefulWidget {
} }
class _SplashScreenState extends State<SplashScreen> { class _SplashScreenState extends State<SplashScreen> {
//Provider.of<ProjectViewModel>(context, listen: false).isLogin
@override @override
void initState() { void initState() {
super.initState(); super.initState();
Timer( Timer(
Duration(seconds: 3), Duration(seconds: 1, milliseconds: 500),
() => Navigator.of(context).pushReplacement( () {
getUserData().then((value) {
Navigator.of(context).pushReplacement(
MaterialPageRoute( MaterialPageRoute(
builder: (BuildContext context) => LandingPage(), builder: (BuildContext context) => LandingPage(),
), ),
),
); );
});
},
);
}
Future getUserData() async {
var data = await sharedPref.getObject(USER_PROFILE);
if (data != null) {
AuthenticatedUser userData = AuthenticatedUser.fromJson(data);
Provider.of<ProjectViewModel>(context, listen: false).isLogin = true;
authenticatedUserObject.isLogin = true;
authenticatedUserObject.user = userData;
}else{
var asd="";
}
} }
@override @override
@ -30,7 +56,7 @@ class _SplashScreenState extends State<SplashScreen> {
backgroundColor: Colors.white, backgroundColor: Colors.white,
body: Center( body: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(12.0),
child: Image.asset('assets/images/DQ/DQ_logo.png'), child: Image.asset('assets/images/DQ/DQ_logo.png'),
), ),
), ),

Loading…
Cancel
Save