first step from upgrade

html_rich_text
Elham Rababah 5 years ago
parent e5cee51ba9
commit e934d3b003

@ -53,12 +53,7 @@ target 'Runner' do
generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path)
cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR'];
unless File.exist?(copied_framework_path)
FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir)
end
unless File.exist?(copied_podspec_path)
FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir)
end
end
# Keep pod path relative so it can be checked into Podfile.lock.

@ -1,325 +0,0 @@
PODS:
- Alamofire (4.9.1)
- barcode_scan (0.0.1):
- Flutter
- MTBBarcodeScanner
- SwiftProtobuf
- connectivity (0.0.1):
- Flutter
- Reachability
- connectivity_for_web (0.1.0):
- Flutter
- connectivity_macos (0.0.1):
- Flutter
- device_info (0.0.1):
- Flutter
- Firebase/CoreOnly (6.33.0):
- FirebaseCore (= 6.10.3)
- Firebase/Messaging (6.33.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 4.7.0)
- firebase_core (0.5.3):
- Firebase/CoreOnly (~> 6.33.0)
- Flutter
- firebase_core_web (0.1.0):
- Flutter
- firebase_messaging (7.0.3):
- Firebase/CoreOnly (~> 6.33.0)
- Firebase/Messaging (~> 6.33.0)
- firebase_core
- Flutter
- FirebaseCore (6.10.3):
- FirebaseCoreDiagnostics (~> 1.6)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/Logger (~> 6.7)
- FirebaseCoreDiagnostics (1.7.0):
- GoogleDataTransport (~> 7.4)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/Logger (~> 6.7)
- nanopb (~> 1.30906.0)
- FirebaseInstallations (1.7.0):
- FirebaseCore (~> 6.10)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/UserDefaults (~> 6.7)
- PromisesObjC (~> 1.2)
- FirebaseInstanceID (4.8.0):
- FirebaseCore (~> 6.10)
- FirebaseInstallations (~> 1.6)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/UserDefaults (~> 6.7)
- FirebaseMessaging (4.7.1):
- FirebaseCore (~> 6.10)
- FirebaseInstanceID (~> 4.7)
- GoogleUtilities/AppDelegateSwizzler (~> 6.7)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/Reachability (~> 6.7)
- GoogleUtilities/UserDefaults (~> 6.7)
- Protobuf (>= 3.9.2, ~> 3.9)
- Flutter (1.0.0)
- flutter_flexible_toast (0.0.1):
- Flutter
- flutter_plugin_android_lifecycle (0.0.1):
- Flutter
- GoogleDataTransport (7.5.1):
- nanopb (~> 1.30906.0)
- GoogleUtilities/AppDelegateSwizzler (6.7.2):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (6.7.2):
- PromisesObjC (~> 1.2)
- GoogleUtilities/Logger (6.7.2):
- GoogleUtilities/Environment
- GoogleUtilities/Network (6.7.2):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (6.7.2)"
- GoogleUtilities/Reachability (6.7.2):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (6.7.2):
- GoogleUtilities/Logger
- hexcolor (0.0.1):
- Flutter
- imei_plugin (0.0.1):
- Flutter
- local_auth (0.0.1):
- Flutter
- maps_launcher (0.0.1):
- Flutter
- MTBBarcodeScanner (5.0.11)
- nanopb (1.30906.0):
- nanopb/decode (= 1.30906.0)
- nanopb/encode (= 1.30906.0)
- nanopb/decode (1.30906.0)
- nanopb/encode (1.30906.0)
- OpenTok (2.15.3)
- path_provider_linux (0.0.1):
- Flutter
- path_provider_windows (0.0.1):
- Flutter
- "permission_handler (5.1.0+2)":
- Flutter
- PromisesObjC (1.2.11)
- Protobuf (3.13.0)
- Reachability (3.2)
- screen (0.0.1):
- Flutter
- shared_preferences (0.0.1):
- Flutter
- shared_preferences_linux (0.0.1):
- Flutter
- shared_preferences_macos (0.0.1):
- Flutter
- shared_preferences_web (0.0.1):
- Flutter
- shared_preferences_windows (0.0.1):
- Flutter
- speech_to_text (0.0.1):
- Flutter
- Try
- SwiftProtobuf (1.9.0)
- Try (2.1.1)
- url_launcher (0.0.1):
- Flutter
- url_launcher_linux (0.0.1):
- Flutter
- url_launcher_macos (0.0.1):
- Flutter
- url_launcher_web (0.0.1):
- Flutter
- url_launcher_windows (0.0.1):
- Flutter
- video_player (0.0.1):
- Flutter
- video_player_web (0.0.1):
- Flutter
- wakelock (0.0.1):
- Flutter
- webview_flutter (0.0.1):
- Flutter
DEPENDENCIES:
- Alamofire
- barcode_scan (from `.symlinks/plugins/barcode_scan/ios`)
- connectivity (from `.symlinks/plugins/connectivity/ios`)
- connectivity_for_web (from `.symlinks/plugins/connectivity_for_web/ios`)
- connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`)
- device_info (from `.symlinks/plugins/device_info/ios`)
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
- firebase_core_web (from `.symlinks/plugins/firebase_core_web/ios`)
- firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
- Flutter (from `Flutter`)
- flutter_flexible_toast (from `.symlinks/plugins/flutter_flexible_toast/ios`)
- flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`)
- hexcolor (from `.symlinks/plugins/hexcolor/ios`)
- imei_plugin (from `.symlinks/plugins/imei_plugin/ios`)
- local_auth (from `.symlinks/plugins/local_auth/ios`)
- maps_launcher (from `.symlinks/plugins/maps_launcher/ios`)
- OpenTok
- path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
- path_provider_windows (from `.symlinks/plugins/path_provider_windows/ios`)
- permission_handler (from `.symlinks/plugins/permission_handler/ios`)
- screen (from `.symlinks/plugins/screen/ios`)
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
- shared_preferences_linux (from `.symlinks/plugins/shared_preferences_linux/ios`)
- shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
- shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
- shared_preferences_windows (from `.symlinks/plugins/shared_preferences_windows/ios`)
- speech_to_text (from `.symlinks/plugins/speech_to_text/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- url_launcher_linux (from `.symlinks/plugins/url_launcher_linux/ios`)
- url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`)
- url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)
- url_launcher_windows (from `.symlinks/plugins/url_launcher_windows/ios`)
- video_player (from `.symlinks/plugins/video_player/ios`)
- video_player_web (from `.symlinks/plugins/video_player_web/ios`)
- wakelock (from `.symlinks/plugins/wakelock/ios`)
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
SPEC REPOS:
trunk:
- Alamofire
- Firebase
- FirebaseCore
- FirebaseCoreDiagnostics
- FirebaseInstallations
- FirebaseInstanceID
- FirebaseMessaging
- GoogleDataTransport
- GoogleUtilities
- MTBBarcodeScanner
- nanopb
- OpenTok
- PromisesObjC
- Protobuf
- Reachability
- SwiftProtobuf
- Try
EXTERNAL SOURCES:
barcode_scan:
:path: ".symlinks/plugins/barcode_scan/ios"
connectivity:
:path: ".symlinks/plugins/connectivity/ios"
connectivity_for_web:
:path: ".symlinks/plugins/connectivity_for_web/ios"
connectivity_macos:
:path: ".symlinks/plugins/connectivity_macos/ios"
device_info:
:path: ".symlinks/plugins/device_info/ios"
firebase_core:
:path: ".symlinks/plugins/firebase_core/ios"
firebase_core_web:
:path: ".symlinks/plugins/firebase_core_web/ios"
firebase_messaging:
:path: ".symlinks/plugins/firebase_messaging/ios"
Flutter:
:path: Flutter
flutter_flexible_toast:
:path: ".symlinks/plugins/flutter_flexible_toast/ios"
flutter_plugin_android_lifecycle:
:path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios"
hexcolor:
:path: ".symlinks/plugins/hexcolor/ios"
imei_plugin:
:path: ".symlinks/plugins/imei_plugin/ios"
local_auth:
:path: ".symlinks/plugins/local_auth/ios"
maps_launcher:
:path: ".symlinks/plugins/maps_launcher/ios"
path_provider_linux:
:path: ".symlinks/plugins/path_provider_linux/ios"
path_provider_windows:
:path: ".symlinks/plugins/path_provider_windows/ios"
permission_handler:
:path: ".symlinks/plugins/permission_handler/ios"
screen:
:path: ".symlinks/plugins/screen/ios"
shared_preferences:
:path: ".symlinks/plugins/shared_preferences/ios"
shared_preferences_linux:
:path: ".symlinks/plugins/shared_preferences_linux/ios"
shared_preferences_macos:
:path: ".symlinks/plugins/shared_preferences_macos/ios"
shared_preferences_web:
:path: ".symlinks/plugins/shared_preferences_web/ios"
shared_preferences_windows:
:path: ".symlinks/plugins/shared_preferences_windows/ios"
speech_to_text:
:path: ".symlinks/plugins/speech_to_text/ios"
url_launcher:
:path: ".symlinks/plugins/url_launcher/ios"
url_launcher_linux:
:path: ".symlinks/plugins/url_launcher_linux/ios"
url_launcher_macos:
:path: ".symlinks/plugins/url_launcher_macos/ios"
url_launcher_web:
:path: ".symlinks/plugins/url_launcher_web/ios"
url_launcher_windows:
:path: ".symlinks/plugins/url_launcher_windows/ios"
video_player:
:path: ".symlinks/plugins/video_player/ios"
video_player_web:
:path: ".symlinks/plugins/video_player_web/ios"
wakelock:
:path: ".symlinks/plugins/wakelock/ios"
webview_flutter:
:path: ".symlinks/plugins/webview_flutter/ios"
SPEC CHECKSUMS:
Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
connectivity_for_web: 2b8584556930d4bd490d82b836bcf45067ce345b
connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191
device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
firebase_core: 5d6a02f3d85acd5f8321c2d6d62877626a670659
firebase_core_web: d501d8b946b60c8af265428ce483b0fff5ad52d1
firebase_messaging: 0aea2cd5885b65e19ede58ee3507f485c992cc75
FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1
FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
flutter_flexible_toast: 0547e740cae0c33bb7c51bcd931233f4584e1143
flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
hexcolor: fdfb9c4258ad96e949c2dbcdf790a62194b8aa89
imei_plugin: cb1af7c223ac2d82dcd1457a7137d93d65d2a3cd
local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
maps_launcher: eae38ee13a9c3f210fa04e04bb4c073fa4c6ed92
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
OpenTok: fde03ecc5ea31fe0a453242847c4ee1f47e1d735
path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
path_provider_windows: a2b81600c677ac1959367280991971cb9a1edb3b
permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
screen: abd91ca7bf3426e1cc3646d27e9b2358d6bf07b0
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
shared_preferences_linux: afefbfe8d921e207f01ede8b60373d9e3b566b78
shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
shared_preferences_windows: 36b76d6f54e76ead957e60b49e2f124b4cd3e6ae
speech_to_text: b43a7d99aef037bd758ed8e45d79bbac035d2dfe
SwiftProtobuf: ecbec1be9036d15655f6b3443a1c4ea693c97932
Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0
url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
url_launcher_windows: 683d7c283894db8d1914d3ab2223b20cc1ad95d5
video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
video_player_web: da8cadb8274ed4f8dbee8d7171b420dedd437ce7
wakelock: 0d4a70faf8950410735e3f61fb15d517c8a6efc4
webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69
COCOAPODS: 1.10.0.rc.1

@ -2,6 +2,6 @@
<Workspace
version = "1.0">
<FileRef
location = "group:Runner.xcodeproj">
location = "self:">
</FileRef>
</Workspace>

@ -10,11 +10,11 @@ import 'package:url_launcher/url_launcher.dart';
import 'widgets/shared/buttons/secondary_button.dart';
class UpdatePage extends StatelessWidget {
final String message;
final String androidLink;
final String iosLink;
final String? message;
final String? androidLink;
final String? iosLink;
const UpdatePage({Key key, this.message, this.androidLink, this.iosLink})
const UpdatePage({Key? key, this.message, this.androidLink, this.iosLink})
: super(key: key);
@override
@ -35,7 +35,7 @@ class UpdatePage extends StatelessWidget {
Image.asset('assets/images/HMG_logo.png'),
SizedBox(height: 8,),
AppText(
TranslationBase.of(context).updateTheApp.toUpperCase(),fontSize: 17,
TranslationBase.of(context)!.updateTheApp!.toUpperCase(),fontSize: 17,
fontWeight: FontWeight.w600,
),
SizedBox(height: 12,),
@ -55,11 +55,11 @@ class UpdatePage extends StatelessWidget {
color: Colors.red[800],
onTap: () {
if (Platform.isIOS)
launch(iosLink);
launch(iosLink!);
else
launch(androidLink);
launch(androidLink!);
},
label: TranslationBase.of(context).updateNow.toUpperCase(),
label: TranslationBase.of(context)!.updateNow!.toUpperCase(),
),
),
),

