Compare commits

...

46 Commits

Author SHA1 Message Date
Elham Rababh 83bd7c64f4 fix gradel 4 years ago
Elham Rababh 6ca54f885c fix header 4 years ago
Elham Rababh 6628b6d67c small fix after fix 4 years ago
Elham Rababh 94e92e8937 fix home 4 years ago
Elham Rababh 94a699a58f fix all the screenshots 4 years ago
Elham Rababh f097005b8c screen fixes 4 4 years ago
Elham Rababh efd4b0221b screen fixes 3 4 years ago
Elham Rababh 8eaf834734 screen fixes 2 4 years ago
Elham Rababh fbb029e320 screen fixes 4 years ago
Elham Rababh 9292b38d5a fix shaerd 4 years ago
Elham Rababh ed4f949053 fix helper 4 years ago
Elham Rababh a623f5418e fix issues 4 years ago
Elham Rababh 44c5621b3f reverting manully step 3 4 years ago
Elham Rababh 47d18dacfd reverting manully step 2 4 years ago
Elham Rababh 6fe3cecc9b reverting manully 4 years ago
Elham Rababh 351d5a79e7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into dev_v2.8
 Conflicts:
	ios/Runner.xcodeproj/project.pbxproj
	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
	lib/core/viewModel/PatientRegistrationViewModel.dart
	lib/core/viewModel/project_view_model.dart
	lib/models/SOAP/selected_items/my_selected_history.dart
	lib/screens/doctor/doctor_replay/not_replaied_doctor_questions.dart
	lib/screens/home/home_screen.dart
	lib/screens/live_care/end_call_screen.dart
	lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart
	lib/screens/patients/In_patient/InPatientHeader.dart
	lib/screens/patients/In_patient/in_patient_screen.dart
	lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
	lib/screens/patients/profile/UCAF/page-stepper-widget.dart
	lib/screens/patients/profile/diabetic_chart/line_chart_for_diabetic.dart
	lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart
	lib/screens/patients/profile/lab_result/LineChartCurved.dart
	lib/screens/patients/profile/lab_result/LineChartCurvedLabHistory.dart
	lib/screens/patients/profile/operation_report/operation_report.dart
	lib/screens/patients/profile/operation_report/update_operation_report.dart
	lib/screens/patients/profile/pending_orders/pending_orders_screen.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
	lib/screens/patients/profile/referral/my-referral-detail-screen.dart
	lib/screens/patients/profile/referral/refer-patient-screen.dart
	lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
	lib/screens/patients/profile/soap_update/objective/examinations_list_search_widget.dart
	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/allergies_item.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/master_key_checkbox_search_allergies_widget.dart
	lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart
	lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
	lib/screens/patients/profile/vital_sign/LineChartCurved.dart
	lib/screens/patients/profile/vital_sign/LineChartCurvedBloodPressure.dart
	lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
	lib/screens/patients/register_patient/CustomEditableText.dart
	lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart
	lib/screens/patients/register_patient/RegisterSearchPatientPage.dart
	lib/screens/prescription/add_prescription_form.dart
	lib/screens/prescription/prescription_text_filed.dart
	lib/screens/reschedule-leaves/reschedule_leave.dart
	lib/util/dr_app_toast_msg.dart
	lib/widgets/patients/patient_card/PatientCard.dart
	lib/widgets/patients/profile/patient-profile-app-bar.dart
	lib/widgets/patients/profile/profile_medical_info_widget_search.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/bottom_navigation_item.dart
	lib/widgets/shared/text_fields/app-textfield-custom.dart
	lib/widgets/shared/text_fields/app_text_field_custom_serach.dart
	lib/widgets/shared/text_fields/new_text_Field.dart
	pubspec.yaml
4 years ago
Elham Rababh 8b68183fd1 add pbxproj 4 years ago
Elham Rababh 4b89b78ab4 fix issues 4 years ago
Elham Rababh 79103a5c84 remove unworking packages 4 years ago
Elham Rababh 07553ac22d first step from v2.1 4 years ago
Elham Rababh 6d445fd72c small fix 4 years ago
Elham Rababh 0e58e6bdbc fix issues 4 years ago
Elham Rababh 88e68830bd small fixes 4 years ago
Elham Rababh ba52eba353 fixes in episode 4 years ago
Elham Rababh 0134e8f5de small fixes inside HEADERS 4 years ago
Elham Rababh 7af43f5f1d fix flutter 2 4 years ago
Elham Rababh 8df3cf8a33 fixes ios on flutter 2 4 years ago
Elham Rababh 2d4c0a8f50 d
f

fixes
4 years ago
Elham Rababh e4f452fdbc small fixes 4 years ago
Elham Rababh 7e2bddbce9 small fixes 4 years ago
Elham Rababh 3a8d8f9aa7 fix the last errors 4 years ago
Elham Rababh 02e4a37d00 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
 Conflicts:
	lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
	lib/screens/patients/profile/UCAF/page-stepper-widget.dart
	lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart
	lib/screens/patients/register_patient/RegisterSearchPatientPage.dart
4 years ago
Elham Ali 0c10d49ac7 Merge branch 'hussam_flutter_2' into 'flutter_2_developemt'
Hussam flutter 2

See merge request Cloud_Solution/doctor_app_flutter!897
4 years ago
Elham Rababh 26f5e57417 8 step from fix screen 4 years ago
hussam al-habibeh 7d3e59e060 flutter version 2 4 years ago
hussam al-habibeh f53920d040 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam_flutter_2
 Conflicts:
	lib/core/viewModel/PatientRegistrationViewModel.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
	lib/screens/patients/profile/referral/my-referral-detail-screen.dart
	lib/screens/reschedule-leaves/reschedule_leave.dart
4 years ago
Elham Rababh bd64603e82 7 step from fix screen 4 years ago
hussam al-habibeh 8720e281ff flutter version 2 4 years ago
Elham Ali 209954ca55 Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
Flutter vervion 2 by elham

See merge request Cloud_Solution/doctor_app_flutter!896
4 years ago
Elham Rababh 359b337b27 6 step from fix screen 4 years ago
Elham Rababh 28d8449345 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
 Conflicts:
	lib/models/SOAP/selected_items/my_selected_allergy.dart
4 years ago
hussam al-habibeh 772c2d300d Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam_flutter_2 4 years ago
Elham Ali 49ab6382c3 Merge branch 'hussam_flutter_2' into 'flutter_2_developemt'
flutter 2 models

See merge request Cloud_Solution/doctor_app_flutter!895
4 years ago
Elham Rababh a54ec0ef78 5 step from fix screen 4 years ago
hussam al-habibeh fe20bfd9b9 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam_flutter_2 4 years ago
Elham Ali 7d835ee280 Merge branch 'hussam_flutter_2' into 'flutter_2_developemt'
Hussam flutter 2

See merge request Cloud_Solution/doctor_app_flutter!892
4 years ago

@ -6,7 +6,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.5.0' classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.3' classpath 'com.google.gms:google-services:4.3.3'
} }
@ -17,7 +17,8 @@ allprojects {
google() google()
jcenter() jcenter()
mavenCentral() mavenCentral()
maven { url 'https://tokbox.bintray.com/maven' } maven { url 'https://developer.huawei.com/repo/' }
// maven { url 'https://tokbox.bintray.com/maven' }
} }
} }

@ -1,6 +1,5 @@
#Fri Jun 23 08:50:38 CEST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

@ -10,57 +10,26 @@ project 'Runner', {
'Release' => :release, 'Release' => :release,
} }
def parse_KV_file(file, separator='=') def flutter_root
file_abs_path = File.expand_path(file) generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
if !File.exists? file_abs_path unless File.exist?(generated_xcode_build_settings_path)
return []; raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
end
generated_key_values = {}
skip_line_start_symbols = ["#", "/"]
File.foreach(file_abs_path) do |line|
next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
plugin = line.split(pattern=separator)
if plugin.length == 2
podname = plugin[0].strip()
path = plugin[1].strip()
podpath = File.expand_path("#{path}", file_abs_path)
generated_key_values[podname] = podpath
else
puts "Invalid plugin specification: #{line}"
end end
File.foreach(generated_xcode_build_settings_path) do |line|
matches = line.match(/FLUTTER_ROOT\=(.*)/)
return matches[1].strip if matches
end end
generated_key_values raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
end end
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
flutter_ios_podfile_setup
target 'Runner' do target 'Runner' do
use_frameworks! use_frameworks!
use_modular_headers! use_modular_headers!
# Flutter Pod
copied_flutter_dir = File.join(__dir__, 'Flutter')
copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework')
copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec')
unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path)
# Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet.
# That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration.
# CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist.
generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig')
unless File.exist?(generated_xcode_build_settings_path)
raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first"
end
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. # Keep pod path relative so it can be checked into Podfile.lock.
pod 'Flutter', :path => 'Flutter' pod 'Flutter', :path => 'Flutter'
pod 'OpenTok' pod 'OpenTok'
@ -68,25 +37,11 @@ target 'Runner' do
pod 'AADraggableView' pod 'AADraggableView'
# Plugin Pods # Plugin Pods
# Prepare symlinks folder. We use symlinks to avoid having Podfile.lock flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
# referring to absolute paths on developers' machines.
system('rm -rf .symlinks')
system('mkdir -p .symlinks/plugins')
plugin_pods = parse_KV_file('../.flutter-plugins')
plugin_pods.each do |name, path|
symlink = File.join('.symlinks', 'plugins', name)
File.symlink(path, symlink)
pod name, :path => File.join(symlink, 'ios')
end
end end
# Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system.
install! 'cocoapods', :disable_input_output_paths => true
post_install do |installer| post_install do |installer|
installer.pods_project.targets.each do |target| installer.pods_project.targets.each do |target|
target.build_configurations.each do |config| flutter_additional_ios_build_settings(target)
config.build_settings['ENABLE_BITCODE'] = 'NO'
end
end end
end end

