Compare commits

...

2 Commits

Author SHA1 Message Date
Haroon Amjad 1fc7ef638b Merge branch 'development' into Haroon
# Conflicts:
#	lib/client/base_app_client.dart
#	lib/screens/patients/patient_search_screen.dart
5 years ago
Haroon Amjad 2fa2e4f0d8 Version update 5 years ago

@ -322,4 +322,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69 PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69
COCOAPODS: 1.10.1 COCOAPODS: 1.10.0

@ -375,7 +375,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 3A359E86ZF; DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -389,7 +389,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 1.3.1; MARKETING_VERSION = 1.3.3;
PRODUCT_BUNDLE_IDENTIFIER = com.hmg.hmgDr; PRODUCT_BUNDLE_IDENTIFIER = com.hmg.hmgDr;
PRODUCT_NAME = Runner; PRODUCT_NAME = Runner;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -510,7 +510,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 3A359E86ZF; DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -524,7 +524,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 1.3.1; MARKETING_VERSION = 1.3.3;
PRODUCT_BUNDLE_IDENTIFIER = com.hmg.hmgDr; PRODUCT_BUNDLE_IDENTIFIER = com.hmg.hmgDr;
PRODUCT_NAME = Runner; PRODUCT_NAME = Runner;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -541,7 +541,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 3A359E86ZF; DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -555,7 +555,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 1.3.1; MARKETING_VERSION = 1.3.3;
PRODUCT_BUNDLE_IDENTIFIER = com.hmg.hmgDr; PRODUCT_BUNDLE_IDENTIFIER = com.hmg.hmgDr;
PRODUCT_NAME = Runner; PRODUCT_NAME = Runner;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

@ -337,7 +337,7 @@ const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2; const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z'; const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '9.9.9.9'; const IP_ADDRESS = '9.9.9.9';
const VERSION_ID = 5.9; const VERSION_ID = 6.0;
const CHANNEL = 9; const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt'; const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true; const IS_LOGIN_FOR_DOCTOR_APP = true;

