Merge branch 'mohammad' into 'master'

Mohammad

See merge request Cloud_Solution/doctor_app_flutter!66
merge-requests/67/merge
Mohammad Aljammal 6 years ago
commit 425b60405d

@ -44,3 +44,13 @@ var SERVICES_PATIANT_HEADER = [
// Colors ////// by : ibrahim
const PRIMARY_COLOR = 0xff58434F;
const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '11.11.11.11';
const VERSION_ID = 1.2;
const CHANNEL = 9;
const SESSION_ID = '2Z7FX4Lokp';
const IS_LOGIN_FOR_DOCTOR_APP = true;
const PATIENT_OUT_SA = false;

@ -1,3 +1,5 @@
import 'package:doctor_app_flutter/config/config.dart';
class RequestDoctorReply {
int projectID;
int doctorID;
@ -13,18 +15,18 @@ class RequestDoctorReply {
bool patientOutSA;
RequestDoctorReply(
{this.projectID = 15,
this.doctorID = 70907,
this.transactionNo = 0,
this.languageID = 2,
this.stamp = '2020-04-27T12:17:17.721Z',
this.iPAdress = '11.11.11.11',
this.versionID = 1.2,
this.channel = 9,
this.tokenID = '@dm!n',
this.sessionID = '2Z7FX4Lokp',
this.isLoginForDoctorApp = true,
this.patientOutSA = false});
{this.projectID ,
this.doctorID ,
this.transactionNo = TRANSACTION_NO,
this.languageID = LANGUAGE_ID,
this.stamp = STAMP,
this.iPAdress = IP_ADDRESS,
this.versionID = VERSION_ID,
this.channel = CHANNEL,
this.tokenID ,
this.sessionID = SESSION_ID,
this.isLoginForDoctorApp = IS_LOGIN_FOR_DOCTOR_APP,
this.patientOutSA = PATIENT_OUT_SA});
RequestDoctorReply.fromJson(Map<String, dynamic> json) {
projectID = json['ProjectID'];

@ -1,3 +1,5 @@
import 'package:doctor_app_flutter/config/config.dart';
class RequestSchedule {
int projectID;
int clinicID;
@ -14,21 +16,21 @@ class RequestSchedule {
bool patientOutSA;
int patientTypeID;
RequestSchedule(
RequestSchedule({
this.projectID,
this.clinicID,
this.doctorID,
this.doctorWorkingHoursDays,
this.languageID,
this.stamp,
this.iPAdress,
this.versionID,
this.channel,
this.doctorWorkingHoursDays = 7,
this.languageID = LANGUAGE_ID,
this.stamp = STAMP,
this.iPAdress = IP_ADDRESS,
this.versionID = VERSION_ID,
this.channel = CHANNEL,
this.tokenID,
this.sessionID,
this.isLoginForDoctorApp,
this.patientOutSA,
this.patientTypeID);
this.sessionID = SESSION_ID,
this.isLoginForDoctorApp = IS_LOGIN_FOR_DOCTOR_APP,
this.patientOutSA = PATIENT_OUT_SA,
this.patientTypeID = 1});
RequestSchedule.fromJson(Map<String, dynamic> json) {
projectID = json['ProjectID'];

@ -20,24 +20,24 @@ class DoctorReplyProvider with ChangeNotifier {
bool isLoading = true;
bool isError = false;
String error = '';
RequestDoctorReply _requestSchedule = RequestDoctorReply();
RequestDoctorReply _requestDoctorReply = RequestDoctorReply();
DoctorReplyProvider() {
getDoctorSchedule();
getDoctorReply();
}
getDoctorSchedule() async {
getDoctorReply() async {
const url = BASE_URL + 'DoctorApplication.svc/REST/GtMyPatientsQuestions';
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
String token = await sharedPref.getString(TOKEN);
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
_requestSchedule.doctorID = doctorProfile.doctorID;
_requestSchedule.projectID = doctorProfile.projectID;
_requestSchedule.tokenID = token;
_requestDoctorReply.doctorID = doctorProfile.doctorID;
_requestDoctorReply.projectID = doctorProfile.projectID;
_requestDoctorReply.tokenID = token;
try {
if (await Helpers.checkConnection()) {
final response = await client.post(url,
body: json.encode(_requestSchedule.toJson()));
body: json.encode(_requestDoctorReply.toJson()));
final int statusCode = response.statusCode;
if (statusCode < 200 || statusCode >= 400 || json == null) {
isLoading = false;

@ -20,7 +20,7 @@ class ScheduleProvider with ChangeNotifier {
bool isLoading = true;
bool isError = false;
String error = '';
RequestSchedule requestSchedule = RequestSchedule(15, 1, 1485, 7, 2, '2020-04-22T11:25:57.640Z', '11.11.11.11', 1.2, 9, '2lMDFT8U+Uy5jxRzCO8n2w==', 'vV6tg9yyVJ222', true, false, 1);
RequestSchedule requestSchedule = RequestSchedule();
ScheduleProvider() {
getDoctorSchedule();

@ -1,6 +1,7 @@
import 'package:barcode_scan/platform_wrapper.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/models/doctor_profile_model.dart';
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/topten_users_res_model.dart';
@ -153,6 +154,14 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
patientList = [];
});
String token = await sharedPref.getString(TOKEN);
// Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
// DoctorProfileModel doctorProfile = new DoctorProfileModel.fromJson(profile);
// patient.PatientID = 8808;
// patient.TokenID = token;
// patient.setDoctorID = doctorProfile.projectID;
// patient.setClinicID = doctorProfile.clinicID;
// patient.setProjectID = doctorProfile.projectID;
// Provider.of<PatientsProvider>(context, listen: false);
patient.PatientID = 8808;
patient.TokenID = token;
Provider.of<PatientsProvider>(context, listen: false)

Loading…
Cancel
Save