@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 46; objectVersion = 50;
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
@ -20,7 +20,7 @@
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
9CE61EBD24AB366E008D68DD /* VideoCallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CE61EBC24AB366E008D68DD /* VideoCallViewController.swift */; }; 9CE61EBD24AB366E008D68DD /* VideoCallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CE61EBC24AB366E008D68DD /* VideoCallViewController.swift */; };
9CE61ECD24ADBB4C008D68DD /* ICallProtocoll.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CE61ECC24ADBB4C008D68DD /* ICallProtocoll.swift */; }; 9CE61ECD24ADBB4C008D68DD /* ICallProtocoll.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CE61ECC24ADBB4C008D68DD /* ICallProtocoll.swift */; };
B650DC3076E9D70CB188286A /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93A5F83B23AB032D1E096663 /* Pods_Runner.framework */; }; E6BEB9F4A2DEF27953D569E9 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 992BD73E4591DE3A72F1559E /* Pods_Runner.framework */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */ /* Begin PBXCopyFilesBuildPhase section */
@ -48,9 +48,7 @@
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
75DD06875D42C7903A76DF9F /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
93A5F83B23AB032D1E096663 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@ -58,10 +56,12 @@
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
992BD73E4591DE3A72F1559E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9CE61EBC24AB366E008D68DD /* VideoCallViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoCallViewController.swift; sourceTree = "<group>"; }; 9CE61EBC24AB366E008D68DD /* VideoCallViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoCallViewController.swift; sourceTree = "<group>"; };
9CE61ECC24ADBB4C008D68DD /* ICallProtocoll.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ICallProtocoll.swift; sourceTree = "<group>"; }; 9CE61ECC24ADBB4C008D68DD /* ICallProtocoll.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ICallProtocoll.swift; sourceTree = "<group>"; };
9D4B7DB43C6A6C849D2387CE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; }; A84D387F5F98138BD4BA72B2 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
E698D7B14B12DF768FE47A1A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; }; C07B6E73A89564BF8FFFCF16 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
C70DC4E2BF99A6F9702540E3 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@ -69,13 +69,21 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
B650DC3076E9D70CB188286A /* Pods_Runner.framework in Frameworks */, E6BEB9F4A2DEF27953D569E9 /* Pods_Runner.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
/* End PBXFrameworksBuildPhase section */ /* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */ /* Begin PBXGroup section */
24FE3FDFDCA1524AF4FAB5C6 /* Frameworks */ = {
isa = PBXGroup;
children = (
992BD73E4591DE3A72F1559E /* Pods_Runner.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
300790F8266FB0F10052174C /* helpers */ = { 300790F8266FB0F10052174C /* helpers */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -104,9 +112,9 @@
7D66D387293CE5376A07EC5F /* Pods */ = { 7D66D387293CE5376A07EC5F /* Pods */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
E698D7B14B12DF768FE47A1A /* Pods-Runner.debug.xcconfig */, C70DC4E2BF99A6F9702540E3 /* Pods-Runner.debug.xcconfig */,
75DD06875D42C7903A76DF9F /* Pods-Runner.release.xcconfig */, A84D387F5F98138BD4BA72B2 /* Pods-Runner.release.xcconfig */,
9D4B7DB43C6A6C849D2387CE /* Pods-Runner.profile.xcconfig */, C07B6E73A89564BF8FFFCF16 /* Pods-Runner.profile.xcconfig */,
); );
path = Pods; path = Pods;
sourceTree = "<group>"; sourceTree = "<group>";
@ -129,7 +137,7 @@
97C146F01CF9000F007C117D /* Runner */, 97C146F01CF9000F007C117D /* Runner */,
97C146EF1CF9000F007C117D /* Products */, 97C146EF1CF9000F007C117D /* Products */,
7D66D387293CE5376A07EC5F /* Pods */, 7D66D387293CE5376A07EC5F /* Pods */,
F984EB986238F1809678CD84 /* Frameworks */, 24FE3FDFDCA1524AF4FAB5C6 /* Frameworks */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
}; };
@ -171,14 +179,6 @@
name = "Supporting Files"; name = "Supporting Files";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
F984EB986238F1809678CD84 /* Frameworks */ = {
isa = PBXGroup;
children = (
93A5F83B23AB032D1E096663 /* Pods_Runner.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
@ -186,14 +186,14 @@
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = ( buildPhases = (
986D76F6694E0D6D8C5CDAAB /* [CP] Check Pods Manifest.lock */, BB6023ED443DFBCBA86A61AC /* [CP] Check Pods Manifest.lock */,
9740EEB61CF901F6004384FC /* Run Script */, 9740EEB61CF901F6004384FC /* Run Script */,
97C146EA1CF9000F007C117D /* Sources */, 97C146EA1CF9000F007C117D /* Sources */,
97C146EB1CF9000F007C117D /* Frameworks */, 97C146EB1CF9000F007C117D /* Frameworks */,
97C146EC1CF9000F007C117D /* Resources */, 97C146EC1CF9000F007C117D /* Resources */,
9705A1C41CF9048500538489 /* Embed Frameworks */, 9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
08568E6EE9BA48E55B7C3865 /* [CP] Embed Pods Frameworks */, 80BBD7071E3C7754BD0EB296 /* [CP] Embed Pods Frameworks */,
); );
buildRules = ( buildRules = (
); );
@ -210,11 +210,12 @@
97C146E61CF9000F007C117D /* Project object */ = { 97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 1020; LastUpgradeCheck = 1300;
ORGANIZATIONNAME = "The Chromium Authors"; ORGANIZATIONNAME = "The Chromium Authors";
TargetAttributes = { TargetAttributes = {
97C146ED1CF9000F007C117D = { 97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1; CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = 3A359E86ZF;
LastSwiftMigration = 1100; LastSwiftMigration = 1100;
}; };
}; };
@ -253,34 +254,113 @@
/* End PBXResourcesBuildPhase section */ /* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */
08568E6EE9BA48E55B7C3865 /* [CP] Embed Pods Frameworks */ = { 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
); );
inputPaths = ( inputPaths = (
); );
name = "[CP] Embed Pods Frameworks"; name = "Thin Binary";
outputPaths = ( outputPaths = (
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
showEnvVarsInLog = 0;
}; };
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { 80BBD7071E3C7754BD0EB296 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
); );
inputPaths = ( inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AADraggableView/AADraggableView.framework",
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework",
"${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework",
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
"${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
"${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework",
"${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework",
"${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework",
"${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework",
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
"${BUILT_PRODUCTS_DIR}/MTBBarcodeScanner/MTBBarcodeScanner.framework",
"${BUILT_PRODUCTS_DIR}/OrderedSet/OrderedSet.framework",
"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework",
"${BUILT_PRODUCTS_DIR}/Toast/Toast.framework",
"${BUILT_PRODUCTS_DIR}/Try/Try.framework",
"${BUILT_PRODUCTS_DIR}/barcode_scan2/barcode_scan2.framework",
"${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework",
"${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
"${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework",
"${BUILT_PRODUCTS_DIR}/flutter_inappwebview/flutter_inappwebview.framework",
"${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework",
"${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework",
"${BUILT_PRODUCTS_DIR}/hexcolor/hexcolor.framework",
"${BUILT_PRODUCTS_DIR}/local_auth/local_auth.framework",
"${BUILT_PRODUCTS_DIR}/maps_launcher/maps_launcher.framework",
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
"${BUILT_PRODUCTS_DIR}/path_provider_ios/path_provider_ios.framework",
"${BUILT_PRODUCTS_DIR}/shared_preferences_ios/shared_preferences_ios.framework",
"${BUILT_PRODUCTS_DIR}/speech_to_text/speech_to_text.framework",
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
"${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
"${BUILT_PRODUCTS_DIR}/webview_flutter_wkwebview/webview_flutter_wkwebview.framework",
); );
name = "Thin Binary"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AADraggableView.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKImagePickerController.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKPhotoGallery.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MTBBarcodeScanner.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OrderedSet.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Try.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/barcode_scan2.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hexcolor.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/maps_launcher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/speech_to_text.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter_wkwebview.framework",
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
showEnvVarsInLog = 0;
}; };
9740EEB61CF901F6004384FC /* Run Script */ = { 9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
@ -296,7 +376,7 @@
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
}; };
986D76F6694E0D6D8C5CDAAB /* [CP] Check Pods Manifest.lock */ = { BB6023ED443DFBCBA86A61AC /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
@ -415,7 +495,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -423,7 +503,10 @@
); );
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
@ -550,7 +633,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -558,7 +641,10 @@
); );
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
@ -581,7 +667,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements;
CURRENT_PROJECT_VERSION = 4; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -589,7 +675,10 @@
); );
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1310" LastUpgradeVersion = "1300"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

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