@ -29,7 +29,7 @@ class PatientReferralService extends LookupService {
"LanguageID": 1, "LanguageID": 1,
"stamp": "2020-02-26T13:51:44.111Z", "stamp": "2020-02-26T13:51:44.111Z",
"IPAdress": "11.11.11.11", "IPAdress": "11.11.11.11",
"VersionID": 5.8, "VersionID": 5.9,
"Channel": 9, "Channel": 9,
"TokenID": "", "TokenID": "",
"SessionID": "i1UJwCTSqt", "SessionID": "i1UJwCTSqt",

@ -13,7 +13,7 @@ class HospitalViewModel with ChangeNotifier {
"LanguageID": 1, "LanguageID": 1,
"stamp": "2020-02-26T13:51:44.111Z", "stamp": "2020-02-26T13:51:44.111Z",
"IPAdress": "11.11.11.11", "IPAdress": "11.11.11.11",
"VersionID": 5.8, "VersionID": 5.9,
"Channel": 9, "Channel": 9,
"TokenID": "", "TokenID": "",
"SessionID": "i1UJwCTSqt", "SessionID": "i1UJwCTSqt",

@ -29,7 +29,7 @@ class ProfileReqModel {
this.languageID, this.languageID,
this.stamp = '2020-04-26T09:32:18.317Z', this.stamp = '2020-04-26T09:32:18.317Z',
this.iPAdress='11.11.11.11', this.iPAdress='11.11.11.11',
this.versionID=5.5, this.versionID=5.9,
this.channel=9, this.channel=9,
this.sessionID='E2bsEeYEJo', this.sessionID='E2bsEeYEJo',
this.tokenID, this.tokenID,

@ -37,7 +37,7 @@ class STPReferralFrequencyRequest {
{this.languageID = 2, {this.languageID = 2,
this.stamp = "2020-06-03T11:18:19.986Z", this.stamp = "2020-06-03T11:18:19.986Z",
this.iPAdress = "11.11.11.11", this.iPAdress = "11.11.11.11",
this.versionID = 5.8, this.versionID = 5.9,
this.channel = 9, this.channel = 9,
this.tokenID, this.tokenID,
this.sessionID = "JBXRsDl37L", this.sessionID = "JBXRsDl37L",

@ -45,7 +45,7 @@ class InsuranceAprovalsRequest {
this.languageID = 2, this.languageID = 2,
this.stamp = '2020-04-23T21:01:21.492Z', this.stamp = '2020-04-23T21:01:21.492Z',
this.ipAdress = '11.11.11.11', this.ipAdress = '11.11.11.11',
this.versionID = 5.8, this.versionID = 6.0,
this.tokenID , this.tokenID ,
this.sessionID = 'e29zoooEJ4', this.sessionID = 'e29zoooEJ4',
this.isLoginForDoctorApp = true, this.isLoginForDoctorApp = true,

@ -28,7 +28,7 @@ class LabOrdersReqModel {
this.tokenID, this.tokenID,
this.stamp = '2020-04-26T09:32:18.317Z', this.stamp = '2020-04-26T09:32:18.317Z',
this.iPAdress='11.11.11.11', this.iPAdress='11.11.11.11',
this.versionID=5.5, this.versionID=5.9,
this.channel=9, this.channel=9,
this.sessionID='E2bsEeYEJo', this.sessionID='E2bsEeYEJo',
this.isLoginForDoctorApp =true, this.isLoginForDoctorApp =true,

@ -49,7 +49,7 @@ class OrdersRequest {
this.sessionID = "LlBk8lUEJY", this.sessionID = "LlBk8lUEJY",
this.isLoginForDoctorApp = true, this.isLoginForDoctorApp = true,
this.patientTypeID = 1, this.patientTypeID = 1,
this.versionID = 5.5, this.versionID = 6.0,
this.patientOutSA = false}); this.patientOutSA = false});
OrdersRequest.fromJson(Map<String, dynamic> json) { OrdersRequest.fromJson(Map<String, dynamic> json) {

@ -84,7 +84,7 @@ class ReferToDoctorRequest {
this.languageID = 2, this.languageID = 2,
this.stamp = "2020-06-03T11:26:42.358Z", this.stamp = "2020-06-03T11:26:42.358Z",
this.iPAdress = "11.11.11.11", this.iPAdress = "11.11.11.11",
this.versionID = 5.5, this.versionID = 6.0,
this.channel = 9, this.channel = 9,
@required this.tokenID, @required this.tokenID,
this.sessionID = "JBXRsDl37L", this.sessionID = "JBXRsDl37L",

@ -1,5 +1,5 @@
/* /*
*@author: Elham Rababah *@author: Elham Rababah
*@Date:27/4/2020 *@Date:27/4/2020
*@param: *@param:
@ -31,7 +31,7 @@ class VitalSignReqModel {
this.tokenID, this.tokenID,
this.stamp = '2020-04-26T09:32:18.317Z', this.stamp = '2020-04-26T09:32:18.317Z',
this.iPAdress='11.11.11.11', this.iPAdress='11.11.11.11',
this.versionID=5.8, this.versionID=6.0,
this.channel=9, this.channel=9,
this.sessionID='E2bsEeYEJo', this.sessionID='E2bsEeYEJo',
this.isLoginForDoctorApp=true, this.isLoginForDoctorApp=true,

@ -10,7 +10,7 @@ class PharmaciesItemsRequestModel {
String pHRItemName; String pHRItemName;
int pageIndex = 0; int pageIndex = 0;
int pageSize = 20; int pageSize = 20;
double versionID = 5.5; double versionID = 5.9;
int channel = 3; int channel = 3;
int languageID = 2; int languageID = 2;
String iPAdress = "10.20.10.20"; String iPAdress = "10.20.10.20";
@ -24,7 +24,7 @@ class PharmaciesItemsRequestModel {
{this.pHRItemName, {this.pHRItemName,
this.pageIndex = 0, this.pageIndex = 0,
this.pageSize = 20, this.pageSize = 20,
this.versionID = 5.8, this.versionID = 6.0,
this.channel = 3, this.channel = 3,
this.languageID = 2, this.languageID = 2,
this.iPAdress = "10.20.10.20", this.iPAdress = "10.20.10.20",

@ -45,7 +45,7 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
LanguageID: 2, LanguageID: 2,
stamp: "2020-03-02T13:56:39.170Z", stamp: "2020-03-02T13:56:39.170Z",
IPAdress: "11.11.11.11", IPAdress: "11.11.11.11",
VersionID: 5.5, VersionID: 6.0,
Channel: 9, Channel: 9,
TokenID: "@dm!n", TokenID: "@dm!n",
SessionID: "5G0yXn0Jnq", SessionID: "5G0yXn0Jnq",

@ -31,7 +31,7 @@ class _PatientArrivalScreen extends State<PatientArrivalScreen>
LanguageID: 2, LanguageID: 2,
stamp: "2020-03-02T13:56:39.170Z", stamp: "2020-03-02T13:56:39.170Z",
IPAdress: "11.11.11.11", IPAdress: "11.11.11.11",
VersionID: 5.8, VersionID: 6.0,
Channel: 9, Channel: 9,
TokenID: "2Fi7HoIHB0eDyekVa6tCJg==", TokenID: "2Fi7HoIHB0eDyekVa6tCJg==",
SessionID: "5G0yXn0Jnq", SessionID: "5G0yXn0Jnq",

@ -11,7 +11,7 @@ description: A new Flutter project.
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.2.2+2 version: 1.2.4+4
environment: environment:
sdk: ">=2.8.0 <3.0.0" sdk: ">=2.8.0 <3.0.0"

Loading…
Cancel
Save