@ -18,9 +18,9 @@ Helpers helpers = new Helpers();
class BaseAppClient {
//TODO change the post fun to nun static when you change all service
post(String endPoint,
{Map<String, dynamic> body,
Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure,
{required Map<String, dynamic> body,
Function(dynamic response, int statusCode)? onSuccess,
Function(String error, int statusCode)? onFailure,
bool isAllowAny = false}) async {
String url = BASE_URL + endPoint;
@ -29,7 +29,7 @@ class BaseAppClient {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
String token = await sharedPref.getString(TOKEN);
if (profile != null) {
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile as Map<String, dynamic>);
if (body['DoctorID'] == null)
body['DoctorID'] = doctorProfile?.doctorID;
if (body['DoctorID'] == "") body['DoctorID'] = null;
@ -91,7 +91,7 @@ class BaseAppClient {
});
final int statusCode = response.statusCode;
if (statusCode < 200 || statusCode >= 400) {
onFailure(Helpers.generateContactAdminMsg(), statusCode);
onFailure!(Helpers.generateContactAdminMsg(), statusCode);
} else {
var parsed = json.decode(response.body.toString());
if (parsed['ErrorType'] == 4) {
@ -101,37 +101,37 @@ class BaseAppClient {
if (!parsed['IsAuthenticated']) {
if (body['OTP_SendType'] != null) {
onFailure(getError(parsed), statusCode);
onFailure!(getError(parsed), statusCode);
} else if (!isAllowAny) {
await Provider.of<AuthenticationViewModel>(AppGlobal.CONTEX, listen: false).logout(isSessionTimeout: true);
Helpers.showErrorToast('Your session expired Please login again');
}
if (isAllowAny) {
onFailure(getError(parsed), statusCode);
onFailure!(getError(parsed), statusCode);
}
} else if (parsed['MessageStatus'] == 1) {
if (!parsed['IsAuthenticated'])
onFailure(getError(parsed), statusCode);
onFailure!(getError(parsed), statusCode);
else
onSuccess(parsed, statusCode);
onSuccess!(parsed, statusCode);
} else {
onFailure(getError(parsed), statusCode);
onFailure!(getError(parsed), statusCode);
}
}
} else {
onFailure('Please Check The Internet Connection', -1);
onFailure!('Please Check The Internet Connection', -1);
}
} catch (e) {
print(e);
onFailure(e.toString(), -1);
onFailure!(e.toString(), -1);
}
}
postPatient(String endPoint,
{Map<String, dynamic> body,
Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure,
@required PatiantInformtion patient,
{required Map<String, dynamic> body,
Function(dynamic response, int statusCode)? onSuccess,
Function(String? error, int statusCode)? onFailure,
required PatiantInformtion? patient,
bool isExternal = false}) async {
String url = BASE_URL + endPoint;
@ -178,7 +178,7 @@ class BaseAppClient {
body['PatientType'] = body.containsKey('PatientType')
? body['PatientType'] != null
? body['PatientType']
: patient.patientType != null
: patient!.patientType != null
? patient.patientType
: PATIENT_TYPE
: PATIENT_TYPE;
@ -186,7 +186,7 @@ class BaseAppClient {
body['PatientTypeID'] = body.containsKey('PatientTypeID')
? body['PatientTypeID'] != null
? body['PatientTypeID']
: patient.patientType != null
: patient!.patientType != null
? patient.patientType
: PATIENT_TYPE_ID
: PATIENT_TYPE_ID;
@ -194,7 +194,7 @@ class BaseAppClient {
body['TokenID'] = token;
body['PatientID'] = body['PatientID'] != null
? body['PatientID']
: patient.patientId ?? patient.patientMRN;
: patient!.patientId ?? patient.patientMRN;
body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it
body['SessionID'] = SESSION_ID; //getSe
@ -214,12 +214,12 @@ class BaseAppClient {
final int statusCode = response.statusCode;
print("statusCode :$statusCode");
if (statusCode < 200 || statusCode >= 400 || json == null) {
onFailure('Error While Fetching data', statusCode);
onFailure!('Error While Fetching data', statusCode);
} else {
// var parsed = json.decode(response.body.toString());
var parsed = json.decode(utf8.decode(response.bodyBytes));
if (parsed['Response_Message'] != null) {
onSuccess(parsed, statusCode);
onSuccess!(parsed, statusCode);
} else {
if (parsed['ErrorType'] == 4) {
helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'],
@ -227,36 +227,36 @@ class BaseAppClient {
}
if (parsed['IsAuthenticated'] == null) {
if (parsed['isSMSSent'] == true) {
onSuccess(parsed, statusCode);
onSuccess!(parsed, statusCode);
} else if (parsed['MessageStatus'] == 1) {
onSuccess(parsed, statusCode);
onSuccess!(parsed, statusCode);
} else if (parsed['Result'] == 'OK') {
onSuccess(parsed, statusCode);
onSuccess!(parsed, statusCode);
} else {
if (parsed != null) {
onSuccess(parsed, statusCode);
onSuccess!(parsed, statusCode);
} else {
onFailure(getError(parsed), statusCode);
onFailure!(getError(parsed), statusCode);
}
}
} else if (parsed['MessageStatus'] == 1 ||
parsed['SMSLoginRequired'] == true) {
onSuccess(parsed, statusCode);
onSuccess!(parsed, statusCode);
} else if (parsed['MessageStatus'] == 2 &&
parsed['IsAuthenticated']) {
if (parsed['SameClinicApptList'] != null) {
onSuccess(parsed, statusCode);
onSuccess!(parsed, statusCode);
} else {
if (parsed['message'] == null &&
parsed['ErrorEndUserMessage'] == null) {
if (parsed['ErrorSearchMsg'] == null) {
onFailure("Server Error found with no available message",
onFailure!("Server Error found with no available message",
statusCode);
} else {
onFailure(parsed['ErrorSearchMsg'], statusCode);
onFailure!(parsed['ErrorSearchMsg'], statusCode);
}
} else {
onFailure(
onFailure!(
parsed['message'] ??
parsed['ErrorEndUserMessage'] ??
parsed['ErrorMessage'],
@ -265,12 +265,12 @@ class BaseAppClient {
}
} else {
if (parsed['SameClinicApptList'] != null) {
onSuccess(parsed, statusCode);
onSuccess!(parsed, statusCode);
} else {
if (parsed['message'] != null) {
onFailure(parsed['message'] ?? parsed['message'], statusCode);
onFailure!(parsed['message'] ?? parsed['message'], statusCode);
} else {
onFailure(
onFailure!(
parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
statusCode);
}
@ -279,17 +279,17 @@ class BaseAppClient {
}
}
} else {
onFailure('Please Check The Internet Connection', -1);
onFailure!('Please Check The Internet Connection', -1);
}
} catch (e) {
print(e);
onFailure(e.toString(), -1);
onFailure!(e.toString(), -1);
}
}
String getError(parsed) {
//TODO change this fun
String error = parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'];
String? error = parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'];
if (parsed["ValidationErrors"] != null) {
error = parsed["ValidationErrors"]["StatusMessage"].toString() + "\n";
@ -298,7 +298,7 @@ class BaseAppClient {
for (var i = 0;
i < parsed["ValidationErrors"]["ValidationErrors"].length;
i++) {
error = error +
error = error! +
parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] +
"\n";
}

@ -350,6 +350,6 @@ const PATIENT_TYPE_ID = 1;
const TIMER_MIN = 10;
class AppGlobal {
static var CONTEX;
static late var CONTEX;
static Color appPrimaryColor = Color(0xFFB9382C);
}

@ -5,14 +5,14 @@ class SizeConfig {
static double _blockWidth = 0;
static double _blockHeight = 0;
static double realScreenWidth;
static double realScreenHeight;
static double screenWidth;
static double screenHeight;
static double textMultiplier;
static double imageSizeMultiplier;
static double heightMultiplier;
static double widthMultiplier;
static double? realScreenWidth;
static double? realScreenHeight;
static double? screenWidth;
static double? screenHeight;
static late double textMultiplier;
static late double imageSizeMultiplier;
static late double heightMultiplier;
static late double widthMultiplier;
static bool isPortrait = true;
static bool isMobilePortrait = false;
@ -28,7 +28,7 @@ class SizeConfig {
}
if (orientation == Orientation.portrait) {
isPortrait = true;
if (realScreenWidth < 450) {
if (realScreenWidth! < 450) {
isMobilePortrait = true;
}
// textMultiplier = _blockHeight;
@ -43,8 +43,8 @@ class SizeConfig {
screenHeight = realScreenWidth;
screenWidth = realScreenHeight;
}
_blockWidth = screenWidth / 100;
_blockHeight = screenHeight / 100;
_blockWidth = screenWidth! / 100;
_blockHeight = screenHeight! / 100;
textMultiplier = _blockHeight;
imageSizeMultiplier = _blockWidth;

@ -1,5 +1,5 @@
enum AuthMethodTypes { SMS, WhatsApp, Fingerprint,FaceID,MoreOptions }
extension SelectedAuthMethodTypesService on AuthMethodTypes {
extension SelectedAuthMethodTypesService on AuthMethodTypes? {
// ignore: missing_return
int getTypeIdService() {
switch (this) {
@ -18,12 +18,14 @@ extension SelectedAuthMethodTypesService on AuthMethodTypes {
case AuthMethodTypes.MoreOptions:
return 5;
break;
default: return 1;
}
}
// ignore: missing_return
static getMethodsTypeService( int typeId) {
static getMethodsTypeService( int? typeId) {
switch (typeId) {
case 1:
return AuthMethodTypes.SMS;

@ -1,17 +1,17 @@
class InsuranceApprovalInPatientRequestModel {
int patientID;
int patientTypeID;
int eXuldAPPNO;
int projectID;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int? patientID;
int? patientTypeID;
int? eXuldAPPNO;
int? projectID;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
InsuranceApprovalInPatientRequestModel(
{this.patientID,

@ -1,40 +1,40 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class Prescriptions {
String setupID;
int projectID;
int patientID;
int appointmentNo;
String appointmentDate;
String doctorName;
String clinicDescription;
String name;
int episodeID;
int actualDoctorRate;
int admission;
int clinicID;
String companyName;
String despensedStatus;
DateTime dischargeDate;
int dischargeNo;
int doctorID;
String doctorImageURL;
int doctorRate;
String doctorTitle;
int gender;
String genderDescription;
bool isActiveDoctorProfile;
bool isDoctorAllowVedioCall;
bool isExecludeDoctor;
bool isInOutPatient;
bool isLiveCareAppointment;
String isInOutPatientDescription;
String isInOutPatientDescriptionN;
bool isInsurancePatient;
String nationalityFlagURL;
int noOfPatientsRate;
String qR;
List<String> speciality;
String? setupID;
int? projectID;
int? patientID;
int? appointmentNo;
String? appointmentDate;
String? doctorName;
String? clinicDescription;
String? name;
int? episodeID;
int? actualDoctorRate;
int? admission;
int? clinicID;
String? companyName;
String? despensedStatus;
DateTime? dischargeDate;
int? dischargeNo;
int? doctorID;
String? doctorImageURL;
int? doctorRate;
String? doctorTitle;
int? gender;
String? genderDescription;
bool? isActiveDoctorProfile;
bool? isDoctorAllowVedioCall;
bool? isExecludeDoctor;
bool? isInOutPatient;
bool? isLiveCareAppointment;
String? isInOutPatientDescription;
String? isInOutPatientDescriptionN;
bool? isInsurancePatient;
String? nationalityFlagURL;
int? noOfPatientsRate;
String? qR;
List<String>? speciality;
Prescriptions(
{this.setupID,
@ -149,10 +149,10 @@ class Prescriptions {
}
class PrescriptionsList {
String filterName = "";
List<Prescriptions> prescriptionsList = List();
String? filterName = "";
List<Prescriptions?> prescriptionsList = [];
PrescriptionsList({this.filterName, Prescriptions prescriptions}) {
PrescriptionsList({this.filterName, Prescriptions? prescriptions}) {
prescriptionsList.add(prescriptions);
}
}

@ -1,5 +1,5 @@
class InPatientPrescriptionRequestModel {
String vidaAuthTokenID;
String? vidaAuthTokenID;
dynamic patientMRN;
dynamic appNo;
dynamic admissionNo;

@ -1,27 +1,27 @@
class PharmacyPrescriptions {
String expiryDate;
String? expiryDate;
dynamic sellingPrice;
int quantity;
int itemID;
int locationID;
int projectID;
String setupID;
String locationDescription;
int? quantity;
int? itemID;
int? locationID;
int? projectID;
String? setupID;
String? locationDescription;
Null locationDescriptionN;
String itemDescription;
String? itemDescription;
Null itemDescriptionN;
String alias;
int locationTypeID;
int barcode;
String? alias;
int? locationTypeID;
int? barcode;
Null companybarcode;
int cityID;
String cityName;
int distanceInKilometers;
String latitude;
int locationType;
String longitude;
String phoneNumber;
String projectImageURL;
int? cityID;
String? cityName;
int? distanceInKilometers;
String? latitude;
int? locationType;
String? longitude;
String? phoneNumber;
String? projectImageURL;
Null sortOrder;
PharmacyPrescriptions(

@ -1,10 +1,10 @@
class PostPrescriptionReqModel {
String vidaAuthTokenID;
int clinicID;
int episodeID;
int appointmentNo;
int patientMRN;
List<PrescriptionRequestModel> prescriptionRequestModel;
String? vidaAuthTokenID;
int? clinicID;
int? episodeID;
int? appointmentNo;
int? patientMRN;
List<PrescriptionRequestModel>? prescriptionRequestModel;
PostPrescriptionReqModel(
{this.vidaAuthTokenID,
@ -21,9 +21,9 @@ class PostPrescriptionReqModel {
appointmentNo = json['AppointmentNo'];
patientMRN = json['PatientMRN'];
if (json['prescriptionRequestModel'] != null) {
prescriptionRequestModel = new List<PrescriptionRequestModel>();
prescriptionRequestModel = [];
json['prescriptionRequestModel'].forEach((v) {
prescriptionRequestModel.add(new PrescriptionRequestModel.fromJson(v));
prescriptionRequestModel!.add(new PrescriptionRequestModel.fromJson(v));
});
}
}
@ -37,25 +37,25 @@ class PostPrescriptionReqModel {
data['PatientMRN'] = this.patientMRN;
if (this.prescriptionRequestModel != null) {
data['prescriptionRequestModel'] =
this.prescriptionRequestModel.map((v) => v.toJson()).toList();
this.prescriptionRequestModel!.map((v) => v.toJson()).toList();
}
return data;
}
}
class PrescriptionRequestModel {
int itemId;
String doseStartDate;
int duration;
double dose;
int doseUnitId;
int route;
int frequency;
int doseTime;
bool covered;
bool approvalRequired;
String remarks;
String icdcode10Id;
int? itemId;
String? doseStartDate;
int? duration;
double? dose;
int? doseUnitId;
int? route;
int? frequency;
int? doseTime;
bool? covered;
bool? approvalRequired;
String? remarks;
String? icdcode10Id;
PrescriptionRequestModel({
this.itemId,

@ -1,50 +1,50 @@
class PrescriotionInPatient {
int admissionNo;
int authorizedBy;
int? admissionNo;
int? authorizedBy;
dynamic bedNo;
String comments;
int createdBy;
String createdByName;
String? comments;
int? createdBy;
String? createdByName;
dynamic createdByNameN;
String createdOn;
String direction;
int directionID;
String? createdOn;
String? direction;
int? directionID;
dynamic directionN;
String dose;
int editedBy;
String? dose;
int? editedBy;
dynamic iVDiluentLine;
int iVDiluentType;
int? iVDiluentType;
dynamic iVDiluentVolume;
dynamic iVRate;
dynamic iVStability;
String itemDescription;
int itemID;
int lineItemNo;
int locationId;
int noOfDoses;
int orderNo;
int patientID;
String pharmacyRemarks;
String prescriptionDatetime;
int prescriptionNo;
String processedBy;
int projectID;
int refillID;
String refillType;
String? itemDescription;
int? itemID;
int? lineItemNo;
int? locationId;
int? noOfDoses;
int? orderNo;
int? patientID;
String? pharmacyRemarks;
String? prescriptionDatetime;
int? prescriptionNo;
String? processedBy;
int? projectID;
int? refillID;
String? refillType;
dynamic refillTypeN;
int reviewedPharmacist;
int? reviewedPharmacist;
dynamic roomId;
String route;
int routeId;
String? route;
int? routeId;
dynamic routeN;
dynamic setupID;
String startDatetime;
int status;
String statusDescription;
String? startDatetime;
int? status;
String? statusDescription;
dynamic statusDescriptionN;
String stopDatetime;
int unitofMeasurement;
String unitofMeasurementDescription;
String? stopDatetime;
int? unitofMeasurement;
String? unitofMeasurementDescription;
dynamic unitofMeasurementDescriptionN;
PrescriotionInPatient(

@ -1,5 +1,5 @@
class PrescriptionModel {
List<EntityList> entityList;
List<EntityList>? entityList;
dynamic rowcount;
dynamic statusMessage;
@ -7,9 +7,9 @@ class PrescriptionModel {
PrescriptionModel.fromJson(Map<String, dynamic> json) {
if (json['entityList'] != null) {
entityList = new List<EntityList>();
entityList = [];
json['entityList'].forEach((v) {
entityList.add(new EntityList.fromJson(v));
entityList!.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
@ -19,7 +19,7 @@ class PrescriptionModel {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.entityList != null) {
data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;

@ -1,48 +1,48 @@
class PrescriptionReport {
String address;
int appointmentNo;
String clinic;
String companyName;
int days;
String doctorName;
String? address;
int? appointmentNo;
String? clinic;
String? companyName;
int? days;
String? doctorName;
var doseDailyQuantity;
String frequency;
int frequencyNumber;
String image;
String imageExtension;
String imageSRCUrl;
String imageString;
String imageThumbUrl;
String isCovered;
String itemDescription;
int itemID;
String orderDate;
int patientID;
String patientName;
String phoneOffice1;
String prescriptionQR;
int prescriptionTimes;
String productImage;
String productImageBase64;
String productImageString;
int projectID;
String projectName;
String remarks;
String route;
String sKU;
int scaleOffset;
String startDate;
String? frequency;
int? frequencyNumber;
String? image;
String? imageExtension;
String? imageSRCUrl;
String? imageString;
String? imageThumbUrl;
String? isCovered;
String? itemDescription;
int? itemID;
String? orderDate;
int? patientID;
String? patientName;
String? phoneOffice1;
String? prescriptionQR;
int? prescriptionTimes;
String? productImage;
String? productImageBase64;
String? productImageString;
int? projectID;
String? projectName;
String? remarks;
String? route;
String? sKU;
int? scaleOffset;
String? startDate;
String patientAge;
String patientGender;
String phoneOffice;
int doseTimingID;
int frequencyID;
int routeID;
String name;
String itemDescriptionN;
String routeN;
String frequencyN;
String? patientAge;
String? patientGender;
String? phoneOffice;
int? doseTimingID;
int? frequencyID;
int? routeID;
String? name;
String? itemDescriptionN;
String? routeN;
String? frequencyN;
PrescriptionReport({
this.address,

@ -1,37 +1,37 @@
class PrescriptionReportEnh {
String address;
int appointmentNo;
String clinic;
String? address;
int? appointmentNo;
String? clinic;
Null companyName;
int days;
String doctorName;
int doseDailyQuantity;
String frequency;
int frequencyNumber;
int? days;
String? doctorName;
int? doseDailyQuantity;
String? frequency;
int? frequencyNumber;
Null image;
Null imageExtension;
String imageSRCUrl;
String? imageSRCUrl;
Null imageString;
String imageThumbUrl;
String isCovered;
String itemDescription;
int itemID;
String orderDate;
int patientID;
String patientName;
String phoneOffice1;
String? imageThumbUrl;
String? isCovered;
String? itemDescription;
int? itemID;
String? orderDate;
int? patientID;
String? patientName;
String? phoneOffice1;
Null prescriptionQR;
int prescriptionTimes;
int? prescriptionTimes;
Null productImage;
Null productImageBase64;
String productImageString;
int projectID;
String projectName;
String remarks;
String route;
String sKU;
int scaleOffset;
String startDate;
String? productImageString;
int? projectID;
String? projectName;
String? remarks;
String? route;
String? sKU;
int? scaleOffset;
String? startDate;
PrescriptionReportEnh(
{this.address,

@ -1,5 +1,5 @@
class PrescriptionReqModel {
String vidaAuthTokenID;
String? vidaAuthTokenID;
dynamic patientMRN;
dynamic appNo;
dynamic admissionNo;

@ -1,32 +1,32 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class PrescriptionsOrder {
int iD;
int? iD;
dynamic patientID;
bool patientOutSA;
bool isOutPatient;
int projectID;
int nearestProjectID;
double longitude;
double latitude;
bool? patientOutSA;
bool? isOutPatient;
int? projectID;
int? nearestProjectID;
double? longitude;
double? latitude;
dynamic appointmentNo;
dynamic dischargeID;
int lineItemNo;
int status;
int? lineItemNo;
int? status;
dynamic description;
dynamic descriptionN;
DateTime createdOn;
int serviceID;
int createdBy;
DateTime editedOn;
int editedBy;
int channel;
DateTime? createdOn;
int? serviceID;
int? createdBy;
DateTime? editedOn;
int? editedBy;
int? channel;
dynamic clientRequestID;
bool returnedToQueue;
bool? returnedToQueue;
dynamic pickupDateTime;
dynamic pickupLocationName;
dynamic dropoffLocationName;
int realRRTHaveTransactions;
int? realRRTHaveTransactions;
dynamic nearestProjectDescription;
dynamic nearestProjectDescriptionN;
dynamic projectDescription;

@ -1,16 +1,16 @@
class RequestGetListPharmacyForPrescriptions {
int latitude;
int longitude;
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int itemID;
int? latitude;
int? longitude;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? itemID;
RequestGetListPharmacyForPrescriptions(
{this.latitude,

@ -1,23 +1,23 @@
class RequestPrescriptionReport {
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
int appointmentNo;
String setupID;
int episodeID;
int clinicID;
int projectID;
int dischargeNo;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? patientID;
String? tokenID;
int? patientTypeID;
int? patientType;
int? appointmentNo;
String? setupID;
int? episodeID;
int? clinicID;
int? projectID;
int? dischargeNo;
RequestPrescriptionReport(
{this.versionID,

@ -1,23 +1,23 @@
class RequestPrescriptionReportEnh {
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
int appointmentNo;
String setupID;
int dischargeNo;
int episodeID;
int clinicID;
int projectID;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? patientID;
String? tokenID;
int? patientTypeID;
int? patientType;
int? appointmentNo;
String? setupID;
int? dischargeNo;
int? episodeID;
int? clinicID;
int? projectID;
RequestPrescriptionReportEnh(
{this.versionID,

@ -1,45 +1,45 @@
class AdmissionRequest {
int patientMRN;
int admitToClinic;
bool isPregnant;
int pregnancyWeeks;
int pregnancyType;
int noOfBabies;
int mrpDoctorID;
String admissionDate;
int expectedDays;
int admissionType;
int admissionLocationID;
int roomCategoryID;
int wardID;
bool isSickLeaveRequired;
String sickLeaveComments;
bool isTransport;
String transportComments;
bool isPhysioAppointmentNeeded;
String physioAppointmentComments;
bool isOPDFollowupAppointmentNeeded;
String opdFollowUpComments;
bool isDietType;
int dietType;
String dietRemarks;
bool isPhysicalActivityModification;
String physicalActivityModificationComments;
int orStatus;
String mainLineOfTreatment;
int estimatedCost;
String elementsForImprovement;
bool isPackagePatient;
String complications;
String otherDepartmentInterventions;
String otherProcedures;
String pastMedicalHistory;
String pastSurgicalHistory;
List<dynamic> admissionRequestDiagnoses;
List<dynamic> admissionRequestProcedures;
int appointmentNo;
int episodeID;
int admissionRequestNo;
int? patientMRN;
int? admitToClinic;
bool? isPregnant;
int? pregnancyWeeks;
int? pregnancyType;
int? noOfBabies;
int? mrpDoctorID;
String? admissionDate;
int? expectedDays;
int? admissionType;
int? admissionLocationID;
int? roomCategoryID;
int? wardID;
bool? isSickLeaveRequired;
String? sickLeaveComments;
bool? isTransport;
String? transportComments;
bool? isPhysioAppointmentNeeded;
String? physioAppointmentComments;
bool? isOPDFollowupAppointmentNeeded;
String? opdFollowUpComments;
bool? isDietType;
int? dietType;
String? dietRemarks;
bool? isPhysicalActivityModification;
String? physicalActivityModificationComments;
int? orStatus;
String? mainLineOfTreatment;
int? estimatedCost;
String? elementsForImprovement;
bool? isPackagePatient;
String? complications;
String? otherDepartmentInterventions;
String? otherProcedures;
String? pastMedicalHistory;
String? pastSurgicalHistory;
List<dynamic>? admissionRequestDiagnoses;
List<dynamic>? admissionRequestProcedures;
int? appointmentNo;
int? episodeID;
int? admissionRequestNo;
AdmissionRequest(
{this.patientMRN,
@ -123,17 +123,17 @@ class AdmissionRequest {
pastMedicalHistory = json['pastMedicalHistory'];
pastSurgicalHistory = json['pastSurgicalHistory'];
if (json['admissionRequestDiagnoses'] != null) {
admissionRequestDiagnoses = new List<dynamic>();
admissionRequestDiagnoses = [];
json['admissionRequestDiagnoses'].forEach((v) {
admissionRequestDiagnoses.add(v);
admissionRequestDiagnoses!.add(v);
// admissionRequestDiagnoses
// .add(new AdmissionRequestDiagnoses.fromJson(v));
});
}
if (json['admissionRequestProcedures'] != null) {
admissionRequestProcedures = new List<dynamic>();
admissionRequestProcedures = [];
json['admissionRequestProcedures'].forEach((v) {
admissionRequestProcedures.add(v);
admissionRequestProcedures!.add(v);
// admissionRequestProcedures
// .add(new AdmissionRequestProcedures.fromJson(v));
});
@ -190,7 +190,7 @@ class AdmissionRequest {
}
if (this.admissionRequestProcedures != null) {
data['admissionRequestProcedures'] =
this.admissionRequestProcedures.map((v) => v.toJson()).toList();
this.admissionRequestProcedures!.map((v) => v.toJson()).toList();
}
data['appointmentNo'] = this.appointmentNo;
data['episodeID'] = this.episodeID;

@ -1,9 +1,9 @@
class Clinic {
int clinicGroupID;
String clinicGroupName;
int clinicID;
String clinicNameArabic;
String clinicNameEnglish;
int? clinicGroupID;
String? clinicGroupName;
int? clinicID;
String? clinicNameArabic;
String? clinicNameEnglish;
Clinic(
{this.clinicGroupID,

@ -1,9 +1,9 @@
class WardModel{
String description;
String descriptionN;
int floorID;
bool isActive;
String? description;
String? descriptionN;
int? floorID;
bool? isActive;
WardModel(
{this.description, this.descriptionN, this.floorID, this.isActive});

@ -1,14 +1,14 @@
class ActivationCodeModel {
String mobileNumber;
String zipCode;
int channel;
int languageID;
double versionID;
int memberID;
String password;
int facilityId;
String generalid;
String otpSendType;
String? mobileNumber;
String? zipCode;
int? channel;
int? languageID;
double? versionID;
int? memberID;
String? password;
int? facilityId;
String? generalid;
String? otpSendType;
ActivationCodeModel(
{this.mobileNumber,
this.zipCode,

@ -1,17 +1,17 @@
class ActivationCodeForVerificationScreenModel {
int oTPSendType;
String mobileNumber;
String zipCode;
int channel;
int languageID;
double versionID;
int memberID;
int facilityId;
String generalid;
int isMobileFingerPrint;
String vidaAuthTokenID;
String vidaRefreshTokenID;
String iMEI;
int? oTPSendType;
String? mobileNumber;
String? zipCode;
int? channel;
int? languageID;
double? versionID;
int? memberID;
int? facilityId;
String? generalid;
int? isMobileFingerPrint;
String? vidaAuthTokenID;
String? vidaRefreshTokenID;
String? iMEI;
ActivationCodeForVerificationScreenModel(
{this.oTPSendType,
this.mobileNumber,

@ -1,10 +1,10 @@
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
class CheckActivationCodeForDoctorAppResponseModel {
String authenticationTokenID;
List<ListDoctorsClinic> listDoctorsClinic;
List<DoctorProfileModel> listDoctorProfile;
MemberInformation memberInformation;
String? authenticationTokenID;
List<ListDoctorsClinic>? listDoctorsClinic;
List<DoctorProfileModel>? listDoctorProfile;
MemberInformation? memberInformation;
CheckActivationCodeForDoctorAppResponseModel(
{this.authenticationTokenID,
@ -15,16 +15,16 @@ class CheckActivationCodeForDoctorAppResponseModel {
Map<String, dynamic> json) {
authenticationTokenID = json['AuthenticationTokenID'];
if (json['List_DoctorsClinic'] != null) {
listDoctorsClinic = new List<ListDoctorsClinic>();
listDoctorsClinic = [];
json['List_DoctorsClinic'].forEach((v) {
listDoctorsClinic.add(new ListDoctorsClinic.fromJson(v));
listDoctorsClinic!.add(new ListDoctorsClinic.fromJson(v));
});
}
if (json['List_DoctorProfile'] != null) {
listDoctorProfile = new List<DoctorProfileModel>();
listDoctorProfile = [];
json['List_DoctorProfile'].forEach((v) {
listDoctorProfile.add(new DoctorProfileModel.fromJson(v));
listDoctorProfile!.add(new DoctorProfileModel.fromJson(v));
});
}
@ -38,15 +38,15 @@ class CheckActivationCodeForDoctorAppResponseModel {
data['AuthenticationTokenID'] = this.authenticationTokenID;
if (this.listDoctorsClinic != null) {
data['List_DoctorsClinic'] =
this.listDoctorsClinic.map((v) => v.toJson()).toList();
this.listDoctorsClinic!.map((v) => v.toJson()).toList();
}
if (this.listDoctorProfile != null) {
data['List_DoctorProfile'] =
this.listDoctorProfile.map((v) => v.toJson()).toList();
this.listDoctorProfile!.map((v) => v.toJson()).toList();
}
if (this.memberInformation != null) {
data['memberInformation'] = this.memberInformation.toJson();
data['memberInformation'] = this.memberInformation!.toJson();
}
return data;
}
@ -54,11 +54,11 @@ class CheckActivationCodeForDoctorAppResponseModel {
class ListDoctorsClinic {
Null setupID;
int projectID;
int doctorID;
int clinicID;
bool isActive;
String clinicName;
int? projectID;
int? doctorID;
int? clinicID;
bool? isActive;
String? clinicName;
ListDoctorsClinic({this.setupID,
this.projectID,
@ -89,15 +89,15 @@ class ListDoctorsClinic {
}
class MemberInformation {
List<Clinics> clinics;
int doctorId;
String email;
int employeeId;
int memberId;
List<Clinics>? clinics;
int? doctorId;
String? email;
int? employeeId;
int? memberId;
Null memberName;
Null memberNameArabic;
String preferredLanguage;
List<Roles> roles;
String? preferredLanguage;
List<Roles>? roles;
MemberInformation({this.clinics,
this.doctorId,
@ -111,9 +111,9 @@ class MemberInformation {
MemberInformation.fromJson(Map<String, dynamic> json) {
if (json['clinics'] != null) {
clinics = new List<Clinics>();
clinics = [];
json['clinics'].forEach((v) {
clinics.add(new Clinics.fromJson(v));
clinics!.add(new Clinics.fromJson(v));
});
}
doctorId = json['doctorId'];
@ -124,9 +124,9 @@ class MemberInformation {
memberNameArabic = json['memberNameArabic'];
preferredLanguage = json['preferredLanguage'];
if (json['roles'] != null) {
roles = new List<Roles>();
roles = [];
json['roles'].forEach((v) {
roles.add(new Roles.fromJson(v));
roles!.add(new Roles.fromJson(v));
});
}
}
@ -134,7 +134,7 @@ class MemberInformation {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.clinics != null) {
data['clinics'] = this.clinics.map((v) => v.toJson()).toList();
data['clinics'] = this.clinics!.map((v) => v.toJson()).toList();
}
data['doctorId'] = this.doctorId;
data['email'] = this.email;
@ -144,16 +144,16 @@ class MemberInformation {
data['memberNameArabic'] = this.memberNameArabic;
data['preferredLanguage'] = this.preferredLanguage;
if (this.roles != null) {
data['roles'] = this.roles.map((v) => v.toJson()).toList();
data['roles'] = this.roles!.map((v) => v.toJson()).toList();
}
return data;
}
}
class Clinics {
bool defaultClinic;
int id;
String name;
bool? defaultClinic;
int? id;
String? name;
Clinics({this.defaultClinic, this.id, this.name});
@ -173,8 +173,8 @@ class Clinics {
}
class Roles {
String name;
int roleId;
String? name;
int? roleId;
Roles({this.name, this.roleId});

@ -1,18 +1,18 @@
class CheckActivationCodeRequestModel {
String mobileNumber;
String zipCode;
int doctorID;
String iPAdress;
int channel;
int languageID;
int projectID;
double versionID;
String generalid;
String logInTokenID;
String activationCode;
String vidaAuthTokenID;
String vidaRefreshTokenID;
int oTPSendType;
String? mobileNumber;
String? zipCode;
int? doctorID;
String? iPAdress;
int? channel;
int? languageID;
int? projectID;
double? versionID;
String? generalid;
String? logInTokenID;
String? activationCode;
String? vidaAuthTokenID;
String? vidaRefreshTokenID;
int? oTPSendType;
CheckActivationCodeRequestModel(
{this.mobileNumber,
this.zipCode,

@ -1,33 +1,33 @@
class GetIMEIDetailsModel {
int iD;
String iMEI;
int logInTypeID;
bool outSA;
String mobile;
int? iD;
String? iMEI;
int? logInTypeID;
bool? outSA;
String? mobile;
dynamic identificationNo;
int doctorID;
String doctorName;
String doctorNameN;
int clinicID;
String clinicDescription;
int? doctorID;
String? doctorName;
String? doctorNameN;
int? clinicID;
String? clinicDescription;
dynamic clinicDescriptionN;
int projectID;
String projectName;
String genderDescription;
int? projectID;
String? projectName;
String? genderDescription;
dynamic genderDescriptionN;
String titleDescription;
String? titleDescription;
dynamic titleDescriptionN;
dynamic zipCode;
String createdOn;
String? createdOn;
dynamic createdBy;
String editedOn;
String? editedOn;
dynamic editedBy;
bool biometricEnabled;
bool? biometricEnabled;
dynamic preferredLanguage;
bool isActive;
String vidaAuthTokenID;
String vidaRefreshTokenID;
String password;
bool? isActive;
String? vidaAuthTokenID;
String? vidaRefreshTokenID;
String? password;
GetIMEIDetailsModel(
{this.iD,
this.iMEI,

@ -1,36 +1,36 @@
class InsertIMEIDetailsModel {
String iMEI;
int logInTypeID;
String? iMEI;
int? logInTypeID;
dynamic outSA;
String mobile;
String? mobile;
dynamic identificationNo;
int doctorID;
String doctorName;
String doctorNameN;
int clinicID;
String clinicDescription;
int? doctorID;
String? doctorName;
String? doctorNameN;
int? clinicID;
String? clinicDescription;
Null clinicDescriptionN;
String projectName;
String genderDescription;
String? projectName;
String? genderDescription;
Null genderDescriptionN;
String titleDescription;
String? titleDescription;
Null titleDescriptionN;
bool bioMetricEnabled;
bool? bioMetricEnabled;
Null preferredLanguage;
bool isActive;
int editedBy;
int projectID;
String tokenID;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String sessionID;
bool isLoginForDoctorApp;
int patientOutSA;
String vidaAuthTokenID;
String vidaRefreshTokenID;
bool? isActive;
int? editedBy;
int? projectID;
String? tokenID;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? sessionID;
bool? isLoginForDoctorApp;
int? patientOutSA;
String? vidaAuthTokenID;
String? vidaRefreshTokenID;
dynamic password;
InsertIMEIDetailsModel(
{this.iMEI,

@ -1,13 +1,13 @@
class NewLoginInformationModel {
int doctorID;
List<ListMemberInformation> listMemberInformation;
String logInTokenID;
String mobileNumber;
int? doctorID;
List<ListMemberInformation>? listMemberInformation;
String? logInTokenID;
String? mobileNumber;
Null sELECTDeviceIMEIbyIMEIList;
int userID;
String zipCode;
bool isActiveCode;
bool isSMSSent;
int? userID;
String? zipCode;
bool? isActiveCode;
bool? isSMSSent;
NewLoginInformationModel(
{this.doctorID,
@ -23,9 +23,9 @@ class NewLoginInformationModel {
NewLoginInformationModel.fromJson(Map<String, dynamic> json) {
doctorID = json['DoctorID'];
if (json['List_MemberInformation'] != null) {
listMemberInformation = new List<ListMemberInformation>();
listMemberInformation = [];
json['List_MemberInformation'].forEach((v) {
listMemberInformation.add(new ListMemberInformation.fromJson(v));
listMemberInformation!.add(new ListMemberInformation.fromJson(v));
});
}
logInTokenID = json['LogInTokenID'];
@ -42,7 +42,7 @@ class NewLoginInformationModel {
data['DoctorID'] = this.doctorID;
if (this.listMemberInformation != null) {
data['List_MemberInformation'] =
this.listMemberInformation.map((v) => v.toJson()).toList();
this.listMemberInformation!.map((v) => v.toJson()).toList();
}
data['LogInTokenID'] = this.logInTokenID;
data['MobileNumber'] = this.mobileNumber;
@ -57,16 +57,16 @@ class NewLoginInformationModel {
class ListMemberInformation {
Null setupID;
int memberID;
String memberName;
int? memberID;
String? memberName;
Null memberNameN;
String preferredLang;
String pIN;
String saltHash;
int referenceID;
int employeeID;
int roleID;
int projectid;
String? preferredLang;
String? pIN;
String? saltHash;
int? referenceID;
int? employeeID;
int? roleID;
int? projectid;
ListMemberInformation(
{this.setupID,

@ -1,8 +1,8 @@
class SendActivationCodeForDoctorAppResponseModel {
String logInTokenID;
String verificationCode;
String vidaAuthTokenID;
String vidaRefreshTokenID;
String? logInTokenID;
String? verificationCode;
String? vidaAuthTokenID;
String? vidaRefreshTokenID;
SendActivationCodeForDoctorAppResponseModel(
{this.logInTokenID,

@ -1,9 +1,9 @@
class CalculateBoxQuantityRequestModel {
int itemCode;
double strength;
int frequency;
int duration;
String vidaAuthTokenID;
int? itemCode;
double? strength;
int? frequency;
int? duration;
String? vidaAuthTokenID;
CalculateBoxQuantityRequestModel(
{this.itemCode,

@ -1,13 +1,13 @@
class GetHospitalsRequestModel {
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
String memberID;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
String? memberID;
GetHospitalsRequestModel(
{this.languageID,

@ -1,7 +1,7 @@
class GetHospitalsResponseModel {
String facilityGroupId;
int facilityId;
String facilityName;
String? facilityGroupId;
int? facilityId;
String? facilityName;
GetHospitalsResponseModel(
{this.facilityGroupId, this.facilityId, this.facilityName});

@ -1,20 +1,20 @@
class HospitalsModel {
String desciption;
String? desciption;
dynamic desciptionN;
int iD;
String legalName;
String legalNameN;
String name;
int? iD;
String? legalName;
String? legalNameN;
String? name;
dynamic nameN;
String phoneNumber;
String setupID;
int distanceInKilometers;
bool isActive;
String latitude;
String longitude;
int mainProjectID;
String? phoneNumber;
String? setupID;
int? distanceInKilometers;
bool? isActive;
String? latitude;
String? longitude;
int? mainProjectID;
dynamic projectOutSA;
bool usingInDoctorApp;
bool? usingInDoctorApp;
HospitalsModel({this.desciption,
this.desciptionN,

@ -1,11 +1,11 @@
class ApporvalDetails {
int approvalNo;
int? approvalNo;
String procedureName;
String? procedureName;
//String procedureNameN;
String status;
String? status;
String isInvoicedDesc;
String? isInvoicedDesc;
ApporvalDetails(
{this.approvalNo, this.procedureName, this.status, this.isInvoicedDesc});
@ -35,35 +35,35 @@ class ApporvalDetails {
}
class InsuranceApprovalModel {
List<ApporvalDetails> apporvalDetails;
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
int eXuldAPPNO;
int projectID;
String doctorName;
String clinicName;
String patientDescription;
int approvalNo;
String approvalStatusDescption;
int unUsedCount;
String doctorImage;
String projectName;
List<ApporvalDetails>? apporvalDetails;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? patientID;
String? tokenID;
int? patientTypeID;
int? patientType;
int? eXuldAPPNO;
int? projectID;
String? doctorName;
String? clinicName;
String? patientDescription;
int? approvalNo;
String? approvalStatusDescption;
int? unUsedCount;
String? doctorImage;
String? projectName;
//String companyName;
String expiryDate;
String rceiptOn;
int appointmentNo;
String? expiryDate;
String? rceiptOn;
int? appointmentNo;
InsuranceApprovalModel(
{this.versionID,
@ -126,9 +126,9 @@ class InsuranceApprovalModel {
doctorImage = json['DoctorImageURL'];
clinicName = json['ClinicName'];
if (json['ApporvalDetails'] != null) {
apporvalDetails = new List<ApporvalDetails>();
apporvalDetails = [];
json['ApporvalDetails'].forEach((v) {
apporvalDetails.add(new ApporvalDetails.fromJson(v));
apporvalDetails!.add(new ApporvalDetails.fromJson(v));
});
}
appointmentNo = json['AppointmentNo'];

@ -1,36 +1,36 @@
class InsuranceApprovalInPatientModel {
String setupID;
int projectID;
int approvalNo;
int status;
String approvalDate;
int patientType;
int patientID;
int companyID;
bool subCategoryID;
int doctorID;
int clinicID;
int approvalType;
int inpatientApprovalSubType;
String? setupID;
int? projectID;
int? approvalNo;
int? status;
String? approvalDate;
int? patientType;
int? patientID;
int? companyID;
bool? subCategoryID;
int? doctorID;
int? clinicID;
int? approvalType;
int? inpatientApprovalSubType;
dynamic isApprovalOnGross;
String companyApprovalNo;
String? companyApprovalNo;
dynamic progNoteOrderNo;
String submitOn;
String receiptOn;
String expiryDate;
int admissionNo;
int admissionRequestNo;
String approvalStatusDescption;
String? submitOn;
String? receiptOn;
String? expiryDate;
int? admissionNo;
int? admissionRequestNo;
String? approvalStatusDescption;
dynamic approvalStatusDescptionN;
dynamic remarks;
List<ApporvalDetails> apporvalDetails;
String clinicName;
List<ApporvalDetails>? apporvalDetails;
String? clinicName;
dynamic companyName;
String doctorName;
String projectName;
int totaUnUsedCount;
int unUsedCount;
String doctorImage;
String? doctorName;
String? projectName;
int? totaUnUsedCount;
int? unUsedCount;
String? doctorImage;
InsuranceApprovalInPatientModel(
{this.setupID,
@ -93,9 +93,9 @@ class InsuranceApprovalInPatientModel {
approvalStatusDescptionN = json['ApprovalStatusDescptionN'];
remarks = json['Remarks'];
if (json['ApporvalDetails'] != null) {
apporvalDetails = new List<ApporvalDetails>();
apporvalDetails = [];
json['ApporvalDetails'].forEach((v) {
apporvalDetails.add(new ApporvalDetails.fromJson(v));
apporvalDetails!.add(new ApporvalDetails.fromJson(v));
});
}
clinicName = json['ClinicName'];
@ -135,7 +135,7 @@ class InsuranceApprovalInPatientModel {
data['Remarks'] = this.remarks;
if (this.apporvalDetails != null) {
data['ApporvalDetails'] =
this.apporvalDetails.map((v) => v.toJson()).toList();
this.apporvalDetails!.map((v) => v.toJson()).toList();
}
data['ClinicName'] = this.clinicName;
data['CompanyName'] = this.companyName;
@ -150,7 +150,7 @@ class InsuranceApprovalInPatientModel {
class ApporvalDetails {
Null setupID;
Null projectID;
int approvalNo;
int? approvalNo;
Null lineItemNo;
Null orderType;
Null procedureID;
@ -167,16 +167,16 @@ class ApporvalDetails {
Null patientShare;
Null companyShare;
Null deductableAmount;
String disapprovedRemarks;
String? disapprovedRemarks;
Null progNoteOrderNo;
Null progNoteLineItemNo;
Null invoiceTransactionType;
Null invoiceNo;
String procedureName;
String procedureNameN;
String status;
String? procedureName;
String? procedureNameN;
String? status;
Null isInvoiced;
String isInvoicedDesc;
String? isInvoicedDesc;
ApporvalDetails(
{this.setupID,

@ -1,23 +1,23 @@
class LabOrderResult {
String description;
String? description;
dynamic femaleInterpretativeData;
int gender;
int lineItemNo;
int? gender;
int? lineItemNo;
dynamic maleInterpretativeData;
dynamic notes;
String packageID;
int patientID;
String projectID;
String referanceRange;
String resultValue;
String sampleCollectedOn;
String sampleReceivedOn;
String setupID;
String? packageID;
int? patientID;
String? projectID;
String? referanceRange;
String? resultValue;
String? sampleCollectedOn;
String? sampleReceivedOn;
String? setupID;
dynamic superVerifiedOn;
String testCode;
String uOM;
String verifiedOn;
String verifiedOnDateTime;
String? testCode;
String? uOM;
String? verifiedOn;
String? verifiedOnDateTime;
LabOrderResult(
{this.description,

@ -1,22 +1,22 @@
class LabResult {
String description;
String? description;
dynamic femaleInterpretativeData;
int gender;
int lineItemNo;
int? gender;
int? lineItemNo;
dynamic maleInterpretativeData;
String notes;
String packageID;
int patientID;
String projectID;
String referanceRange;
String resultValue;
String sampleCollectedOn;
String sampleReceivedOn;
String setupID;
String? notes;
String? packageID;
int? patientID;
String? projectID;
String? referanceRange;
String? resultValue;
String? sampleCollectedOn;
String? sampleReceivedOn;
String? setupID;
dynamic superVerifiedOn;
String testCode;
String uOM;
String verifiedOn;
String? testCode;
String? uOM;
String? verifiedOn;
dynamic verifiedOnDateTime;
LabResult(
@ -89,10 +89,10 @@ class LabResult {
class LabResultList {
String filterName = "";
List<LabResult> patientLabResultList = List();
String? filterName = "";
List<LabResult?> patientLabResultList = [];
LabResultList({this.filterName, LabResult lab}) {
LabResultList({this.filterName, LabResult? lab}) {
patientLabResultList.add(lab);
}
}

@ -1,40 +1,40 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class PatientLabOrders {
int actualDoctorRate;
String clinicDescription;
String clinicDescriptionEnglish;
int? actualDoctorRate;
String? clinicDescription;
String? clinicDescriptionEnglish;
Null clinicDescriptionN;
int clinicID;
int doctorID;
String doctorImageURL;
String doctorName;
String doctorNameEnglish;
int? clinicID;
int? doctorID;
String? doctorImageURL;
String? doctorName;
String? doctorNameEnglish;
Null doctorNameN;
int doctorRate;
String doctorTitle;
int gender;
String genderDescription;
String invoiceNo;
bool isActiveDoctorProfile;
bool isDoctorAllowVedioCall;
bool isExecludeDoctor;
bool isInOutPatient;
String isInOutPatientDescription;
String isInOutPatientDescriptionN;
bool isRead;
String nationalityFlagURL;
int noOfPatientsRate;
DateTime orderDate;
String orderNo;
String patientID;
String projectID;
String projectName;
int? doctorRate;
String? doctorTitle;
int? gender;
String? genderDescription;
String? invoiceNo;
bool? isActiveDoctorProfile;
bool? isDoctorAllowVedioCall;
bool? isExecludeDoctor;
bool? isInOutPatient;
String? isInOutPatientDescription;
String? isInOutPatientDescriptionN;
bool? isRead;
String? nationalityFlagURL;
int? noOfPatientsRate;
DateTime? orderDate;
String? orderNo;
String? patientID;
String? projectID;
String? projectName;
Null projectNameN;
String qR;
String setupID;
List<String> speciality;
bool isLiveCareAppointment;
String? qR;
String? setupID;
List<String>? speciality;
bool? isLiveCareAppointment;
PatientLabOrders(
{this.actualDoctorRate,
this.clinicDescription,
@ -148,11 +148,11 @@ class PatientLabOrders {
}
class PatientLabOrdersList {
String filterName = "";
List<PatientLabOrders> patientLabOrdersList = List();
String? filterName = "";
List<PatientLabOrders?> patientLabOrdersList = [];
PatientLabOrdersList(
{this.filterName, PatientLabOrders patientDoctorAppointment}) {
{this.filterName, PatientLabOrders? patientDoctorAppointment}) {
patientLabOrdersList.add(patientDoctorAppointment);
}
}

@ -1,8 +1,8 @@
class PatientLabSpecialResult {
String invoiceNo;
String moduleID;
String resultData;
String resultDataHTML;
String? invoiceNo;
String? moduleID;
String? resultData;
String? resultDataHTML;
Null resultDataTxt;
PatientLabSpecialResult(

@ -1,17 +1,17 @@
class RequestPatientLabOrders {
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? patientID;
String? tokenID;
int? patientTypeID;
int? patientType;
RequestPatientLabOrders(
{this.versionID,

@ -1,22 +1,22 @@
class RequestPatientLabSpecialResult {
String invoiceNo;
String orderNo;
String setupID;
String projectID;
int clinicID;
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
String? invoiceNo;
String? orderNo;
String? setupID;
String? projectID;
int? clinicID;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? patientID;
String? tokenID;
int? patientTypeID;
int? patientType;
RequestPatientLabSpecialResult(
{this.invoiceNo,

@ -1,29 +1,29 @@
class RequestSendLabReportEmail {
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
String to;
String dateofBirth;
String patientIditificationNum;
String patientMobileNumber;
String patientName;
String setupID;
String projectName;
String clinicName;
String doctorName;
String projectID;
String invoiceNo;
String orderDate;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? patientID;
String? tokenID;
int? patientTypeID;
int? patientType;
String? to;
String? dateofBirth;
String? patientIditificationNum;
String? patientMobileNumber;
String? patientName;
String? setupID;
String? projectName;
String? clinicName;
String? doctorName;
String? projectID;
String? invoiceNo;
String? orderDate;
RequestSendLabReportEmail(
{this.versionID,

@ -1,14 +1,14 @@
class MedicalFileModel {
List<EntityList> entityList;
List<EntityList>? entityList;
dynamic statusMessage;
MedicalFileModel({this.entityList, this.statusMessage});
MedicalFileModel.fromJson(Map<String, dynamic> json) {
if (json['entityList'] != null) {
entityList = new List<EntityList>();
entityList = [];
json['entityList'].forEach((v) {
entityList.add(new EntityList.fromJson(v));
entityList!.add(new EntityList.fromJson(v));
});
}
statusMessage = json['statusMessage'];
@ -17,7 +17,7 @@ class MedicalFileModel {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.entityList != null) {
data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
}
data['statusMessage'] = this.statusMessage;
return data;
@ -25,15 +25,15 @@ class MedicalFileModel {
}
class EntityList {
List<Timelines> timelines;
List<Timelines>? timelines;
EntityList({this.timelines});
EntityList.fromJson(Map<String, dynamic> json) {
if (json['Timelines'] != null) {
timelines = new List<Timelines>();
timelines = [];
json['Timelines'].forEach((v) {
timelines.add(new Timelines.fromJson(v));
timelines!.add(new Timelines.fromJson(v));
});
}
}
@ -41,25 +41,25 @@ class EntityList {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.timelines != null) {
data['Timelines'] = this.timelines.map((v) => v.toJson()).toList();
data['Timelines'] = this.timelines!.map((v) => v.toJson()).toList();
}
return data;
}
}
class Timelines {
int clinicId;
String clinicName;
String date;
int doctorId;
String doctorImage;
String doctorName;
int encounterNumber;
String encounterType;
int projectID;
String projectName;
String setupID;
List<TimeLineEvents> timeLineEvents;
int? clinicId;
String? clinicName;
String? date;
int? doctorId;
String? doctorImage;
String? doctorName;
int? encounterNumber;
String? encounterType;
int? projectID;
String? projectName;
String? setupID;
List<TimeLineEvents>? timeLineEvents;
Timelines(
{this.clinicId,
@ -88,9 +88,9 @@ class Timelines {
projectName = json['ProjectName'];
setupID = json['SetupID'];
if (json['TimeLineEvents'] != null) {
timeLineEvents = new List<TimeLineEvents>();
timeLineEvents = [];
json['TimeLineEvents'].forEach((v) {
timeLineEvents.add(new TimeLineEvents.fromJson(v));
timeLineEvents!.add(new TimeLineEvents.fromJson(v));
});
}
}
@ -110,25 +110,25 @@ class Timelines {
data['SetupID'] = this.setupID;
if (this.timeLineEvents != null) {
data['TimeLineEvents'] =
this.timeLineEvents.map((v) => v.toJson()).toList();
this.timeLineEvents!.map((v) => v.toJson()).toList();
}
return data;
}
}
class TimeLineEvents {
List<Null> admissions;
String colorClass;
List<Consulations> consulations;
List<Null>? admissions;
String? colorClass;
List<Consulations>? consulations;
TimeLineEvents({this.admissions, this.colorClass, this.consulations});
TimeLineEvents.fromJson(Map<String, dynamic> json) {
colorClass = json['ColorClass'];
if (json['Consulations'] != null) {
consulations = new List<Consulations>();
consulations = [];
json['Consulations'].forEach((v) {
consulations.add(new Consulations.fromJson(v));
consulations!.add(new Consulations.fromJson(v));
});
}
}
@ -138,38 +138,38 @@ class TimeLineEvents {
data['ColorClass'] = this.colorClass;
if (this.consulations != null) {
data['Consulations'] = this.consulations.map((v) => v.toJson()).toList();
data['Consulations'] = this.consulations!.map((v) => v.toJson()).toList();
}
return data;
}
}
class Consulations {
int admissionNo;
String appointmentDate;
int appointmentNo;
String appointmentType;
String clinicID;
String clinicName;
int doctorID;
String doctorName;
String endTime;
String episodeDate;
int episodeID;
int patientID;
int projectID;
String projectName;
String remarks;
String setupID;
String startTime;
String visitFor;
String visitType;
String dispalyName;
List<LstAssessments> lstAssessments;
List<LstPhysicalExam> lstPhysicalExam;
List<LstProcedure> lstProcedure;
List<LstMedicalHistory> lstMedicalHistory;
List<LstCheifComplaint> lstCheifComplaint;
int? admissionNo;
String? appointmentDate;
int? appointmentNo;
String? appointmentType;
String? clinicID;
String? clinicName;
int? doctorID;
String? doctorName;
String? endTime;
String? episodeDate;
int? episodeID;
int? patientID;
int? projectID;
String? projectName;
String? remarks;
String? setupID;
String? startTime;
String? visitFor;
String? visitType;
String? dispalyName;
List<LstAssessments>? lstAssessments;
List<LstPhysicalExam>? lstPhysicalExam;
List<LstProcedure>? lstProcedure;
List<LstMedicalHistory>? lstMedicalHistory;
List<LstCheifComplaint>? lstCheifComplaint;
Consulations(
{this.admissionNo,
@ -220,33 +220,33 @@ class Consulations {
visitType = json['VisitType'];
dispalyName = json['dispalyName'];
if (json['lstAssessments'] != null) {
lstAssessments = new List<LstAssessments>();
lstAssessments = [];
json['lstAssessments'].forEach((v) {
lstAssessments.add(new LstAssessments.fromJson(v));
lstAssessments!.add(new LstAssessments.fromJson(v));
});
}
if (json['lstCheifComplaint'] != null) {
lstCheifComplaint = new List<LstCheifComplaint>();
lstCheifComplaint = [];
json['lstCheifComplaint'].forEach((v) {
lstCheifComplaint.add(new LstCheifComplaint.fromJson(v));
lstCheifComplaint!.add(new LstCheifComplaint.fromJson(v));
});
}
if (json['lstPhysicalExam'] != null) {
lstPhysicalExam = new List<LstPhysicalExam>();
lstPhysicalExam = [];
json['lstPhysicalExam'].forEach((v) {
lstPhysicalExam.add(new LstPhysicalExam.fromJson(v));
lstPhysicalExam!.add(new LstPhysicalExam.fromJson(v));
});
}
if (json['lstProcedure'] != null) {
lstProcedure = new List<LstProcedure>();
lstProcedure = [];
json['lstProcedure'].forEach((v) {
lstProcedure.add(new LstProcedure.fromJson(v));
lstProcedure!.add(new LstProcedure.fromJson(v));
});
}
if (json['lstMedicalHistory'] != null) {
lstMedicalHistory = new List<LstMedicalHistory>();
lstMedicalHistory = [];
json['lstMedicalHistory'].forEach((v) {
lstMedicalHistory.add(new LstMedicalHistory.fromJson(v));
lstMedicalHistory!.add(new LstMedicalHistory.fromJson(v));
});
}
}
@ -275,40 +275,40 @@ class Consulations {
data['dispalyName'] = this.dispalyName;
if (this.lstAssessments != null) {
data['lstAssessments'] =
this.lstAssessments.map((v) => v.toJson()).toList();
this.lstAssessments!.map((v) => v.toJson()).toList();
}
if (this.lstCheifComplaint != null) {
data['lstCheifComplaint'] =
this.lstCheifComplaint.map((v) => v.toJson()).toList();
this.lstCheifComplaint!.map((v) => v.toJson()).toList();
}
if (this.lstPhysicalExam != null) {
data['lstPhysicalExam'] =
this.lstPhysicalExam.map((v) => v.toJson()).toList();
this.lstPhysicalExam!.map((v) => v.toJson()).toList();
}
if (this.lstProcedure != null) {
data['lstProcedure'] = this.lstProcedure.map((v) => v.toJson()).toList();
data['lstProcedure'] = this.lstProcedure!.map((v) => v.toJson()).toList();
}
if (this.lstMedicalHistory != null) {
data['lstMedicalHistory'] =
this.lstMedicalHistory.map((v) => v.toJson()).toList();
this.lstMedicalHistory!.map((v) => v.toJson()).toList();
}
return data;
}
}
class LstCheifComplaint {
int appointmentNo;
String cCDate;
String chiefComplaint;
String currentMedication;
int episodeID;
String hOPI;
int patientID;
String patientType;
int projectID;
String projectName;
String setupID;
String dispalyName;
int? appointmentNo;
String? cCDate;
String? chiefComplaint;
String? currentMedication;
int? episodeID;
String? hOPI;
int? patientID;
String? patientType;
int? projectID;
String? projectName;
String? setupID;
String? dispalyName;
LstCheifComplaint(
{this.appointmentNo,
@ -358,19 +358,19 @@ class LstCheifComplaint {
}
class LstAssessments {
int appointmentNo;
String condition;
String description;
int episodeID;
String iCD10;
int patientID;
String patientType;
int projectID;
String projectName;
String remarks;
String setupID;
String type;
String dispalyName;
int? appointmentNo;
String? condition;
String? description;
int? episodeID;
String? iCD10;
int? patientID;
String? patientType;
int? projectID;
String? projectName;
String? remarks;
String? setupID;
String? type;
String? dispalyName;
LstAssessments(
{this.appointmentNo,
@ -423,19 +423,19 @@ class LstAssessments {
}
class LstPhysicalExam {
String abnormal;
int appointmentNo;
int episodeID;
String examDesc;
String examID;
String examType;
int patientID;
String patientType;
int projectID;
String projectName;
String remarks;
String setupID;
String dispalyName;
String? abnormal;
int? appointmentNo;
int? episodeID;
String? examDesc;
String? examID;
String? examType;
int? patientID;
String? patientType;
int? projectID;
String? projectName;
String? remarks;
String? setupID;
String? dispalyName;
LstPhysicalExam(
{this.abnormal,
@ -488,17 +488,17 @@ class LstPhysicalExam {
}
class LstProcedure {
int appointmentNo;
int episodeID;
String orderDate;
int patientID;
String patientType;
String procName;
String procedureId;
int projectID;
String projectName;
String setupID;
String dispalyName;
int? appointmentNo;
int? episodeID;
String? orderDate;
int? patientID;
String? patientType;
String? procName;
String? procedureId;
int? projectID;
String? projectName;
String? setupID;
String? dispalyName;
LstProcedure(
{this.appointmentNo,
@ -545,17 +545,17 @@ class LstProcedure {
}
class LstMedicalHistory {
int appointmentNo;
String checked;
int episodeID;
String history;
int patientID;
String patientType;
int projectID;
String projectName;
String remarks;
String setupID;
String dispalyName;
int? appointmentNo;
String? checked;
int? episodeID;
String? history;
int? patientID;
String? patientType;
int? projectID;
String? projectName;
String? remarks;
String? setupID;
String? dispalyName;
LstMedicalHistory(
{this.appointmentNo,

@ -1,7 +1,7 @@
class MedicalFileRequestModel {
int patientMRN;
String vidaAuthTokenID;
String iPAdress;
int? patientMRN;
String? vidaAuthTokenID;
String? iPAdress;
MedicalFileRequestModel({this.patientMRN, this.vidaAuthTokenID,this.iPAdress});

@ -1,23 +1,23 @@
class CreateNoteModel {
int visitType;
int admissionNo;
int projectID;
int patientTypeID;
int patientID;
int clinicID;
String notes;
int createdBy;
int editedBy;
String nursingRemarks;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int? visitType;
int? admissionNo;
int? projectID;
int? patientTypeID;
int? patientID;
int? clinicID;
String? notes;
int? createdBy;
int? editedBy;
String? nursingRemarks;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
CreateNoteModel(
{this.visitType,

@ -1,24 +1,24 @@
class NoteModel {
String setupID;
int projectID;
int patientID;
int patientType;
String admissionNo;
int lineItemNo;
int visitType;
String notes;
String assessmentDate;
String visitTime;
int status;
String nursingRemarks;
String createdOn;
String editedOn;
int createdBy;
int admissionClinicID;
String admissionClinicName;
String? setupID;
int? projectID;
int? patientID;
int? patientType;
String? admissionNo;
int? lineItemNo;
int? visitType;
String? notes;
String? assessmentDate;
String? visitTime;
int? status;
String? nursingRemarks;
String? createdOn;
String? editedOn;
int? createdBy;
int? admissionClinicID;
String? admissionClinicName;
Null doctorClinicName;
String doctorName;
String visitTypeDesc;
String? doctorName;
String? visitTypeDesc;
NoteModel(
{this.setupID,

@ -1,21 +1,21 @@
class UpdateNoteReqModel {
int projectID;
int createdBy;
int admissionNo;
int lineItemNo;
String notes;
bool verifiedNote;
bool cancelledNote;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int patientTypeID;
int? projectID;
int? createdBy;
int? admissionNo;
int? lineItemNo;
String? notes;
bool? verifiedNote;
bool? cancelledNote;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
int? patientTypeID;
UpdateNoteReqModel(
{this.projectID,

@ -1,19 +1,19 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class PatientMuseResultsModel {
int rowID;
String setupID;
int projectID;
String orderNo;
int lineItemNo;
int patientType;
int patientID;
String procedureID;
int? rowID;
String? setupID;
int? projectID;
String? orderNo;
int? lineItemNo;
int? patientType;
int? patientID;
String? procedureID;
dynamic reportData;
String imageURL;
String createdBy;
String createdOn;
DateTime createdOnDateTime;
String? imageURL;
String? createdBy;
String? createdOn;
DateTime? createdOnDateTime;
PatientMuseResultsModel(
{this.rowID,

@ -1,16 +1,16 @@
class PatientSearchRequestModel {
int doctorID;
String firstName;
String middleName;
String lastName;
String patientMobileNumber;
String patientIdentificationID;
int patientID;
String from;
String to;
int searchType;
String mobileNo;
String identificationNo;
int? doctorID;
String? firstName;
String? middleName;
String? lastName;
String? patientMobileNumber;
String? patientIdentificationID;
int? patientID;
String? from;
String? to;
int? searchType;
String? mobileNo;
String? identificationNo;
PatientSearchRequestModel(
{this.doctorID =0,

@ -1,6 +1,6 @@
class Controls {
String code;
String controlValue;
String? code;
String? controlValue;
Controls({this.code, this.controlValue});

@ -1,6 +1,6 @@
class CategoriseProcedureModel {
List<EntityList> entityList;
int rowcount;
List<EntityList>? entityList;
int? rowcount;
dynamic statusMessage;
CategoriseProcedureModel(
@ -8,9 +8,9 @@ class CategoriseProcedureModel {
CategoriseProcedureModel.fromJson(Map<String, dynamic> json) {
if (json['entityList'] != null) {
entityList = new List<EntityList>();
entityList = [];
json['entityList'].forEach((v) {
entityList.add(new EntityList.fromJson(v));
entityList!.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
@ -20,7 +20,7 @@ class CategoriseProcedureModel {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.entityList != null) {
data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;
@ -29,20 +29,20 @@ class CategoriseProcedureModel {
}
class EntityList {
bool allowedClinic;
String category;
String categoryID;
String genderValidation;
String group;
String orderedValidation;
bool? allowedClinic;
String? category;
String? categoryID;
String? genderValidation;
String? group;
String? orderedValidation;
dynamic price;
String procedureId;
String procedureName;
String specialPermission;
String subGroup;
String template;
String remarks;
String type;
String? procedureId;
String? procedureName;
String? specialPermission;
String? subGroup;
String? template;
String? remarks;
String? type;
EntityList(
{this.allowedClinic,

@ -1,6 +1,6 @@
class GetOrderedProcedureModel {
List<EntityList> entityList;
int rowcount;
List<EntityList>? entityList;
int? rowcount;
dynamic statusMessage;
GetOrderedProcedureModel(
@ -8,9 +8,9 @@ class GetOrderedProcedureModel {
GetOrderedProcedureModel.fromJson(Map<String, dynamic> json) {
if (json['entityList'] != null) {
entityList = new List<EntityList>();
entityList = [];
json['entityList'].forEach((v) {
entityList.add(new EntityList.fromJson(v));
entityList!.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
@ -20,7 +20,7 @@ class GetOrderedProcedureModel {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.entityList != null) {
data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;
@ -29,30 +29,30 @@ class GetOrderedProcedureModel {
}
class EntityList {
String achiCode;
String appointmentDate;
int appointmentNo;
int categoryID;
String clinicDescription;
String cptCode;
int createdBy;
String createdOn;
String doctorName;
bool isApprovalCreated;
bool isApprovalRequired;
bool isCovered;
bool isInvoiced;
bool isReferralInvoiced;
bool isUncoveredByDoctor;
int lineItemNo;
String orderDate;
int orderNo;
int orderType;
String procedureId;
String procedureName;
String remarks;
String status;
String template;
String? achiCode;
String? appointmentDate;
int? appointmentNo;
int? categoryID;
String? clinicDescription;
String? cptCode;
int? createdBy;
String? createdOn;
String? doctorName;
bool? isApprovalCreated;
bool? isApprovalRequired;
bool? isCovered;
bool? isInvoiced;
bool? isReferralInvoiced;
bool? isUncoveredByDoctor;
int? lineItemNo;
String? orderDate;
int? orderNo;
int? orderType;
String? procedureId;
String? procedureName;
String? remarks;
String? status;
String? template;
EntityList(
{this.achiCode,

@ -1,6 +1,6 @@
class GetOrderedProcedureRequestModel {
String vidaAuthTokenID;
int patientMRN;
String? vidaAuthTokenID;
int? patientMRN;
GetOrderedProcedureRequestModel({this.vidaAuthTokenID, this.patientMRN});

@ -1,15 +1,15 @@
class GetProcedureModel {
List<EntityList> entityList;
int rowcount;
List<EntityList>? entityList;
int? rowcount;
dynamic statusMessage;
GetProcedureModel({this.entityList, this.rowcount, this.statusMessage});
GetProcedureModel.fromJson(Map<String, dynamic> json) {
if (json['entityList'] != null) {
entityList = new List<EntityList>();
entityList = [];
json['entityList'].forEach((v) {
entityList.add(new EntityList.fromJson(v));
entityList!.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
@ -19,7 +19,7 @@ class GetProcedureModel {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.entityList != null) {
data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;
@ -28,18 +28,18 @@ class GetProcedureModel {
}
class EntityList {
bool allowedClinic;
String category;
String categoryID;
String genderValidation;
String group;
String orderedValidation;
bool? allowedClinic;
String? category;
String? categoryID;
String? genderValidation;
String? group;
String? orderedValidation;
dynamic price;
String procedureId;
String procedureName;
String specialPermission;
String subGroup;
String template;
String? procedureId;
String? procedureName;
String? specialPermission;
String? subGroup;
String? template;
EntityList(
{this.allowedClinic,

@ -1,11 +1,11 @@
class GetProcedureReqModel {
int clinicId;
int patientMRN;
int pageSize;
int pageIndex;
List<String> search;
int? clinicId;
int? patientMRN;
int? pageSize;
int? pageIndex;
List<String>? search;
dynamic category;
String vidaAuthTokenID;
String? vidaAuthTokenID;
GetProcedureReqModel(
{this.clinicId,

@ -1,11 +1,11 @@
import 'ControlsModel.dart';
class PostProcedureReqModel {
int patientMRN;
int appointmentNo;
int episodeID;
List<Procedures> procedures;
String vidaAuthTokenID;
int? patientMRN;
int? appointmentNo;
int? episodeID;
List<Procedures>? procedures;
String? vidaAuthTokenID;
PostProcedureReqModel(
{this.patientMRN,
@ -19,9 +19,9 @@ class PostProcedureReqModel {
appointmentNo = json['AppointmentNo'];
episodeID = json['EpisodeID'];
if (json['Procedures'] != null) {
procedures = new List<Procedures>();
procedures = [];
json['Procedures'].forEach((v) {
procedures.add(new Procedures.fromJson(v));
procedures!.add(new Procedures.fromJson(v));
});
}
vidaAuthTokenID = json['VidaAuthTokenID'];
@ -33,7 +33,7 @@ class PostProcedureReqModel {
data['AppointmentNo'] = this.appointmentNo;
data['EpisodeID'] = this.episodeID;
if (this.procedures != null) {
data['Procedures'] = this.procedures.map((v) => v.toJson()).toList();
data['Procedures'] = this.procedures!.map((v) => v.toJson()).toList();
}
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
return data;
@ -41,9 +41,9 @@ class PostProcedureReqModel {
}
class Procedures {
String procedure;
String category;
List<Controls> controls;
String? procedure;
String? category;
List<Controls>? controls;
Procedures({this.procedure, this.category, this.controls});
@ -51,9 +51,9 @@ class Procedures {
procedure = json['Procedure'];
category = json['Category'];
if (json['Controls'] != null) {
controls = new List<Controls>();
controls = [];
json['Controls'].forEach((v) {
controls.add(new Controls.fromJson(v));
controls!.add(new Controls.fromJson(v));
});
}
}
@ -63,7 +63,7 @@ class Procedures {
data['Procedure'] = this.procedure;
data['Category'] = this.category;
if (this.controls != null) {
data['Controls'] = this.controls.map((v) => v.toJson()).toList();
data['Controls'] = this.controls!.map((v) => v.toJson()).toList();
}
return data;
}

@ -1,6 +1,6 @@
class ProcedureCategoryListModel {
List<EntityList> entityList;
int rowcount;
List<EntityList>? entityList;
int? rowcount;
dynamic statusMessage;
ProcedureCategoryListModel(
@ -8,9 +8,9 @@ class ProcedureCategoryListModel {
ProcedureCategoryListModel.fromJson(Map<String, dynamic> json) {
if (json['entityList'] != null) {
entityList = new List<EntityList>();
entityList = [];
json['entityList'].forEach((v) {
entityList.add(new EntityList.fromJson(v));
entityList!.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
@ -20,7 +20,7 @@ class ProcedureCategoryListModel {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.entityList != null) {
data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;
@ -29,8 +29,8 @@ class ProcedureCategoryListModel {
}
class EntityList {
int categoryId;
String categoryName;
int? categoryId;
String? categoryName;
EntityList({this.categoryId, this.categoryName});

@ -1,6 +1,6 @@
class ProcedureValadteModel {
List<EntityList> entityList;
int rowcount;
List<EntityList>? entityList;
int? rowcount;
dynamic statusMessage;
dynamic success;
@ -9,9 +9,9 @@ class ProcedureValadteModel {
ProcedureValadteModel.fromJson(Map<String, dynamic> json) {
if (json['entityList'] != null) {
entityList = new List<EntityList>();
entityList = [];
json['entityList'].forEach((v) {
entityList.add(new EntityList.fromJson(v));
entityList!.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
@ -22,7 +22,7 @@ class ProcedureValadteModel {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.entityList != null) {
data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;
@ -32,8 +32,8 @@ class ProcedureValadteModel {
}
class EntityList {
String procedureId;
List<String> warringMessages;
String? procedureId;
List<String>? warringMessages;
EntityList({this.procedureId, this.warringMessages});

@ -1,9 +1,9 @@
class ProcedureValadteRequestModel {
String vidaAuthTokenID;
int patientMRN;
int appointmentNo;
int episodeID;
List<String> procedure;
String? vidaAuthTokenID;
int? patientMRN;
int? appointmentNo;
int? episodeID;
List<String?>? procedure;
ProcedureValadteRequestModel(
{this.vidaAuthTokenID,

@ -1,13 +1,13 @@
import 'ControlsModel.dart';
class UpdateProcedureRequestModel {
int orderNo;
int patientMRN;
int appointmentNo;
int episodeID;
int lineItemNo;
ProcedureDetail procedureDetail;
String vidaAuthTokenID;
int? orderNo;
int? patientMRN;
int? appointmentNo;
int? episodeID;
int? lineItemNo;
ProcedureDetail? procedureDetail;
String? vidaAuthTokenID;
UpdateProcedureRequestModel(
{this.orderNo,
@ -38,7 +38,7 @@ class UpdateProcedureRequestModel {
data['EpisodeID'] = this.episodeID;
data['LineItemNo'] = this.lineItemNo;
if (this.procedureDetail != null) {
data['procedureDetail'] = this.procedureDetail.toJson();
data['procedureDetail'] = this.procedureDetail!.toJson();
}
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
return data;
@ -46,9 +46,9 @@ class UpdateProcedureRequestModel {
}
class ProcedureDetail {
String procedure;
String category;
List<Controls> controls;
String? procedure;
String? category;
List<Controls>? controls;
ProcedureDetail({this.procedure, this.category, this.controls});
@ -56,9 +56,9 @@ class ProcedureDetail {
procedure = json['Procedure'];
category = json['Category'];
if (json['Controls'] != null) {
controls = new List<Controls>();
controls = [];
json['Controls'].forEach((v) {
controls.add(new Controls.fromJson(v));
controls!.add(new Controls.fromJson(v));
});
}
}
@ -68,7 +68,7 @@ class ProcedureDetail {
data['Procedure'] = this.procedure;
data['Category'] = this.category;
if (this.controls != null) {
data['Controls'] = this.controls.map((v) => v.toJson()).toList();
data['Controls'] = this.controls!.map((v) => v.toJson()).toList();
}
return data;
}

@ -8,17 +8,17 @@ class FinalRadiology {
dynamic invoiceNo;
dynamic doctorID;
dynamic clinicID;
DateTime orderDate;
DateTime reportDate;
DateTime? orderDate;
DateTime? reportDate;
dynamic reportData;
dynamic imageURL;
dynamic procedureID;
dynamic appodynamicmentNo;
dynamic dIAPacsURL;
bool isRead;
bool? isRead;
dynamic readOn;
var admissionNo;
bool isInOutPatient;
bool? isInOutPatient;
dynamic actualDoctorRate;
dynamic clinicDescription;
dynamic dIAPACSURL;
@ -28,8 +28,8 @@ class FinalRadiology {
dynamic doctorTitle;
dynamic gender;
dynamic genderDescription;
bool isActiveDoctorProfile;
bool isExecludeDoctor;
bool? isActiveDoctorProfile;
bool? isExecludeDoctor;
dynamic isInOutPatientDescription;
dynamic isInOutPatientDescriptionN;
dynamic nationalityFlagURL;
@ -39,10 +39,10 @@ class FinalRadiology {
dynamic qR;
dynamic reportDataHTML;
dynamic reportDataTextdynamic;
List<dynamic> speciality;
bool isCVI;
bool isRadMedicalReport;
bool isLiveCareAppodynamicment;
List<dynamic>? speciality;
bool? isCVI;
bool? isRadMedicalReport;
bool? isLiveCareAppodynamicment;
FinalRadiology(
{this.setupID,
@ -186,9 +186,9 @@ class FinalRadiology {
class FinalRadiologyList {
dynamic filterName = "";
List<FinalRadiology> finalRadiologyList = List();
List<FinalRadiology?> finalRadiologyList = [];
FinalRadiologyList({this.filterName, FinalRadiology finalRadiology}) {
FinalRadiologyList({this.filterName, FinalRadiology? finalRadiology}) {
finalRadiologyList.add(finalRadiology);
}
}

@ -1,24 +1,24 @@
class RequestPatientRadOrdersDetails {
int projectID;
int orderNo;
int invoiceNo;
String setupID;
String procedureID;
bool isMedicalReport;
bool isCVI;
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
int? projectID;
int? orderNo;
int? invoiceNo;
String? setupID;
String? procedureID;
bool? isMedicalReport;
bool? isCVI;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? patientID;
String? tokenID;
int? patientTypeID;
int? patientType;
RequestPatientRadOrdersDetails(
{this.projectID,

@ -1,30 +1,30 @@
class RequestSendRadReportEmail {
int channel;
String clinicName;
String dateofBirth;
int deviceTypeID;
String doctorName;
String generalid;
int invoiceNo;
String iPAdress;
bool isDentalAllowedBackend;
int languageID;
String orderDate;
int patientID;
String patientIditificationNum;
String patientMobileNumber;
String patientName;
int patientOutSA;
int patientType;
int patientTypeID;
int projectID;
String projectName;
String radResult;
String sessionID;
String setupID;
String to;
String tokenID;
double versionID;
int? channel;
String? clinicName;
String? dateofBirth;
int? deviceTypeID;
String? doctorName;
String? generalid;
int? invoiceNo;
String? iPAdress;
bool? isDentalAllowedBackend;
int? languageID;
String? orderDate;
int? patientID;
String? patientIditificationNum;
String? patientMobileNumber;
String? patientName;
int? patientOutSA;
int? patientType;
int? patientTypeID;
int? projectID;
String? projectName;
String? radResult;
String? sessionID;
String? setupID;
String? to;
String? tokenID;
double? versionID;
RequestSendRadReportEmail(
{this.channel,

@ -2,56 +2,56 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
class DischargeReferralPatient {
dynamic rowID;
int projectID;
int lineItemNo;
int doctorID;
int patientID;
String doctorName;
int? projectID;
int? lineItemNo;
int? doctorID;
int? patientID;
String? doctorName;
dynamic doctorNameN;
String firstName;
String middleName;
String lastName;
String? firstName;
String? middleName;
String? lastName;
dynamic firstNameN;
dynamic middleNameN;
dynamic lastNameN;
int gender;
String dateofBirth;
String mobileNumber;
String emailAddress;
String patientIdentificationNo;
int patientType;
String admissionNo;
String admissionDate;
String roomID;
String bedID;
int? gender;
String? dateofBirth;
String? mobileNumber;
String? emailAddress;
String? patientIdentificationNo;
int? patientType;
String? admissionNo;
String? admissionDate;
String? roomID;
String? bedID;
dynamic nursingStationID;
dynamic description;
String nationalityName;
String? nationalityName;
dynamic nationalityNameN;
int referralDoctor;
int referringDoctor;
int referralClinic;
int referringClinic;
int referralStatus;
DateTime referralDate;
String referringDoctorRemarks;
String referredDoctorRemarks;
String referralResponseOn;
int priority;
int frequency;
String mAXResponseTime;
String dischargeDate;
int? referralDoctor;
int? referringDoctor;
int? referralClinic;
int? referringClinic;
int? referralStatus;
DateTime? referralDate;
String? referringDoctorRemarks;
String? referredDoctorRemarks;
String? referralResponseOn;
int? priority;
int? frequency;
String? mAXResponseTime;
String? dischargeDate;
dynamic clinicID;
String age;
String clinicDescription;
String frequencyDescription;
String genderDescription;
bool isDoctorLate;
bool isDoctorResponse;
String nursingStationName;
String priorityDescription;
String referringClinicDescription;
String referringDoctorName;
String? age;
String? clinicDescription;
String? frequencyDescription;
String? genderDescription;
bool? isDoctorLate;
bool? isDoctorResponse;
String? nursingStationName;
String? priorityDescription;
String? referringClinicDescription;
String? referringDoctorName;
DischargeReferralPatient(
{this.rowID,

@ -2,65 +2,65 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
class MyReferralPatientModel {
dynamic rowID;
int projectID;
int lineItemNo;
int doctorID;
int patientID;
String doctorName;
int? projectID;
int? lineItemNo;
int? doctorID;
int? patientID;
String? doctorName;
dynamic doctorNameN;
String firstName;
String middleName;
String lastName;
String? firstName;
String? middleName;
String? lastName;
dynamic firstNameN;
dynamic middleNameN;
dynamic lastNameN;
int gender;
String dateofBirth;
String mobileNumber;
String emailAddress;
String patientIdentificationNo;
int patientType;
String admissionNo;
String admissionDate;
String roomID;
String bedID;
int? gender;
String? dateofBirth;
String? mobileNumber;
String? emailAddress;
String? patientIdentificationNo;
int? patientType;
String? admissionNo;
String? admissionDate;
String? roomID;
String? bedID;
dynamic nursingStationID;
dynamic description;
String nationalityName;
String? nationalityName;
dynamic nationalityNameN;
String clinicDescription;
String clinicDescriptionN;
int referralDoctor;
int referringDoctor;
int referralClinic;
int referringClinic;
int referralStatus;
DateTime referralDate;
String referringDoctorRemarks;
String referredDoctorRemarks;
String referralResponseOn;
int priority;
int frequency;
String mAXResponseTime;
int episodeID;
int appointmentNo;
String appointmentDate;
int appointmentType;
int patientMRN;
String createdOn;
int clinicID;
String nationalityID;
String age;
String doctorImageURL;
String frequencyDescription;
String genderDescription;
bool isDoctorLate;
bool isDoctorResponse;
String nationalityFlagURL;
String nursingStationName;
String priorityDescription;
String referringClinicDescription;
String referringDoctorName;
String? clinicDescription;
String? clinicDescriptionN;
int? referralDoctor;
int? referringDoctor;
int? referralClinic;
int? referringClinic;
int? referralStatus;
DateTime? referralDate;
String? referringDoctorRemarks;
String? referredDoctorRemarks;
String? referralResponseOn;
int? priority;
int? frequency;
String? mAXResponseTime;
int? episodeID;
int? appointmentNo;
String? appointmentDate;
int? appointmentType;
int? patientMRN;
String? createdOn;
int? clinicID;
String? nationalityID;
String? age;
String? doctorImageURL;
String? frequencyDescription;
String? genderDescription;
bool? isDoctorLate;
bool? isDoctorResponse;
String? nationalityFlagURL;
String? nursingStationName;
String? priorityDescription;
String? referringClinicDescription;
String? referringDoctorName;
MyReferralPatientModel(
{this.rowID,
@ -253,6 +253,6 @@ class MyReferralPatientModel {
}
get patientName {
return this.firstName+" "+this.lastName;
return this.firstName!+" "+this.lastName!;
}
}

@ -1,28 +1,28 @@
class ReferralRequest {
String roomID;
String referralClinic;
String referralDoctor;
int createdBy;
int editedBy;
int patientID;
int patientTypeID;
int referringClinic;
int referringDoctor;
int projectID;
int admissionNo;
String referringDoctorRemarks;
String priority;
String frequency;
String extension;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
String? roomID;
String? referralClinic;
String? referralDoctor;
int? createdBy;
int? editedBy;
int? patientID;
int? patientTypeID;
int? referringClinic;
int? referringDoctor;
int? projectID;
int? admissionNo;
String? referringDoctorRemarks;
String? priority;
String? frequency;
String? extension;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
ReferralRequest(
{this.roomID,

@ -1,13 +1,13 @@
class GetMedicationResponseModel {
String description;
String genericName;
int itemId;
String keywords;
String? description;
String? genericName;
int? itemId;
String? keywords;
dynamic price;
dynamic quantity;
dynamic mediSpanGPICode;
bool isNarcotic;
String uom;
bool? isNarcotic;
String? uom;
GetMedicationResponseModel(
{this.description,
this.genericName,

@ -1,27 +1,27 @@
class ItemByMedicineModel {
List<Frequencies> frequencies;
List<Routes> routes;
List<Strengths> strengths;
List<Frequencies>? frequencies;
List<Routes>? routes;
List<Strengths>? strengths;
ItemByMedicineModel({this.frequencies, this.routes, this.strengths});
ItemByMedicineModel.fromJson(Map<String, dynamic> json) {
if (json['frequencies'] != null) {
frequencies = new List<Frequencies>();
frequencies = [];
json['frequencies'].forEach((v) {
frequencies.add(new Frequencies.fromJson(v));
frequencies!.add(new Frequencies.fromJson(v));
});
}
if (json['routes'] != null) {
routes = new List<Routes>();
routes = [];
json['routes'].forEach((v) {
routes.add(new Routes.fromJson(v));
routes!.add(new Routes.fromJson(v));
});
}
if (json['strengths'] != null) {
strengths = new List<Strengths>();
strengths = [];
json['strengths'].forEach((v) {
strengths.add(new Strengths.fromJson(v));
strengths!.add(new Strengths.fromJson(v));
});
}
}
@ -29,22 +29,22 @@ class ItemByMedicineModel {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.frequencies != null) {
data['frequencies'] = this.frequencies.map((v) => v.toJson()).toList();
data['frequencies'] = this.frequencies!.map((v) => v.toJson()).toList();
}
if (this.routes != null) {
data['routes'] = this.routes.map((v) => v.toJson()).toList();
data['routes'] = this.routes!.map((v) => v.toJson()).toList();
}
if (this.strengths != null) {
data['strengths'] = this.strengths.map((v) => v.toJson()).toList();
data['strengths'] = this.strengths!.map((v) => v.toJson()).toList();
}
return data;
}
}
class Frequencies {
String description;
bool isDefault;
int parameterCode;
String? description;
bool? isDefault;
int? parameterCode;
Frequencies({this.description, this.isDefault, this.parameterCode});
@ -64,9 +64,9 @@ class Frequencies {
}
class Strengths {
String description;
bool isDefault;
int parameterCode;
String? description;
bool? isDefault;
int? parameterCode;
Strengths({this.description, this.isDefault, this.parameterCode});
@ -86,9 +86,9 @@ class Strengths {
}
class Routes {
String description;
bool isDefault;
int parameterCode;
String? description;
bool? isDefault;
int? parameterCode;
Routes({this.description, this.isDefault, this.parameterCode});

@ -1,6 +1,6 @@
class ItemByMedicineRequestModel {
String vidaAuthTokenID;
int medicineCode;
String? vidaAuthTokenID;
int? medicineCode;
ItemByMedicineRequestModel({this.vidaAuthTokenID, this.medicineCode});

@ -1,15 +1,15 @@
class SearchDrugModel {
List<EntityList> entityList;
int rowcount;
List<EntityList>? entityList;
int? rowcount;
dynamic statusMessage;
SearchDrugModel({this.entityList, this.rowcount, this.statusMessage});
SearchDrugModel.fromJson(Map<String, dynamic> json) {
if (json['entityList'] != null) {
entityList = new List<EntityList>();
entityList = [];
json['entityList'].forEach((v) {
entityList.add(new EntityList.fromJson(v));
entityList!.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
@ -19,7 +19,7 @@ class SearchDrugModel {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.entityList != null) {
data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;

@ -1,5 +1,5 @@
class SearchDrugRequestModel {
List<String> search;
List<String?>? search;
// String vidaAuthTokenID;
SearchDrugRequestModel({this.search});

@ -1,41 +1,41 @@
import 'package:doctor_app_flutter/widgets/shared/StarRating.dart';
class SickLeavePatientModel {
String setupID;
int projectID;
int patientID;
int patientType;
int clinicID;
int doctorID;
int requestNo;
String requestDate;
int sickLeaveDays;
int appointmentNo;
int admissionNo;
int actualDoctorRate;
String appointmentDate;
String clinicName;
String doctorImageURL;
String doctorName;
int doctorRate;
String doctorTitle;
int gender;
String genderDescription;
bool isActiveDoctorProfile;
bool isDoctorAllowVedioCall;
bool isExecludeDoctor;
bool isInOutPatient;
String isInOutPatientDescription;
String isInOutPatientDescriptionN;
bool isLiveCareAppointment;
int noOfPatientsRate;
String? setupID;
int? projectID;
int? patientID;
int? patientType;
int? clinicID;
int? doctorID;
int? requestNo;
String? requestDate;
int? sickLeaveDays;
int? appointmentNo;
int? admissionNo;
int? actualDoctorRate;
String? appointmentDate;
String? clinicName;
String? doctorImageURL;
String? doctorName;
int? doctorRate;
String? doctorTitle;
int? gender;
String? genderDescription;
bool? isActiveDoctorProfile;
bool? isDoctorAllowVedioCall;
bool? isExecludeDoctor;
bool? isInOutPatient;
String? isInOutPatientDescription;
String? isInOutPatientDescriptionN;
bool? isLiveCareAppointment;
int? noOfPatientsRate;
dynamic patientName;
String projectName;
String qR;
String? projectName;
String? qR;
// List<String> speciality;
String strRequestDate;
String startDate;
String endDate;
String? strRequestDate;
String? startDate;
String? endDate;
SickLeavePatientModel(
{this.setupID,

@ -1,16 +1,16 @@
class SickLeavePatientRequestModel {
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
int deviceTypeID;
int patientType;
int patientTypeID;
String tokenID;
int patientID;
String sessionID;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
int? deviceTypeID;
int? patientType;
int? patientTypeID;
String? tokenID;
int? patientID;
String? sessionID;
SickLeavePatientRequestModel(
{this.versionID,

@ -3,7 +3,7 @@ import 'dart:async';
class RobotProvider {
static final RobotProvider _singleton = RobotProvider._internal();
var value;
StreamController<Map> controller = StreamController<Map>.broadcast();
StreamController<Map?> controller = StreamController<Map?>.broadcast();
getData() {
// return data;

@ -49,7 +49,7 @@ class AuthenticationService extends BaseService {
}, body: {"IMEI": imei, "TokenID": "@dm!n"});
} catch (error) {
hasError = true;
super.error = error;
super.error = error.toString();
}
}
@ -66,7 +66,7 @@ class AuthenticationService extends BaseService {
}, body: userInfo.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error.toString();
}
}
@ -84,7 +84,7 @@ class AuthenticationService extends BaseService {
}, body: activationCodeModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error.toString();
}
}
@ -102,7 +102,7 @@ class AuthenticationService extends BaseService {
}, body: activationCodeModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error.toString();
}
}
@ -119,7 +119,7 @@ class AuthenticationService extends BaseService {
}, body: checkActivationCodeRequestModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error.toString();
}
}
@ -138,7 +138,7 @@ class AuthenticationService extends BaseService {
}, body: insertIMEIDetailsModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error.toString();
}
}
@ -157,7 +157,7 @@ class AuthenticationService extends BaseService {
}, body: profileReqModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error.toString();
}
}
}

@ -6,21 +6,21 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
class BaseService {
String error;
String? error;
bool hasError = false;
BaseAppClient baseAppClient = BaseAppClient();
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
DoctorProfileModel doctorProfile;
DoctorProfileModel? doctorProfile;
List<PatiantInformtion> patientArrivalList = [];
//TODO add the user login model when we need it
Future<DoctorProfileModel> getDoctorProfile({bool isGetProfile = false}) async {
Future<DoctorProfileModel?> getDoctorProfile({bool isGetProfile = false}) async {
if(isGetProfile)
{
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
if (profile != null) {
doctorProfile = DoctorProfileModel.fromJson(profile);
doctorProfile = DoctorProfileModel.fromJson(profile as Map<String, dynamic>);
if (doctorProfile != null) {
return doctorProfile;
}
@ -29,7 +29,7 @@ class BaseService {
if (doctorProfile == null) {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
if (profile != null) {
doctorProfile = DoctorProfileModel.fromJson(profile);
doctorProfile = DoctorProfileModel.fromJson(profile as Map<String, dynamic>);
if (doctorProfile != null) {
return doctorProfile;
}
@ -40,7 +40,7 @@ class BaseService {
}
}
Future getPatientArrivalList(String date,{String fromDate, int patientMrn = -1, int appointmentNo = -1}) async{
Future getPatientArrivalList(String date,{String? fromDate, int? patientMrn = -1, int appointmentNo = -1}) async{
hasError = false;
Map<String, dynamic> body = Map();
body['From'] = fromDate == null ? date : fromDate;

@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class HospitalsService extends BaseService {
List<GetHospitalsResponseModel> hospitals =List();
List<GetHospitalsResponseModel> hospitals = [];
Future getHospitals(GetHospitalsRequestModel getHospitalsRequestModel) async {
hasError = false;

@ -4,15 +4,15 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
class DischargedPatientService extends BaseService {
List<PatiantInformtion> myDischargedPatients = List();
List<PatiantInformtion> myDischargedPatients = [];
List<DischargeReferralPatient> myDischargeReferralPatients = List();
List<DischargeReferralPatient> myDischargeReferralPatients = [];
Future getDischargedPatient() async {
hasError = false;
Map<String, dynamic> body = Map();
await getDoctorProfile(isGetProfile: true);
body['DoctorID'] = doctorProfile.doctorID;
body['DoctorID'] = doctorProfile!.doctorID;
body['FirstName'] = "0";
body['MiddleName'] = "0";
body['LastName'] = "0";
@ -45,7 +45,7 @@ class DischargedPatientService extends BaseService {
hasError = false;
Map<String, dynamic> body = Map();
await getDoctorProfile(isGetProfile: true);
body['DoctorID'] = doctorProfile.doctorID;
body['DoctorID'] = doctorProfile!.doctorID;
body['FirstName'] = "0";
body['MiddleName'] = "0";
body['LastName'] = "0";

@ -4,13 +4,13 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/models/doctor/request_add_referred_doctor_remarks.dart';
class MyReferralInPatientService extends BaseService {
List<MyReferralPatientModel> myReferralPatients = List();
List<MyReferralPatientModel> myReferralPatients = [];
Future getMyReferralPatientService() async {
hasError = false;
Map<String, dynamic> body = Map();
await getDoctorProfile();
body['DoctorID'] = doctorProfile.doctorID;
body['DoctorID'] = doctorProfile!.doctorID;
body['FirstName'] = "0";
body['MiddleName'] = "0";
body['LastName'] = "0";
@ -54,7 +54,7 @@ class MyReferralInPatientService extends BaseService {
_requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo;
_requestAddReferredDoctorRemarks.referredDoctorRemarks =
referredDoctorRemarks;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile.doctorID;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile!.doctorID;
_requestAddReferredDoctorRemarks.patientID = referral.patientID;
_requestAddReferredDoctorRemarks.referringDoctor = referral.referringDoctor;
await baseAppClient.post(

@ -3,9 +3,9 @@ import 'package:doctor_app_flutter/core/model/patient_muse/PatientMuseResultsMod
import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class PatientMuseService extends BaseService {
List<PatientMuseResultsModel> patientMuseResultsModelList = List();
List<PatientMuseResultsModel> patientMuseResultsModelList = [];
getECGPatient({int patientType, int patientOutSA, int patientID}) async {
getECGPatient({int? patientType, int? patientOutSA, int? patientID}) async {
Map<String, dynamic> body = Map();
body['PatientType'] = patientType == 7 ? 1 : patientType;
body['PatientOutSA'] = patientOutSA;

@ -4,16 +4,16 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class ReferralService extends BaseService {
Future referralPatient(
{int admissionNo,
String roomID,
int referralClinic,
int referralDoctor,
int patientID,
int patientTypeID,
int priority,
int frequency,
String referringDoctorRemarks,
String extension}) async {
{int? admissionNo,
String? roomID,
int? referralClinic,
int? referralDoctor,
int? patientID,
int? patientTypeID,
int? priority,
int? frequency,
String? referringDoctorRemarks,
String? extension}) async {
await getDoctorProfile();
ReferralRequest referralRequest = ReferralRequest();
referralRequest.admissionNo = admissionNo;
@ -25,11 +25,11 @@ class ReferralService extends BaseService {
referralRequest.priority = priority.toString();
referralRequest.frequency = frequency.toString();
referralRequest.referringDoctorRemarks = referringDoctorRemarks;
referralRequest.referringClinic = doctorProfile.clinicID;
referralRequest.referringDoctor = doctorProfile.doctorID;
referralRequest.referringClinic = doctorProfile!.clinicID;
referralRequest.referringDoctor = doctorProfile!.doctorID;
referralRequest.extension = extension;
referralRequest.editedBy = doctorProfile.doctorID;
referralRequest.createdBy = doctorProfile.doctorID;
referralRequest.editedBy = doctorProfile!.doctorID;
referralRequest.createdBy = doctorProfile!.doctorID;
referralRequest.patientOutSA = false;
await baseAppClient.post(

@ -12,15 +12,15 @@ import 'package:doctor_app_flutter/models/patient/request_my_referral_patient_mo
import '../base/lookup-service.dart';
class PatientReferralService extends LookupService {
List<dynamic> projectsList = [];
List<dynamic> clinicsList = [];
List<ClinicDoctor> doctorsList = List();
List<dynamic>? projectsList = [];
List<dynamic>? clinicsList = [];
List<ClinicDoctor> doctorsList = [];
List<MyReferredPatientModel> listMyReferredPatientModel = [];
List<PendingReferral> pendingReferralList = [];
List<PendingReferral> patientReferralList = [];
String setupID = "0";
String? setupID = "0";
var frequencyList = [];
List<dynamic>? frequencyList = [];
Future getProjectsList() async {
hasError = false;
@ -65,7 +65,7 @@ class PatientReferralService extends LookupService {
}, body: body);
}
Future getProjectInfo(int projectId) async {
Future getProjectInfo(int? projectId) async {
Map<String, dynamic> body = Map();
body['ProjectID'] = projectId;
@ -82,7 +82,7 @@ class PatientReferralService extends LookupService {
);
}
Future getClinicsList(int projectId) async {
Future getClinicsList(int? projectId) async {
hasError = false;
ClinicByProjectIdRequest _clinicByProjectIdRequest =
ClinicByProjectIdRequest();
@ -104,7 +104,7 @@ class PatientReferralService extends LookupService {
}
Future getDoctorsList(
PatiantInformtion patient, int clinicId, int branchId) async {
PatiantInformtion patient, int? clinicId, int? branchId) async {
hasError = false;
DoctorsByClinicIdRequest _doctorsByClinicIdRequest =
DoctorsByClinicIdRequest();
@ -120,7 +120,7 @@ class PatientReferralService extends LookupService {
response['DoctorList'].forEach((v) {
doctorsList.add(ClinicDoctor.fromJson(v));
});
}, onFailure: (String error, int statusCode) {
}, onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
}, body: _doctorsByClinicIdRequest.toJson(), patient: patient);
@ -130,7 +130,7 @@ class PatientReferralService extends LookupService {
hasError = false;
RequestMyReferralPatientModel _requestMyReferralPatient =
RequestMyReferralPatientModel();
DoctorProfileModel doctorProfile = await getDoctorProfile();
DoctorProfileModel? doctorProfile = await getDoctorProfile();
await baseAppClient.post(
GET_MY_REFERRED_PATIENT,
@ -159,7 +159,7 @@ class PatientReferralService extends LookupService {
Future getPendingReferralList() async {
hasError = false;
DoctorProfileModel doctorProfile = await getDoctorProfile();
DoctorProfileModel doctorProfile = await (getDoctorProfile() as FutureOr<DoctorProfileModel>);
Map<String, dynamic> body = Map();
// body['ClinicID'] = 0;
body['DoctorID'] = doctorProfile.doctorID;
@ -214,7 +214,7 @@ class PatientReferralService extends LookupService {
Future responseReferral(
PendingReferral pendingReferral, bool isAccepted) async {
hasError = false;
DoctorProfileModel doctorProfile = await getDoctorProfile();
DoctorProfileModel doctorProfile = await (getDoctorProfile() as FutureOr<DoctorProfileModel>);
Map<String, dynamic> body = Map();
body['PatientMRN'] = pendingReferral.patientID;
@ -240,7 +240,7 @@ class PatientReferralService extends LookupService {
}
Future makeReferral(PatiantInformtion patient, String isoStringDate,
int projectID, int clinicID, int doctorID, String remarks) async {
int? projectID, int? clinicID, int? doctorID, String remarks) async {
hasError = false;
Map<String, dynamic> body = Map();

@ -4,8 +4,8 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
class PatientInPatientService extends BaseService {
List<PatiantInformtion> inPatientList = List();
List<PatiantInformtion> myInPatientList = List();
List<PatiantInformtion> inPatientList = [];
List<PatiantInformtion> myInPatientList = [];
Future getInPatientList(
PatientSearchRequestModel requestModel, bool isMyInpatient) async {
@ -13,7 +13,7 @@ class PatientInPatientService extends BaseService {
await getDoctorProfile();
if (isMyInpatient) {
requestModel.doctorID = doctorProfile.doctorID;
requestModel.doctorID = doctorProfile!.doctorID;
} else {
requestModel.doctorID = 0;
}
@ -27,7 +27,7 @@ class PatientInPatientService extends BaseService {
response['List_MyInPatient'].forEach((v) {
PatiantInformtion patient = PatiantInformtion.fromJson(v);
inPatientList.add(patient);
if(patient.doctorId == doctorProfile.doctorID){
if(patient.doctorId == doctorProfile!.doctorID){
myInPatientList.add(patient);
}
});

@ -56,26 +56,26 @@ class PatientService extends BaseService {
List<NoteModel> get patientProgressNoteList => _patientProgressNoteList;
// TODO: replace var with model
var _insuranceApporvalsList = [];
List<dynamic>? _insuranceApporvalsList = [];
get insuranceApporvalsList => _insuranceApporvalsList;
// TODO: replace var with model
var _doctorsList = [];
List<dynamic>? _doctorsList = [];
var _arrivedList = [];
List<dynamic>? _arrivedList = [];
get arrivedList => _arrivedList;
get doctorsList => _doctorsList;
// TODO: replace var with model
var _clinicsList = [];
List<dynamic>? _clinicsList = [];
get clinicsList => _clinicsList;
// TODO: replace var with model
var _referalFrequancyList = [];
List<dynamic>? _referalFrequancyList = [];
get referalFrequancyList => _referalFrequancyList;
@ -85,7 +85,7 @@ class PatientService extends BaseService {
STPReferralFrequencyRequest();
ClinicByProjectIdRequest _clinicByProjectIdRequest =
ClinicByProjectIdRequest();
ReferToDoctorRequest _referToDoctorRequest;
late ReferToDoctorRequest _referToDoctorRequest;
Future<dynamic> getPatientList(patient, patientType, {isView}) async {
hasError = false;
@ -375,25 +375,26 @@ class PatientService extends BaseService {
// TODO send the total model insted of each parameter
Future referToDoctor(
{String selectedDoctorID,
String selectedClinicID,
int admissionNo,
String extension,
String priority,
String frequency,
String referringDoctorRemarks,
int patientID,
int patientTypeID,
String roomID,
int projectID}) async {
{String? selectedDoctorID,
String? selectedClinicID,
int? admissionNo,
String? extension,
String? priority,
String? frequency,
String? referringDoctorRemarks,
int? patientID,
int? patientTypeID,
String? roomID,
int? projectID}) async {
hasError = false;
// TODO Change it to use it when we implement authentication user
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel doctorProfile = new DoctorProfileModel.fromJson(profile);
int doctorID = doctorProfile.doctorID;
int clinicId = doctorProfile.clinicID;
DoctorProfileModel doctorProfile = new DoctorProfileModel.fromJson(profile as Map<String, dynamic>);
int? doctorID = doctorProfile.doctorID;
int? clinicId = doctorProfile.clinicID;
_referToDoctorRequest = ReferToDoctorRequest(
projectID: projectID,
tokenID: '',
admissionNo: admissionNo,
roomID: roomID,
referralClinic: selectedClinicID.toString(),

@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/service/base/lookup-service.dart';
class AdmissionRequestService extends LookupService {
List<dynamic> clinicList = [];
List<dynamic> doctorsList = [];
List<dynamic>? doctorsList = [];
List<dynamic> specialityList = [];
List<dynamic> floorList = [];
List<dynamic> wardList = [];
@ -29,7 +29,7 @@ class AdmissionRequestService extends LookupService {
});
}
Future getDoctorsList(int clinicId) async {
Future getDoctorsList(int? clinicId) async {
hasError = false;
Map<String, dynamic> body = Map();
@ -159,7 +159,7 @@ class AdmissionRequestService extends LookupService {
);
}
Future getDietTypesList(int patientMrn) async {
Future getDietTypesList(int? patientMrn) async {
hasError = false;
Map<String, dynamic> body = Map();
@ -185,7 +185,7 @@ class AdmissionRequestService extends LookupService {
);
}
Future getICDCodes(int patientMrn) async {
Future getICDCodes(int? patientMrn) async {
hasError = false;
Map<String, dynamic> body = Map();

@ -16,14 +16,14 @@ class InsuranceCardService extends BaseService {
_insuranceApprovalInPatientRequestModel =
InsuranceApprovalInPatientRequestModel();
List<InsuranceApprovalModel> _insuranceApproval = List();
List<InsuranceApprovalModel> _insuranceApproval = [];
List<InsuranceApprovalModel> get insuranceApproval => _insuranceApproval;
List<InsuranceApprovalInPatientModel> _insuranceApprovalInPatient = List();
List<InsuranceApprovalInPatientModel> _insuranceApprovalInPatient = [];
List<InsuranceApprovalInPatientModel> get insuranceApprovalInPatient =>
_insuranceApprovalInPatient;
Future getInsuranceApprovalInPatient({int mrn}) async {
Future getInsuranceApprovalInPatient({int? mrn}) async {
_insuranceApprovalInPatientRequestModel =
InsuranceApprovalInPatientRequestModel(
patientID: mrn,
@ -45,8 +45,8 @@ class InsuranceCardService extends BaseService {
}, body: _insuranceApprovalInPatientRequestModel.toJson());
}
Future getInsuranceApproval(PatiantInformtion patient,
{int appointmentNo, int projectId}) async {
Future getInsuranceApproval(PatiantInformtion? patient,
{int? appointmentNo, int? projectId}) async {
hasError = false;
// _cardList.clear();
// if (appointmentNo != null) {
@ -67,7 +67,7 @@ class InsuranceCardService extends BaseService {
response['HIS_Approval_List'].forEach((item) {
_insuranceApproval.add(InsuranceApprovalModel.fromJson(item));
});
}, onFailure: (String error, int statusCode) {
}, onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
}, body: _insuranceApprovalModel.toJson());

@ -10,16 +10,16 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import '../../base/base_service.dart';
class LabsService extends BaseService {
List<PatientLabOrders> patientLabOrdersList = List();
List<PatientLabOrders> patientLabOrdersList = [];
Future getPatientLabOrdersList(
PatiantInformtion patient, bool isInpatient) async {
PatiantInformtion? patient, bool isInpatient) async {
hasError = false;
Map<String, dynamic> body = Map();
String url = "";
if (isInpatient) {
await getDoctorProfile();
body['ProjectID'] = doctorProfile.projectID;
body['ProjectID'] = doctorProfile!.projectID;
url = GET_PATIENT_LAB_OREDERS;
} else {
body['isDentalAllowedBackend'] = false;
@ -40,7 +40,7 @@ class LabsService extends BaseService {
patientLabOrdersList.add(PatientLabOrders.fromJson(hospital));
});
}
}, onFailure: (String error, int statusCode) {
}, onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
@ -49,17 +49,17 @@ class LabsService extends BaseService {
RequestPatientLabSpecialResult _requestPatientLabSpecialResult =
RequestPatientLabSpecialResult();
List<PatientLabSpecialResult> patientLabSpecialResult = List();
List<LabResult> labResultList = List();
List<LabOrderResult> labOrdersResultsList = List();
List<PatientLabSpecialResult> patientLabSpecialResult = [];
List<LabResult> labResultList = [];
List<LabOrderResult> labOrdersResultsList = [];
Future getLaboratoryResult(
{String projectID,
int clinicID,
String invoiceNo,
String orderNo,
PatiantInformtion patient,
bool isInpatient = false}) async {
{String? projectID,
int? clinicID,
String? invoiceNo,
String? orderNo,
PatiantInformtion? patient,
bool? isInpatient = false}) async {
hasError = false;
Map<String, dynamic> body = Map();
@ -76,16 +76,16 @@ class LabsService extends BaseService {
response['ListPLSR'].forEach((hospital) {
patientLabSpecialResult.add(PatientLabSpecialResult.fromJson(hospital));
});
}, onFailure: (String error, int statusCode) {
}, onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
}
Future getPatientLabResult(
{PatientLabOrders patientLabOrder,
PatiantInformtion patient,
bool isInpatient}) async {
{required PatientLabOrders patientLabOrder,
PatiantInformtion? patient,
required bool isInpatient}) async {
hasError = false;
String url = "";
@ -117,16 +117,16 @@ class LabsService extends BaseService {
labResultList.add(LabResult.fromJson(lab));
});
}
}, onFailure: (String error, int statusCode) {
}, onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
}
Future getPatientLabOrdersResults(
{PatientLabOrders patientLabOrder,
String procedure,
PatiantInformtion patient}) async {
{PatientLabOrders? patientLabOrder,
String? procedure,
PatiantInformtion? patient}) async {
hasError = false;
Map<String, dynamic> body = Map();
if (patientLabOrder != null) {
@ -144,7 +144,7 @@ class LabsService extends BaseService {
response['ListPLR'].forEach((lab) {
labOrdersResultsList.add(LabOrderResult.fromJson(lab));
});
}, onFailure: (String error, int statusCode) {
}, onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
@ -153,7 +153,7 @@ class LabsService extends BaseService {
RequestSendLabReportEmail _requestSendLabReportEmail =
RequestSendLabReportEmail();
Future sendLabReportEmail({PatientLabOrders patientLabOrder}) async {
Future sendLabReportEmail({PatientLabOrders? patientLabOrder}) async {
// _requestSendLabReportEmail.projectID = patientLabOrder.projectID;
// _requestSendLabReportEmail.invoiceNo = patientLabOrder.invoiceNo;
// _requestSendLabReportEmail.doctorName = patientLabOrder.doctorName;

@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/model/medical_report/medical_file_reques
import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class MedicalFileService extends BaseService {
List<MedicalFileModel> _medicalFileList = List();
List<MedicalFileModel> _medicalFileList = [];
List<MedicalFileModel> get medicalFileList => _medicalFileList;
MedicalFileRequestModel _fileRequestModel = MedicalFileRequestModel(
@ -13,7 +13,7 @@ class MedicalFileService extends BaseService {
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMDAyIiwianRpIjoiNDM1MGNjZTYtYzc3MS00YjBiLThiNDItMGZhY2IzYzgxMjQ4IiwiZW1haWwiOiIiLCJpZCI6IjEwMDIiLCJOYW1lIjoiVEVNUCAtIERPQ1RPUiIsIkVtcGxveWVlSWQiOiI0NzA5IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiI0NzA5IiwiU0VTU0lPTklEIjoiMjE1OTYwNTQiLCJDbGluaWNJZCI6IjEiLCJyb2xlIjpbIkRPQ1RPUlMiLCJIRUFEIERPQ1RPUlMiLCJBRE1JTklTVFJBVE9SUyIsIlJFQ0VQVElPTklTVCIsIkVSIE5VUlNFIiwiRVIgUkVDRVBUSU9OSVNUIiwiUEhBUk1BQ1kgQUNDT1VOVCBTVEFGRiIsIlBIQVJNQUNZIE5VUlNFIiwiSU5QQVRJRU5UIFBIQVJNQUNJU1QiLCJBRE1JU1NJT04gU1RBRkYiLCJBUFBST1ZBTCBTVEFGRiIsIkNPTlNFTlQgIiwiTUVESUNBTCBSRVBPUlQgLSBTSUNLIExFQVZFIE1BTkFHRVIiXSwibmJmIjoxNjA5MjI1MjMwLCJleHAiOjE2MTAwODkyMzAsImlhdCI6MTYwOTIyNTIzMH0.rs7lTBQ1ON4PbR11PBkOyjf818DdeMKuqz2IrCJMYQU",
);
Future getMedicalFile({int mrn}) async {
Future getMedicalFile({int? mrn}) async {
_fileRequestModel = MedicalFileRequestModel(patientMRN: mrn);
_fileRequestModel.iPAdress = "9.9.9.9";
hasError = false;

@ -5,8 +5,8 @@ import 'package:doctor_app_flutter/models/pharmacies/pharmacies_List_request_mod
import 'package:doctor_app_flutter/models/pharmacies/pharmacies_items_request_model.dart';
class MedicineService extends BaseService {
var _pharmacyItemsList = [];
var _pharmaciesList = [];
List<dynamic>? _pharmacyItemsList = [];
List<dynamic>? _pharmaciesList = [];
get pharmacyItemsList => _pharmacyItemsList;
get pharmaciesList => _pharmaciesList;
String searchText='';
@ -22,7 +22,7 @@ class MedicineService extends BaseService {
await baseAppClient.post(
PHARMACY_ITEMS_URL,
onSuccess: (dynamic response, int statusCode) {
_pharmacyItemsList.clear();
_pharmacyItemsList!.clear();
_pharmacyItemsList = response['ListPharmcy_Region_enh'];
},
onFailure: (String error, int statusCode) {
@ -33,12 +33,12 @@ class MedicineService extends BaseService {
);
}
Future getPharmaciesList(int itemId) async {
Future getPharmaciesList(int? itemId) async {
_listRequestModel.itemID = itemId;
await baseAppClient.post(
PHARMACY_LIST_URL,
onSuccess: (dynamic response, int statusCode) {
_pharmaciesList.clear();
_pharmaciesList!.clear();
_pharmaciesList = response['PharmList'];
},
onFailure: (String error, int statusCode) {

@ -16,18 +16,18 @@ import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-
import 'package:doctor_app_flutter/util/date-utils.dart';
class PrescriptionService extends LookupService {
List<PrescriptionModel> _prescriptionList = List();
List<PrescriptionModel> _prescriptionList = [];
List<PrescriptionModel> get prescriptionList => _prescriptionList;
List<SearchDrugModel> _drugsList = List();
List<SearchDrugModel> _drugsList = [];
List<SearchDrugModel> get drugsList => _drugsList;
List<dynamic> doctorsList = [];
List<dynamic>? doctorsList = [];
List<GetMedicationResponseModel> allMedicationList = [];
List<dynamic> specialityList = [];
List<dynamic> drugToDrug = [];
List<dynamic> get drugToDrugList => drugToDrug;
List<dynamic> itemMedicineList = [];
List<dynamic> itemMedicineListRoute = [];
List<dynamic> itemMedicineListUnit = [];
List<dynamic>? drugToDrug = [];
List<dynamic>? get drugToDrugList => drugToDrug;
List<dynamic>? itemMedicineList = [];
List<dynamic>? itemMedicineListRoute = [];
List<dynamic>? itemMedicineListUnit = [];
dynamic boxQuantity;
PrescriptionReqModel _prescriptionReqModel = PrescriptionReqModel();
@ -44,7 +44,7 @@ class PrescriptionService extends LookupService {
PostPrescriptionReqModel _postPrescriptionReqModel =
PostPrescriptionReqModel();
Future getItem({int itemID}) async {
Future getItem({int? itemID}) async {
_itemByMedicineRequestModel =
ItemByMedicineRequestModel(medicineCode: itemID);
@ -78,7 +78,7 @@ class PrescriptionService extends LookupService {
}, body: getAssessmentReqModel.toJson());
}
Future getPrescription({int mrn}) async {
Future getPrescription({int? mrn}) async {
_prescriptionReqModel = PrescriptionReqModel(
patientMRN: mrn,
);
@ -94,7 +94,7 @@ class PrescriptionService extends LookupService {
}, body: _prescriptionReqModel.toJson());
}
Future getDrugs({String drugName}) async {
Future getDrugs({String? drugName}) async {
_drugRequestModel = SearchDrugRequestModel(search: [drugName]);
hasError = false;
@ -109,7 +109,7 @@ class PrescriptionService extends LookupService {
}, body: _drugRequestModel.toJson());
}
Future getMedicationList({String drug = ''}) async {
Future getMedicationList({String? drug = ''}) async {
hasError = false;
_drugRequestModel.search = ["$drug"];
await baseAppClient.post(SEARCH_DRUG,
@ -159,7 +159,7 @@ class PrescriptionService extends LookupService {
}
Future getDrugToDrug(
VitalSignData vital,
VitalSignData? vital,
List<GetAssessmentResModel> lstAssessments,
List<GetAllergiesResModel> allergy,
PatiantInformtion patient,
@ -243,7 +243,7 @@ class PrescriptionService extends LookupService {
}
Future calculateBoxQuantity(
{int freq, int duration, int itemCode, double strength}) async {
{int? freq, int? duration, int? itemCode, double? strength}) async {
_boxQuantityRequestModel = CalculateBoxQuantityRequestModel(
frequency: freq,
duration: duration,

@ -15,14 +15,14 @@ import 'package:flutter/cupertino.dart';
import '../../base/base_service.dart';
class PrescriptionsService extends BaseService {
List<Prescriptions> prescriptionsList = List();
List<PrescriptionsOrder> prescriptionsOrderList = List();
List<PrescriotionInPatient> prescriptionInPatientList = List();
List<Prescriptions> prescriptionsList = [];
List<PrescriptionsOrder> prescriptionsOrderList = [];
List<PrescriotionInPatient> prescriptionInPatientList = [];
InPatientPrescriptionRequestModel _inPatientPrescriptionRequestModel =
InPatientPrescriptionRequestModel();
Future getPrescriptionInPatient({int mrn, String adn}) async {
Future getPrescriptionInPatient({int? mrn, String? adn}) async {
_inPatientPrescriptionRequestModel = InPatientPrescriptionRequestModel(
patientMRN: mrn,
admissionNo: adn,
@ -43,7 +43,7 @@ class PrescriptionsService extends BaseService {
}, body: _inPatientPrescriptionRequestModel.toJson());
}
Future getPrescriptions(PatiantInformtion patient) async {
Future getPrescriptions(PatiantInformtion? patient) async {
hasError = false;
Map<String, dynamic> body = Map();
body['isDentalAllowedBackend'] = false;
@ -53,7 +53,7 @@ class PrescriptionsService extends BaseService {
response['PatientPrescriptionList'].forEach((prescriptions) {
prescriptionsList.add(Prescriptions.fromJson(prescriptions));
});
}, onFailure: (String error, int statusCode) {
}, onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
@ -62,11 +62,11 @@ class PrescriptionsService extends BaseService {
RequestPrescriptionReport _requestPrescriptionReport =
RequestPrescriptionReport(
appointmentNo: 0, isDentalAllowedBackend: false);
List<PrescriptionReport> prescriptionReportList = List();
List<PrescriptionReport> prescriptionReportList = [];
Future getPrescriptionReport(
{Prescriptions prescriptions,
@required PatiantInformtion patient}) async {
{required Prescriptions prescriptions,
required PatiantInformtion? patient}) async {
hasError = false;
_requestPrescriptionReport.dischargeNo = prescriptions.dischargeNo;
_requestPrescriptionReport.projectID = prescriptions.projectID;
@ -76,13 +76,13 @@ class PrescriptionsService extends BaseService {
_requestPrescriptionReport.appointmentNo = prescriptions.appointmentNo;
await baseAppClient.postPatient(
prescriptions.isInOutPatient
prescriptions.isInOutPatient!
? GET_PRESCRIPTION_REPORT_ENH
: GET_PRESCRIPTION_REPORT_NEW,
patient: patient, onSuccess: (dynamic response, int statusCode) {
prescriptionReportList.clear();
prescriptionReportEnhList.clear();
if (prescriptions.isInOutPatient) {
if (prescriptions.isInOutPatient!) {
response['ListPRM'].forEach((prescriptions) {
prescriptionReportList
.add(PrescriptionReport.fromJson(prescriptions));
@ -95,7 +95,7 @@ class PrescriptionsService extends BaseService {
.add(PrescriptionReport.fromJson(prescriptions));
});
}
}, onFailure: (String error, int statusCode) {
}, onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
}, body: _requestPrescriptionReport.toJson());
@ -108,10 +108,10 @@ class PrescriptionsService extends BaseService {
longitude: 0,
isDentalAllowedBackend: false,
);
List<PharmacyPrescriptions> pharmacyPrescriptionsList = List();
List<PharmacyPrescriptions> pharmacyPrescriptionsList = [];
Future getListPharmacyForPrescriptions(
{int itemId, @required PatiantInformtion patient}) async {
{int? itemId, required PatiantInformtion patient}) async {
hasError = false;
requestGetListPharmacyForPrescriptions.itemID = itemId;
await baseAppClient.postPatient(GET_PHARMACY_LIST, patient: patient,
@ -121,7 +121,7 @@ class PrescriptionsService extends BaseService {
pharmacyPrescriptionsList
.add(PharmacyPrescriptions.fromJson(prescriptions));
});
}, onFailure: (String error, int statusCode) {
}, onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
}, body: requestGetListPharmacyForPrescriptions.toJson());
@ -132,15 +132,15 @@ class PrescriptionsService extends BaseService {
isDentalAllowedBackend: false,
);
List<PrescriptionReportEnh> prescriptionReportEnhList = List();
List<PrescriptionReportEnh> prescriptionReportEnhList = [];
Future getPrescriptionReportEnh(
{PrescriptionsOrder prescriptionsOrder,
@required PatiantInformtion patient}) async {
{PrescriptionsOrder? prescriptionsOrder,
required PatiantInformtion patient}) async {
///This logic copy from the old app from class [order-history.component.ts] in line 45
bool isInPatient = false;
bool? isInPatient = false;
prescriptionsList.forEach((element) {
if (prescriptionsOrder.appointmentNo == "0") {
if (prescriptionsOrder!.appointmentNo == "0") {
if (element.dischargeNo == int.parse(prescriptionsOrder.dischargeID)) {
_requestPrescriptionReportEnh.appointmentNo = element.appointmentNo;
_requestPrescriptionReportEnh.clinicID = element.clinicID;
@ -169,11 +169,11 @@ class PrescriptionsService extends BaseService {
hasError = false;
await baseAppClient.postPatient(
isInPatient ? GET_PRESCRIPTION_REPORT_ENH : GET_PRESCRIPTION_REPORT_NEW,
isInPatient! ? GET_PRESCRIPTION_REPORT_ENH : GET_PRESCRIPTION_REPORT_NEW,
patient: patient, onSuccess: (dynamic response, int statusCode) {
prescriptionReportEnhList.clear();
if (isInPatient) {
if (isInPatient!) {
response['ListPRM'].forEach((prescriptions) {
prescriptionReportEnhList
.add(PrescriptionReportEnh.fromJson(prescriptions));
@ -186,7 +186,7 @@ class PrescriptionsService extends BaseService {
prescriptionReportEnhList.add(reportEnh);
});
}
}, onFailure: (String error, int statusCode) {
}, onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
}, body: _requestPrescriptionReportEnh.toJson());

@ -10,14 +10,14 @@ import 'package:doctor_app_flutter/core/model/procedure/update_procedure_request
import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class ProcedureService extends BaseService {
List<GetOrderedProcedureModel> _procedureList = List();
List<GetOrderedProcedureModel> _procedureList = [];
List<GetOrderedProcedureModel> get procedureList => _procedureList;
List<ProcedureValadteModel> _valadteProcedureList = List();
List<ProcedureValadteModel> _valadteProcedureList = [];
List<ProcedureValadteModel> get valadteProcedureList => _valadteProcedureList;
List<CategoriseProcedureModel> _categoriesList = List();
List<CategoriseProcedureModel> _categoriesList = [];
List<CategoriseProcedureModel> get categoriesList => _categoriesList;
List<Procedures> procedureslist = List();
List<dynamic> categoryList = [];
List<Procedures> procedureslist = [];
List<dynamic>? categoryList = [];
GetOrderedProcedureRequestModel _getOrderedProcedureRequestModel =
GetOrderedProcedureRequestModel();
@ -46,7 +46,7 @@ class ProcedureService extends BaseService {
//search: ["DENTAL"],
);
Future getProcedure({int mrn}) async {
Future getProcedure({int? mrn}) async {
_getOrderedProcedureRequestModel =
GetOrderedProcedureRequestModel(patientMRN: mrn);
hasError = false;
@ -74,7 +74,7 @@ class ProcedureService extends BaseService {
}, body: Map());
}
Future getProcedureCategory({String categoryName, String categoryID}) async {
Future getProcedureCategory({String? categoryName, String? categoryID}) async {
_getProcedureCategoriseReqModel = GetProcedureReqModel(
search: ["$categoryName"],
patientMRN: 0,

@ -6,14 +6,14 @@ import 'package:flutter/cupertino.dart';
import '../../base/base_service.dart';
class RadiologyService extends BaseService {
List<FinalRadiology> finalRadiologyList = List();
String url = '';
List<FinalRadiology> finalRadiologyList = [];
String? url = '';
Future getRadImageURL(
{int invoiceNo,
int lineItem,
int projectId,
@required PatiantInformtion patient}) async {
{int? invoiceNo,
int? lineItem,
int? projectId,
required PatiantInformtion? patient}) async {
hasError = false;
final Map<String, dynamic> body = new Map<String, dynamic>();
body['InvoiceNo'] = invoiceNo;
@ -23,19 +23,19 @@ class RadiologyService extends BaseService {
await baseAppClient.postPatient(GET_RAD_IMAGE_URL, patient: patient,
onSuccess: (dynamic response, int statusCode) {
url = response['Data'];
}, onFailure: (String error, int statusCode) {
}, onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
}
Future getPatientRadOrders(PatiantInformtion patient,
Future getPatientRadOrders(PatiantInformtion? patient,
{isInPatient = false}) async {
String url = GET_PATIENT_ORDERS;
final Map<String, dynamic> body = new Map<String, dynamic>();
if (isInPatient) {
url = GET_IN_PATIENT_ORDERS;
body['ProjectID'] = patient.projectId;
body['ProjectID'] = patient!.projectId;
}
hasError = false;
@ -49,7 +49,7 @@ class RadiologyService extends BaseService {
response[label].forEach((radiology) {
finalRadiologyList.add(FinalRadiology.fromJson(radiology));
});
}, onFailure: (String error, int statusCode) {
}, onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);

@ -9,17 +9,17 @@ import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.d
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
class SickLeaveService extends BaseService {
Map get sickLeavestatisitics => _statistics;
Map _statistics = {};
Map? get sickLeavestatisitics => _statistics;
Map? _statistics = {};
List get getOffTimeList => offTime;
List offTime = [];
List get getReasons => reasonse;
List reasonse = [];
List? get getReasons => reasonse;
List? reasonse = [];
List<GetAllSickLeaveResponse> get getAllSickLeave => _getAllsickLeave;
List<GetAllSickLeaveResponse> _getAllsickLeave = List();
List<GetAllSickLeaveResponse> _getAllsickLeave = [];
List get coveringDoctorsList => _coveringDoctors;
List _coveringDoctors = [];
List? get coveringDoctorsList => _coveringDoctors;
List? _coveringDoctors = [];
List<GetRescheduleLeavesResponse> get getAllRescheduleLeave =>
_getReScheduleLeave;
@ -30,7 +30,7 @@ class SickLeaveService extends BaseService {
dynamic get sickLeaveResponse => _sickLeaveResponse;
dynamic _sickLeaveResponse;
List<SickLeavePatientModel> getAllSickLeavePatient = List();
List<SickLeavePatientModel> getAllSickLeavePatient = [];
SickLeavePatientRequestModel _sickLeavePatientRequestModel =
SickLeavePatientRequestModel();
@ -97,6 +97,7 @@ class SickLeaveService extends BaseService {
hasError = false;
getAllSickLeavePatient = [];
await baseAppClient.postPatient(
GET_SICK_LEAVE,
onSuccess: (dynamic response, int statusCode) {
// Future.value(response);
@ -105,11 +106,12 @@ class SickLeaveService extends BaseService {
getAllSickLeavePatient.add(SickLeavePatientModel.fromJson(v));
});
},
onFailure: (String error, int statusCode) {
onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
},
body: {'PatientMRN': patientMRN, "Status": 0},
patient:null
);
}
@ -128,11 +130,12 @@ class SickLeaveService extends BaseService {
getAllSickLeavePatient.add(SickLeavePatientModel.fromJson(v));
});
},
onFailure: (String error, int statusCode) {
onFailure: (String? error, int statusCode) {
hasError = true;
super.error = error;
},
body: _sickLeavePatientRequestModel.toJson(),
patient:null
);
}
@ -147,8 +150,8 @@ class SickLeaveService extends BaseService {
_getReScheduleLeave.add(GetRescheduleLeavesResponse.fromJson(v));
});
_getReScheduleLeave.sort((a, b) {
var adate = a.dateTimeFrom; //before -> var adate = a.date;
var bdate = b.dateTimeFrom; //var bdate = b.date;
var adate = a.dateTimeFrom!; //before -> var adate = a.date;
var bdate = b.dateTimeFrom!; //var bdate = b.date;
return -adate.compareTo(bdate);
});
},

@ -32,7 +32,7 @@ class SOAPService extends LookupService {
List<GetPatientProgressNoteResModel> patientProgressNoteList = [];
List<GetAssessmentResModel> patientAssessmentList = [];
int episodeID;
int? episodeID;
Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async {
await baseAppClient.post(
GET_ALLERGIES,

@ -12,7 +12,7 @@ class UcafService extends LookupService {
List<VitalSignHistory> patientVitalSignsHistory = [];
List<GetAssessmentResModel> patientAssessmentList = [];
List<OrderProcedure> orderProcedureList = [];
PrescriptionModel prescriptionList;
PrescriptionModel? prescriptionList;
Future getPatientChiefComplaint(PatiantInformtion patient) async {
hasError = false;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save