@ -22,9 +22,9 @@ Helpers helpers = new Helpers();
class BaseAppClient { class BaseAppClient {
//TODO change the post fun to nun static when you change all service //TODO change the post fun to nun static when you change all service
post(String endPoint, post(String endPoint,
{Map<String, dynamic> body, {required Map<String, dynamic> body,
Function(dynamic response, int statusCode) onSuccess, required Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure, required Function(String error, int statusCode) onFailure,
bool isAllowAny = false, bool isAllowAny = false,
bool isLiveCare = false, bool isLiveCare = false,
bool isFallLanguage = false}) async { bool isFallLanguage = false}) async {
@ -36,30 +36,28 @@ class BaseAppClient {
bool callLog = true; bool callLog = true;
try { try {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); Map<String, dynamic>? profile = await sharedPref.getObj(DOCTOR_PROFILE);
String token = await sharedPref.getString(TOKEN); String token = await sharedPref.getString(TOKEN);
DoctorProfileModel? doctorProfile;
if (profile != null) { if (profile != null) {
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); doctorProfile = DoctorProfileModel.fromJson(profile);
if (body['DoctorID'] == null) if (body['DoctorID'] == null) body['DoctorID'] = doctorProfile!.doctorID;
body['DoctorID'] = doctorProfile?.doctorID;
if (body['DoctorID'] == "") body['DoctorID'] = null; if (body['DoctorID'] == "") body['DoctorID'] = null;
if (body['EditedBy'] == null) if (body['EditedBy'] == null) body['EditedBy'] = doctorProfile!.doctorID;
body['EditedBy'] = doctorProfile?.doctorID;
if (body['ProjectID'] == null) { if (body['ProjectID'] == null) {
body['ProjectID'] = doctorProfile?.projectID; body['ProjectID'] = doctorProfile!.projectID;
} }
if (body['ClinicID'] == null) if (body['ClinicID'] == null) body['ClinicID'] = doctorProfile!.clinicID;
body['ClinicID'] = doctorProfile?.clinicID;
}
if (body['DoctorID'] == '') { if (body['DoctorID'] == '') {
body['DoctorID'] = null; body['DoctorID'] = null;
} }
if (body['EditedBy'] == '') { if (body['EditedBy'] == '') {
body.remove("EditedBy"); body.remove("EditedBy");
} }
}
if (body['TokenID'] == null) { if (body['TokenID'] == null) {
body['TokenID'] = token ?? ''; body['TokenID'] = token;
} }
// body['TokenID'] = "@dm!n" ?? ''; // body['TokenID'] = "@dm!n" ?? '';
if (!isFallLanguage) { if (!isFallLanguage) {
@ -82,12 +80,10 @@ class BaseAppClient {
body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP; body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP;
body['PatientOutSA'] = body['PatientOutSA'] ?? 0; // PATIENT_OUT_SA; body['PatientOutSA'] = body['PatientOutSA'] ?? 0; // PATIENT_OUT_SA;
if (body['VidaAuthTokenID'] == null) { if (body['VidaAuthTokenID'] == null) {
body['VidaAuthTokenID'] = body['VidaAuthTokenID'] = await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
} }
if (body['VidaRefreshTokenID'] == null) { if (body['VidaRefreshTokenID'] == null) {
body['VidaRefreshTokenID'] = body['VidaRefreshTokenID'] = await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
} }
int projectID = await sharedPref.getInt(PROJECT_ID); int projectID = await sharedPref.getInt(PROJECT_ID);
@ -107,30 +103,22 @@ class BaseAppClient {
var asd = json.encode(body); var asd = json.encode(body);
var asd2; var asd2;
if (await Helpers.checkConnection()) { if (await Helpers.checkConnection()) {
final response = await http.post(url, final response = await http.post(Uri.parse(url),
body: json.encode(body), body: json.encode(body), headers: {'Content-Type': 'application/json', 'Accept': 'application/json'});
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json'
});
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
if (statusCode < 200 || statusCode >= 400) { if (statusCode < 200 || statusCode >= 400) {
onFailure(Helpers.generateContactAdminMsg(), statusCode); onFailure(Helpers.generateContactAdminMsg(), statusCode);
} else { } else {
var parsed = json.decode(response.body.toString()); var parsed = json.decode(response.body.toString());
if (parsed['ErrorType'] == 4) { if (parsed['ErrorType'] == 4) {
helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], parsed['AndroidLink'], parsed['IOSLink']);
parsed['AndroidLink'], parsed['IOSLink']);
} }
if (parsed['IsAuthenticated'] != null && !parsed['IsAuthenticated']) { if (parsed['IsAuthenticated'] != null && !parsed['IsAuthenticated']) {
if (body['OTP_SendType'] != null) { if (body['OTP_SendType'] != null) {
onFailure(getError(parsed), statusCode); onFailure(getError(parsed), statusCode);
} else if (!isAllowAny) { } else if (!isAllowAny) {
await Provider.of<AuthenticationViewModel>(AppGlobal.CONTEX, await Provider.of<AuthenticationViewModel>(AppGlobal.CONTEX, listen: false).logout();
listen: false)
.logout();
Helpers.showErrorToast('Your session expired Please login again'); Helpers.showErrorToast('Your session expired Please login again');
locator<NavigationService>().pushNamedAndRemoveUntil(ROOT); locator<NavigationService>().pushNamedAndRemoveUntil(ROOT);
} }
@ -156,22 +144,18 @@ class BaseAppClient {
} }
postPatient(String endPoint, postPatient(String endPoint,
{Map<String, dynamic> body, {required Map<String, dynamic> body,
Function(dynamic response, int statusCode) onSuccess, required Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure, required Function(String error, int statusCode) onFailure,
@required PatiantInformtion patient, PatiantInformtion? patient,
bool isExternal = false}) async { bool isExternal = false}) async {
String url = BASE_URL + endPoint; String url = BASE_URL + endPoint;
try { try {
Map<String, String> headers = { Map<String, String> headers = {'Content-Type': 'application/json', 'Accept': 'application/json'};
'Content-Type': 'application/json',
'Accept': 'application/json'
};
String token = await sharedPref.getString(TOKEN); String token = await sharedPref.getString(TOKEN);
var languageID = var languageID = await sharedPref.getStringWithDefaultValue(APP_Language, 'en');
await sharedPref.getStringWithDefaultValue(APP_Language, 'en');
body['SetupID'] = body.containsKey('SetupID') body['SetupID'] = body.containsKey('SetupID')
? body['SetupID'] != null ? body['SetupID'] != null
? body['SetupID'] ? body['SetupID']
@ -191,8 +175,7 @@ class BaseAppClient {
: PATIENT_OUT_SA_PATIENT_REQ; : PATIENT_OUT_SA_PATIENT_REQ;
if (body.containsKey('isDentalAllowedBackend')) { if (body.containsKey('isDentalAllowedBackend')) {
body['isDentalAllowedBackend'] = body['isDentalAllowedBackend'] = body.containsKey('isDentalAllowedBackend')
body.containsKey('isDentalAllowedBackend')
? body['isDentalAllowedBackend'] != null ? body['isDentalAllowedBackend'] != null
? body['isDentalAllowedBackend'] ? body['isDentalAllowedBackend']
: IS_DENTAL_ALLOWED_BACKEND : IS_DENTAL_ALLOWED_BACKEND
@ -204,7 +187,7 @@ class BaseAppClient {
body['PatientType'] = body.containsKey('PatientType') body['PatientType'] = body.containsKey('PatientType')
? body['PatientType'] != null ? body['PatientType'] != null
? body['PatientType'] ? body['PatientType']
: patient.patientType != null : patient!.patientType != null
? patient.patientType ? patient.patientType
: PATIENT_TYPE : PATIENT_TYPE
: PATIENT_TYPE; : PATIENT_TYPE;
@ -212,15 +195,13 @@ class BaseAppClient {
body['PatientTypeID'] = body.containsKey('PatientTypeID') body['PatientTypeID'] = body.containsKey('PatientTypeID')
? body['PatientTypeID'] != null ? body['PatientTypeID'] != null
? body['PatientTypeID'] ? body['PatientTypeID']
: patient.patientType != null : patient!.patientType != null
? patient.patientType ? patient.patientType
: PATIENT_TYPE_ID : PATIENT_TYPE_ID
: PATIENT_TYPE_ID; : PATIENT_TYPE_ID;
body['TokenID'] = body.containsKey('TokenID') ? body['TokenID'] : token; body['TokenID'] = body.containsKey('TokenID') ? body['TokenID'] : token;
body['PatientID'] = body['PatientID'] != null body['PatientID'] = body['PatientID'] != null ? body['PatientID'] : patient!.patientId ?? patient.patientMRN;
? body['PatientID']
: patient.patientId ?? patient.patientMRN;
body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it
body['SessionID'] = SESSION_ID; //getSe body['SessionID'] = SESSION_ID; //getSe
@ -236,8 +217,7 @@ class BaseAppClient {
var asd = json.encode(body); var asd = json.encode(body);
var asd2; var asd2;
if (await Helpers.checkConnection()) { if (await Helpers.checkConnection()) {
final response = await http.post(url.trim(), final response = await http.post(Uri.parse(url.trim()), body: json.encode(body), headers: headers);
body: json.encode(body), headers: headers);
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
print("statusCode :$statusCode"); print("statusCode :$statusCode");
if (statusCode < 200 || statusCode >= 400 || json == null) { if (statusCode < 200 || statusCode >= 400 || json == null) {
@ -249,8 +229,7 @@ class BaseAppClient {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
} else { } else {
if (parsed['ErrorType'] == 4) { if (parsed['ErrorType'] == 4) {
helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], parsed['AndroidLink'], parsed['IOSLink']);
parsed['AndroidLink'], parsed['IOSLink']);
} }
if (parsed['IsAuthenticated'] == null) { if (parsed['IsAuthenticated'] == null) {
if (parsed['isSMSSent'] == true) { if (parsed['isSMSSent'] == true) {
@ -266,28 +245,20 @@ class BaseAppClient {
onFailure(getError(parsed), statusCode); onFailure(getError(parsed), statusCode);
} }
} }
} else if (parsed['MessageStatus'] == 1 || } else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) {
parsed['SMSLoginRequired'] == true) {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
} else if (parsed['MessageStatus'] == 2 && } else if (parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']) {
parsed['IsAuthenticated']) {
if (parsed['SameClinicApptList'] != null) { if (parsed['SameClinicApptList'] != null) {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
} else { } else {
if (parsed['message'] == null && if (parsed['message'] == null && parsed['ErrorEndUserMessage'] == null) {
parsed['ErrorEndUserMessage'] == null) {
if (parsed['ErrorSearchMsg'] == null) { if (parsed['ErrorSearchMsg'] == null) {
onFailure("Server Error found with no available message", onFailure("Server Error found with no available message", statusCode);
statusCode);
} else { } else {
onFailure(parsed['ErrorSearchMsg'], statusCode); onFailure(parsed['ErrorSearchMsg'], statusCode);
} }
} else { } else {
onFailure( onFailure(parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
parsed['message'] ??
parsed['ErrorEndUserMessage'] ??
parsed['ErrorMessage'],
statusCode);
} }
} }
} else { } else {
@ -297,9 +268,7 @@ class BaseAppClient {
if (parsed['message'] != null) { if (parsed['message'] != null) {
onFailure(parsed['message'] ?? parsed['message'], statusCode); onFailure(parsed['message'] ?? parsed['message'], statusCode);
} else { } else {
onFailure( onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
statusCode);
} }
} }
} }
@ -322,12 +291,8 @@ class BaseAppClient {
if (parsed["ValidationErrors"]["ValidationErrors"] != null && if (parsed["ValidationErrors"]["ValidationErrors"] != null &&
parsed["ValidationErrors"]["ValidationErrors"].length != 0) { parsed["ValidationErrors"]["ValidationErrors"].length != 0) {
for (var i = 0; for (var i = 0; i < parsed["ValidationErrors"]["ValidationErrors"].length; i++) {
i < parsed["ValidationErrors"]["ValidationErrors"].length; error = error + parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] + "\n";
i++) {
error = error +
parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] +
"\n";
} }
} }
} }

@ -5,15 +5,16 @@ class SizeConfig {
static double _blockWidth = 0; static double _blockWidth = 0;
static double _blockHeight = 0; static double _blockHeight = 0;
static double realScreenWidth; static late double realScreenWidth;
static double realScreenHeight; static late double realScreenHeight;
static double screenWidth; static late double screenWidth;
static double screenHeight; static late double screenHeight;
static double textMultiplier; static late double textMultiplier;
static double imageSizeMultiplier; static late double imageSizeMultiplier;
static double heightMultiplier; static late double heightMultiplier;
static late double widthMultiplier;
static bool isPortrait = true; static bool isPortrait = true;
static double widthMultiplier;
static bool isMobilePortrait = false; static bool isMobilePortrait = false;
static bool isMobile = false; static bool isMobile = false;
static bool isHeightShort = false; static bool isHeightShort = false;
@ -24,6 +25,7 @@ class SizeConfig {
void init(BoxConstraints constraints, Orientation orientation) { void init(BoxConstraints constraints, Orientation orientation) {
realScreenHeight = constraints.maxHeight; realScreenHeight = constraints.maxHeight;
realScreenWidth = constraints.maxWidth; realScreenWidth = constraints.maxWidth;
if (constraints.maxWidth <= MAX_SMALL_SCREEN) { if (constraints.maxWidth <= MAX_SMALL_SCREEN) {
isMobile = true; isMobile = true;
} }
@ -46,20 +48,16 @@ class SizeConfig {
if (realScreenWidth < 450) { if (realScreenWidth < 450) {
isMobilePortrait = true; isMobilePortrait = true;
} }
// textMultiplier = _blockHeight;
// imageSizeMultiplier = _blockWidth;
screenHeight = realScreenHeight; screenHeight = realScreenHeight;
screenWidth = realScreenWidth; screenWidth = realScreenWidth;
} else { } else {
isPortrait = false; isPortrait = false;
isMobilePortrait = false; isMobilePortrait = false;
// textMultiplier = _blockWidth;
// imageSizeMultiplier = _blockHeight;
screenHeight = realScreenWidth; screenHeight = realScreenWidth;
screenWidth = realScreenHeight; screenWidth = realScreenHeight;
} }
_blockWidth = screenWidth / 100; _blockWidth = (screenWidth / 100);
_blockHeight = screenHeight / 100; _blockHeight = (screenHeight / 100);
textMultiplier = _blockHeight; textMultiplier = _blockHeight;
imageSizeMultiplier = _blockWidth; imageSizeMultiplier = _blockWidth;
@ -74,9 +72,11 @@ class SizeConfig {
print('widthMultiplier $widthMultiplier'); print('widthMultiplier $widthMultiplier');
print('isPortrait $isPortrait'); print('isPortrait $isPortrait');
print('isMobilePortrait $isMobilePortrait'); print('isMobilePortrait $isMobilePortrait');
} }
static getTextMultiplierBasedOnWidth({double width}) { static getTextMultiplierBasedOnWidth({double? width}) {
// TODO handel LandScape case // TODO handel LandScape case
if (width != null) { if (width != null) {
return width / 100; return width / 100;
@ -84,7 +84,7 @@ class SizeConfig {
return widthMultiplier; return widthMultiplier;
} }
static getWidthMultiplier({double width}) { static getWidthMultiplier({double? width}) {
// TODO handel LandScape case // TODO handel LandScape case
if (width != null) { if (width != null) {
return width / 100; return width / 100;
@ -92,7 +92,7 @@ class SizeConfig {
return widthMultiplier; return widthMultiplier;
} }
static getHeightMultiplier({double height}) { static getHeightMultiplier({double? height}) {
// TODO handel LandScape case // TODO handel LandScape case
if (height != null) { if (height != null) {
return height / 100; return height / 100;

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

@ -1,29 +1,29 @@
class CheckActivationCodeModel { class CheckActivationCodeModel {
int patientMobileNumber; int? patientMobileNumber;
String mobileNo; String? mobileNo;
int projectOutSA; int? projectOutSA;
int loginType; int? loginType;
String zipCode; String? zipCode;
bool isRegister; bool? isRegister;
String logInTokenID; String? logInTokenID;
int searchType; int? searchType;
int patientID; int? patientID;
int nationalID; int? nationalID;
int patientIdentificationID; int? patientIdentificationID;
bool forRegisteration; bool? forRegisteration;
String activationCode; String? activationCode;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null? sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int ?deviceTypeID;
String dOB; String? dOB;
int isHijri; int? isHijri;
String healthId; String? healthId;
CheckActivationCodeModel( CheckActivationCodeModel(
{this.patientMobileNumber, {this.patientMobileNumber,

@ -1,21 +1,21 @@
class CheckPatientForRegistrationModel { class CheckPatientForRegistrationModel {
int patientIdentificationID; int? patientIdentificationID;
int patientMobileNumber; int? patientMobileNumber;
String zipCode; String? zipCode;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
String tokenID; String? tokenID;
int patientID; int? patientID;
bool isRegister; bool? isRegister;
String dOB; String? dOB;
int isHijri; int? isHijri;
CheckPatientForRegistrationModel( CheckPatientForRegistrationModel(
{this.patientIdentificationID, {this.patientIdentificationID,

@ -1,16 +1,16 @@
class GetPatientInfoRequestModel { class GetPatientInfoRequestModel {
String patientIdentificationID; String? patientIdentificationID;
String dOB; String? dOB;
int isHijri; int? isHijri;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
GetPatientInfoRequestModel( GetPatientInfoRequestModel(
{this.patientIdentificationID, {this.patientIdentificationID,

@ -1,78 +1,78 @@
class GetPatientInfoResponseModel { class GetPatientInfoResponseModel {
dynamic date; dynamic date;
int languageID; int? languageID;
int serviceName; int? serviceName;
dynamic time; dynamic time;
dynamic androidLink; dynamic androidLink;
dynamic authenticationTokenID; dynamic authenticationTokenID;
dynamic data; dynamic data;
bool dataw; bool? dataw;
int dietType; int? dietType;
dynamic errorCode; dynamic errorCode;
dynamic errorEndUserMessage; dynamic errorEndUserMessage;
dynamic errorEndUserMessageN; dynamic errorEndUserMessageN;
dynamic errorMessage; dynamic errorMessage;
int errorType; int? errorType;
int foodCategory; int? foodCategory;
dynamic iOSLink; dynamic iOSLink;
bool isAuthenticated; bool? isAuthenticated;
int mealOrderStatus; int? mealOrderStatus;
int mealType; int? mealType;
int messageStatus; int? messageStatus;
int numberOfResultRecords; int? numberOfResultRecords;
dynamic patientBlodType; dynamic patientBlodType;
dynamic successMsg; dynamic successMsg;
dynamic successMsgN; dynamic successMsgN;
dynamic vidaUpdatedResponse; dynamic vidaUpdatedResponse;
dynamic accessTokenObject; dynamic accessTokenObject;
int age; int? age;
dynamic clientIdentifierId; dynamic clientIdentifierId;
int createdBy; int? createdBy;
String dateOfBirth; String? dateOfBirth;
String firstNameAr; String? firstNameAr;
String firstNameEn; String? firstNameEn;
String gender; String? gender;
dynamic genderAr; dynamic genderAr;
dynamic genderEn; dynamic genderEn;
String healthId; String? healthId;
String idNumber; String? idNumber;
String idType; String? idType;
bool isHijri; bool? isHijri;
int isInstertedOrUpdated; int? isInstertedOrUpdated;
int isNull; int? isNull;
int isPatientExistNHIC; int? isPatientExistNHIC;
bool isRecordLockedByCurrentUser; bool? isRecordLockedByCurrentUser;
String lastNameAr; String? lastNameAr;
String lastNameEn; String? lastNameEn;
dynamic listActiveAccessToken; dynamic listActiveAccessToken;
String maritalStatus; String? maritalStatus;
String maritalStatusCode; String? maritalStatusCode;
String nationalDateOfBirth; String? nationalDateOfBirth;
String nationality; String? nationality;
String nationalityCode; String? nationalityCode;
String occupation; String? occupation;
dynamic pCDTransactionDataResultList; dynamic pCDTransactionDataResultList;
dynamic pCDGetVidaPatientForManualVerificationList; dynamic pCDGetVidaPatientForManualVerificationList;
dynamic pCDNHICHMGPatientDetailsMatchCalulationList; dynamic pCDNHICHMGPatientDetailsMatchCalulationList;
int pCDReturnValue; int? pCDReturnValue;
String patientStatus; String? patientStatus;
String placeofBirth; String? placeofBirth;
dynamic practitionerStatusCode; dynamic practitionerStatusCode;
dynamic practitionerStatusDescAr; dynamic practitionerStatusDescAr;
dynamic practitionerStatusDescEn; dynamic practitionerStatusDescEn;
int rowCount; int? rowCount;
String secondNameAr; String? secondNameAr;
String secondNameEn; String? secondNameEn;
String thirdNameAr; String? thirdNameAr;
String thirdNameEn; String? thirdNameEn;
dynamic yakeenVidaPatientDataStatisticsByPatientIdList; dynamic yakeenVidaPatientDataStatisticsByPatientIdList;
dynamic yakeenVidaPatientDataStatisticsList; dynamic yakeenVidaPatientDataStatisticsList;
dynamic yakeenVidaPatientDataStatisticsPrefferedList; dynamic yakeenVidaPatientDataStatisticsPrefferedList;
dynamic accessToken; dynamic accessToken;
int categoryCode; int? categoryCode;
dynamic categoryNameAr; dynamic categoryNameAr;
dynamic categoryNameEn; dynamic categoryNameEn;
int constraintCode; int? constraintCode;
dynamic constraintNameAr; dynamic constraintNameAr;
dynamic constraintNameEn; dynamic constraintNameEn;
dynamic content; dynamic content;
@ -84,7 +84,7 @@ class GetPatientInfoResponseModel {
dynamic licenseStatusDescEn; dynamic licenseStatusDescEn;
dynamic organizations; dynamic organizations;
dynamic registrationNumber; dynamic registrationNumber;
int specialtyCode; int? specialtyCode;
dynamic specialtyNameAr; dynamic specialtyNameAr;
dynamic specialtyNameEn; dynamic specialtyNameEn;

@ -1,22 +1,22 @@
class PatientRegistrationModel { class PatientRegistrationModel {
Patientobject patientobject; Patientobject? patientobject;
String patientIdentificationID; String? patientIdentificationID;
String patientMobileNumber; String? patientMobileNumber;
String logInTokenID; String? logInTokenID;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
String tokenID; String? tokenID;
String dOB; String? dOB;
int isHijri; int? isHijri;
String healthId; String? healthId;
String zipCode; String? zipCode;
PatientRegistrationModel( PatientRegistrationModel(
{this.patientobject, {this.patientobject,
@ -64,7 +64,7 @@ class PatientRegistrationModel {
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.patientobject != null) { if (this.patientobject != null) {
data['Patientobject'] = this.patientobject.toJson(); data['Patientobject'] = this.patientobject!.toJson();
} }
data['PatientIdentificationID'] = this.patientIdentificationID; data['PatientIdentificationID'] = this.patientIdentificationID;
data['PatientMobileNumber'] = this.patientMobileNumber; data['PatientMobileNumber'] = this.patientMobileNumber;
@ -88,27 +88,27 @@ class PatientRegistrationModel {
} }
class Patientobject { class Patientobject {
bool tempValue; bool? tempValue;
int patientIdentificationType; int? patientIdentificationType;
String patientIdentificationNo; String? patientIdentificationNo;
int mobileNumber; int? mobileNumber;
int patientOutSA; int? patientOutSA;
String firstNameN; String? firstNameN;
String middleNameN; String? middleNameN;
String lastNameN; String? lastNameN;
String firstName; String? firstName;
String middleName; String? middleName;
String lastName; String? lastName;
String strDateofBirth; String? strDateofBirth;
String dateofBirth; String? dateofBirth;
int gender; int? gender;
String nationalityID; String? nationalityID;
String dateofBirthN; String? dateofBirthN;
String emailAddress; String? emailAddress;
String sourceType; String? sourceType;
String preferredLanguage; String? preferredLanguage;
String marital; String? marital;
String eHealthIDField; String? eHealthIDField;
Patientobject( Patientobject(
{this.tempValue, {this.tempValue,

@ -1,28 +1,28 @@
class SendActivationCodeByOTPNotificationTypeForRegistrationModel { class SendActivationCodeByOTPNotificationTypeForRegistrationModel {
int patientMobileNumber; int? patientMobileNumber;
String mobileNo; String? mobileNo;
int projectOutSA; int? projectOutSA;
int loginType; int? loginType;
String zipCode; String? zipCode;
bool isRegister; bool? isRegister;
String logInTokenID; String? logInTokenID;
int searchType; int? searchType;
int patientID; int? patientID;
int nationalID; int? nationalID;
int patientIdentificationID; int? patientIdentificationID;
int oTPSendType; int? oTPSendType;
int languageID; int? languageID;
double versionID; double? versionID;
int channel; int? channel;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
String dOB; String? dOB;
int isHijri; int? isHijri;
String healthId; String? healthId;
SendActivationCodeByOTPNotificationTypeForRegistrationModel( SendActivationCodeByOTPNotificationTypeForRegistrationModel(
{this.patientMobileNumber, {this.patientMobileNumber,

@ -1,40 +1,40 @@
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
class Prescriptions { class Prescriptions {
String setupID; String? setupID;
int projectID; int? projectID;
int patientID; int? patientID;
int appointmentNo; int? appointmentNo;
String appointmentDate; String? appointmentDate;
String doctorName; String? doctorName;
String clinicDescription; String? clinicDescription;
String name; String? name;
int episodeID; int? episodeID;
int actualDoctorRate; int? actualDoctorRate;
int admission; int? admission;
int clinicID; int? clinicID;
String companyName; String? companyName;
String despensedStatus; String? despensedStatus;
DateTime dischargeDate; DateTime? dischargeDate;
int dischargeNo; int? dischargeNo;
int doctorID; int? doctorID;
String doctorImageURL; String? doctorImageURL;
int doctorRate; int? doctorRate;
String doctorTitle; String? doctorTitle;
int gender; int? gender;
String genderDescription; String? genderDescription;
bool isActiveDoctorProfile; bool? isActiveDoctorProfile;
bool isDoctorAllowVedioCall; bool? isDoctorAllowVedioCall;
bool isExecludeDoctor; bool? isExecludeDoctor;
bool isInOutPatient; bool? isInOutPatient;
bool isLiveCareAppointment; bool? isLiveCareAppointment;
String isInOutPatientDescription; String? isInOutPatientDescription;
String isInOutPatientDescriptionN; String? isInOutPatientDescriptionN;
bool isInsurancePatient; bool? isInsurancePatient;
String nationalityFlagURL; String? nationalityFlagURL;
int noOfPatientsRate; int? noOfPatientsRate;
String qR; String? qR;
List<String> speciality; List<String?>? speciality;
Prescriptions( Prescriptions(
{this.setupID, {this.setupID,
@ -69,9 +69,10 @@ class Prescriptions {
this.nationalityFlagURL, this.nationalityFlagURL,
this.noOfPatientsRate, this.noOfPatientsRate,
this.qR, this.qR,
this.speciality,this.isLiveCareAppointment}); this.speciality,
this.isLiveCareAppointment});
Prescriptions.fromJson(Map<String, dynamic> json) { Prescriptions.fromJson(Map<String?, dynamic> json) {
setupID = json['SetupID']; setupID = json['SetupID'];
projectID = json['ProjectID']; projectID = json['ProjectID'];
patientID = json['PatientID']; patientID = json['PatientID'];
@ -105,11 +106,11 @@ class Prescriptions {
noOfPatientsRate = json['NoOfPatientsRate']; noOfPatientsRate = json['NoOfPatientsRate'];
qR = json['QR']; qR = json['QR'];
isLiveCareAppointment = json['IsLiveCareAppointment']; isLiveCareAppointment = json['IsLiveCareAppointment'];
// speciality = json['Speciality'].cast<String>(); // speciality = json['Speciality'].cast<String ?>();
} }
Map<String, dynamic> toJson() { Map<String?, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['SetupID'] = this.setupID; data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID; data['ProjectID'] = this.projectID;
data['PatientID'] = this.patientID; data['PatientID'] = this.patientID;
@ -149,10 +150,10 @@ class Prescriptions {
} }
class PrescriptionsList { class PrescriptionsList {
String filterName = ""; String? filterName = "";
List<Prescriptions> prescriptionsList = List(); List<Prescriptions> prescriptionsList =[];
PrescriptionsList({this.filterName, Prescriptions prescriptions}) { PrescriptionsList({this.filterName, required Prescriptions prescriptions}) {
prescriptionsList.add(prescriptions); prescriptionsList.add(prescriptions);
} }
} }

@ -1,40 +1,40 @@
class GetMedicationForInPatientModel { class GetMedicationForInPatientModel {
String setupID; String? setupID;
int projectID; int? projectID;
int admissionNo; int? admissionNo;
int patientID; int? patientID;
int orderNo; int? orderNo;
int prescriptionNo; int? prescriptionNo;
int lineItemNo; int? lineItemNo;
String prescriptionDatetime; String? prescriptionDatetime;
int itemID; int? itemID;
int directionID; int? directionID;
int refillID; int? refillID;
String dose; String? dose;
int unitofMeasurement; int? unitofMeasurement;
String startDatetime; String? startDatetime;
String stopDatetime; String? stopDatetime;
int noOfDoses; int? noOfDoses;
int routeId; int? routeId;
String comments; String? comments;
int reviewedPharmacist; int? reviewedPharmacist;
dynamic reviewedPharmacistDatetime; dynamic reviewedPharmacistDatetime;
dynamic discountinueDatetime; dynamic discountinueDatetime;
dynamic rescheduleDatetime; dynamic rescheduleDatetime;
int status; int? status;
String statusDescription; String? statusDescription;
int createdBy; int? createdBy;
String createdOn; String? createdOn;
dynamic editedBy; dynamic editedBy;
dynamic editedOn; dynamic editedOn;
dynamic strength; dynamic strength;
String pHRItemDescription; String? pHRItemDescription;
String pHRItemDescriptionN; String? pHRItemDescriptionN;
String doctorName; String? doctorName;
String uomDescription; String? uomDescription;
String routeDescription; String? routeDescription;
String directionDescription; String? directionDescription;
String refillDescription; String? refillDescription;
GetMedicationForInPatientModel( GetMedicationForInPatientModel(
{this.setupID, {this.setupID,

@ -1,16 +1,16 @@
class GetMedicationForInPatientRequestModel { class GetMedicationForInPatientRequestModel {
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int deviceTypeID; int? deviceTypeID;
String tokenID; String? tokenID;
int patientID; int? patientID;
int admissionNo; int? admissionNo;
String sessionID; String? sessionID;
int projectID; int? projectID;
GetMedicationForInPatientRequestModel( GetMedicationForInPatientRequestModel(
{this.isDentalAllowedBackend, {this.isDentalAllowedBackend,

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

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

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

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

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

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

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

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

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

@ -1,16 +1,16 @@
class RequestGetListPharmacyForPrescriptions { class RequestGetListPharmacyForPrescriptions {
int latitude; int? latitude;
int longitude; int? longitude;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
String sessionID; String? sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
int itemID; int? itemID;
RequestGetListPharmacyForPrescriptions( RequestGetListPharmacyForPrescriptions(
{this.latitude, {this.latitude,
@ -26,7 +26,7 @@ class RequestGetListPharmacyForPrescriptions {
this.deviceTypeID, this.deviceTypeID,
this.itemID}); this.itemID});
RequestGetListPharmacyForPrescriptions.fromJson(Map<String, dynamic> json) { RequestGetListPharmacyForPrescriptions.fromJson(Map<String?, dynamic> json) {
latitude = json['Latitude']; latitude = json['Latitude'];
longitude = json['Longitude']; longitude = json['Longitude'];
versionID = json['VersionID']; versionID = json['VersionID'];

@ -1,23 +1,23 @@
class RequestPrescriptionReport { class RequestPrescriptionReport {
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
String sessionID; String? sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
int patientID; int? patientID;
String tokenID; String? tokenID;
int patientTypeID; int? patientTypeID;
int patientType; int? patientType;
int appointmentNo; int? appointmentNo;
String setupID; String? setupID;
int episodeID; int? episodeID;
int clinicID; int? clinicID;
int projectID; int? projectID;
int dischargeNo; int? dischargeNo;
RequestPrescriptionReport( RequestPrescriptionReport(
{this.versionID, {this.versionID,
@ -40,7 +40,7 @@ class RequestPrescriptionReport {
this.projectID, this.projectID,
this.dischargeNo}); this.dischargeNo});
RequestPrescriptionReport.fromJson(Map<String, dynamic> json) { RequestPrescriptionReport.fromJson(Map<String?, dynamic> json) {
versionID = json['VersionID']; versionID = json['VersionID'];
channel = json['Channel']; channel = json['Channel'];
languageID = json['LanguageID']; languageID = json['LanguageID'];

@ -1,23 +1,23 @@
class RequestPrescriptionReportEnh { class RequestPrescriptionReportEnh {
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
String sessionID; String? sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
int patientID; int? patientID;
String tokenID; String? tokenID;
int patientTypeID; int? patientTypeID;
int patientType; int? patientType;
int appointmentNo; int? appointmentNo;
String setupID; String? setupID;
int dischargeNo; int? dischargeNo;
int episodeID; int? episodeID;
int clinicID; int? clinicID;
int projectID; int? projectID;
RequestPrescriptionReportEnh( RequestPrescriptionReportEnh(
{this.versionID, {this.versionID,
@ -37,9 +37,10 @@ class RequestPrescriptionReportEnh {
this.setupID, this.setupID,
this.episodeID, this.episodeID,
this.clinicID, this.clinicID,
this.projectID,this.dischargeNo}); this.projectID,
this.dischargeNo});
RequestPrescriptionReportEnh.fromJson(Map<String, dynamic> json) { RequestPrescriptionReportEnh.fromJson(Map<String?, dynamic> json) {
versionID = json['VersionID']; versionID = json['VersionID'];
channel = json['Channel']; channel = json['Channel'];
languageID = json['LanguageID']; languageID = json['LanguageID'];

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

@ -1,9 +1,9 @@
class Clinic { class Clinic {
int clinicGroupID; late int? clinicGroupID;
String clinicGroupName; late String? clinicGroupName;
int clinicID; late int? clinicID;
String clinicNameArabic; late String? clinicNameArabic;
String clinicNameEnglish; late String? clinicNameEnglish;
Clinic( Clinic(
{this.clinicGroupID, {this.clinicGroupID,
@ -29,5 +29,4 @@ class Clinic {
data['clinicNameEnglish'] = this.clinicNameEnglish; data['clinicNameEnglish'] = this.clinicNameEnglish;
return data; return data;
} }
} }

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

@ -1,12 +1,12 @@
class ActivationCodeModel { class ActivationCodeModel {
int channel; late int? channel;
int languageID; late int? loginDoctorID;
int loginDoctorID; late int? languageID;
double versionID; late double? versionID;
int memberID; late int? memberID;
int facilityId; late int? facilityId;
String generalid; late String? generalid;
String otpSendType; late String? otpSendType;
ActivationCodeModel( ActivationCodeModel(
{this.channel, {this.channel,

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

@ -1,12 +1,12 @@
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
class CheckActivationCodeForDoctorAppResponseModel { class CheckActivationCodeForDoctorAppResponseModel {
String authenticationTokenID; late String? authenticationTokenID;
List<ListDoctorsClinic> listDoctorsClinic; late List<ListDoctorsClinic>? listDoctorsClinic;
List<DoctorProfileModel> listDoctorProfile; List<DoctorProfileModel>? listDoctorProfile;
MemberInformation memberInformation; late MemberInformation? memberInformation;
String vidaAuthTokenID; String? vidaAuthTokenID;
String vidaRefreshTokenID; String? vidaRefreshTokenID;
CheckActivationCodeForDoctorAppResponseModel( CheckActivationCodeForDoctorAppResponseModel(
{this.authenticationTokenID, {this.authenticationTokenID,
@ -20,16 +20,16 @@ class CheckActivationCodeForDoctorAppResponseModel {
Map<String, dynamic> json) { Map<String, dynamic> json) {
authenticationTokenID = json['AuthenticationTokenID']; authenticationTokenID = json['AuthenticationTokenID'];
if (json['List_DoctorsClinic'] != null) { if (json['List_DoctorsClinic'] != null) {
listDoctorsClinic = new List<ListDoctorsClinic>(); listDoctorsClinic = [];
json['List_DoctorsClinic'].forEach((v) { json['List_DoctorsClinic'].forEach((v) {
listDoctorsClinic.add(new ListDoctorsClinic.fromJson(v)); listDoctorsClinic!.add(new ListDoctorsClinic.fromJson(v));
}); });
} }
if (json['List_DoctorProfile'] != null) { if (json['List_DoctorProfile'] != null) {
listDoctorProfile = new List<DoctorProfileModel>(); listDoctorProfile = [];
json['List_DoctorProfile'].forEach((v) { json['List_DoctorProfile'].forEach((v) {
listDoctorProfile.add(new DoctorProfileModel.fromJson(v)); listDoctorProfile!.add(new DoctorProfileModel.fromJson(v));
}); });
} }
vidaAuthTokenID = json['VidaAuthTokenID']; vidaAuthTokenID = json['VidaAuthTokenID'];
@ -45,27 +45,27 @@ class CheckActivationCodeForDoctorAppResponseModel {
data['AuthenticationTokenID'] = this.authenticationTokenID; data['AuthenticationTokenID'] = this.authenticationTokenID;
if (this.listDoctorsClinic != null) { if (this.listDoctorsClinic != null) {
data['List_DoctorsClinic'] = data['List_DoctorsClinic'] =
this.listDoctorsClinic.map((v) => v.toJson()).toList(); this.listDoctorsClinic!.map((v) => v.toJson()).toList();
} }
if (this.listDoctorProfile != null) { if (this.listDoctorProfile != null) {
data['List_DoctorProfile'] = data['List_DoctorProfile'] =
this.listDoctorProfile.map((v) => v.toJson()).toList(); this.listDoctorProfile!.map((v) => v.toJson()).toList();
} }
if (this.memberInformation != null) { if (this.memberInformation != null) {
data['memberInformation'] = this.memberInformation.toJson(); data['memberInformation'] = this.memberInformation!.toJson();
} }
return data; return data;
} }
} }
class ListDoctorsClinic { class ListDoctorsClinic {
Null setupID; late dynamic setupID;
int projectID; late int? projectID;
int doctorID; late int? doctorID;
int clinicID; late int? clinicID;
bool isActive; late bool? isActive;
String clinicName; late String? clinicName;
ListDoctorsClinic( ListDoctorsClinic(
{this.setupID, {this.setupID,
@ -97,15 +97,15 @@ class ListDoctorsClinic {
} }
class MemberInformation { class MemberInformation {
List<Clinics> clinics; late List<Clinics>? clinics;
int doctorId; late int? doctorId;
String email; late String? email;
int employeeId; late int? employeeId;
int memberId; late int? memberId;
Null memberName; late dynamic memberName;
Null memberNameArabic; late dynamic memberNameArabic;
String preferredLanguage; late String? preferredLanguage;
List<Roles> roles; late List<Roles>? roles;
MemberInformation( MemberInformation(
{this.clinics, {this.clinics,
@ -120,9 +120,9 @@ class MemberInformation {
MemberInformation.fromJson(Map<String, dynamic> json) { MemberInformation.fromJson(Map<String, dynamic> json) {
if (json['clinics'] != null) { if (json['clinics'] != null) {
clinics = new List<Clinics>(); clinics = [];
json['clinics'].forEach((v) { json['clinics'].forEach((v) {
clinics.add(new Clinics.fromJson(v)); clinics!.add(new Clinics.fromJson(v));
}); });
} }
doctorId = json['doctorId']; doctorId = json['doctorId'];
@ -133,9 +133,9 @@ class MemberInformation {
memberNameArabic = json['memberNameArabic']; memberNameArabic = json['memberNameArabic'];
preferredLanguage = json['preferredLanguage']; preferredLanguage = json['preferredLanguage'];
if (json['roles'] != null) { if (json['roles'] != null) {
roles = new List<Roles>(); roles = [];
json['roles'].forEach((v) { json['roles'].forEach((v) {
roles.add(new Roles.fromJson(v)); roles!.add(new Roles.fromJson(v));
}); });
} }
} }
@ -143,7 +143,7 @@ class MemberInformation {
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.clinics != null) { 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['doctorId'] = this.doctorId;
data['email'] = this.email; data['email'] = this.email;
@ -153,16 +153,16 @@ class MemberInformation {
data['memberNameArabic'] = this.memberNameArabic; data['memberNameArabic'] = this.memberNameArabic;
data['preferredLanguage'] = this.preferredLanguage; data['preferredLanguage'] = this.preferredLanguage;
if (this.roles != null) { if (this.roles != null) {
data['roles'] = this.roles.map((v) => v.toJson()).toList(); data['roles'] = this.roles!.map((v) => v.toJson()).toList();
} }
return data; return data;
} }
} }
class Clinics { class Clinics {
bool defaultClinic; late bool? defaultClinic;
int id; late int? id;
String name; late String? name;
Clinics({this.defaultClinic, this.id, this.name}); Clinics({this.defaultClinic, this.id, this.name});
@ -182,8 +182,8 @@ class Clinics {
} }
class Roles { class Roles {
String name; late String? name;
int roleId; late int? roleId;
Roles({this.name, this.roleId}); Roles({this.name, this.roleId});

@ -1,24 +1,24 @@
class CheckActivationCodeRequestModel { class CheckActivationCodeRequestModel {
String mobileNumber; String? mobileNumber;
String zipCode; String? zipCode;
int doctorID; int? doctorID;
int memberID; int? memberID;
int loginDoctorID; int? loginDoctorID;
String password; String? password;
String facilityId; String? facilityId;
String iPAdress; String? iPAdress;
int channel; int? channel;
int languageID; int? languageID;
int projectID; int? projectID;
double versionID; double? versionID;
String generalid; String? generalid;
String logInTokenID; String? logInTokenID;
String activationCode; String? activationCode;
String vidaAuthTokenID; String? vidaAuthTokenID;
String vidaRefreshTokenID; String? vidaRefreshTokenID;
String iMEI; String? iMEI;
bool isForSilentLogin; bool? isForSilentLogin;
int oTPSendType; int? oTPSendType;
CheckActivationCodeRequestModel( CheckActivationCodeRequestModel(
{this.mobileNumber, {this.mobileNumber,
this.zipCode, this.zipCode,

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

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

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

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

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

@ -1,7 +1,7 @@
class DiabeticType { class DiabeticType {
int value; int? value;
String nameEn; String? nameEn;
String nameAr; String? nameAr;
DiabeticType({this.value, this.nameEn, this.nameAr}); DiabeticType({this.value, this.nameEn, this.nameAr});

@ -1,12 +1,12 @@
class GetDiabeticChartValuesRequestModel { class GetDiabeticChartValuesRequestModel {
int deviceTypeID; int? deviceTypeID;
int patientID; int? patientID;
int resultType; int? resultType;
int admissionNo; int? admissionNo;
String setupID; String? setupID;
bool patientOutSA; bool? patientOutSA;
int patientType; int? patientType;
int patientTypeID; int? patientTypeID;
GetDiabeticChartValuesRequestModel( GetDiabeticChartValuesRequestModel(
{this.deviceTypeID, {this.deviceTypeID,

@ -1,10 +1,10 @@
class GetDiabeticChartValuesResponseModel { class GetDiabeticChartValuesResponseModel {
String resultType; String? resultType;
int admissionNo; int? admissionNo;
String dateChart; String? dateChart;
int resultValue; int? resultValue;
int createdBy; int? createdBy;
String createdOn; String? createdOn;
GetDiabeticChartValuesResponseModel( GetDiabeticChartValuesResponseModel(
{this.resultType, {this.resultType,

@ -1,9 +1,9 @@
class GetDiagnosisForInPatientRequestModel { class GetDiagnosisForInPatientRequestModel {
int patientID; int? patientID;
int admissionNo; int? admissionNo;
String setupID; String? setupID;
int patientType; int? patientType;
int patientTypeID; int? patientTypeID;
GetDiagnosisForInPatientRequestModel( GetDiagnosisForInPatientRequestModel(
{this.patientID, {this.patientID,

@ -1,15 +1,15 @@
class GetDiagnosisForInPatientResponseModel { class GetDiagnosisForInPatientResponseModel {
String iCDCode10ID; String? iCDCode10ID;
int diagnosisTypeID; int? diagnosisTypeID;
int conditionID; int? conditionID;
bool complexDiagnosis; bool? complexDiagnosis;
String asciiDesc; String? asciiDesc;
int createdBy; int? createdBy;
String createdOn; String? createdOn;
int editedBy; int? editedBy;
String editedOn; String? editedOn;
String createdByName; String? createdByName;
String editedByName; String? editedByName;
GetDiagnosisForInPatientResponseModel( GetDiagnosisForInPatientResponseModel(
{this.iCDCode10ID, {this.iCDCode10ID,

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

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

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

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

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

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

@ -1,28 +1,28 @@
class LabResultHistory { class LabResultHistory {
String description; String? description;
String femaleInterpretativeData; String? femaleInterpretativeData;
int gender; int? gender;
bool isCertificateAllowed; bool? isCertificateAllowed;
int lineItemNo; int? lineItemNo;
String maleInterpretativeData; String? maleInterpretativeData;
String notes; String? notes;
int orderLineItemNo; int? orderLineItemNo;
int orderNo; int? orderNo;
String packageID; String? packageID;
int patientID; int? patientID;
String projectID; String? projectID;
String referanceRange; String? referanceRange;
String resultValue; String? resultValue;
int resultValueBasedLineItemNo; int? resultValueBasedLineItemNo;
String resultValueFlag; String? resultValueFlag;
String sampleCollectedOn; String? sampleCollectedOn;
String sampleReceivedOn; String? sampleReceivedOn;
String setupID; String? setupID;
String superVerifiedOn; String? superVerifiedOn;
String testCode; String? testCode;
String uOM; String? uOM;
String verifiedOn; String? verifiedOn;
String verifiedOnDateTime; String? verifiedOnDateTime;
LabResultHistory( LabResultHistory(
{this.description, {this.description,

@ -5,51 +5,51 @@ class AllSpecialLabResultModel {
dynamic appointmentDate; dynamic appointmentDate;
dynamic appointmentNo; dynamic appointmentNo;
dynamic appointmentTime; dynamic appointmentTime;
String clinicDescription; String? clinicDescription;
String clinicDescriptionEnglish; String? clinicDescriptionEnglish;
dynamic clinicDescriptionN; dynamic clinicDescriptionN;
dynamic clinicID; dynamic clinicID;
dynamic createdOn; dynamic createdOn;
double decimalDoctorRate; double? decimalDoctorRate;
dynamic doctorID; dynamic doctorID;
String doctorImageURL; String? doctorImageURL;
String doctorName; String? doctorName;
String doctorNameEnglish; String? doctorNameEnglish;
dynamic doctorNameN; dynamic doctorNameN;
dynamic doctorRate; dynamic doctorRate;
dynamic doctorStarsRate; dynamic doctorStarsRate;
String doctorTitle; String? doctorTitle;
dynamic gender; dynamic gender;
String genderDescription; String? genderDescription;
bool inOutPatient; bool? inOutPatient;
String invoiceNo; String? invoiceNo;
bool isActiveDoctorProfile; bool? isActiveDoctorProfile;
bool isDoctorAllowVedioCall; bool? isDoctorAllowVedioCall;
bool isExecludeDoctor; bool? isExecludeDoctor;
bool isInOutPatient; bool? isInOutPatient;
dynamic isInOutPatientDescription; dynamic isInOutPatientDescription;
dynamic isInOutPatientDescriptionN; dynamic isInOutPatientDescriptionN;
bool isLiveCareAppointment; bool? isLiveCareAppointment;
bool isRead; bool? isRead;
bool isSendEmail; bool? isSendEmail;
String moduleID; String? moduleID;
String nationalityFlagURL; String? nationalityFlagURL;
dynamic noOfPatientsRate; dynamic noOfPatientsRate;
dynamic orderDate; dynamic orderDate;
String orderNo; String? orderNo;
dynamic patientID; dynamic patientID;
String projectID; String? projectID;
String projectName; String? projectName;
dynamic projectNameN; dynamic projectNameN;
String qR; String? qR;
String resultData; String? resultData;
String resultDataHTML; String? resultDataHTML;
dynamic resultDataTxt; dynamic resultDataTxt;
String setupID; String? setupID;
//List<String> speciality; //List<String> speciality;
dynamic status; dynamic status;
dynamic statusDesc; dynamic statusDesc;
String strOrderDate; String? strOrderDate;
AllSpecialLabResultModel( AllSpecialLabResultModel(
{this.actualDoctorRate, {this.actualDoctorRate,

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

@ -1,24 +1,24 @@
class LabResult { class LabResult {
String description; String? description;
dynamic femaleInterpretativeData; dynamic femaleInterpretativeData;
int gender; int? gender;
int lineItemNo; int? lineItemNo;
dynamic maleInterpretativeData; dynamic maleInterpretativeData;
String notes; String? notes;
String packageID; String? packageID;
int patientID; int? patientID;
String projectID; String? projectID;
String referanceRange; String? referanceRange;
String resultValue; String? resultValue;
String maxValue; String? sampleCollectedOn;
String minValue; String? sampleReceivedOn;
String sampleCollectedOn; String? setupID;
String sampleReceivedOn; String? maxValue;
String setupID; String? minValue;
dynamic superVerifiedOn; dynamic superVerifiedOn;
String testCode; String? testCode;
String uOM; String? uOM;
String verifiedOn; String? verifiedOn;
dynamic verifiedOnDateTime; dynamic verifiedOnDateTime;
LabResult( LabResult(
@ -96,9 +96,9 @@ class LabResult {
int checkResultStatus() { int checkResultStatus() {
try { try {
var max = double.tryParse(maxValue) ?? null; var max = double.tryParse(maxValue!) ?? null;
var min = double.tryParse(minValue) ?? null; var min = double.tryParse(minValue!) ?? null;
var result = double.tryParse(resultValue) ?? null; var result = double.tryParse(resultValue!) ?? null;
if (max != null && min != null && result != null) { if (max != null && min != null && result != null) {
if (result > max) { if (result > max) {
return 1; return 1;
@ -110,18 +110,17 @@ class LabResult {
} else { } else {
return 0; return 0;
} }
}catch (e){ } catch (e) {
return 0; return 0;
} }
} }
} }
class LabResultList { class LabResultList {
String filterName = ""; String filterName = "";
List<LabResult> patientLabResultList = List(); List<LabResult> patientLabResultList = [];
LabResultList({this.filterName, LabResult lab}) { LabResultList({required this.filterName, required LabResult lab}) {
patientLabResultList.add(lab); patientLabResultList.add(lab);
} }
} }

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

@ -1,9 +1,9 @@
class PatientLabSpecialResult { class PatientLabSpecialResult {
String invoiceNo; String ?invoiceNo;
String moduleID; String ?moduleID;
String resultData; String ? resultData;
String resultDataHTML; String ? resultDataHTML;
Null resultDataTxt; dynamic resultDataTxt;
PatientLabSpecialResult( PatientLabSpecialResult(
{this.invoiceNo, {this.invoiceNo,

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

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

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

@ -1,9 +1,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class AlternativeService { class AlternativeService {
int serviceID; int? serviceID;
String serviceName; String? serviceName;
bool isSelected; bool? isSelected;
AlternativeService( AlternativeService(
{this.serviceID, this.serviceName, this.isSelected = false}); {this.serviceID, this.serviceName, this.isSelected = false});
@ -23,7 +23,7 @@ class AlternativeService {
} }
class AlternativeServicesList with ChangeNotifier { class AlternativeServicesList with ChangeNotifier {
List<AlternativeService> _alternativeServicesList; late List<AlternativeService> _alternativeServicesList;
getServicesList(){ getServicesList(){
return _alternativeServicesList; return _alternativeServicesList;

@ -1,7 +1,7 @@
class PendingPatientERForDoctorAppRequestModel { class PendingPatientERForDoctorAppRequestModel {
bool outSA; bool ? outSA;
int doctorID; int ? doctorID;
String sErServiceID; String ? sErServiceID;
PendingPatientERForDoctorAppRequestModel( PendingPatientERForDoctorAppRequestModel(
{this.outSA, this.doctorID, this.sErServiceID}); {this.outSA, this.doctorID, this.sErServiceID});

@ -1,9 +1,9 @@
class AddPatientToDoctorListRequestModel { class AddPatientToDoctorListRequestModel {
int vCID; int? vCID;
String tokenID; String? tokenID;
String generalid; String? generalid;
int doctorId; int? doctorId;
bool isOutKsa; bool? isOutKsa;
AddPatientToDoctorListRequestModel({this.vCID, this.tokenID, this.generalid, this.doctorId, this.isOutKsa}); AddPatientToDoctorListRequestModel({this.vCID, this.tokenID, this.generalid, this.doctorId, this.isOutKsa});

@ -1,9 +1,9 @@
class LiveCareUserLoginRequestModel { class LiveCareUserLoginRequestModel {
String tokenID; String? tokenID;
String generalid; String? generalid;
int doctorId; int? doctorId;
int isOutKsa; int? isOutKsa;
int isLogin; int? isLogin;
LiveCareUserLoginRequestModel({this.tokenID, this.generalid, this.doctorId, this.isOutKsa, this.isLogin}); LiveCareUserLoginRequestModel({this.tokenID, this.generalid, this.doctorId, this.isOutKsa, this.isLogin});

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

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

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

@ -1,14 +1,18 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
class GetNursingProgressNoteRequestModel { class GetNursingProgressNoteRequestModel {
int patientID; int? patientID;
int admissionNo; int? admissionNo;
int patientTypeID; int? patientTypeID;
int patientType; int? patientType;
String setupID; String? setupID;
GetNursingProgressNoteRequestModel( GetNursingProgressNoteRequestModel(
{this.patientID, this.admissionNo, this.patientTypeID = 1, this.patientType = 1, this.setupID }); {this.patientID,
this.admissionNo,
this.patientTypeID = 1,
this.patientType = 1,
this.setupID});
GetNursingProgressNoteRequestModel.fromJson(Map<String, dynamic> json) { GetNursingProgressNoteRequestModel.fromJson(Map<String, dynamic> json) {
patientID = json['PatientID']; patientID = json['PatientID'];

@ -1,14 +1,14 @@
class GetNursingProgressNoteResposeModel { class GetNursingProgressNoteResposeModel {
String notes; String? notes;
dynamic conditionType; dynamic conditionType;
int createdBy; int? createdBy;
String createdOn; String? createdOn;
dynamic editedBy; dynamic editedBy;
dynamic editedOn; dynamic editedOn;
String createdByName; String? createdByName;
String editedByName; String? editedByName;
GetNursingProgressNoteResposeModel( GetNursingProgressNoteResposeModel(
{this.notes, {this.notes,

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

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

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

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

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

@ -1,31 +1,31 @@
class ProcedureTempleteRequestModel { class ProcedureTempleteRequestModel {
int doctorID; int? doctorID;
String firstName; String? firstName;
String middleName; String? middleName;
String lastName; String? lastName;
String patientMobileNumber; String? patientMobileNumber;
String patientIdentificationID; String? patientIdentificationID;
int patientID; int? patientID;
String from; String? from;
String to; String? to;
int searchType; int? searchType;
String mobileNo; String? mobileNo;
String identificationNo; String? identificationNo;
int editedBy; int? editedBy;
int projectID; int? projectID;
int clinicID; int? clinicID;
String tokenID; String? tokenID;
int languageID; int? languageID;
String stamp; String? stamp;
String iPAdress; String? iPAdress;
double versionID; double? versionID;
int channel; int? channel;
String sessionID; String? sessionID;
bool isLoginForDoctorApp; bool? isLoginForDoctorApp;
bool patientOutSA; bool? patientOutSA;
String vidaAuthTokenID; String? vidaAuthTokenID;
String vidaRefreshTokenID; String? vidaRefreshTokenID;
int deviceTypeID; int? deviceTypeID;
ProcedureTempleteRequestModel( ProcedureTempleteRequestModel(
{this.doctorID, {this.doctorID,

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

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

@ -1,9 +1,10 @@
class GetOrderedProcedureRequestModel { class GetOrderedProcedureRequestModel {
String vidaAuthTokenID; String? vidaAuthTokenID;
int patientMRN; int? patientMRN;
int appointmentNo; int? appointmentNo;
GetOrderedProcedureRequestModel({this.vidaAuthTokenID, this.patientMRN, this.appointmentNo}); GetOrderedProcedureRequestModel(
{this.vidaAuthTokenID, this.patientMRN, this.appointmentNo});
GetOrderedProcedureRequestModel.fromJson(Map<String, dynamic> json) { GetOrderedProcedureRequestModel.fromJson(Map<String, dynamic> json) {
vidaAuthTokenID = json['VidaAuthTokenID']; vidaAuthTokenID = json['VidaAuthTokenID'];

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

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

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

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

@ -1,13 +1,13 @@
class ProcedureTempleteModel { class ProcedureTempleteModel {
String setupID; String? setupID;
int projectID; int? projectID;
int clinicID; int? clinicID;
int doctorID; int? doctorID;
int templateID; int? templateID;
String templateName; String? templateName;
bool isActive; bool? isActive;
int createdBy; int? createdBy;
String createdOn; String? createdOn;
dynamic editedBy; dynamic editedBy;
dynamic editedOn; dynamic editedOn;

@ -1,29 +1,29 @@
class ProcedureTempleteDetailsModel { class ProcedureTempleteDetailsModel {
String setupID; String? setupID;
int projectID; int? projectID;
int clinicID; int? clinicID;
int doctorID; int? doctorID;
int templateID; int? templateID;
String templateName; String? templateName;
String procedureID; String? procedureID;
bool isActive; bool ?isActive;
int createdBy; int? createdBy;
String createdOn; String? createdOn;
dynamic editedBy; dynamic editedBy;
dynamic editedOn; dynamic editedOn;
String procedureName; String? procedureName;
String procedureNameN; String? procedureNameN;
String alias; String? alias;
String aliasN; String? aliasN;
String categoryID; String? categoryID;
String subGroupID; String? subGroupID;
String categoryDescription; String? categoryDescription;
String categoryDescriptionN; String? categoryDescriptionN;
String categoryAlias; String? categoryAlias;
dynamic riskCategoryID; dynamic riskCategoryID;
String type = "1"; String? type = "1";
String remarks; String? remarks;
int selectedType = 0; int? selectedType = 0;
ProcedureTempleteDetailsModel( ProcedureTempleteDetailsModel(
{this.setupID, {this.setupID,
@ -52,7 +52,7 @@ class ProcedureTempleteDetailsModel {
this.type = "1", this.type = "1",
this.selectedType = 0}); this.selectedType = 0});
ProcedureTempleteDetailsModel.fromJson(Map<String, dynamic> json) { ProcedureTempleteDetailsModel.fromJson(Map<String?, dynamic> json) {
setupID = json['SetupID']; setupID = json['SetupID'];
projectID = json['ProjectID']; projectID = json['ProjectID'];
clinicID = json['ClinicID']; clinicID = json['ClinicID'];
@ -77,8 +77,8 @@ class ProcedureTempleteDetailsModel {
categoryAlias = json['CategoryAlias']; categoryAlias = json['CategoryAlias'];
} }
Map<String, dynamic> toJson() { Map<String?, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['SetupID'] = this.setupID; data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID; data['ProjectID'] = this.projectID;
data['ClinicID'] = this.clinicID; data['ClinicID'] = this.clinicID;
@ -105,12 +105,12 @@ class ProcedureTempleteDetailsModel {
} }
} }
class ProcedureTempleteDetailsModelList { class ProcedureTempleteDetailsModelList {
List<ProcedureTempleteDetailsModel> procedureTemplate = List(); List<ProcedureTempleteDetailsModel> procedureTemplate =[];
String templateName; String? templateName;
int templateId; int? templateId;
ProcedureTempleteDetailsModelList( ProcedureTempleteDetailsModelList(
{this.templateName, this.templateId, ProcedureTempleteDetailsModel template}) { {this.templateName, this.templateId, required ProcedureTempleteDetailsModel template}) {
procedureTemplate.add(template); procedureTemplate.add(template);
} }
} }

@ -1,32 +1,32 @@
class ProcedureTempleteDetailsRequestModel { class ProcedureTempleteDetailsRequestModel {
int doctorID; int? doctorID;
String firstName; String? firstName;
int templateID; int? templateID;
String middleName; String? middleName;
String lastName; String? lastName;
String patientMobileNumber; String? patientMobileNumber;
String patientIdentificationID; String? patientIdentificationID;
int patientID; int? patientID;
String from; String? from;
String to; String? to;
int searchType; int? searchType;
String mobileNo; String? mobileNo;
String identificationNo; String? identificationNo;
int editedBy; int? editedBy;
int projectID; int? projectID;
int clinicID; int? clinicID;
String tokenID; String? tokenID;
int languageID; int? languageID;
String stamp; String? stamp;
String iPAdress; String? iPAdress;
double versionID; double? versionID;
int channel; int? channel;
String sessionID; String? sessionID;
bool isLoginForDoctorApp; bool? isLoginForDoctorApp;
bool patientOutSA; bool? patientOutSA;
String vidaAuthTokenID; String? vidaAuthTokenID;
String vidaRefreshTokenID; String? vidaRefreshTokenID;
int deviceTypeID; int? deviceTypeID;
ProcedureTempleteDetailsRequestModel( ProcedureTempleteDetailsRequestModel(
{this.doctorID, {this.doctorID,

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

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

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

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

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

@ -1,30 +1,30 @@
class RequestSendRadReportEmail { class RequestSendRadReportEmail {
int channel; int? channel;
String clinicName; String? clinicName;
String dateofBirth; String? dateofBirth;
int deviceTypeID; int? deviceTypeID;
String doctorName; String? doctorName;
String generalid; String? generalid;
int invoiceNo; int? invoiceNo;
String iPAdress; String? iPAdress;
bool isDentalAllowedBackend; bool ?isDentalAllowedBackend;
int languageID; int? languageID;
String orderDate; String? orderDate;
int patientID; int? patientID;
String patientIditificationNum; String? patientIditificationNum;
String patientMobileNumber; String? patientMobileNumber;
String patientName; String? patientName;
int patientOutSA; int? patientOutSA;
int patientType; int? patientType;
int patientTypeID; int? patientTypeID;
int projectID; int? projectID;
String projectName; String? projectName;
String radResult; String? radResult;
String sessionID; String? sessionID;
String setupID; String? setupID;
String to; String? to;
String tokenID; String? tokenID;
double versionID; double? versionID;
RequestSendRadReportEmail( RequestSendRadReportEmail(
{this.channel, {this.channel,
@ -54,7 +54,7 @@ class RequestSendRadReportEmail {
this.tokenID, this.tokenID,
this.versionID}); this.versionID});
RequestSendRadReportEmail.fromJson(Map<String, dynamic> json) { RequestSendRadReportEmail.fromJson(Map<String?, dynamic> json) {
channel = json['Channel']; channel = json['Channel'];
clinicName = json['ClinicName']; clinicName = json['ClinicName'];
dateofBirth = json['DateofBirth']; dateofBirth = json['DateofBirth'];
@ -83,8 +83,8 @@ class RequestSendRadReportEmail {
versionID = json['VersionID']; versionID = json['VersionID'];
} }
Map<String, dynamic> toJson() { Map<String?, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['Channel'] = this.channel; data['Channel'] = this.channel;
data['ClinicName'] = this.clinicName; data['ClinicName'] = this.clinicName;
data['DateofBirth'] = this.dateofBirth; data['DateofBirth'] = this.dateofBirth;

@ -2,56 +2,56 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
class DischargeReferralPatient { class DischargeReferralPatient {
dynamic rowID; dynamic rowID;
int projectID; int? projectID;
int lineItemNo; int? lineItemNo;
int doctorID; int? doctorID;
int patientID; int? patientID;
String doctorName; String? doctorName;
dynamic doctorNameN; dynamic doctorNameN;
String firstName; String? firstName;
String middleName; String? middleName;
String lastName; String? lastName;
dynamic firstNameN; dynamic firstNameN;
dynamic middleNameN; dynamic middleNameN;
dynamic lastNameN; dynamic lastNameN;
int gender; int? gender;
String dateofBirth; String? dateofBirth;
String mobileNumber; String? mobileNumber;
String emailAddress; String? emailAddress;
String patientIdentificationNo; String? patientIdentificationNo;
int patientType; int? patientType;
String admissionNo; String? admissionNo;
String admissionDate; String? admissionDate;
String roomID; String? roomID;
String bedID; String? bedID;
dynamic nursingStationID; dynamic nursingStationID;
dynamic description; dynamic description;
String nationalityName; String? nationalityName;
dynamic nationalityNameN; dynamic nationalityNameN;
int referralDoctor; int? referralDoctor;
int referringDoctor; int? referringDoctor;
int referralClinic; int? referralClinic;
int referringClinic; int? referringClinic;
int referralStatus; int? referralStatus;
DateTime referralDate; DateTime ?referralDate;
String referringDoctorRemarks; String? referringDoctorRemarks;
String referredDoctorRemarks; String? referredDoctorRemarks;
String referralResponseOn; String? referralResponseOn;
int priority; int? priority;
int frequency; int? frequency;
String mAXResponseTime; String? mAXResponseTime;
String dischargeDate; String? dischargeDate;
dynamic clinicID; dynamic clinicID;
String age; String? age;
String clinicDescription; String? clinicDescription;
String frequencyDescription; String? frequencyDescription;
String genderDescription; String? genderDescription;
bool isDoctorLate; bool?isDoctorLate;
bool isDoctorResponse; bool? isDoctorResponse;
String nursingStationName; String? nursingStationName;
String priorityDescription; String? priorityDescription;
String referringClinicDescription; String? referringClinicDescription;
String referringDoctorName; String? referringDoctorName;
DischargeReferralPatient( DischargeReferralPatient(
{this.rowID, {this.rowID,
@ -106,7 +106,7 @@ class DischargeReferralPatient {
this.referringClinicDescription, this.referringClinicDescription,
this.referringDoctorName}); this.referringDoctorName});
DischargeReferralPatient.fromJson(Map<String, dynamic> json) { DischargeReferralPatient.fromJson(Map<String?, dynamic> json) {
rowID = json['RowID']; rowID = json['RowID'];
projectID = json['ProjectID']; projectID = json['ProjectID'];
lineItemNo = json['LineItemNo']; lineItemNo = json['LineItemNo'];
@ -160,8 +160,8 @@ class DischargeReferralPatient {
referringDoctorName = json['ReferringDoctorName']; referringDoctorName = json['ReferringDoctorName'];
} }
Map<String, dynamic> toJson() { Map<String?, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['RowID'] = this.rowID; data['RowID'] = this.rowID;
data['ProjectID'] = this.projectID; data['ProjectID'] = this.projectID;
data['LineItemNo'] = this.lineItemNo; data['LineItemNo'] = this.lineItemNo;

@ -2,75 +2,75 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
class MyReferralPatientModel { class MyReferralPatientModel {
dynamic rowID; dynamic rowID;
int projectID; int? projectID;
int lineItemNo; int? lineItemNo;
int doctorID; int? doctorID;
int patientID; int? patientID;
String doctorName; String? doctorName;
dynamic doctorNameN; dynamic doctorNameN;
String firstName; String? firstName;
String middleName; String? middleName;
String lastName; String? lastName;
dynamic firstNameN; dynamic firstNameN;
dynamic middleNameN; dynamic middleNameN;
dynamic lastNameN; dynamic lastNameN;
int gender; int? gender;
String dateofBirth; String? dateofBirth;
String mobileNumber; String? mobileNumber;
String emailAddress; String? emailAddress;
String patientIdentificationNo; String? patientIdentificationNo;
int patientType; int? patientType;
String admissionNo; String? admissionNo;
String admissionDate; String? admissionDate;
String roomID; String? roomID;
String bedID; String? bedID;
dynamic nursingStationID; dynamic nursingStationID;
dynamic description; dynamic description;
String nationalityName; String? nationalityName;
dynamic nationalityNameN; dynamic nationalityNameN;
String clinicDescription; String? clinicDescription;
String clinicDescriptionN; String? clinicDescriptionN;
int referralDoctor; int? referralDoctor;
int referringDoctor; int? referringDoctor;
int referralClinic; int? referralClinic;
int referringClinic; int? referringClinic;
int referralStatus; int? referralStatus;
DateTime referralDate; DateTime? referralDate;
String referringDoctorRemarks; String? referringDoctorRemarks;
String referredDoctorRemarks; String? referredDoctorRemarks;
String referralResponseOn; String? referralResponseOn;
int priority; int? priority;
int frequency; int? frequency;
String mAXResponseTime; String? mAXResponseTime;
int episodeID; int? episodeID;
int appointmentNo; int? appointmentNo;
String appointmentDate; String? appointmentDate;
int appointmentType; int? appointmentType;
int patientMRN; int? patientMRN;
String createdOn; String? createdOn;
int clinicID; int? clinicID;
String nationalityID; String? nationalityID;
String age; String? age;
String doctorImageURL; String? doctorImageURL;
String frequencyDescription; String? frequencyDescription;
String genderDescription; String? genderDescription;
bool isDoctorLate; bool? isDoctorLate;
bool isDoctorResponse; bool? isDoctorResponse;
String nationalityFlagURL; String? nationalityFlagURL;
String nursingStationName; String? nursingStationName;
String priorityDescription; String? priorityDescription;
String referringClinicDescription; String? referringClinicDescription;
String referringDoctorName; String? referringDoctorName;
int referalStatus; int? referalStatus;
String sourceSetupID; String? sourceSetupID;
int sourceProjectId; int? sourceProjectId;
String targetSetupID; String? targetSetupID;
int targetProjectId; int? targetProjectId;
int targetClinicID; int? targetClinicID;
int targetDoctorID; int? targetDoctorID;
int sourceAppointmentNo; int? sourceAppointmentNo;
int targetAppointmentNo; int? targetAppointmentNo;
String remarksFromSource; String? remarksFromSource;
MyReferralPatientModel( MyReferralPatientModel(
{this.rowID, {this.rowID,
@ -133,9 +133,18 @@ class MyReferralPatientModel {
this.priorityDescription, this.priorityDescription,
this.referringClinicDescription, this.referringClinicDescription,
this.referringDoctorName, this.referringDoctorName,
this.referalStatus, this.sourceSetupID, this.sourceAppointmentNo, this.sourceProjectId, this.targetProjectId, this.targetAppointmentNo, this.targetClinicID, this.targetSetupID, this.targetDoctorID, this.remarksFromSource}); this.referalStatus,
this.sourceSetupID,
this.sourceAppointmentNo,
this.sourceProjectId,
this.targetProjectId,
this.targetAppointmentNo,
this.targetClinicID,
this.targetSetupID,
this.targetDoctorID,
this.remarksFromSource});
MyReferralPatientModel.fromJson(Map<String, dynamic> json) { MyReferralPatientModel.fromJson(Map<String?, dynamic> json) {
rowID = json['RowID']; rowID = json['RowID'];
referalStatus = json['ReferalStatus']; referalStatus = json['ReferalStatus'];
projectID = json['ProjectID']; projectID = json['ProjectID'];
@ -219,11 +228,10 @@ class MyReferralPatientModel {
sourceAppointmentNo = json['SourceAppointmentNo']; sourceAppointmentNo = json['SourceAppointmentNo'];
targetAppointmentNo = json['TargetAppointmentNo']; targetAppointmentNo = json['TargetAppointmentNo'];
remarksFromSource = json['RemarksFromSource']; remarksFromSource = json['RemarksFromSource'];
} }
Map<String, dynamic> toJson() { Map<String?, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['RowID'] = this.rowID; data['RowID'] = this.rowID;
data['ReferalStatus'] = this.referalStatus; data['ReferalStatus'] = this.referalStatus;
data['ProjectID'] = this.projectID; data['ProjectID'] = this.projectID;
@ -298,6 +306,6 @@ class MyReferralPatientModel {
} }
get patientName { get patientName {
return this.firstName + " " + this.lastName; return this.firstName! + " " + this.lastName!;
} }
} }

@ -1,27 +1,27 @@
class MyReferralPatientRequestModel { class MyReferralPatientRequestModel {
int channel; int? channel;
int clinicID; int? clinicID;
int doctorID; int? doctorID;
int editedBy; int? editedBy;
String firstName; String? firstName;
String from; String? from;
String iPAdress; String? iPAdress;
bool isLoginForDoctorApp; bool? isLoginForDoctorApp;
int languageID; int? languageID;
String lastName; String? lastName;
String middleName; String? middleName;
int patientID; int? patientID;
String patientIdentificationID; String? patientIdentificationID;
String patientMobileNumber; String? patientMobileNumber;
bool patientOutSA; bool? patientOutSA;
int patientTypeID; int? patientTypeID;
int projectID; int? projectID;
String sessionID; String? sessionID;
String stamp; String? stamp;
String to; String? to;
String tokenID; String? tokenID;
double versionID; double? versionID;
String vidaAuthTokenID; String? vidaAuthTokenID;
MyReferralPatientRequestModel( MyReferralPatientRequestModel(
{this.channel, {this.channel,

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

@ -1,19 +1,19 @@
class AddReferredRemarksRequestModel { class AddReferredRemarksRequestModel {
int projectID; int? projectID;
int admissionNo; int? admissionNo;
int lineItemNo; int? lineItemNo;
String referredDoctorRemarks; String? referredDoctorRemarks;
int editedBy; int? editedBy;
int referalStatus; int? referalStatus;
bool isLoginForDoctorApp; bool? isLoginForDoctorApp;
String iPAdress; String? iPAdress;
bool patientOutSA; bool? patientOutSA;
String tokenID; String? tokenID;
int languageID; int? languageID;
double versionID; double? versionID;
int channel; int? channel;
String sessionID; String? sessionID;
int deviceTypeID; int? deviceTypeID;
AddReferredRemarksRequestModel( AddReferredRemarksRequestModel(
{this.projectID, {this.projectID,

@ -1,13 +1,13 @@
class GetMedicationResponseModel { class GetMedicationResponseModel {
String description; String? description;
String genericName; String? genericName;
int itemId; int ?itemId;
String keywords; String? keywords;
dynamic price; dynamic price;
dynamic quantity; dynamic quantity;
dynamic mediSpanGPICode; dynamic mediSpanGPICode;
bool isNarcotic; bool ?isNarcotic;
String uom; String? uom;
GetMedicationResponseModel( GetMedicationResponseModel(
{this.description, {this.description,
this.genericName, this.genericName,
@ -19,7 +19,7 @@ class GetMedicationResponseModel {
this.uom, this.uom,
this.mediSpanGPICode}); this.mediSpanGPICode});
GetMedicationResponseModel.fromJson(Map<String, dynamic> json) { GetMedicationResponseModel.fromJson(Map<String?, dynamic> json) {
description = json['Description']; description = json['Description'];
genericName = json['GenericName']; genericName = json['GenericName'];
itemId = json['ItemId']; itemId = json['ItemId'];
@ -31,8 +31,8 @@ class GetMedicationResponseModel {
uom = json['uom']; uom = json['uom'];
} }
Map<String, dynamic> toJson() { Map<String?, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['Description'] = this.description; data['Description'] = this.description;
data['GenericName'] = this.genericName; data['GenericName'] = this.genericName;
data['ItemId'] = this.itemId; data['ItemId'] = this.itemId;

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

Loading…
Cancel
Save