From ed1c04ab2569147abb098aba5477aa9936745da1 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 8 Sep 2020 10:57:46 +0300 Subject: [PATCH] ER --- lib/config/config.dart | 2 +- .../model/er/projectavgerwaitingtime.dart | 56 ++++++++++++++++++- .../ErService/widgets/card_position.dart | 2 +- 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 8ce2bdf2..a5210914 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -56,6 +56,7 @@ const GET_NEAREST_HOSPITAL= + ///Reports const REPORTS = 'Services/Doctors.svc/REST/GetPatientMedicalReportStatusInfo'; const INSERT_REQUEST_FOR_MEDICAL_REPORT = @@ -160,7 +161,6 @@ const SESSION_ID = 'TMRhVmkGhOsvamErw'; const IS_DENTAL_ALLOWED_BACKEND = false; const PATIENT_TYPE = 1; const PATIENT_TYPE_ID = 1; - var DeviceTypeID = Platform.isIOS ? 1 : 2; const LANGUAGE_ID = 2; const GET_PHARMCY_ITEMS = "Services/Lists.svc/REST/GetPharmcyItems_Region"; diff --git a/lib/core/model/er/projectavgerwaitingtime.dart b/lib/core/model/er/projectavgerwaitingtime.dart index f999d46f..9b21ec66 100644 --- a/lib/core/model/er/projectavgerwaitingtime.dart +++ b/lib/core/model/er/projectavgerwaitingtime.dart @@ -3,7 +3,7 @@ class ProjectAvgERWaitingTime { int projectID; int avgTimeInMinutes; String avgTimeInHHMM; - int distanceInKilometers; + dynamic distanceInKilometers; String latitude; String longitude; String phoneNumber; @@ -49,4 +49,56 @@ class ProjectAvgERWaitingTime { data['ProjectName'] = this.projectName; return data; } -} \ No newline at end of file +} +//class ProjectAvgERWaitingTime { +// int iD; +// int projectID; +// int avgTimeInMinutes; +// String avgTimeInHHMM; +// String distanceInKilometers; +// String latitude; +// String longitude; +// String phoneNumber; +// String projectImageURL; +// String projectName; +// +// ProjectAvgERWaitingTime( +// {this.iD, +// this.projectID, +// this.avgTimeInMinutes, +// this.avgTimeInHHMM, +// this.distanceInKilometers, +// this.latitude, +// this.longitude, +// this.phoneNumber, +// this.projectImageURL, +// this.projectName}); +// +// ProjectAvgERWaitingTime.fromJson(Map json) { +// iD = json['ID']; +// projectID = json['ProjectID']; +// avgTimeInMinutes = json['AvgTimeInMinutes']; +// avgTimeInHHMM = json['AvgTimeInHHMM']; +// distanceInKilometers = json['DistanceInKilometers']; +// latitude = json['Latitude']; +// longitude = json['Longitude']; +// phoneNumber = json['PhoneNumber']; +// projectImageURL = json['ProjectImageURL']; +// projectName = json['ProjectName']; +// } +// +// Map toJson() { +// final Map data = new Map(); +// data['ID'] = this.iD; +// data['ProjectID'] = this.projectID; +// data['AvgTimeInMinutes'] = this.avgTimeInMinutes; +// data['AvgTimeInHHMM'] = this.avgTimeInHHMM; +// data['DistanceInKilometers'] = this.distanceInKilometers; +// data['Latitude'] = this.latitude; +// data['Longitude'] = this.longitude; +// data['PhoneNumber'] = this.phoneNumber; +// data['ProjectImageURL'] = this.projectImageURL; +// data['ProjectName'] = this.projectName; +// return data; +// } +//} \ No newline at end of file diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index 05141351..572d52f0 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -37,7 +37,7 @@ class CardPosition extends StatelessWidget { return GestureDetector( onTap: () { navigateToSearch(context, this.type,this.telephone,this.networkImage,this.latitude,this.longitude,this.projectname); - print("=============this.type============="+this.type); + }, child: Container( width:190,