fix issue in merge request

logut
Elham Rababah 5 years ago
parent ccea6d730f
commit caa2306218

@ -11,6 +11,7 @@ const UPDATE_ORDER_STATUS =
/// Body Constant /// Body Constant
const CHANNEL = 9; const CHANNEL = 9;
const VERSION_ID = 8.3;
/// design constant /// design constant
const MAX_SMALL_SCREEN = 660; const MAX_SMALL_SCREEN = 660;
@ -18,5 +19,3 @@ const MAX_SMALL_SCREEN = 660;
class AppGlobal { class AppGlobal {
static BuildContext context; static BuildContext context;
} }

@ -16,9 +16,9 @@ class PendingOrdersRes {
String descriptionN; String descriptionN;
double longitude; double longitude;
double latitude; double latitude;
Null amount; dynamic amount;
String orderCreatedOn; String orderCreatedOn;
Null ePharmacyOrderNo; dynamic ePharmacyOrderNo;
int projectID; int projectID;
String appointmentNo; String appointmentNo;
String dischargeID; String dischargeID;

@ -1,3 +0,0 @@
import 'package:driverapp/core/service/base_service.dart';
class UserDetailsService extends BaseService {}

@ -33,10 +33,9 @@ class BaseAppClient {
body['UserID'] = '${doctorProfile?.userID}'; body['UserID'] = '${doctorProfile?.userID}';
body['TokenID'] = token; body['TokenID'] = token;
body['MobileNo'] = doctorProfile?.mobileNumber; body['MobileNo'] = doctorProfile?.mobileNumber;
body['Channel'] = CHANNEL;
body['VersionID'] = 8.3;
} }
body['Channel'] = CHANNEL;
body['VersionID'] = VERSION_ID;
print("URL : $url"); print("URL : $url");
print("Body : ${json.encode(body)}"); print("Body : ${json.encode(body)}");

@ -23,7 +23,6 @@ class AuthenticationViewModel with ChangeNotifier {
} }
getUser() async { getUser() async {
var asd = "";
if (user == null) { if (user == null) {
isLoading = true; isLoading = true;
notifyListeners(); notifyListeners();

@ -20,6 +20,4 @@ void setupLocator() {
locator.registerFactory(() => HospitalViewModel()); locator.registerFactory(() => HospitalViewModel());
locator.registerFactory(() => AuthenticationViewModel()); locator.registerFactory(() => AuthenticationViewModel());
locator.registerFactory(() => OrdersViewModel()); locator.registerFactory(() => OrdersViewModel());
//locator.registerSingleton(AuthenticatedUser(),instanceName: "user",signalsReady: true);
// locator.registerSingleton(() => BaseViewModel());
} }

@ -30,11 +30,6 @@ class MyApp extends StatelessWidget {
ChangeNotifierProvider<AuthenticationViewModel>( ChangeNotifierProvider<AuthenticationViewModel>(
create: (context) => AuthenticationViewModel(), create: (context) => AuthenticationViewModel(),
), ),
// ChangeNotifierProxyProvider<ProjectViewModel, AuthenticationViewModel>(
// update: (_, auth, payments) => payments..getUser(),
// create: (_) => AuthenticationViewModel(),
// ),
], ],
child: Consumer<ProjectViewModel>( child: Consumer<ProjectViewModel>(
builder: (context, projectProvider, child) => MaterialApp( builder: (context, projectProvider, child) => MaterialApp(

Loading…
Cancel
Save