diff --git a/ios/Podfile b/ios/Podfile
index bebf8f5b..14f8bd58 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -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.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
deleted file mode 100644
index 2f4607e0..00000000
--- a/ios/Podfile.lock
+++ /dev/null
@@ -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
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 1d526a16..919434a6 100644
--- a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
+ location = "self:">
diff --git a/lib/UpdatePage.dart b/lib/UpdatePage.dart
index 16284ed1..53024316 100644
--- a/lib/UpdatePage.dart
+++ b/lib/UpdatePage.dart
@@ -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(),
),
),
),
diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart
index 42e3ef87..3c74c413 100644
--- a/lib/client/base_app_client.dart
+++ b/lib/client/base_app_client.dart
@@ -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 body,
- Function(dynamic response, int statusCode) onSuccess,
- Function(String error, int statusCode) onFailure,
+ {required Map 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);
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(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 body,
- Function(dynamic response, int statusCode) onSuccess,
- Function(String error, int statusCode) onFailure,
- @required PatiantInformtion patient,
+ {required Map 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";
}
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 852e7bab..e0f22fac 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -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);
}
diff --git a/lib/config/size_config.dart b/lib/config/size_config.dart
index 6b996b3f..5d0720a9 100644
--- a/lib/config/size_config.dart
+++ b/lib/config/size_config.dart
@@ -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;
diff --git a/lib/core/enum/auth_method_types.dart b/lib/core/enum/auth_method_types.dart
index 82577eeb..572a36f1 100644
--- a/lib/core/enum/auth_method_types.dart
+++ b/lib/core/enum/auth_method_types.dart
@@ -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;
diff --git a/lib/core/insurance_approval_request_model.dart b/lib/core/insurance_approval_request_model.dart
index 02f71ecb..11f7804e 100644
--- a/lib/core/insurance_approval_request_model.dart
+++ b/lib/core/insurance_approval_request_model.dart
@@ -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,
diff --git a/lib/core/model/Prescriptions/Prescriptions.dart b/lib/core/model/Prescriptions/Prescriptions.dart
index c47a813a..952e7f69 100644
--- a/lib/core/model/Prescriptions/Prescriptions.dart
+++ b/lib/core/model/Prescriptions/Prescriptions.dart
@@ -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 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? speciality;
Prescriptions(
{this.setupID,
@@ -149,10 +149,10 @@ class Prescriptions {
}
class PrescriptionsList {
- String filterName = "";
- List prescriptionsList = List();
+ String? filterName = "";
+ List prescriptionsList = [];
- PrescriptionsList({this.filterName, Prescriptions prescriptions}) {
+ PrescriptionsList({this.filterName, Prescriptions? prescriptions}) {
prescriptionsList.add(prescriptions);
}
}
diff --git a/lib/core/model/Prescriptions/in_patient_prescription_model.dart b/lib/core/model/Prescriptions/in_patient_prescription_model.dart
index f6e88bf7..3f67e659 100644
--- a/lib/core/model/Prescriptions/in_patient_prescription_model.dart
+++ b/lib/core/model/Prescriptions/in_patient_prescription_model.dart
@@ -1,5 +1,5 @@
class InPatientPrescriptionRequestModel {
- String vidaAuthTokenID;
+ String? vidaAuthTokenID;
dynamic patientMRN;
dynamic appNo;
dynamic admissionNo;
diff --git a/lib/core/model/Prescriptions/perscription_pharmacy.dart b/lib/core/model/Prescriptions/perscription_pharmacy.dart
index 3adaef7e..54809e1c 100644
--- a/lib/core/model/Prescriptions/perscription_pharmacy.dart
+++ b/lib/core/model/Prescriptions/perscription_pharmacy.dart
@@ -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(
diff --git a/lib/core/model/Prescriptions/post_prescrition_req_model.dart b/lib/core/model/Prescriptions/post_prescrition_req_model.dart
index 06a524ed..43bcb09a 100644
--- a/lib/core/model/Prescriptions/post_prescrition_req_model.dart
+++ b/lib/core/model/Prescriptions/post_prescrition_req_model.dart
@@ -1,10 +1,10 @@
class PostPrescriptionReqModel {
- String vidaAuthTokenID;
- int clinicID;
- int episodeID;
- int appointmentNo;
- int patientMRN;
- List prescriptionRequestModel;
+ String? vidaAuthTokenID;
+ int? clinicID;
+ int? episodeID;
+ int? appointmentNo;
+ int? patientMRN;
+ List? prescriptionRequestModel;
PostPrescriptionReqModel(
{this.vidaAuthTokenID,
@@ -21,9 +21,9 @@ class PostPrescriptionReqModel {
appointmentNo = json['AppointmentNo'];
patientMRN = json['PatientMRN'];
if (json['prescriptionRequestModel'] != null) {
- prescriptionRequestModel = new List();
+ 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,
diff --git a/lib/core/model/Prescriptions/prescription_in_patient.dart b/lib/core/model/Prescriptions/prescription_in_patient.dart
index c66bc8a4..bbb2b756 100644
--- a/lib/core/model/Prescriptions/prescription_in_patient.dart
+++ b/lib/core/model/Prescriptions/prescription_in_patient.dart
@@ -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(
diff --git a/lib/core/model/Prescriptions/prescription_model.dart b/lib/core/model/Prescriptions/prescription_model.dart
index 92574c66..fa45ff13 100644
--- a/lib/core/model/Prescriptions/prescription_model.dart
+++ b/lib/core/model/Prescriptions/prescription_model.dart
@@ -1,5 +1,5 @@
class PrescriptionModel {
- List entityList;
+ List? entityList;
dynamic rowcount;
dynamic statusMessage;
@@ -7,9 +7,9 @@ class PrescriptionModel {
PrescriptionModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = new List();
+ 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 toJson() {
final Map data = new Map();
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;
diff --git a/lib/core/model/Prescriptions/prescription_report.dart b/lib/core/model/Prescriptions/prescription_report.dart
index d2427004..c442d37d 100644
--- a/lib/core/model/Prescriptions/prescription_report.dart
+++ b/lib/core/model/Prescriptions/prescription_report.dart
@@ -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,
diff --git a/lib/core/model/Prescriptions/prescription_report_enh.dart b/lib/core/model/Prescriptions/prescription_report_enh.dart
index 203eaaff..66c57349 100644
--- a/lib/core/model/Prescriptions/prescription_report_enh.dart
+++ b/lib/core/model/Prescriptions/prescription_report_enh.dart
@@ -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,
diff --git a/lib/core/model/Prescriptions/prescription_req_model.dart b/lib/core/model/Prescriptions/prescription_req_model.dart
index a45878d8..325223fb 100644
--- a/lib/core/model/Prescriptions/prescription_req_model.dart
+++ b/lib/core/model/Prescriptions/prescription_req_model.dart
@@ -1,5 +1,5 @@
class PrescriptionReqModel {
- String vidaAuthTokenID;
+ String? vidaAuthTokenID;
dynamic patientMRN;
dynamic appNo;
dynamic admissionNo;
diff --git a/lib/core/model/Prescriptions/prescriptions_order.dart b/lib/core/model/Prescriptions/prescriptions_order.dart
index f51420ec..0f69ffe5 100644
--- a/lib/core/model/Prescriptions/prescriptions_order.dart
+++ b/lib/core/model/Prescriptions/prescriptions_order.dart
@@ -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;
diff --git a/lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart b/lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart
index 739bb838..425f8565 100644
--- a/lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart
+++ b/lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart
@@ -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,
diff --git a/lib/core/model/Prescriptions/request_prescription_report.dart b/lib/core/model/Prescriptions/request_prescription_report.dart
index c8323740..ee0226a8 100644
--- a/lib/core/model/Prescriptions/request_prescription_report.dart
+++ b/lib/core/model/Prescriptions/request_prescription_report.dart
@@ -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,
diff --git a/lib/core/model/Prescriptions/request_prescription_report_enh.dart b/lib/core/model/Prescriptions/request_prescription_report_enh.dart
index 4905fc2a..81cdeae3 100644
--- a/lib/core/model/Prescriptions/request_prescription_report_enh.dart
+++ b/lib/core/model/Prescriptions/request_prescription_report_enh.dart
@@ -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,
diff --git a/lib/core/model/admissionRequest/admission-request.dart b/lib/core/model/admissionRequest/admission-request.dart
index 1ab5a990..2eda5240 100644
--- a/lib/core/model/admissionRequest/admission-request.dart
+++ b/lib/core/model/admissionRequest/admission-request.dart
@@ -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 admissionRequestDiagnoses;
- List 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? admissionRequestDiagnoses;
+ List? 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();
+ admissionRequestDiagnoses = [];
json['admissionRequestDiagnoses'].forEach((v) {
- admissionRequestDiagnoses.add(v);
+ admissionRequestDiagnoses!.add(v);
// admissionRequestDiagnoses
// .add(new AdmissionRequestDiagnoses.fromJson(v));
});
}
if (json['admissionRequestProcedures'] != null) {
- admissionRequestProcedures = new List();
+ 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;
diff --git a/lib/core/model/admissionRequest/clinic-model.dart b/lib/core/model/admissionRequest/clinic-model.dart
index 05d34645..2d7d1fe3 100644
--- a/lib/core/model/admissionRequest/clinic-model.dart
+++ b/lib/core/model/admissionRequest/clinic-model.dart
@@ -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,
diff --git a/lib/core/model/admissionRequest/ward-model.dart b/lib/core/model/admissionRequest/ward-model.dart
index 606758d3..abca4900 100644
--- a/lib/core/model/admissionRequest/ward-model.dart
+++ b/lib/core/model/admissionRequest/ward-model.dart
@@ -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});
diff --git a/lib/core/model/auth/activation_Code_req_model.dart b/lib/core/model/auth/activation_Code_req_model.dart
index 1a9510e8..7a7112d9 100644
--- a/lib/core/model/auth/activation_Code_req_model.dart
+++ b/lib/core/model/auth/activation_Code_req_model.dart
@@ -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,
diff --git a/lib/core/model/auth/activation_code_for_verification_screen_model.dart b/lib/core/model/auth/activation_code_for_verification_screen_model.dart
index 28cc58db..c564b933 100644
--- a/lib/core/model/auth/activation_code_for_verification_screen_model.dart
+++ b/lib/core/model/auth/activation_code_for_verification_screen_model.dart
@@ -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,
diff --git a/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart b/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
index c5ff29e6..b5647280 100644
--- a/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
+++ b/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
@@ -1,10 +1,10 @@
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
class CheckActivationCodeForDoctorAppResponseModel {
- String authenticationTokenID;
- List listDoctorsClinic;
- List listDoctorProfile;
- MemberInformation memberInformation;
+ String? authenticationTokenID;
+ List? listDoctorsClinic;
+ List? listDoctorProfile;
+ MemberInformation? memberInformation;
CheckActivationCodeForDoctorAppResponseModel(
{this.authenticationTokenID,
@@ -15,16 +15,16 @@ class CheckActivationCodeForDoctorAppResponseModel {
Map json) {
authenticationTokenID = json['AuthenticationTokenID'];
if (json['List_DoctorsClinic'] != null) {
- listDoctorsClinic = new List();
+ 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();
+ 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;
- int doctorId;
- String email;
- int employeeId;
- int memberId;
+ List? clinics;
+ int? doctorId;
+ String? email;
+ int? employeeId;
+ int? memberId;
Null memberName;
Null memberNameArabic;
- String preferredLanguage;
- List roles;
+ String? preferredLanguage;
+ List? roles;
MemberInformation({this.clinics,
this.doctorId,
@@ -111,9 +111,9 @@ class MemberInformation {
MemberInformation.fromJson(Map json) {
if (json['clinics'] != null) {
- clinics = new List();
+ 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 = [];
json['roles'].forEach((v) {
- roles.add(new Roles.fromJson(v));
+ roles!.add(new Roles.fromJson(v));
});
}
}
@@ -134,7 +134,7 @@ class MemberInformation {
Map toJson() {
final Map data = new Map();
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});
diff --git a/lib/core/model/auth/check_activation_code_request_model.dart b/lib/core/model/auth/check_activation_code_request_model.dart
index 9bb3d4f6..150c4100 100644
--- a/lib/core/model/auth/check_activation_code_request_model.dart
+++ b/lib/core/model/auth/check_activation_code_request_model.dart
@@ -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,
diff --git a/lib/core/model/auth/imei_details.dart b/lib/core/model/auth/imei_details.dart
index eb37e736..095d5bc9 100644
--- a/lib/core/model/auth/imei_details.dart
+++ b/lib/core/model/auth/imei_details.dart
@@ -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,
diff --git a/lib/core/model/auth/insert_imei_model.dart b/lib/core/model/auth/insert_imei_model.dart
index 25e22b7a..a4aeab7b 100644
--- a/lib/core/model/auth/insert_imei_model.dart
+++ b/lib/core/model/auth/insert_imei_model.dart
@@ -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,
diff --git a/lib/core/model/auth/new_login_information_response_model.dart b/lib/core/model/auth/new_login_information_response_model.dart
index 117060e4..3922d0ba 100644
--- a/lib/core/model/auth/new_login_information_response_model.dart
+++ b/lib/core/model/auth/new_login_information_response_model.dart
@@ -1,13 +1,13 @@
class NewLoginInformationModel {
- int doctorID;
- List listMemberInformation;
- String logInTokenID;
- String mobileNumber;
+ int? doctorID;
+ List? 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 json) {
doctorID = json['DoctorID'];
if (json['List_MemberInformation'] != null) {
- listMemberInformation = new List();
+ 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,
diff --git a/lib/core/model/auth/send_activation_code_for_doctor_app_response_model.dart b/lib/core/model/auth/send_activation_code_for_doctor_app_response_model.dart
index ceaf4c65..db971954 100644
--- a/lib/core/model/auth/send_activation_code_for_doctor_app_response_model.dart
+++ b/lib/core/model/auth/send_activation_code_for_doctor_app_response_model.dart
@@ -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,
diff --git a/lib/core/model/calculate_box_request_model.dart b/lib/core/model/calculate_box_request_model.dart
index 80281854..24e75bb7 100644
--- a/lib/core/model/calculate_box_request_model.dart
+++ b/lib/core/model/calculate_box_request_model.dart
@@ -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,
diff --git a/lib/core/model/hospitals/get_hospitals_request_model.dart b/lib/core/model/hospitals/get_hospitals_request_model.dart
index 8a5f1bc1..99868c4c 100644
--- a/lib/core/model/hospitals/get_hospitals_request_model.dart
+++ b/lib/core/model/hospitals/get_hospitals_request_model.dart
@@ -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,
diff --git a/lib/core/model/hospitals/get_hospitals_response_model.dart b/lib/core/model/hospitals/get_hospitals_response_model.dart
index edbc3fe5..9a4262ef 100644
--- a/lib/core/model/hospitals/get_hospitals_response_model.dart
+++ b/lib/core/model/hospitals/get_hospitals_response_model.dart
@@ -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});
diff --git a/lib/core/model/hospitals_model.dart b/lib/core/model/hospitals_model.dart
index b09807d6..c5d4ae14 100644
--- a/lib/core/model/hospitals_model.dart
+++ b/lib/core/model/hospitals_model.dart
@@ -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,
diff --git a/lib/core/model/insurance/insurance_approval.dart b/lib/core/model/insurance/insurance_approval.dart
index a3717c42..995bd176 100644
--- a/lib/core/model/insurance/insurance_approval.dart
+++ b/lib/core/model/insurance/insurance_approval.dart
@@ -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;
- 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;
+ 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 = [];
json['ApporvalDetails'].forEach((v) {
- apporvalDetails.add(new ApporvalDetails.fromJson(v));
+ apporvalDetails!.add(new ApporvalDetails.fromJson(v));
});
}
appointmentNo = json['AppointmentNo'];
diff --git a/lib/core/model/insurance/insurance_approval_in_patient_model.dart b/lib/core/model/insurance/insurance_approval_in_patient_model.dart
index f185a8bf..805958e7 100644
--- a/lib/core/model/insurance/insurance_approval_in_patient_model.dart
+++ b/lib/core/model/insurance/insurance_approval_in_patient_model.dart
@@ -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;
- String clinicName;
+ List? 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 = [];
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,
diff --git a/lib/core/model/labs/LabOrderResult.dart b/lib/core/model/labs/LabOrderResult.dart
index ecb4ae65..d282c6b4 100644
--- a/lib/core/model/labs/LabOrderResult.dart
+++ b/lib/core/model/labs/LabOrderResult.dart
@@ -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,
diff --git a/lib/core/model/labs/lab_result.dart b/lib/core/model/labs/lab_result.dart
index 1c09696b..e1588ba9 100644
--- a/lib/core/model/labs/lab_result.dart
+++ b/lib/core/model/labs/lab_result.dart
@@ -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 patientLabResultList = List();
+ String? filterName = "";
+ List patientLabResultList = [];
- LabResultList({this.filterName, LabResult lab}) {
+ LabResultList({this.filterName, LabResult? lab}) {
patientLabResultList.add(lab);
}
}
diff --git a/lib/core/model/labs/patient_lab_orders.dart b/lib/core/model/labs/patient_lab_orders.dart
index af60f86f..8f175616 100644
--- a/lib/core/model/labs/patient_lab_orders.dart
+++ b/lib/core/model/labs/patient_lab_orders.dart
@@ -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 speciality;
- bool isLiveCareAppointment;
+ String? qR;
+ String? setupID;
+ List? speciality;
+ bool? isLiveCareAppointment;
PatientLabOrders(
{this.actualDoctorRate,
this.clinicDescription,
@@ -148,11 +148,11 @@ class PatientLabOrders {
}
class PatientLabOrdersList {
- String filterName = "";
- List patientLabOrdersList = List();
+ String? filterName = "";
+ List patientLabOrdersList = [];
PatientLabOrdersList(
- {this.filterName, PatientLabOrders patientDoctorAppointment}) {
+ {this.filterName, PatientLabOrders? patientDoctorAppointment}) {
patientLabOrdersList.add(patientDoctorAppointment);
}
}
diff --git a/lib/core/model/labs/patient_lab_special_result.dart b/lib/core/model/labs/patient_lab_special_result.dart
index 2fbcb832..89a3218e 100644
--- a/lib/core/model/labs/patient_lab_special_result.dart
+++ b/lib/core/model/labs/patient_lab_special_result.dart
@@ -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(
diff --git a/lib/core/model/labs/request_patient_lab_orders.dart b/lib/core/model/labs/request_patient_lab_orders.dart
index ce9263ef..9f9dd4d3 100644
--- a/lib/core/model/labs/request_patient_lab_orders.dart
+++ b/lib/core/model/labs/request_patient_lab_orders.dart
@@ -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,
diff --git a/lib/core/model/labs/request_patient_lab_special_result.dart b/lib/core/model/labs/request_patient_lab_special_result.dart
index b48cf0e1..a8183bfb 100644
--- a/lib/core/model/labs/request_patient_lab_special_result.dart
+++ b/lib/core/model/labs/request_patient_lab_special_result.dart
@@ -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,
diff --git a/lib/core/model/labs/request_send_lab_report_email.dart b/lib/core/model/labs/request_send_lab_report_email.dart
index 118da906..699ddafb 100644
--- a/lib/core/model/labs/request_send_lab_report_email.dart
+++ b/lib/core/model/labs/request_send_lab_report_email.dart
@@ -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,
diff --git a/lib/core/model/medical_report/medical_file_model.dart b/lib/core/model/medical_report/medical_file_model.dart
index deebb2af..0964d0de 100644
--- a/lib/core/model/medical_report/medical_file_model.dart
+++ b/lib/core/model/medical_report/medical_file_model.dart
@@ -1,14 +1,14 @@
class MedicalFileModel {
- List entityList;
+ List? entityList;
dynamic statusMessage;
MedicalFileModel({this.entityList, this.statusMessage});
MedicalFileModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = new List();
+ 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 toJson() {
final Map data = new Map();
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;
+ List? timelines;
EntityList({this.timelines});
EntityList.fromJson(Map json) {
if (json['Timelines'] != null) {
- timelines = new List();
+ timelines = [];
json['Timelines'].forEach((v) {
- timelines.add(new Timelines.fromJson(v));
+ timelines!.add(new Timelines.fromJson(v));
});
}
}
@@ -41,25 +41,25 @@ class EntityList {
Map toJson() {
final Map data = new Map();
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;
+ int? clinicId;
+ String? clinicName;
+ String? date;
+ int? doctorId;
+ String? doctorImage;
+ String? doctorName;
+ int? encounterNumber;
+ String? encounterType;
+ int? projectID;
+ String? projectName;
+ String? setupID;
+ List? timeLineEvents;
Timelines(
{this.clinicId,
@@ -88,9 +88,9 @@ class Timelines {
projectName = json['ProjectName'];
setupID = json['SetupID'];
if (json['TimeLineEvents'] != null) {
- timeLineEvents = new List();
+ 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 admissions;
- String colorClass;
- List consulations;
+ List? admissions;
+ String? colorClass;
+ List? consulations;
TimeLineEvents({this.admissions, this.colorClass, this.consulations});
TimeLineEvents.fromJson(Map json) {
colorClass = json['ColorClass'];
if (json['Consulations'] != null) {
- consulations = new List();
+ 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;
- List lstPhysicalExam;
- List lstProcedure;
- List lstMedicalHistory;
- List 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;
+ List? lstPhysicalExam;
+ List? lstProcedure;
+ List? lstMedicalHistory;
+ List? lstCheifComplaint;
Consulations(
{this.admissionNo,
@@ -220,33 +220,33 @@ class Consulations {
visitType = json['VisitType'];
dispalyName = json['dispalyName'];
if (json['lstAssessments'] != null) {
- lstAssessments = new List();
+ 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 = [];
json['lstCheifComplaint'].forEach((v) {
- lstCheifComplaint.add(new LstCheifComplaint.fromJson(v));
+ lstCheifComplaint!.add(new LstCheifComplaint.fromJson(v));
});
}
if (json['lstPhysicalExam'] != null) {
- lstPhysicalExam = new List();
+ 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 = [];
json['lstProcedure'].forEach((v) {
- lstProcedure.add(new LstProcedure.fromJson(v));
+ lstProcedure!.add(new LstProcedure.fromJson(v));
});
}
if (json['lstMedicalHistory'] != null) {
- lstMedicalHistory = new List();
+ 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,
diff --git a/lib/core/model/medical_report/medical_file_request_model.dart b/lib/core/model/medical_report/medical_file_request_model.dart
index 8703141a..1fa6650b 100644
--- a/lib/core/model/medical_report/medical_file_request_model.dart
+++ b/lib/core/model/medical_report/medical_file_request_model.dart
@@ -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});
diff --git a/lib/core/model/note/CreateNoteModel.dart b/lib/core/model/note/CreateNoteModel.dart
index ce076705..355ad511 100644
--- a/lib/core/model/note/CreateNoteModel.dart
+++ b/lib/core/model/note/CreateNoteModel.dart
@@ -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,
diff --git a/lib/core/model/note/note_model.dart b/lib/core/model/note/note_model.dart
index 797f9b6d..f929acee 100644
--- a/lib/core/model/note/note_model.dart
+++ b/lib/core/model/note/note_model.dart
@@ -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,
diff --git a/lib/core/model/note/update_note_model.dart b/lib/core/model/note/update_note_model.dart
index 20fd4b86..5c59cc77 100644
--- a/lib/core/model/note/update_note_model.dart
+++ b/lib/core/model/note/update_note_model.dart
@@ -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,
diff --git a/lib/core/model/patient_muse/PatientMuseResultsModel.dart b/lib/core/model/patient_muse/PatientMuseResultsModel.dart
index 401fd1a7..a813fd03 100644
--- a/lib/core/model/patient_muse/PatientMuseResultsModel.dart
+++ b/lib/core/model/patient_muse/PatientMuseResultsModel.dart
@@ -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,
diff --git a/lib/core/model/patient_muse/PatientSearchRequestModel.dart b/lib/core/model/patient_muse/PatientSearchRequestModel.dart
index 437c5885..023ecdcd 100644
--- a/lib/core/model/patient_muse/PatientSearchRequestModel.dart
+++ b/lib/core/model/patient_muse/PatientSearchRequestModel.dart
@@ -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,
diff --git a/lib/core/model/procedure/ControlsModel.dart b/lib/core/model/procedure/ControlsModel.dart
index b3e8ae9c..c4dbcfd5 100644
--- a/lib/core/model/procedure/ControlsModel.dart
+++ b/lib/core/model/procedure/ControlsModel.dart
@@ -1,6 +1,6 @@
class Controls {
- String code;
- String controlValue;
+ String? code;
+ String? controlValue;
Controls({this.code, this.controlValue});
diff --git a/lib/core/model/procedure/categories_procedure.dart b/lib/core/model/procedure/categories_procedure.dart
index 9e6f847f..47d0d83c 100644
--- a/lib/core/model/procedure/categories_procedure.dart
+++ b/lib/core/model/procedure/categories_procedure.dart
@@ -1,6 +1,6 @@
class CategoriseProcedureModel {
- List entityList;
- int rowcount;
+ List? entityList;
+ int? rowcount;
dynamic statusMessage;
CategoriseProcedureModel(
@@ -8,9 +8,9 @@ class CategoriseProcedureModel {
CategoriseProcedureModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = new List();
+ 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 toJson() {
final Map data = new Map();
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,
diff --git a/lib/core/model/procedure/get_ordered_procedure_model.dart b/lib/core/model/procedure/get_ordered_procedure_model.dart
index b7185711..234cabab 100644
--- a/lib/core/model/procedure/get_ordered_procedure_model.dart
+++ b/lib/core/model/procedure/get_ordered_procedure_model.dart
@@ -1,6 +1,6 @@
class GetOrderedProcedureModel {
- List entityList;
- int rowcount;
+ List? entityList;
+ int? rowcount;
dynamic statusMessage;
GetOrderedProcedureModel(
@@ -8,9 +8,9 @@ class GetOrderedProcedureModel {
GetOrderedProcedureModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = new List();
+ 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 toJson() {
final Map data = new Map();
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,
diff --git a/lib/core/model/procedure/get_ordered_procedure_request_model.dart b/lib/core/model/procedure/get_ordered_procedure_request_model.dart
index dfbd444c..64f1cb2b 100644
--- a/lib/core/model/procedure/get_ordered_procedure_request_model.dart
+++ b/lib/core/model/procedure/get_ordered_procedure_request_model.dart
@@ -1,6 +1,6 @@
class GetOrderedProcedureRequestModel {
- String vidaAuthTokenID;
- int patientMRN;
+ String? vidaAuthTokenID;
+ int? patientMRN;
GetOrderedProcedureRequestModel({this.vidaAuthTokenID, this.patientMRN});
diff --git a/lib/core/model/procedure/get_procedure_model.dart b/lib/core/model/procedure/get_procedure_model.dart
index 5c83b49b..31f4c522 100644
--- a/lib/core/model/procedure/get_procedure_model.dart
+++ b/lib/core/model/procedure/get_procedure_model.dart
@@ -1,15 +1,15 @@
class GetProcedureModel {
- List entityList;
- int rowcount;
+ List? entityList;
+ int? rowcount;
dynamic statusMessage;
GetProcedureModel({this.entityList, this.rowcount, this.statusMessage});
GetProcedureModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = new List();
+ 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 toJson() {
final Map data = new Map();
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,
diff --git a/lib/core/model/procedure/get_procedure_req_model.dart b/lib/core/model/procedure/get_procedure_req_model.dart
index 6202a520..309e657c 100644
--- a/lib/core/model/procedure/get_procedure_req_model.dart
+++ b/lib/core/model/procedure/get_procedure_req_model.dart
@@ -1,11 +1,11 @@
class GetProcedureReqModel {
- int clinicId;
- int patientMRN;
- int pageSize;
- int pageIndex;
- List search;
+ int? clinicId;
+ int? patientMRN;
+ int? pageSize;
+ int? pageIndex;
+ List? search;
dynamic category;
- String vidaAuthTokenID;
+ String? vidaAuthTokenID;
GetProcedureReqModel(
{this.clinicId,
diff --git a/lib/core/model/procedure/post_procedure_req_model.dart b/lib/core/model/procedure/post_procedure_req_model.dart
index b12563f8..836955d9 100644
--- a/lib/core/model/procedure/post_procedure_req_model.dart
+++ b/lib/core/model/procedure/post_procedure_req_model.dart
@@ -1,11 +1,11 @@
import 'ControlsModel.dart';
class PostProcedureReqModel {
- int patientMRN;
- int appointmentNo;
- int episodeID;
- List procedures;
- String vidaAuthTokenID;
+ int? patientMRN;
+ int? appointmentNo;
+ int? episodeID;
+ List? 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 = [];
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;
+ String? procedure;
+ String? category;
+ List? 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 = [];
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;
}
diff --git a/lib/core/model/procedure/procedure_category_list_model.dart b/lib/core/model/procedure/procedure_category_list_model.dart
index 849e84e5..a72e7062 100644
--- a/lib/core/model/procedure/procedure_category_list_model.dart
+++ b/lib/core/model/procedure/procedure_category_list_model.dart
@@ -1,6 +1,6 @@
class ProcedureCategoryListModel {
- List entityList;
- int rowcount;
+ List? entityList;
+ int? rowcount;
dynamic statusMessage;
ProcedureCategoryListModel(
@@ -8,9 +8,9 @@ class ProcedureCategoryListModel {
ProcedureCategoryListModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = new List();
+ 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 toJson() {
final Map data = new Map();
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});
diff --git a/lib/core/model/procedure/procedure_valadate_model.dart b/lib/core/model/procedure/procedure_valadate_model.dart
index 3a3e23cf..02512d78 100644
--- a/lib/core/model/procedure/procedure_valadate_model.dart
+++ b/lib/core/model/procedure/procedure_valadate_model.dart
@@ -1,6 +1,6 @@
class ProcedureValadteModel {
- List entityList;
- int rowcount;
+ List? entityList;
+ int? rowcount;
dynamic statusMessage;
dynamic success;
@@ -9,9 +9,9 @@ class ProcedureValadteModel {
ProcedureValadteModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = new List();
+ 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 toJson() {
final Map data = new Map();
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 warringMessages;
+ String? procedureId;
+ List? warringMessages;
EntityList({this.procedureId, this.warringMessages});
diff --git a/lib/core/model/procedure/procedure_valadate_request_model.dart b/lib/core/model/procedure/procedure_valadate_request_model.dart
index 0b872b93..4418806e 100644
--- a/lib/core/model/procedure/procedure_valadate_request_model.dart
+++ b/lib/core/model/procedure/procedure_valadate_request_model.dart
@@ -1,9 +1,9 @@
class ProcedureValadteRequestModel {
- String vidaAuthTokenID;
- int patientMRN;
- int appointmentNo;
- int episodeID;
- List procedure;
+ String? vidaAuthTokenID;
+ int? patientMRN;
+ int? appointmentNo;
+ int? episodeID;
+ List? procedure;
ProcedureValadteRequestModel(
{this.vidaAuthTokenID,
diff --git a/lib/core/model/procedure/update_procedure_request_model.dart b/lib/core/model/procedure/update_procedure_request_model.dart
index aee39879..a6b92d16 100644
--- a/lib/core/model/procedure/update_procedure_request_model.dart
+++ b/lib/core/model/procedure/update_procedure_request_model.dart
@@ -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;
+ String? procedure;
+ String? category;
+ List? 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 = [];
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;
}
diff --git a/lib/core/model/radiology/final_radiology.dart b/lib/core/model/radiology/final_radiology.dart
index e09f269a..43b6d2b9 100644
--- a/lib/core/model/radiology/final_radiology.dart
+++ b/lib/core/model/radiology/final_radiology.dart
@@ -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 speciality;
- bool isCVI;
- bool isRadMedicalReport;
- bool isLiveCareAppodynamicment;
+ List? speciality;
+ bool? isCVI;
+ bool? isRadMedicalReport;
+ bool? isLiveCareAppodynamicment;
FinalRadiology(
{this.setupID,
@@ -186,9 +186,9 @@ class FinalRadiology {
class FinalRadiologyList {
dynamic filterName = "";
- List finalRadiologyList = List();
+ List finalRadiologyList = [];
- FinalRadiologyList({this.filterName, FinalRadiology finalRadiology}) {
+ FinalRadiologyList({this.filterName, FinalRadiology? finalRadiology}) {
finalRadiologyList.add(finalRadiology);
}
}
diff --git a/lib/core/model/radiology/request_patient_rad_orders_details.dart b/lib/core/model/radiology/request_patient_rad_orders_details.dart
index 9e3458d5..7f39ee25 100644
--- a/lib/core/model/radiology/request_patient_rad_orders_details.dart
+++ b/lib/core/model/radiology/request_patient_rad_orders_details.dart
@@ -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,
diff --git a/lib/core/model/radiology/request_send_rad_report_email.dart b/lib/core/model/radiology/request_send_rad_report_email.dart
index 6d68653d..7c178fb3 100644
--- a/lib/core/model/radiology/request_send_rad_report_email.dart
+++ b/lib/core/model/radiology/request_send_rad_report_email.dart
@@ -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,
diff --git a/lib/core/model/referral/DischargeReferralPatient.dart b/lib/core/model/referral/DischargeReferralPatient.dart
index dff63bfc..0d711720 100644
--- a/lib/core/model/referral/DischargeReferralPatient.dart
+++ b/lib/core/model/referral/DischargeReferralPatient.dart
@@ -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,
diff --git a/lib/core/model/referral/MyReferralPatientModel.dart b/lib/core/model/referral/MyReferralPatientModel.dart
index 797109dd..a871c3a9 100644
--- a/lib/core/model/referral/MyReferralPatientModel.dart
+++ b/lib/core/model/referral/MyReferralPatientModel.dart
@@ -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!;
}
}
diff --git a/lib/core/model/referral/ReferralRequest.dart b/lib/core/model/referral/ReferralRequest.dart
index b3ad1f03..e88b0e9b 100644
--- a/lib/core/model/referral/ReferralRequest.dart
+++ b/lib/core/model/referral/ReferralRequest.dart
@@ -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,
diff --git a/lib/core/model/search_drug/get_medication_response_model.dart b/lib/core/model/search_drug/get_medication_response_model.dart
index a42a8b47..2c584dc7 100644
--- a/lib/core/model/search_drug/get_medication_response_model.dart
+++ b/lib/core/model/search_drug/get_medication_response_model.dart
@@ -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,
diff --git a/lib/core/model/search_drug/item_by_medicine_model.dart b/lib/core/model/search_drug/item_by_medicine_model.dart
index 0a93a4f1..8651c841 100644
--- a/lib/core/model/search_drug/item_by_medicine_model.dart
+++ b/lib/core/model/search_drug/item_by_medicine_model.dart
@@ -1,27 +1,27 @@
class ItemByMedicineModel {
- List frequencies;
- List routes;
- List strengths;
+ List? frequencies;
+ List? routes;
+ List? strengths;
ItemByMedicineModel({this.frequencies, this.routes, this.strengths});
ItemByMedicineModel.fromJson(Map json) {
if (json['frequencies'] != null) {
- frequencies = new List();
+ 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 = [];
json['routes'].forEach((v) {
- routes.add(new Routes.fromJson(v));
+ routes!.add(new Routes.fromJson(v));
});
}
if (json['strengths'] != null) {
- strengths = new List();
+ strengths = [];
json['strengths'].forEach((v) {
- strengths.add(new Strengths.fromJson(v));
+ strengths!.add(new Strengths.fromJson(v));
});
}
}
@@ -29,22 +29,22 @@ class ItemByMedicineModel {
Map toJson() {
final Map data = new Map();
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});
diff --git a/lib/core/model/search_drug/item_by_medicine_request_model.dart b/lib/core/model/search_drug/item_by_medicine_request_model.dart
index 7460044b..2845edf4 100644
--- a/lib/core/model/search_drug/item_by_medicine_request_model.dart
+++ b/lib/core/model/search_drug/item_by_medicine_request_model.dart
@@ -1,6 +1,6 @@
class ItemByMedicineRequestModel {
- String vidaAuthTokenID;
- int medicineCode;
+ String? vidaAuthTokenID;
+ int? medicineCode;
ItemByMedicineRequestModel({this.vidaAuthTokenID, this.medicineCode});
diff --git a/lib/core/model/search_drug/search_drug_model.dart b/lib/core/model/search_drug/search_drug_model.dart
index 396526c1..257181b8 100644
--- a/lib/core/model/search_drug/search_drug_model.dart
+++ b/lib/core/model/search_drug/search_drug_model.dart
@@ -1,15 +1,15 @@
class SearchDrugModel {
- List entityList;
- int rowcount;
+ List? entityList;
+ int? rowcount;
dynamic statusMessage;
SearchDrugModel({this.entityList, this.rowcount, this.statusMessage});
SearchDrugModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = new List();
+ 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 toJson() {
final Map data = new Map();
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;
diff --git a/lib/core/model/search_drug/search_drug_request_model.dart b/lib/core/model/search_drug/search_drug_request_model.dart
index b64e7d18..991ddd9a 100644
--- a/lib/core/model/search_drug/search_drug_request_model.dart
+++ b/lib/core/model/search_drug/search_drug_request_model.dart
@@ -1,5 +1,5 @@
class SearchDrugRequestModel {
- List search;
+ List? search;
// String vidaAuthTokenID;
SearchDrugRequestModel({this.search});
diff --git a/lib/core/model/sick_leave/sick_leave_patient_model.dart b/lib/core/model/sick_leave/sick_leave_patient_model.dart
index 3c78f1ff..58de5649 100644
--- a/lib/core/model/sick_leave/sick_leave_patient_model.dart
+++ b/lib/core/model/sick_leave/sick_leave_patient_model.dart
@@ -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 speciality;
- String strRequestDate;
- String startDate;
- String endDate;
+ String? strRequestDate;
+ String? startDate;
+ String? endDate;
SickLeavePatientModel(
{this.setupID,
diff --git a/lib/core/model/sick_leave/sick_leave_patient_request_model.dart b/lib/core/model/sick_leave/sick_leave_patient_request_model.dart
index ec588316..6be893e2 100644
--- a/lib/core/model/sick_leave/sick_leave_patient_request_model.dart
+++ b/lib/core/model/sick_leave/sick_leave_patient_request_model.dart
@@ -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,
diff --git a/lib/core/provider/robot_provider.dart b/lib/core/provider/robot_provider.dart
index a01b1318..56afd443 100644
--- a/lib/core/provider/robot_provider.dart
+++ b/lib/core/provider/robot_provider.dart
@@ -3,7 +3,7 @@ import 'dart:async';
class RobotProvider {
static final RobotProvider _singleton = RobotProvider._internal();
var value;
- StreamController