merge-requests/214/head
Sultan Khan 5 years ago
commit 70d11bfe9e

@ -36,21 +36,20 @@ class BaseAppClient {
}) async { }) async {
String url = BASE_URL + endPoint; String url = BASE_URL + endPoint;
try { try {
//TODO change it edit By Jammal Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
// Map profile = await sharedPref.getObj(DOCTOR_PROFILE); 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); if (body['DoctorID'] == null)
// if (body['DoctorID'] == null) body['DoctorID'] = doctorProfile?.doctorID;
body['DoctorID'] = 4709;//doctorProfile?.doctorID; body['EditedBy'] = doctorProfile?.doctorID;
body['EditedBy'] = 4709;//doctorProfile?.doctorID; if (body['ProjectID'] == null) {
//if (body['ProjectID'] == null) { body['ProjectID'] = doctorProfile?.projectID;
body['ProjectID'] = 15;//doctorProfile?.projectID; }
// } if (body['ClinicID'] == null)
// if (body['ClinicID'] == null) body['ClinicID'] = doctorProfile?.clinicID;
body['ClinicID'] = 1;//doctorProfile?.clinicID; }
// } body['TokenID'] = token ?? '';
body['TokenID'] = "@dm!n";//token ?? '';
String lang = await sharedPref.getString(APP_Language); String lang = await sharedPref.getString(APP_Language);
if (lang != null && lang == 'ar') if (lang != null && lang == 'ar')
body['LanguageID'] = 1; body['LanguageID'] = 1;
@ -64,11 +63,9 @@ class BaseAppClient {
body['SessionID'] = SESSION_ID; body['SessionID'] = SESSION_ID;
body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP; body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP;
body['PatientOutSA'] = 0; // PATIENT_OUT_SA; body['PatientOutSA'] = 0; // PATIENT_OUT_SA;
body['VidaAuthTokenID'] = body['VidaAuthTokenID'] = await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMDAyIiwianRpIjoiNDM1MGNjZTYtYzc3MS00YjBiLThiNDItMGZhY2IzYzgxMjQ4IiwiZW1haWwiOiIiLCJpZCI6IjEwMDIiLCJOYW1lIjoiVEVNUCAtIERPQ1RPUiIsIkVtcGxveWVlSWQiOiI0NzA5IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiI0NzA5IiwiU0VTU0lPTklEIjoiMjE1OTYwNTQiLCJDbGluaWNJZCI6IjEiLCJyb2xlIjpbIkRPQ1RPUlMiLCJIRUFEIERPQ1RPUlMiLCJBRE1JTklTVFJBVE9SUyIsIlJFQ0VQVElPTklTVCIsIkVSIE5VUlNFIiwiRVIgUkVDRVBUSU9OSVNUIiwiUEhBUk1BQ1kgQUNDT1VOVCBTVEFGRiIsIlBIQVJNQUNZIE5VUlNFIiwiSU5QQVRJRU5UIFBIQVJNQUNJU1QiLCJBRE1JU1NJT04gU1RBRkYiLCJBUFBST1ZBTCBTVEFGRiIsIkNPTlNFTlQgIiwiTUVESUNBTCBSRVBPUlQgLSBTSUNLIExFQVZFIE1BTkFHRVIiXSwibmJmIjoxNjA5MjI1MjMwLCJleHAiOjE2MTAwODkyMzAsImlhdCI6MTYwOTIyNTIzMH0.rs7lTBQ1ON4PbR11PBkOyjf818DdeMKuqz2IrCJMYQU"; body['VidaRefreshTokenID'] = await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
//await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
body['VidaRefreshTokenID'] ="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMDAyIiwianRpIjoiNDM1MGNjZTYtYzc3MS00YjBiLThiNDItMGZhY2IzYzgxMjQ4IiwiZW1haWwiOiIiLCJpZCI6IjEwMDIiLCJOYW1lIjoiVEVNUCAtIERPQ1RPUiIsIkVtcGxveWVlSWQiOiI0NzA5IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiI0NzA5IiwiU0VTU0lPTklEIjoiMjE1OTYwNTQiLCJDbGluaWNJZCI6IjEiLCJyb2xlIjpbIkRPQ1RPUlMiLCJIRUFEIERPQ1RPUlMiLCJBRE1JTklTVFJBVE9SUyIsIlJFQ0VQVElPTklTVCIsIkVSIE5VUlNFIiwiRVIgUkVDRVBUSU9OSVNUIiwiUEhBUk1BQ1kgQUNDT1VOVCBTVEFGRiIsIlBIQVJNQUNZIE5VUlNFIiwiSU5QQVRJRU5UIFBIQVJNQUNJU1QiLCJBRE1JU1NJT04gU1RBRkYiLCJBUFBST1ZBTCBTVEFGRiIsIkNPTlNFTlQgIiwiTUVESUNBTCBSRVBPUlQgLSBTSUNLIExFQVZFIE1BTkFHRVIiXSwibmJmIjoxNjA5MjI1MjMwLCJleHAiOjE2MTAwODkyMzAsImlhdCI6MTYwOTIyNTIzMH0.rs7lTBQ1ON4PbR11PBkOyjf818DdeMKuqz2IrCJMYQU";
//await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
print("URL : $url"); print("URL : $url");
print("Body : ${json.encode(body)}"); print("Body : ${json.encode(body)}");

@ -22,7 +22,7 @@ class RootPage extends StatelessWidget {
); );
break; break;
case APP_STATUS.UNAUTHENTICATED: case APP_STATUS.UNAUTHENTICATED:
return LandingPage(); return Loginsreen();
break; break;
case APP_STATUS.AUTHENTICATED: case APP_STATUS.AUTHENTICATED:
return LandingPage(); return LandingPage();

@ -116,69 +116,68 @@ class _DashboardScreenState extends State<DashboardScreen> {
SizedBox( SizedBox(
height: 4, height: 4,
), ),
//TODO change it edit By Jammal InkWell(
// InkWell( onTap: () async {
// onTap: () async { showCupertinoPicker(
// showCupertinoPicker( decKey: '',
// decKey: '', context: context,
// context: context, actionList: projectsProvider
// actionList: projectsProvider .doctorClinicsList);
// .doctorClinicsList); },
// }, child: Row(
// child: Row( mainAxisAlignment:
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// MainAxisAlignment.spaceBetween, children: <Widget>[
// children: <Widget>[ Container(
// Container( child: AppText(
// child: AppText( authProvider.selectedClinicName !=
// authProvider.selectedClinicName != null
// null ? authProvider
// ? authProvider .selectedClinicName
// .selectedClinicName : authProvider.doctorProfile
// : authProvider.doctorProfile .clinicDescription,
// .clinicDescription, fontSize:
// fontSize: SizeConfig.textMultiplier *
// SizeConfig.textMultiplier * 1.7,
// 1.7, color: Colors.white,
// color: Colors.white, textAlign: TextAlign.center,
// textAlign: TextAlign.center, ),
// ), alignment: projectsProvider.isArabic
// alignment: projectsProvider.isArabic ? Alignment.topRight
// ? Alignment.topRight : Alignment.topLeft,
// : Alignment.topLeft, ),
// ), Row(
// Row( mainAxisAlignment:
// mainAxisAlignment: MainAxisAlignment.start,
// MainAxisAlignment.start, mainAxisSize: MainAxisSize.max,
// mainAxisSize: MainAxisSize.max, crossAxisAlignment:
// crossAxisAlignment: CrossAxisAlignment.start,
// CrossAxisAlignment.start, children: <Widget>[
// children: <Widget>[ InkWell(
// InkWell( child: Container(
// child: Container( margin: EdgeInsets.only(
// margin: EdgeInsets.only( left: 5,
// left: 5, top: projectsProvider
// top: projectsProvider .isArabic
// .isArabic ? 0
// ? 0 : 5,
// : 5, right: 10,
// right: 10, bottom: projectsProvider
// bottom: projectsProvider .isArabic
// .isArabic ? 15
// ? 15 : 7),
// : 7), child: Icon(
// child: Icon( DoctorApp.sync_icon,
// DoctorApp.sync_icon, color: Colors.white,
// color: Colors.white, size: SizeConfig
// size: SizeConfig .textMultiplier *
// .textMultiplier * 1.8,
// 1.8, )),
// )), ),
// ), ],
// ], ),
// ), ]),
// ]), ),
// ),
], ],
), ),
]), ]),

@ -43,8 +43,7 @@ final double height;
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
//TODO change it edit By Jammal 'Dr. ${authProvider.doctorProfile.doctorName}',
'Dr. ',//${authProvider.doctorProfile.doctorName}',
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: SizeConfig.textMultiplier * 2.5, fontSize: SizeConfig.textMultiplier * 2.5,
color: Colors.white, color: Colors.white,
@ -72,9 +71,7 @@ final double height;
height: 50, height: 50,
width: 60, width: 60,
child: Image.network( child: Image.network(
//TODO change it edit By Jammal authProvider.doctorProfile.doctorImageURL,
'https://cdn.pixabay.com/photo/2015/04/23/22/00/tree-736885__340.jpg'
// authProvider.doctorProfile.doctorImageURL,
// fit: BoxFit.fill, // fit: BoxFit.fill,
), ),
), ),

Loading…
Cancel
Save