diff --git a/android/build.gradle b/android/build.gradle
index bf0f679d..ae74fcf6 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
}
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 'com.google.gms:google-services:4.3.3'
}
@@ -17,7 +17,8 @@ allprojects {
google()
jcenter()
mavenCentral()
- maven { url 'https://tokbox.bintray.com/maven' }
+ maven { url 'https://developer.huawei.com/repo/' }
+// maven { url 'https://tokbox.bintray.com/maven' }
}
}
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 296b146b..ed1a787b 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
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
diff --git a/assets/images/Doctor_app_logo.png b/assets/images/Doctor_app_logo.png
deleted file mode 100644
index 2de2d460..00000000
Binary files a/assets/images/Doctor_app_logo.png and /dev/null differ
diff --git a/assets/images/DrAppEmblemAnimation_v2.gif b/assets/images/DrAppEmblemAnimation_v2.gif
deleted file mode 100644
index fd2248b5..00000000
Binary files a/assets/images/DrAppEmblemAnimation_v2.gif and /dev/null differ
diff --git a/assets/images/arrow_dropdown_icon.png b/assets/images/arrow_dropdown_icon.png
deleted file mode 100644
index 98a94f64..00000000
Binary files a/assets/images/arrow_dropdown_icon.png and /dev/null differ
diff --git a/assets/images/booked.png b/assets/images/booked.png
deleted file mode 100644
index e07b7d35..00000000
Binary files a/assets/images/booked.png and /dev/null differ
diff --git a/assets/images/close_icon.png b/assets/images/close_icon.png
deleted file mode 100644
index 84df5ff3..00000000
Binary files a/assets/images/close_icon.png and /dev/null differ
diff --git a/assets/images/create-episod.png b/assets/images/create-episod.png
deleted file mode 100644
index 02386fd1..00000000
Binary files a/assets/images/create-episod.png and /dev/null differ
diff --git a/assets/images/dashboard/3.png b/assets/images/dashboard/3.png
deleted file mode 100644
index 38585ec8..00000000
Binary files a/assets/images/dashboard/3.png and /dev/null differ
diff --git a/assets/images/dashboard/5.png b/assets/images/dashboard/5.png
deleted file mode 100644
index 2a64c27a..00000000
Binary files a/assets/images/dashboard/5.png and /dev/null differ
diff --git a/assets/images/femaleIcon.svg b/assets/images/femaleIcon.svg
deleted file mode 100644
index c08fc259..00000000
--- a/assets/images/femaleIcon.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
diff --git a/assets/images/filter-512.png b/assets/images/filter-512.png
deleted file mode 100644
index ce2f89b8..00000000
Binary files a/assets/images/filter-512.png and /dev/null differ
diff --git a/assets/images/heartbeat.png b/assets/images/heartbeat.png
deleted file mode 100644
index 3a83ddee..00000000
Binary files a/assets/images/heartbeat.png and /dev/null differ
diff --git a/assets/images/lab.png b/assets/images/lab.png
deleted file mode 100644
index 3f2f72c9..00000000
Binary files a/assets/images/lab.png and /dev/null differ
diff --git a/assets/images/leaves.svg b/assets/images/leaves.svg
deleted file mode 100644
index 474585fd..00000000
--- a/assets/images/leaves.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/assets/images/livecare.png b/assets/images/livecare.png
deleted file mode 100644
index b1fd3f06..00000000
Binary files a/assets/images/livecare.png and /dev/null differ
diff --git a/assets/images/login/101.png b/assets/images/login/101.png
deleted file mode 100644
index 90c1c575..00000000
Binary files a/assets/images/login/101.png and /dev/null differ
diff --git a/assets/images/login/102.png b/assets/images/login/102.png
deleted file mode 100644
index 8502d197..00000000
Binary files a/assets/images/login/102.png and /dev/null differ
diff --git a/assets/images/login/103.png b/assets/images/login/103.png
deleted file mode 100644
index 3326814b..00000000
Binary files a/assets/images/login/103.png and /dev/null differ
diff --git a/assets/images/login/104.png b/assets/images/login/104.png
deleted file mode 100644
index ad55ff74..00000000
Binary files a/assets/images/login/104.png and /dev/null differ
diff --git a/assets/images/login/fileNum.png b/assets/images/login/fileNum.png
deleted file mode 100644
index 386299b7..00000000
Binary files a/assets/images/login/fileNum.png and /dev/null differ
diff --git a/assets/images/login/forget.png b/assets/images/login/forget.png
deleted file mode 100644
index 57aa7ccc..00000000
Binary files a/assets/images/login/forget.png and /dev/null differ
diff --git a/assets/images/login/id.png b/assets/images/login/id.png
deleted file mode 100644
index 9260cf11..00000000
Binary files a/assets/images/login/id.png and /dev/null differ
diff --git a/assets/images/login/nationalID.png b/assets/images/login/nationalID.png
deleted file mode 100644
index 5779d562..00000000
Binary files a/assets/images/login/nationalID.png and /dev/null differ
diff --git a/assets/images/login_btn_arrow_icon.png b/assets/images/login_btn_arrow_icon.png
deleted file mode 100644
index 4fc877e2..00000000
Binary files a/assets/images/login_btn_arrow_icon.png and /dev/null differ
diff --git a/assets/images/login_icon.png b/assets/images/login_icon.png
deleted file mode 100644
index bc158303..00000000
Binary files a/assets/images/login_icon.png and /dev/null differ
diff --git a/assets/images/menu.png b/assets/images/menu.png
deleted file mode 100644
index e62a00e6..00000000
Binary files a/assets/images/menu.png and /dev/null differ
diff --git a/assets/images/modilfy-episode.png b/assets/images/modilfy-episode.png
deleted file mode 100644
index 6fdd224f..00000000
Binary files a/assets/images/modilfy-episode.png and /dev/null differ
diff --git a/assets/images/no-data.png b/assets/images/no-data.png
deleted file mode 100644
index 4fd47e0f..00000000
Binary files a/assets/images/no-data.png and /dev/null differ
diff --git a/assets/images/note.png b/assets/images/note.png
deleted file mode 100644
index 86d42f9b..00000000
Binary files a/assets/images/note.png and /dev/null differ
diff --git a/assets/images/password_icon.png b/assets/images/password_icon.png
deleted file mode 100644
index 94c82cb3..00000000
Binary files a/assets/images/password_icon.png and /dev/null differ
diff --git a/assets/images/patient/Order_Procedures.png b/assets/images/patient/Order_Procedures.png
deleted file mode 100644
index a3cd8ae0..00000000
Binary files a/assets/images/patient/Order_Procedures.png and /dev/null differ
diff --git a/assets/images/patient/Progress_notes.png b/assets/images/patient/Progress_notes.png
deleted file mode 100644
index f5aba841..00000000
Binary files a/assets/images/patient/Progress_notes.png and /dev/null differ
diff --git a/assets/images/patient/arrow_forward.png b/assets/images/patient/arrow_forward.png
deleted file mode 100644
index df393784..00000000
Binary files a/assets/images/patient/arrow_forward.png and /dev/null differ
diff --git a/assets/images/patient/health_summary.png b/assets/images/patient/health_summary.png
deleted file mode 100644
index fe374ebc..00000000
Binary files a/assets/images/patient/health_summary.png and /dev/null differ
diff --git a/assets/images/patient/lab_results.png b/assets/images/patient/lab_results.png
deleted file mode 100644
index 20e6b5ff..00000000
Binary files a/assets/images/patient/lab_results.png and /dev/null differ
diff --git a/assets/images/patient/order_prescription.png b/assets/images/patient/order_prescription.png
deleted file mode 100644
index 26e7e9c4..00000000
Binary files a/assets/images/patient/order_prescription.png and /dev/null differ
diff --git a/assets/images/patient/patient_sick_leave.png b/assets/images/patient/patient_sick_leave.png
deleted file mode 100644
index 56196834..00000000
Binary files a/assets/images/patient/patient_sick_leave.png and /dev/null differ
diff --git a/assets/images/patient/vital_signs.png b/assets/images/patient/vital_signs.png
deleted file mode 100644
index 76017194..00000000
Binary files a/assets/images/patient/vital_signs.png and /dev/null differ
diff --git a/assets/images/profile.svg b/assets/images/profile.svg
deleted file mode 100644
index 02b2dc19..00000000
--- a/assets/images/profile.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
diff --git a/assets/images/radiology-1.png b/assets/images/radiology-1.png
deleted file mode 100644
index ceb0775e..00000000
Binary files a/assets/images/radiology-1.png and /dev/null differ
diff --git a/assets/images/sick_leaves_icons.png b/assets/images/sick_leaves_icons.png
deleted file mode 100644
index 67a9c937..00000000
Binary files a/assets/images/sick_leaves_icons.png and /dev/null differ
diff --git a/assets/images/svgs/bottom_nav/Dr reply.svg b/assets/images/svgs/bottom_nav/Dr reply.svg
deleted file mode 100644
index 931b5304..00000000
--- a/assets/images/svgs/bottom_nav/Dr reply.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/assets/images/svgs/bottom_nav/home.svg b/assets/images/svgs/bottom_nav/home.svg
deleted file mode 100644
index 725dd1f9..00000000
--- a/assets/images/svgs/bottom_nav/home.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/svgs/bottom_nav/qr reader.svg b/assets/images/svgs/bottom_nav/qr reader.svg
deleted file mode 100644
index 403e3137..00000000
--- a/assets/images/svgs/bottom_nav/qr reader.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/assets/images/svgs/bottom_nav/schedule.svg b/assets/images/svgs/bottom_nav/schedule.svg
deleted file mode 100644
index 98232af9..00000000
--- a/assets/images/svgs/bottom_nav/schedule.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/assets/images/type-booked.png b/assets/images/type-booked.png
deleted file mode 100644
index c42945cf..00000000
Binary files a/assets/images/type-booked.png and /dev/null differ
diff --git a/assets/images/type-livecare.png b/assets/images/type-livecare.png
deleted file mode 100644
index 05f3d213..00000000
Binary files a/assets/images/type-livecare.png and /dev/null differ
diff --git a/assets/images/type-walkin.png b/assets/images/type-walkin.png
deleted file mode 100644
index 555023b3..00000000
Binary files a/assets/images/type-walkin.png and /dev/null differ
diff --git a/assets/images/user_female.svg b/assets/images/user_female.svg
deleted file mode 100644
index 4c9d8cd2..00000000
--- a/assets/images/user_female.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/assets/images/user_id_icon.png b/assets/images/user_id_icon.png
deleted file mode 100644
index 283beb2f..00000000
Binary files a/assets/images/user_id_icon.png and /dev/null differ
diff --git a/assets/images/user_male.svg b/assets/images/user_male.svg
deleted file mode 100644
index bdf4987f..00000000
--- a/assets/images/user_male.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
diff --git a/assets/images/verification_faceid_icon.png b/assets/images/verification_faceid_icon.png
deleted file mode 100644
index 408930e2..00000000
Binary files a/assets/images/verification_faceid_icon.png and /dev/null differ
diff --git a/assets/images/verification_fingerprint_icon.png b/assets/images/verification_fingerprint_icon.png
deleted file mode 100644
index 32174f4c..00000000
Binary files a/assets/images/verification_fingerprint_icon.png and /dev/null differ
diff --git a/assets/images/verification_sms_icon.png b/assets/images/verification_sms_icon.png
deleted file mode 100644
index 96b4810b..00000000
Binary files a/assets/images/verification_sms_icon.png and /dev/null differ
diff --git a/assets/images/verification_whatsapp_icon.png b/assets/images/verification_whatsapp_icon.png
deleted file mode 100644
index 5f6034e5..00000000
Binary files a/assets/images/verification_whatsapp_icon.png and /dev/null differ
diff --git a/assets/images/verified_icon.png b/assets/images/verified_icon.png
deleted file mode 100644
index 28b5ab3d..00000000
Binary files a/assets/images/verified_icon.png and /dev/null differ
diff --git a/assets/images/verify-face.png b/assets/images/verify-face.png
deleted file mode 100644
index 58e1f4a6..00000000
Binary files a/assets/images/verify-face.png and /dev/null differ
diff --git a/assets/images/verify-finger.png b/assets/images/verify-finger.png
deleted file mode 100644
index 15d60b03..00000000
Binary files a/assets/images/verify-finger.png and /dev/null differ
diff --git a/assets/images/verify-sms.png b/assets/images/verify-sms.png
deleted file mode 100644
index e265e1f9..00000000
Binary files a/assets/images/verify-sms.png and /dev/null differ
diff --git a/assets/images/verify-whtsapp.png b/assets/images/verify-whtsapp.png
deleted file mode 100644
index 9a79516c..00000000
Binary files a/assets/images/verify-whtsapp.png and /dev/null differ
diff --git a/assets/images/vital_blood-pressure.png b/assets/images/vital_blood-pressure.png
deleted file mode 100644
index 44c9f2e2..00000000
Binary files a/assets/images/vital_blood-pressure.png and /dev/null differ
diff --git a/assets/images/vital_blood_type.png b/assets/images/vital_blood_type.png
deleted file mode 100644
index fbb5296f..00000000
Binary files a/assets/images/vital_blood_type.png and /dev/null differ
diff --git a/assets/images/vital_body_mass.png b/assets/images/vital_body_mass.png
deleted file mode 100644
index 08476c51..00000000
Binary files a/assets/images/vital_body_mass.png and /dev/null differ
diff --git a/assets/images/vital_heart_rate.png b/assets/images/vital_heart_rate.png
deleted file mode 100644
index e788658b..00000000
Binary files a/assets/images/vital_heart_rate.png and /dev/null differ
diff --git a/assets/images/vital_height.png b/assets/images/vital_height.png
deleted file mode 100644
index 8c324b2c..00000000
Binary files a/assets/images/vital_height.png and /dev/null differ
diff --git a/assets/images/vital_respiration.png b/assets/images/vital_respiration.png
deleted file mode 100644
index 7e1b4466..00000000
Binary files a/assets/images/vital_respiration.png and /dev/null differ
diff --git a/assets/images/vital_signs.png b/assets/images/vital_signs.png
deleted file mode 100644
index 7b642d6e..00000000
Binary files a/assets/images/vital_signs.png and /dev/null differ
diff --git a/assets/images/vital_temperature.png b/assets/images/vital_temperature.png
deleted file mode 100644
index 7fe657de..00000000
Binary files a/assets/images/vital_temperature.png and /dev/null differ
diff --git a/assets/images/vital_weight.png b/assets/images/vital_weight.png
deleted file mode 100644
index 5247e924..00000000
Binary files a/assets/images/vital_weight.png and /dev/null differ
diff --git a/assets/images/walkin.png b/assets/images/walkin.png
deleted file mode 100644
index 81f112f5..00000000
Binary files a/assets/images/walkin.png and /dev/null differ
diff --git a/assets/images/welcome_login_icon.png b/assets/images/welcome_login_icon.png
deleted file mode 100644
index 811b13c2..00000000
Binary files a/assets/images/welcome_login_icon.png and /dev/null differ
diff --git a/ios/Podfile b/ios/Podfile
index c2335042..1d3f65fc 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -10,83 +10,38 @@ project 'Runner', {
'Release' => :release,
}
-def parse_KV_file(file, separator='=')
- file_abs_path = File.expand_path(file)
- if !File.exists? file_abs_path
- return [];
+def flutter_root
+ generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+ unless File.exist?(generated_xcode_build_settings_path)
+ 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
+
+ File.foreach(generated_xcode_build_settings_path) do |line|
+ matches = line.match(/FLUTTER_ROOT\=(.*)/)
+ return matches[1].strip if matches
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
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
target 'Runner' do
use_frameworks!
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.
- pod 'Flutter', :path => 'Flutter'
- pod 'OpenTok'
- pod 'Alamofire', '~> 5.2'
- pod 'AADraggableView'
- # Plugin Pods
+ pod 'Flutter', :path => 'Flutter'
+ pod 'OpenTok'
+ pod 'Alamofire', '~> 5.2'
+ pod 'AADraggableView'
+ # Plugin Pods
- # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
- # 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
+ flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
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|
installer.pods_project.targets.each do |target|
- target.build_configurations.each do |config|
- config.build_settings['ENABLE_BITCODE'] = 'NO'
- end
+ flutter_additional_ios_build_settings(target)
end
end
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 80868187..3c58fe30 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 50;
objects = {
/* Begin PBXBuildFile section */
@@ -14,13 +14,13 @@
30F70E6C266F56FD005D8F8E /* MainAppViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30F70E6B266F56FD005D8F8E /* MainAppViewController.swift */; };
30F70E6F266F6509005D8F8E /* VideoCallRequestParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30F70E6E266F6509005D8F8E /* VideoCallRequestParameters.swift */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+ 3D7F2AC9B3EBF568D59B943B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 104DCFE405BA413255D4BDD9 /* Pods_Runner.framework */; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
9CE61EBD24AB366E008D68DD /* VideoCallViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CE61EBC24AB366E008D68DD /* VideoCallViewController.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 */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -37,10 +37,13 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
+ 0762701A9540BA69842BCA9C /* 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 = ""; };
+ 104DCFE405BA413255D4BDD9 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; };
29211CD725C165D600DD740D /* RunnerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerRelease.entitlements; sourceTree = ""; };
29211E4125C172B700DD740D /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; };
+ 2ADF20AFB51DAEC9BED1884D /* 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 = ""; };
300790F9266FB14B0052174C /* VCEmbeder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VCEmbeder.swift; sourceTree = ""; };
300790FB26710CAB0052174C /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = ""; };
30F70E6B266F56FD005D8F8E /* MainAppViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainAppViewController.swift; sourceTree = ""; };
@@ -48,9 +51,7 @@
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; };
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; };
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; };
- 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 = ""; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; };
- 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 = ""; };
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; };
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -60,8 +61,7 @@
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
9CE61EBC24AB366E008D68DD /* VideoCallViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoCallViewController.swift; sourceTree = ""; };
9CE61ECC24ADBB4C008D68DD /* ICallProtocoll.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ICallProtocoll.swift; sourceTree = ""; };
- 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 = ""; };
- 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 = ""; };
+ E5CA53445955DBB6BB6D164C /* 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 = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -69,7 +69,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- B650DC3076E9D70CB188286A /* Pods_Runner.framework in Frameworks */,
+ 3D7F2AC9B3EBF568D59B943B /* Pods_Runner.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -104,9 +104,9 @@
7D66D387293CE5376A07EC5F /* Pods */ = {
isa = PBXGroup;
children = (
- E698D7B14B12DF768FE47A1A /* Pods-Runner.debug.xcconfig */,
- 75DD06875D42C7903A76DF9F /* Pods-Runner.release.xcconfig */,
- 9D4B7DB43C6A6C849D2387CE /* Pods-Runner.profile.xcconfig */,
+ 2ADF20AFB51DAEC9BED1884D /* Pods-Runner.debug.xcconfig */,
+ E5CA53445955DBB6BB6D164C /* Pods-Runner.release.xcconfig */,
+ 0762701A9540BA69842BCA9C /* Pods-Runner.profile.xcconfig */,
);
path = Pods;
sourceTree = "";
@@ -129,7 +129,7 @@
97C146F01CF9000F007C117D /* Runner */,
97C146EF1CF9000F007C117D /* Products */,
7D66D387293CE5376A07EC5F /* Pods */,
- F984EB986238F1809678CD84 /* Frameworks */,
+ C1938275850F66EAA5D7AC0F /* Frameworks */,
);
sourceTree = "";
};
@@ -171,10 +171,10 @@
name = "Supporting Files";
sourceTree = "";
};
- F984EB986238F1809678CD84 /* Frameworks */ = {
+ C1938275850F66EAA5D7AC0F /* Frameworks */ = {
isa = PBXGroup;
children = (
- 93A5F83B23AB032D1E096663 /* Pods_Runner.framework */,
+ 104DCFE405BA413255D4BDD9 /* Pods_Runner.framework */,
);
name = Frameworks;
sourceTree = "";
@@ -186,14 +186,14 @@
isa = PBXNativeTarget;
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = (
- 986D76F6694E0D6D8C5CDAAB /* [CP] Check Pods Manifest.lock */,
+ C79BE4619064E868C0DFBD12 /* [CP] Check Pods Manifest.lock */,
9740EEB61CF901F6004384FC /* Run Script */,
97C146EA1CF9000F007C117D /* Sources */,
97C146EB1CF9000F007C117D /* Frameworks */,
97C146EC1CF9000F007C117D /* Resources */,
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
- 08568E6EE9BA48E55B7C3865 /* [CP] Embed Pods Frameworks */,
+ 3DBDEDAE0EB70F8613EE7963 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@@ -210,7 +210,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 1020;
+ LastUpgradeCheck = 1300;
ORGANIZATIONNAME = "The Chromium Authors";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
@@ -253,34 +253,113 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
- 08568E6EE9BA48E55B7C3865 /* [CP] Embed Pods Frameworks */ = {
+ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
- name = "[CP] Embed Pods Frameworks";
+ name = "Thin Binary";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
- showEnvVarsInLog = 0;
+ shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
};
- 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+ 3DBDEDAE0EB70F8613EE7963 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
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_avfoundation/video_player_avfoundation.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 = (
+ "${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_avfoundation.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter_wkwebview.framework",
);
runOnlyForDeploymentPostprocessing = 0;
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 */ = {
isa = PBXShellScriptBuildPhase;
@@ -296,7 +375,7 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
};
- 986D76F6694E0D6D8C5CDAAB /* [CP] Check Pods Manifest.lock */ = {
+ C79BE4619064E868C0DFBD12 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -423,7 +502,10 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
@@ -558,7 +640,10 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
@@ -589,7 +674,10 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 1d526a16..919434a6 100644
--- a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
+ location = "self:">
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index bfbb2561..c87d15a3 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
> localizedValues = {
"fileNo": {"en": "File No : ", "ar": "رقم الملف :"},
"mobileNo": {"en": "Mobile No", "ar": "رقم الجوال"},
"messagesScreenToolbarTitle": {"en": "Messages", "ar": "الرسائل"},
- "mySchedule": {"en": "Schedule", "ar": "جدولي"},
+ "mySchedule": {"en": "Schedules", "ar": "جدولي"},
"errorNoSchedule": {
"en": "You don't have any Schedule",
"ar": "ليس لديك أي جدول"
},
"verify": {"en": "VERIFY", "ar": "تحقق"},
+ "pharmacy-intervention": {"en": "Pharmacy Intervention", "ar": "التدخل الصيدلاني"},
"referralDoctor": {"en": "Referral Doctor", "ar": "الطبيب المُحول إليه"},
"referringClinic": {"en": "Referring Clinic", "ar": "العيادة المُحول إليها"},
"frequency": {"en": "Frequency", "ar": "تكرر"},
@@ -56,7 +57,7 @@ const Map> localizedValues = {
"myInPatient": {"en": "My\n In Patients", "ar": "مرضاي\nالمنومين"},
"myInPatientTitle": {"en": "My Patients", "ar": "مرضاي المنومين"},
"inPatientLabel": {"en": "InPatients", "ar": "المريض المنوم"},
- "inPatientAll": {"en": "All Patients", "ar": "جميع المرضى المنومين"},
+ "inPatientAll": {"en": "All Patients", "ar": "المرضى المنومين"},
"operations": {"en": "Operations", "ar": "عمليات"},
"patientServices": {"en": "Patient Services", "ar": "خدمات المرضى"},
"searchMedicineDashboard": {
@@ -83,8 +84,8 @@ const Map> localizedValues = {
"ar": "المريض الذي حضر للموعد"
},
"searchMedicineNameHere": {"en": "Search Medicine ", "ar": "ابحث هنا"},
- "youCanFind": {"en": "You Can Find ", "ar": "تستطيع ان تجد "},
- "itemsInSearch": {"en": "items in search", "ar": "عناصر في البحث"},
+ "youCanFind": {"en": "You can find ", "ar": "تستطيع ان تجد "},
+ "medicineSearchResult": {"en": "as a search result for", "ar": "كنتيجة بحث عن"},
"qr": {"en": "QR", "ar": "QR"},
"reader": {"en": "Reader", "ar": "قارىء رمز ال"},
"startScanning": {"en": "Start Scanning", "ar": "بدء المسح"},
@@ -537,6 +538,10 @@ const Map> localizedValues = {
"selectSeverity": {"en": "Select Severity", "ar": "حدد الخطورة"},
"leaveCreated": {"en": "Leave has been created", "ar": "تم إنشاء الإجازة"},
"medications": {"en": "Medications", "ar": "الأدوية"},
+ "medication": {"en": "Medication", "ar": "الدواء"},
+ "createdByName": {"en": "Created By Name", "ar": "الدواء"},
+ "statusDescription": {"en": "Status Description", "ar": "وصف الحالة"},
+ "doctorComments": {"en": "Doctor Comments", "ar": "تعليقات الطبيب"},
"procedures": {"en": "Procedures", "ar": "الإجراءات"},
"vitalSignEmptyMsg": {
"en": "There is no vital signs for this patient",
@@ -663,6 +668,7 @@ const Map> localizedValues = {
"progressNoteSOAP": {"en": "Progress Note", "ar": "ملاحظة التقدم"},
"addProgressNote": {"en": "Add Progress Note", "ar": "أضف ملاحظة التقدم"},
"createdBy": {"en": "Created By :", "ar": "أضيفت عن طريق: "},
+ "riskScore": {"en": "Risk Score :", "ar": "درجة المخاطر"},
"editedBy": {"en": "Edited By :", "ar": "عدلت من : "},
"currentMedications": {"en": "Current Medications", "ar": "الأدوية الحالية"},
"noItem": {
@@ -708,7 +714,7 @@ const Map> localizedValues = {
"icd": {"en": "ICD", "ar": "التصنيف الدولي للأمراض"},
"days": {"en": "Days", "ar": "أيام"},
"months": {"en": "Months", "ar": "أشهر"},
- "years": {"en": "Years", "ar": "سنوات"},
+ "years": {"en": "Years", "ar": "سنة"},
"hr": {"en": "Hr", "ar": "س"},
"min": {"en": "Min", "ar": "د"},
"appointmentNumber": {"en": "Appointment Number", "ar": "رقم الموعد"},
@@ -1053,6 +1059,8 @@ const Map> localizedValues = {
"maritalStatus": {"en": "Marital Status", "ar": "الحالة الزوجية"},
"nursing": {"en": "Nursing", "ar": "تمريض"},
"diabetic": {"en": "Diabetic", "ar": "مرض السكري"},
+ "pharmacy": {"en": "Pharmacy", "ar": "الصيدلاني"},
+ "intervention": {"en": "Intervention", "ar": "التدخل"},
"chart": {"en": "Chart", "ar": "جدول"},
"operationTimeStart": {
"en": "Operation Time Start :",
@@ -1118,4 +1126,20 @@ const Map> localizedValues = {
},
"planedProcedure": {"en": "Planed Procedure", "ar": "الإجراء المخطط"},
"moreDetails": {"en": "More Details", "ar": "المزيد من التفاصيل"},
+ "VTE_Type": {"en": "VTE Type", "ar": "VTE Type"},
+ "pharmacology": {"en": "Pharmacology", "ar": "علم العقاقير"},
+ "reasonsThrombo": {"en": "Reasons Thrombo", "ar": "أسباب ثرومبو"},
+ "youDoNotHaveFavoritePrescription": {"en": "You Don't Have Favorite Prescription", "ar": "ليس لديك وصفة طبية مفضلة"},
+ "pleaseSelectItem": {"en": "please Select Item", "ar": "الرجاء اختيار عنصر"},
+ "searchFavoriteTemplate": {"en": "search Favorites Template", "ar": "البحث في قالب المفضلة"},
+ "sorryNoMatch": {"en": "Sorry No Match", "ar": "عذرا لا يوجد تطابق"},
+ "thousandIsTheMAXForTheStrength": {"en": "1000 Is The MAX For The Strength", "ar": "ألف هو القيمة الأعلى"},
+ "strengthCanNotBeZero": {"en": "Strength Can't Be Zero", "ar": "القوة لا يمكن أن تكون صفر "},
+ "old": {"en": "Old", "ar":"القديمه"},
+ "orderTypeDescription": {"en": "Order Type Description", "ar":"وصف نوع الطلب"},
+ "doseDetails": {"en": "Dose Details", "ar":"تفاصيل الجرعة"},
+ "selectCondition": {"en": "Select Condition", "ar":"قم بتحديد الشرط"},
+ "yourOrderAddedSuccessfully": {"en": "Your Order Added Successfully", "ar":"تم إضافة طلبك بنجاح"},
+ "youCannotAddOnlySpaces": {"en": "You Can't Add Only Spaces", "ar":""},
+ "conditionDescription": {"en": "Condition Description", "ar":"لا يمكنك إضافة مسافات فقط"},
};
diff --git a/lib/config/size_config.dart b/lib/config/size_config.dart
index 21859d3b..f131d30a 100644
--- a/lib/config/size_config.dart
+++ b/lib/config/size_config.dart
@@ -21,6 +21,7 @@ class SizeConfig {
static bool isHeightMiddle = false;
static bool isHeightLarge = false;
static bool isWidthLarge = false;
+
void init(BoxConstraints constraints, Orientation orientation) {
realScreenHeight = constraints.maxHeight;
realScreenWidth = constraints.maxWidth;
diff --git a/lib/core/enum/CalenderType.dart b/lib/core/enum/CalenderType.dart
index 51f98512..fbfbbc64 100644
--- a/lib/core/enum/CalenderType.dart
+++ b/lib/core/enum/CalenderType.dart
@@ -1,4 +1,4 @@
-enum CalenderType{
+enum CalenderType {
Gregorian,
Hijri,
-}
\ No newline at end of file
+}
diff --git a/lib/core/enum/PatientType.dart b/lib/core/enum/PatientType.dart
index 96fd9ae5..145aacf2 100644
--- a/lib/core/enum/PatientType.dart
+++ b/lib/core/enum/PatientType.dart
@@ -1,4 +1,4 @@
-enum PatientType{
+enum PatientType {
IN_PATIENT,
OUT_PATIENT,
-}
\ No newline at end of file
+}
diff --git a/lib/core/enum/auth_method_types.dart b/lib/core/enum/auth_method_types.dart
index 82577eeb..cf7befad 100644
--- a/lib/core/enum/auth_method_types.dart
+++ b/lib/core/enum/auth_method_types.dart
@@ -1,4 +1,5 @@
-enum AuthMethodTypes { SMS, WhatsApp, Fingerprint,FaceID,MoreOptions }
+enum AuthMethodTypes { SMS, WhatsApp, Fingerprint, FaceID, MoreOptions }
+
extension SelectedAuthMethodTypesService on AuthMethodTypes {
// ignore: missing_return
int getTypeIdService() {
@@ -18,12 +19,11 @@ extension SelectedAuthMethodTypesService on AuthMethodTypes {
case AuthMethodTypes.MoreOptions:
return 5;
break;
-
}
}
// ignore: missing_return
- static getMethodsTypeService( int typeId) {
+ static getMethodsTypeService(int typeId) {
switch (typeId) {
case 1:
return AuthMethodTypes.SMS;
@@ -40,7 +40,6 @@ extension SelectedAuthMethodTypesService on AuthMethodTypes {
case 5:
return AuthMethodTypes.MoreOptions;
break;
-
}
}
-}
\ No newline at end of file
+}
diff --git a/lib/core/enum/filter_type.dart b/lib/core/enum/filter_type.dart
index bfa781f9..a80b8898 100644
--- a/lib/core/enum/filter_type.dart
+++ b/lib/core/enum/filter_type.dart
@@ -1,6 +1,3 @@
enum FilterType { Clinic, Hospital }
enum OutPatientFilterType { Previous, Today, NextWeek }
-
-
-
diff --git a/lib/core/enum/master_lookup_key.dart b/lib/core/enum/master_lookup_key.dart
index 25e40d3b..04608719 100644
--- a/lib/core/enum/master_lookup_key.dart
+++ b/lib/core/enum/master_lookup_key.dart
@@ -19,7 +19,6 @@ enum MasterKeysService {
MedicationFrequency,
MedicationDoseTime,
MedicationIndications,
-
AdmissionRequestType,
DiagnosisSelectionType,
}
diff --git a/lib/core/enum/patient_type.dart b/lib/core/enum/patient_type.dart
index efea543c..7591f6f5 100644
--- a/lib/core/enum/patient_type.dart
+++ b/lib/core/enum/patient_type.dart
@@ -1,2 +1 @@
enum PatientType { inPatient, OutPatient }
-
diff --git a/lib/core/model/PatientRegistration/CheckActivationCodeModel.dart b/lib/core/model/PatientRegistration/CheckActivationCodeModel.dart
index 4b95c1b0..ce65a600 100644
--- a/lib/core/model/PatientRegistration/CheckActivationCodeModel.dart
+++ b/lib/core/model/PatientRegistration/CheckActivationCodeModel.dart
@@ -27,30 +27,30 @@ class CheckActivationCodeModel {
CheckActivationCodeModel(
{this.patientMobileNumber,
- this.mobileNo,
- this.projectOutSA,
- this.loginType,
- this.zipCode,
- this.isRegister,
- this.logInTokenID,
- this.searchType,
- this.patientID,
- this.nationalID,
- this.patientIdentificationID,
- this.forRegisteration,
- this.activationCode,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.dOB,
- this.isHijri,
- this.healthId});
+ this.mobileNo,
+ this.projectOutSA,
+ this.loginType,
+ this.zipCode,
+ this.isRegister,
+ this.logInTokenID,
+ this.searchType,
+ this.patientID,
+ this.nationalID,
+ this.patientIdentificationID,
+ this.forRegisteration,
+ this.activationCode,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.dOB,
+ this.isHijri,
+ this.healthId});
CheckActivationCodeModel.fromJson(Map json) {
patientMobileNumber = json['PatientMobileNumber'];
diff --git a/lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart b/lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart
index 3465cf8d..cba0e11d 100644
--- a/lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart
+++ b/lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart
@@ -19,22 +19,22 @@ class CheckPatientForRegistrationModel {
CheckPatientForRegistrationModel(
{this.patientIdentificationID,
- this.patientMobileNumber,
- this.zipCode,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.tokenID,
- this.patientID,
- this.isRegister,
- this.dOB,
- this.isHijri});
+ this.patientMobileNumber,
+ this.zipCode,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.tokenID,
+ this.patientID,
+ this.isRegister,
+ this.dOB,
+ this.isHijri});
CheckPatientForRegistrationModel.fromJson(Map json) {
patientIdentificationID = json['PatientIdentificationID'];
diff --git a/lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart b/lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart
index f05131ef..254ddab5 100644
--- a/lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart
+++ b/lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart
@@ -14,17 +14,17 @@ class GetPatientInfoRequestModel {
GetPatientInfoRequestModel(
{this.patientIdentificationID,
- this.dOB,
- this.isHijri,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID});
+ this.dOB,
+ this.isHijri,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID});
GetPatientInfoRequestModel.fromJson(Map json) {
patientIdentificationID = json['PatientIdentificationID'];
diff --git a/lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart b/lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart
index 158bd1e2..1de1ded4 100644
--- a/lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart
+++ b/lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart
@@ -90,93 +90,93 @@ class GetPatientInfoResponseModel {
GetPatientInfoResponseModel(
{this.date,
- this.languageID,
- this.serviceName,
- this.time,
- this.androidLink,
- this.authenticationTokenID,
- this.data,
- this.dataw,
- this.dietType,
- this.errorCode,
- this.errorEndUserMessage,
- this.errorEndUserMessageN,
- this.errorMessage,
- this.errorType,
- this.foodCategory,
- this.iOSLink,
- this.isAuthenticated,
- this.mealOrderStatus,
- this.mealType,
- this.messageStatus,
- this.numberOfResultRecords,
- this.patientBlodType,
- this.successMsg,
- this.successMsgN,
- this.vidaUpdatedResponse,
- this.accessTokenObject,
- this.age,
- this.clientIdentifierId,
- this.createdBy,
- this.dateOfBirth,
- this.firstNameAr,
- this.firstNameEn,
- this.gender,
- this.genderAr,
- this.genderEn,
- this.healthId,
- this.idNumber,
- this.idType,
- this.isHijri,
- this.isInstertedOrUpdated,
- this.isNull,
- this.isPatientExistNHIC,
- this.isRecordLockedByCurrentUser,
- this.lastNameAr,
- this.lastNameEn,
- this.listActiveAccessToken,
- this.maritalStatus,
- this.maritalStatusCode,
- this.nationalDateOfBirth,
- this.nationality,
- this.nationalityCode,
- this.occupation,
- this.pCDTransactionDataResultList,
- this.pCDGetVidaPatientForManualVerificationList,
- this.pCDNHICHMGPatientDetailsMatchCalulationList,
- this.pCDReturnValue,
- this.patientStatus,
- this.placeofBirth,
- this.practitionerStatusCode,
- this.practitionerStatusDescAr,
- this.practitionerStatusDescEn,
- this.rowCount,
- this.secondNameAr,
- this.secondNameEn,
- this.thirdNameAr,
- this.thirdNameEn,
- this.yakeenVidaPatientDataStatisticsByPatientIdList,
- this.yakeenVidaPatientDataStatisticsList,
- this.yakeenVidaPatientDataStatisticsPrefferedList,
- this.accessToken,
- this.categoryCode,
- this.categoryNameAr,
- this.categoryNameEn,
- this.constraintCode,
- this.constraintNameAr,
- this.constraintNameEn,
- this.content,
- this.errorList,
- this.licenseExpiryDate,
- this.licenseIssuedDate,
- this.licenseStatusCode,
- this.licenseStatusDescAr,
- this.licenseStatusDescEn,
- this.organizations,
- this.registrationNumber,
- this.specialtyCode,
- this.specialtyNameAr,
- this.specialtyNameEn});
+ this.languageID,
+ this.serviceName,
+ this.time,
+ this.androidLink,
+ this.authenticationTokenID,
+ this.data,
+ this.dataw,
+ this.dietType,
+ this.errorCode,
+ this.errorEndUserMessage,
+ this.errorEndUserMessageN,
+ this.errorMessage,
+ this.errorType,
+ this.foodCategory,
+ this.iOSLink,
+ this.isAuthenticated,
+ this.mealOrderStatus,
+ this.mealType,
+ this.messageStatus,
+ this.numberOfResultRecords,
+ this.patientBlodType,
+ this.successMsg,
+ this.successMsgN,
+ this.vidaUpdatedResponse,
+ this.accessTokenObject,
+ this.age,
+ this.clientIdentifierId,
+ this.createdBy,
+ this.dateOfBirth,
+ this.firstNameAr,
+ this.firstNameEn,
+ this.gender,
+ this.genderAr,
+ this.genderEn,
+ this.healthId,
+ this.idNumber,
+ this.idType,
+ this.isHijri,
+ this.isInstertedOrUpdated,
+ this.isNull,
+ this.isPatientExistNHIC,
+ this.isRecordLockedByCurrentUser,
+ this.lastNameAr,
+ this.lastNameEn,
+ this.listActiveAccessToken,
+ this.maritalStatus,
+ this.maritalStatusCode,
+ this.nationalDateOfBirth,
+ this.nationality,
+ this.nationalityCode,
+ this.occupation,
+ this.pCDTransactionDataResultList,
+ this.pCDGetVidaPatientForManualVerificationList,
+ this.pCDNHICHMGPatientDetailsMatchCalulationList,
+ this.pCDReturnValue,
+ this.patientStatus,
+ this.placeofBirth,
+ this.practitionerStatusCode,
+ this.practitionerStatusDescAr,
+ this.practitionerStatusDescEn,
+ this.rowCount,
+ this.secondNameAr,
+ this.secondNameEn,
+ this.thirdNameAr,
+ this.thirdNameEn,
+ this.yakeenVidaPatientDataStatisticsByPatientIdList,
+ this.yakeenVidaPatientDataStatisticsList,
+ this.yakeenVidaPatientDataStatisticsPrefferedList,
+ this.accessToken,
+ this.categoryCode,
+ this.categoryNameAr,
+ this.categoryNameEn,
+ this.constraintCode,
+ this.constraintNameAr,
+ this.constraintNameEn,
+ this.content,
+ this.errorList,
+ this.licenseExpiryDate,
+ this.licenseIssuedDate,
+ this.licenseStatusCode,
+ this.licenseStatusDescAr,
+ this.licenseStatusDescEn,
+ this.organizations,
+ this.registrationNumber,
+ this.specialtyCode,
+ this.specialtyNameAr,
+ this.specialtyNameEn});
GetPatientInfoResponseModel.fromJson(Map json) {
date = json['Date'];
@@ -233,9 +233,9 @@ class GetPatientInfoResponseModel {
occupation = json['Occupation'];
pCDTransactionDataResultList = json['PCDTransactionDataResultList'];
pCDGetVidaPatientForManualVerificationList =
- json['PCD_GetVidaPatientForManualVerificationList'];
+ json['PCD_GetVidaPatientForManualVerificationList'];
pCDNHICHMGPatientDetailsMatchCalulationList =
- json['PCD_NHIC_HMG_PatientDetailsMatchCalulationList'];
+ json['PCD_NHIC_HMG_PatientDetailsMatchCalulationList'];
pCDReturnValue = json['PCD_ReturnValue'];
patientStatus = json['PatientStatus'];
placeofBirth = json['PlaceofBirth'];
@@ -248,11 +248,11 @@ class GetPatientInfoResponseModel {
thirdNameAr = json['ThirdNameAr'];
thirdNameEn = json['ThirdNameEn'];
yakeenVidaPatientDataStatisticsByPatientIdList =
- json['YakeenVidaPatientDataStatisticsByPatientIdList'];
+ json['YakeenVidaPatientDataStatisticsByPatientIdList'];
yakeenVidaPatientDataStatisticsList =
- json['YakeenVidaPatientDataStatisticsList'];
+ json['YakeenVidaPatientDataStatisticsList'];
yakeenVidaPatientDataStatisticsPrefferedList =
- json['YakeenVidaPatientDataStatisticsPrefferedList'];
+ json['YakeenVidaPatientDataStatisticsPrefferedList'];
accessToken = json['accessToken'];
categoryCode = json['categoryCode'];
categoryNameAr = json['categoryNameAr'];
diff --git a/lib/core/model/PatientRegistration/PatientRegistrationModel.dart b/lib/core/model/PatientRegistration/PatientRegistrationModel.dart
index 83ff53d7..f7139725 100644
--- a/lib/core/model/PatientRegistration/PatientRegistrationModel.dart
+++ b/lib/core/model/PatientRegistration/PatientRegistrationModel.dart
@@ -20,23 +20,23 @@ class PatientRegistrationModel {
PatientRegistrationModel(
{this.patientobject,
- this.patientIdentificationID,
- this.patientMobileNumber,
- this.logInTokenID,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.tokenID,
- this.dOB,
- this.isHijri,
- this.healthId,
- this.zipCode});
+ this.patientIdentificationID,
+ this.patientMobileNumber,
+ this.logInTokenID,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.tokenID,
+ this.dOB,
+ this.isHijri,
+ this.healthId,
+ this.zipCode});
PatientRegistrationModel.fromJson(Map json) {
patientobject = json['Patientobject'] != null
@@ -112,26 +112,26 @@ class Patientobject {
Patientobject(
{this.tempValue,
- this.patientIdentificationType,
- this.patientIdentificationNo,
- this.mobileNumber,
- this.patientOutSA,
- this.firstNameN,
- this.middleNameN,
- this.lastNameN,
- this.firstName,
- this.middleName,
- this.lastName,
- this.strDateofBirth,
- this.dateofBirth,
- this.gender,
- this.nationalityID,
- this.dateofBirthN,
- this.emailAddress,
- this.sourceType,
- this.preferredLanguage,
- this.marital,
- this.eHealthIDField});
+ this.patientIdentificationType,
+ this.patientIdentificationNo,
+ this.mobileNumber,
+ this.patientOutSA,
+ this.firstNameN,
+ this.middleNameN,
+ this.lastNameN,
+ this.firstName,
+ this.middleName,
+ this.lastName,
+ this.strDateofBirth,
+ this.dateofBirth,
+ this.gender,
+ this.nationalityID,
+ this.dateofBirthN,
+ this.emailAddress,
+ this.sourceType,
+ this.preferredLanguage,
+ this.marital,
+ this.eHealthIDField});
Patientobject.fromJson(Map json) {
tempValue = json['TempValue'];
diff --git a/lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart b/lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart
index 8244a95f..5709e137 100644
--- a/lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart
+++ b/lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart
@@ -26,29 +26,29 @@ class SendActivationCodeByOTPNotificationTypeForRegistrationModel {
SendActivationCodeByOTPNotificationTypeForRegistrationModel(
{this.patientMobileNumber,
- this.mobileNo,
- this.projectOutSA,
- this.loginType,
- this.zipCode,
- this.isRegister,
- this.logInTokenID,
- this.searchType,
- this.patientID,
- this.nationalID,
- this.patientIdentificationID,
- this.oTPSendType,
- this.languageID,
- this.versionID,
- this.channel,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.dOB,
- this.isHijri,
- this.healthId});
+ this.mobileNo,
+ this.projectOutSA,
+ this.loginType,
+ this.zipCode,
+ this.isRegister,
+ this.logInTokenID,
+ this.searchType,
+ this.patientID,
+ this.nationalID,
+ this.patientIdentificationID,
+ this.oTPSendType,
+ this.languageID,
+ this.versionID,
+ this.channel,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.dOB,
+ this.isHijri,
+ this.healthId});
SendActivationCodeByOTPNotificationTypeForRegistrationModel.fromJson(
Map json) {
diff --git a/lib/core/model/Prescriptions/Prescriptions.dart b/lib/core/model/Prescriptions/Prescriptions.dart
index c47a813a..1ba6007e 100644
--- a/lib/core/model/Prescriptions/Prescriptions.dart
+++ b/lib/core/model/Prescriptions/Prescriptions.dart
@@ -69,7 +69,8 @@ class Prescriptions {
this.nationalityFlagURL,
this.noOfPatientsRate,
this.qR,
- this.speciality,this.isLiveCareAppointment});
+ this.speciality,
+ this.isLiveCareAppointment});
Prescriptions.fromJson(Map json) {
setupID = json['SetupID'];
@@ -105,7 +106,7 @@ class Prescriptions {
noOfPatientsRate = json['NoOfPatientsRate'];
qR = json['QR'];
isLiveCareAppointment = json['IsLiveCareAppointment'];
- // speciality = json['Speciality'].cast();
+ // speciality = json['Speciality'].cast();
}
Map toJson() {
diff --git a/lib/core/model/Prescriptions/perscription_pharmacy.dart b/lib/core/model/Prescriptions/perscription_pharmacy.dart
index 3adaef7e..4634d30e 100644
--- a/lib/core/model/Prescriptions/perscription_pharmacy.dart
+++ b/lib/core/model/Prescriptions/perscription_pharmacy.dart
@@ -26,29 +26,29 @@ class PharmacyPrescriptions {
PharmacyPrescriptions(
{this.expiryDate,
- this.sellingPrice,
- this.quantity,
- this.itemID,
- this.locationID,
- this.projectID,
- this.setupID,
- this.locationDescription,
- this.locationDescriptionN,
- this.itemDescription,
- this.itemDescriptionN,
- this.alias,
- this.locationTypeID,
- this.barcode,
- this.companybarcode,
- this.cityID,
- this.cityName,
- this.distanceInKilometers,
- this.latitude,
- this.locationType,
- this.longitude,
- this.phoneNumber,
- this.projectImageURL,
- this.sortOrder});
+ this.sellingPrice,
+ this.quantity,
+ this.itemID,
+ this.locationID,
+ this.projectID,
+ this.setupID,
+ this.locationDescription,
+ this.locationDescriptionN,
+ this.itemDescription,
+ this.itemDescriptionN,
+ this.alias,
+ this.locationTypeID,
+ this.barcode,
+ this.companybarcode,
+ this.cityID,
+ this.cityName,
+ this.distanceInKilometers,
+ this.latitude,
+ this.locationType,
+ this.longitude,
+ this.phoneNumber,
+ this.projectImageURL,
+ this.sortOrder});
PharmacyPrescriptions.fromJson(Map json) {
expiryDate = json['ExpiryDate'];
diff --git a/lib/core/model/Prescriptions/prescription_entity_model.dart b/lib/core/model/Prescriptions/prescription_entity_model.dart
new file mode 100644
index 00000000..166cd599
--- /dev/null
+++ b/lib/core/model/Prescriptions/prescription_entity_model.dart
@@ -0,0 +1,145 @@
+class PrescriptionEntityModel {
+ dynamic appointmentNo;
+ dynamic clinicName;
+ dynamic createdBy;
+ dynamic createdOn;
+ dynamic doctorName;
+ dynamic doseDailyQuantity;
+ dynamic doseDailyUnitID;
+ dynamic doseDetail;
+ dynamic doseDurationDays;
+ dynamic doseTimingID;
+ dynamic episodeID;
+ dynamic frequencyID;
+ dynamic icdCode10ID;
+ dynamic indication;
+ dynamic isDispensed;
+ dynamic isMedicineCovered;
+ dynamic isSIG;
+ dynamic medicationName;
+ dynamic medicationPrice;
+ dynamic medicineCode;
+ dynamic orderTypeDescription;
+ dynamic qty;
+ dynamic quantity;
+ dynamic remarks;
+ dynamic routeID;
+ dynamic startDate;
+ dynamic status;
+ dynamic stopDate;
+ dynamic uom;
+ dynamic pharmacistRemarks;
+ dynamic pharmacyInervention;
+ dynamic refill;
+ dynamic mediSpanGPICode;
+
+ PrescriptionEntityModel(
+ {this.appointmentNo,
+ this.clinicName,
+ this.createdBy,
+ this.createdOn,
+ this.doctorName,
+ this.doseDailyQuantity,
+ this.doseDailyUnitID,
+ this.doseDetail,
+ this.doseDurationDays,
+ this.doseTimingID,
+ this.episodeID,
+ this.frequencyID,
+ this.icdCode10ID,
+ this.indication,
+ this.isDispensed,
+ this.isMedicineCovered,
+ this.isSIG,
+ this.medicationName,
+ this.medicationPrice,
+ this.medicineCode,
+ this.orderTypeDescription,
+ this.qty,
+ this.quantity,
+ this.remarks,
+ this.routeID,
+ this.startDate,
+ this.status,
+ this.stopDate,
+ this.uom,
+ this.pharmacistRemarks,
+ this.mediSpanGPICode,
+ this.pharmacyInervention,
+ this.refill});
+
+ PrescriptionEntityModel.fromJson(Map json) {
+ appointmentNo = json['appointmentNo'];
+ clinicName = json['clinicName'];
+ createdBy = json['createdBy'];
+ createdOn = json['createdOn'];
+ doctorName = json['doctorName'];
+ doseDailyQuantity = json['doseDailyQuantity'];
+ doseDailyUnitID = json['doseDailyUnitID'];
+ doseDetail = json['doseDetail'];
+ doseDurationDays = json['doseDurationDays'];
+ doseTimingID = json['doseTimingID'];
+ episodeID = json['episodeID'];
+ frequencyID = json['frequencyID'];
+ icdCode10ID = json['icdCode10ID'];
+ indication = json['indication'];
+ isDispensed = json['isDispensed'];
+ isMedicineCovered = json['isMedicineCovered'];
+ isSIG = json['isSIG'];
+ medicationName = json['medicationName'];
+ medicationPrice = json['medicationPrice'];
+ medicineCode = json['medicineCode'];
+ orderTypeDescription = json['orderTypeDescription'];
+ qty = json['qty'];
+ quantity = json['quantity'];
+ remarks = json['remarks'];
+ routeID = json['routeID'];
+ startDate = json['startDate'];
+ status = json['status'];
+ stopDate = json['stopDate'];
+ uom = json['uom'];
+ pharmacistRemarks = json['pharmacistRemarks'];
+ mediSpanGPICode = json['mediSpanGPICode'];
+ refill = json['refill'];
+ pharmacyInervention = json['interventionID'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['appointmentNo'] = this.appointmentNo;
+ data['clinicName'] = this.clinicName;
+ data['createdBy'] = this.createdBy;
+ data['createdOn'] = this.createdOn;
+ data['doctorName'] = this.doctorName;
+ data['doseDailyQuantity'] = this.doseDailyQuantity;
+ data['doseDailyUnitID'] = this.doseDailyUnitID;
+ data['doseDetail'] = this.doseDetail;
+ data['doseDurationDays'] = this.doseDurationDays;
+ data['doseTimingID'] = this.doseTimingID;
+ data['episodeID'] = this.episodeID;
+ data['frequencyID'] = this.frequencyID;
+ data['icdCode10ID'] = this.icdCode10ID;
+ data['indication'] = this.indication;
+ data['isDispensed'] = this.isDispensed;
+ data['isMedicineCovered'] = this.isMedicineCovered;
+ data['isSIG'] = this.isSIG;
+ data['medicationName'] = this.medicationName;
+ data['medicationPrice'] = this.medicationPrice;
+ data['medicineCode'] = this.medicineCode;
+ data['orderTypeDescription'] = this.orderTypeDescription;
+ data['qty'] = this.qty;
+ data['quantity'] = this.quantity;
+ data['remarks'] = this.remarks;
+ data['routeID'] = this.routeID;
+ data['startDate'] = this.startDate;
+ data['status'] = this.status;
+ data['stopDate'] = this.stopDate;
+ data['uom'] = this.uom;
+ data['pharmacistRemarks'] = this.pharmacistRemarks;
+ data['mediSpanGPICode'] = this.mediSpanGPICode;
+ data['refill'] = this.refill;
+ data['interventionID'] = this.pharmacyInervention;
+
+ return data;
+ }
+}
\ No newline at end of file
diff --git a/lib/core/model/Prescriptions/prescription_model.dart b/lib/core/model/Prescriptions/prescription_model.dart
index 92574c66..a286908f 100644
--- a/lib/core/model/Prescriptions/prescription_model.dart
+++ b/lib/core/model/Prescriptions/prescription_model.dart
@@ -1,5 +1,7 @@
+import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_entity_model.dart';
+
class PrescriptionModel {
- List entityList;
+ List entityList;
dynamic rowcount;
dynamic statusMessage;
@@ -7,9 +9,9 @@ class PrescriptionModel {
PrescriptionModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = new List();
+ entityList = new List();
json['entityList'].forEach((v) {
- entityList.add(new EntityList.fromJson(v));
+ entityList.add(new PrescriptionEntityModel.fromJson(v));
});
}
rowcount = json['rowcount'];
@@ -26,148 +28,3 @@ class PrescriptionModel {
return data;
}
}
-
-class EntityList {
- dynamic appointmentNo;
- dynamic clinicName;
- dynamic createdBy;
- dynamic createdOn;
- dynamic doctorName;
- dynamic doseDailyQuantity;
- dynamic doseDailyUnitID;
- dynamic doseDetail;
- dynamic doseDurationDays;
- dynamic doseTimingID;
- dynamic episodeID;
- dynamic frequencyID;
- dynamic icdCode10ID;
- dynamic indication;
- dynamic isDispensed;
- dynamic isMedicineCovered;
- dynamic isSIG;
- dynamic medicationName;
- dynamic medicationPrice;
- dynamic medicineCode;
- dynamic orderTypeDescription;
- dynamic qty;
- dynamic quantity;
- dynamic remarks;
- dynamic routeID;
- dynamic startDate;
- dynamic status;
- dynamic stopDate;
- dynamic uom;
- dynamic pharmacistRemarks;
- dynamic pharmacyInervention;
- dynamic refill;
- dynamic mediSpanGPICode;
- EntityList(
- {this.appointmentNo,
- this.clinicName,
- this.createdBy,
- this.createdOn,
- this.doctorName,
- this.doseDailyQuantity,
- this.doseDailyUnitID,
- this.doseDetail,
- this.doseDurationDays,
- this.doseTimingID,
- this.episodeID,
- this.frequencyID,
- this.icdCode10ID,
- this.indication,
- this.isDispensed,
- this.isMedicineCovered,
- this.isSIG,
- this.medicationName,
- this.medicationPrice,
- this.medicineCode,
- this.orderTypeDescription,
- this.qty,
- this.quantity,
- this.remarks,
- this.routeID,
- this.startDate,
- this.status,
- this.stopDate,
- this.uom,
- this.pharmacistRemarks,
- this.mediSpanGPICode,
- this.pharmacyInervention,
- this.refill});
-
- EntityList.fromJson(Map json) {
- appointmentNo = json['appointmentNo'];
- clinicName = json['clinicName'];
- createdBy = json['createdBy'];
- createdOn = json['createdOn'];
- doctorName = json['doctorName'];
- doseDailyQuantity = json['doseDailyQuantity'];
- doseDailyUnitID = json['doseDailyUnitID'];
- doseDetail = json['doseDetail'];
- doseDurationDays = json['doseDurationDays'];
- doseTimingID = json['doseTimingID'];
- episodeID = json['episodeID'];
- frequencyID = json['frequencyID'];
- icdCode10ID = json['icdCode10ID'];
- indication = json['indication'];
- isDispensed = json['isDispensed'];
- isMedicineCovered = json['isMedicineCovered'];
- isSIG = json['isSIG'];
- medicationName = json['medicationName'];
- medicationPrice = json['medicationPrice'];
- medicineCode = json['medicineCode'];
- orderTypeDescription = json['orderTypeDescription'];
- qty = json['qty'];
- quantity = json['quantity'];
- remarks = json['remarks'];
- routeID = json['routeID'];
- startDate = json['startDate'];
- status = json['status'];
- stopDate = json['stopDate'];
- uom = json['uom'];
- pharmacistRemarks = json['pharmacistRemarks'];
- mediSpanGPICode = json['mediSpanGPICode'];
- refill = json['refill'];
- pharmacyInervention = json['interventionID'];
- }
-
- Map toJson() {
- final Map data = new Map();
- data['appointmentNo'] = this.appointmentNo;
- data['clinicName'] = this.clinicName;
- data['createdBy'] = this.createdBy;
- data['createdOn'] = this.createdOn;
- data['doctorName'] = this.doctorName;
- data['doseDailyQuantity'] = this.doseDailyQuantity;
- data['doseDailyUnitID'] = this.doseDailyUnitID;
- data['doseDetail'] = this.doseDetail;
- data['doseDurationDays'] = this.doseDurationDays;
- data['doseTimingID'] = this.doseTimingID;
- data['episodeID'] = this.episodeID;
- data['frequencyID'] = this.frequencyID;
- data['icdCode10ID'] = this.icdCode10ID;
- data['indication'] = this.indication;
- data['isDispensed'] = this.isDispensed;
- data['isMedicineCovered'] = this.isMedicineCovered;
- data['isSIG'] = this.isSIG;
- data['medicationName'] = this.medicationName;
- data['medicationPrice'] = this.medicationPrice;
- data['medicineCode'] = this.medicineCode;
- data['orderTypeDescription'] = this.orderTypeDescription;
- data['qty'] = this.qty;
- data['quantity'] = this.quantity;
- data['remarks'] = this.remarks;
- data['routeID'] = this.routeID;
- data['startDate'] = this.startDate;
- data['status'] = this.status;
- data['stopDate'] = this.stopDate;
- data['uom'] = this.uom;
- data['pharmacistRemarks'] = this.pharmacistRemarks;
- data['mediSpanGPICode'] = this.mediSpanGPICode;
- data['refill'] = this.refill;
- data['interventionID'] = this.pharmacyInervention;
-
- return data;
- }
-}
diff --git a/lib/core/model/Prescriptions/prescription_report_enh.dart b/lib/core/model/Prescriptions/prescription_report_enh.dart
index 01b9a5c9..e73034bd 100644
--- a/lib/core/model/Prescriptions/prescription_report_enh.dart
+++ b/lib/core/model/Prescriptions/prescription_report_enh.dart
@@ -35,38 +35,38 @@ class PrescriptionReportEnh {
PrescriptionReportEnh(
{this.address,
- this.appodynamicmentNo,
- this.clinic,
- this.companyName,
- this.days,
- this.doctorName,
- this.doseDailyQuantity,
- this.frequency,
- this.frequencyNumber,
- this.image,
- this.imageExtension,
- this.imageSRCUrl,
- this.imageString,
- this.imageThumbUrl,
- this.isCovered,
- this.itemDescription,
- this.itemID,
- this.orderDate,
- this.patientID,
- this.patientName,
- this.phoneOffice1,
- this.prescriptionQR,
- this.prescriptionTimes,
- this.productImage,
- this.productImageBase64,
- this.productImageString,
- this.projectID,
- this.projectName,
- this.remarks,
- this.route,
- this.sKU,
- this.scaleOffset,
- this.startDate});
+ this.appodynamicmentNo,
+ this.clinic,
+ this.companyName,
+ this.days,
+ this.doctorName,
+ this.doseDailyQuantity,
+ this.frequency,
+ this.frequencyNumber,
+ this.image,
+ this.imageExtension,
+ this.imageSRCUrl,
+ this.imageString,
+ this.imageThumbUrl,
+ this.isCovered,
+ this.itemDescription,
+ this.itemID,
+ this.orderDate,
+ this.patientID,
+ this.patientName,
+ this.phoneOffice1,
+ this.prescriptionQR,
+ this.prescriptionTimes,
+ this.productImage,
+ this.productImageBase64,
+ this.productImageString,
+ this.projectID,
+ this.projectName,
+ this.remarks,
+ this.route,
+ this.sKU,
+ this.scaleOffset,
+ this.startDate});
PrescriptionReportEnh.fromJson(Map json) {
address = json['Address'];
diff --git a/lib/core/model/Prescriptions/prescription_req_model.dart b/lib/core/model/Prescriptions/prescription_req_model.dart
index a45878d8..ec69ca33 100644
--- a/lib/core/model/Prescriptions/prescription_req_model.dart
+++ b/lib/core/model/Prescriptions/prescription_req_model.dart
@@ -1,26 +1,20 @@
class PrescriptionReqModel {
- String vidaAuthTokenID;
dynamic patientMRN;
dynamic appNo;
- dynamic admissionNo;
PrescriptionReqModel(
- {this.vidaAuthTokenID, this.patientMRN, this.appNo, this.admissionNo});
+ { this.patientMRN, this.appNo});
PrescriptionReqModel.fromJson(Map json) {
- vidaAuthTokenID = json['VidaAuthTokenID'];
patientMRN = json['PatientMRN'];
appNo = json['AppointmentNo'];
- admissionNo = json['AdmissionNo'];
+
}
Map toJson() {
final Map data = new Map();
- data['VidaAuthTokenID'] = this.vidaAuthTokenID;
data['PatientMRN'] = this.patientMRN;
data['AppointmentNo'] = this.appNo;
- data['AdmissionNo'] = this.admissionNo;
-
return data;
}
}
diff --git a/lib/core/model/Prescriptions/prescriptions_order.dart b/lib/core/model/Prescriptions/prescriptions_order.dart
index f51420ec..33e23fe8 100644
--- a/lib/core/model/Prescriptions/prescriptions_order.dart
+++ b/lib/core/model/Prescriptions/prescriptions_order.dart
@@ -34,35 +34,35 @@ class PrescriptionsOrder {
PrescriptionsOrder(
{this.iD,
- this.patientID,
- this.patientOutSA,
- this.isOutPatient,
- this.projectID,
- this.nearestProjectID,
- this.longitude,
- this.latitude,
- this.appointmentNo,
- this.dischargeID,
- this.lineItemNo,
- this.status,
- this.description,
- this.descriptionN,
- this.createdOn,
- this.serviceID,
- this.createdBy,
- this.editedOn,
- this.editedBy,
- this.channel,
- this.clientRequestID,
- this.returnedToQueue,
- this.pickupDateTime,
- this.pickupLocationName,
- this.dropoffLocationName,
- this.realRRTHaveTransactions,
- this.nearestProjectDescription,
- this.nearestProjectDescriptionN,
- this.projectDescription,
- this.projectDescriptionN});
+ this.patientID,
+ this.patientOutSA,
+ this.isOutPatient,
+ this.projectID,
+ this.nearestProjectID,
+ this.longitude,
+ this.latitude,
+ this.appointmentNo,
+ this.dischargeID,
+ this.lineItemNo,
+ this.status,
+ this.description,
+ this.descriptionN,
+ this.createdOn,
+ this.serviceID,
+ this.createdBy,
+ this.editedOn,
+ this.editedBy,
+ this.channel,
+ this.clientRequestID,
+ this.returnedToQueue,
+ this.pickupDateTime,
+ this.pickupLocationName,
+ this.dropoffLocationName,
+ this.realRRTHaveTransactions,
+ this.nearestProjectDescription,
+ this.nearestProjectDescriptionN,
+ this.projectDescription,
+ this.projectDescriptionN});
PrescriptionsOrder.fromJson(Map json) {
iD = json['ID'];
diff --git a/lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart b/lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart
index 739bb838..e7d968c5 100644
--- a/lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart
+++ b/lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart
@@ -14,17 +14,17 @@ class RequestGetListPharmacyForPrescriptions {
RequestGetListPharmacyForPrescriptions(
{this.latitude,
- this.longitude,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.itemID});
+ this.longitude,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.itemID});
RequestGetListPharmacyForPrescriptions.fromJson(Map json) {
latitude = json['Latitude'];
diff --git a/lib/core/model/Prescriptions/request_prescription_report.dart b/lib/core/model/Prescriptions/request_prescription_report.dart
index c8323740..edd249ee 100644
--- a/lib/core/model/Prescriptions/request_prescription_report.dart
+++ b/lib/core/model/Prescriptions/request_prescription_report.dart
@@ -21,24 +21,24 @@ class RequestPrescriptionReport {
RequestPrescriptionReport(
{this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.patientID,
- this.tokenID,
- this.patientTypeID,
- this.patientType,
- this.appointmentNo,
- this.setupID,
- this.episodeID,
- this.clinicID,
- this.projectID,
- this.dischargeNo});
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.patientID,
+ this.tokenID,
+ this.patientTypeID,
+ this.patientType,
+ this.appointmentNo,
+ this.setupID,
+ this.episodeID,
+ this.clinicID,
+ this.projectID,
+ this.dischargeNo});
RequestPrescriptionReport.fromJson(Map json) {
versionID = json['VersionID'];
diff --git a/lib/core/model/Prescriptions/request_prescription_report_enh.dart b/lib/core/model/Prescriptions/request_prescription_report_enh.dart
index 4905fc2a..48b4f435 100644
--- a/lib/core/model/Prescriptions/request_prescription_report_enh.dart
+++ b/lib/core/model/Prescriptions/request_prescription_report_enh.dart
@@ -21,23 +21,24 @@ class RequestPrescriptionReportEnh {
RequestPrescriptionReportEnh(
{this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.patientID,
- this.tokenID,
- this.patientTypeID,
- this.patientType,
- this.appointmentNo,
- this.setupID,
- this.episodeID,
- this.clinicID,
- this.projectID,this.dischargeNo});
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.patientID,
+ this.tokenID,
+ this.patientTypeID,
+ this.patientType,
+ this.appointmentNo,
+ this.setupID,
+ this.episodeID,
+ this.clinicID,
+ this.projectID,
+ this.dischargeNo});
RequestPrescriptionReportEnh.fromJson(Map json) {
versionID = json['VersionID'];
diff --git a/lib/models/SOAP/Allergy_model.dart b/lib/core/model/SOAP/Allergy_model.dart
similarity index 83%
rename from lib/models/SOAP/Allergy_model.dart
rename to lib/core/model/SOAP/Allergy_model.dart
index c3493832..f1a498da 100644
--- a/lib/models/SOAP/Allergy_model.dart
+++ b/lib/core/model/SOAP/Allergy_model.dart
@@ -14,17 +14,17 @@ class AllergyModel {
AllergyModel(
{this.allergyDiseaseId,
- this.allergyDiseaseName,
- this.allergyDiseaseType,
- this.appointmentNo,
- this.createdBy,
- this.createdByName,
- this.createdOn,
- this.episodeID,
- this.isChecked,
- this.isUpdatedByNurse,
- this.severity,
- this.severityName});
+ this.allergyDiseaseName,
+ this.allergyDiseaseType,
+ this.appointmentNo,
+ this.createdBy,
+ this.createdByName,
+ this.createdOn,
+ this.episodeID,
+ this.isChecked,
+ this.isUpdatedByNurse,
+ this.severity,
+ this.severityName});
AllergyModel.fromJson(Map json) {
allergyDiseaseId = json['allergyDiseaseId'];
diff --git a/lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart b/lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
similarity index 88%
rename from lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
rename to lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
index f04fd8d4..b8b7f38c 100644
--- a/lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
+++ b/lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
@@ -7,7 +7,12 @@ class GetChiefComplaintReqModel {
int admissionNo;
GetChiefComplaintReqModel(
- {this.patientMRN, this.appointmentNo, this.episodeId, this.episodeID, this.doctorID, this.admissionNo});
+ {this.patientMRN,
+ this.appointmentNo,
+ this.episodeId,
+ this.episodeID,
+ this.doctorID,
+ this.admissionNo});
GetChiefComplaintReqModel.fromJson(Map json) {
patientMRN = json['PatientMRN'];
diff --git a/lib/models/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart b/lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart
similarity index 84%
rename from lib/models/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart
rename to lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart
index 85ada324..16a524ef 100644
--- a/lib/models/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart
+++ b/lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart
@@ -14,17 +14,17 @@ class GetChiefComplaintResModel {
GetChiefComplaintResModel(
{this.appointmentNo,
- this.ccdate,
- this.chiefComplaint,
- this.clinicDescription,
- this.clinicID,
- this.currentMedication,
- this.doctorID,
- this.doctorName,
- this.episodeId,
- this.hopi,
- this.patientMRN,
- this.status});
+ this.ccdate,
+ this.chiefComplaint,
+ this.clinicDescription,
+ this.clinicID,
+ this.currentMedication,
+ this.doctorID,
+ this.doctorName,
+ this.episodeId,
+ this.hopi,
+ this.patientMRN,
+ this.status});
GetChiefComplaintResModel.fromJson(Map json) {
appointmentNo = json['appointmentNo'];
diff --git a/lib/models/SOAP/GeneralGetReqForSOAP.dart b/lib/core/model/SOAP/GeneralGetReqForSOAP.dart
similarity index 100%
rename from lib/models/SOAP/GeneralGetReqForSOAP.dart
rename to lib/core/model/SOAP/GeneralGetReqForSOAP.dart
diff --git a/lib/models/SOAP/GetAllergiesResModel.dart b/lib/core/model/SOAP/GetAllergiesResModel.dart
similarity index 84%
rename from lib/models/SOAP/GetAllergiesResModel.dart
rename to lib/core/model/SOAP/GetAllergiesResModel.dart
index 1eeca63e..d3eac57d 100644
--- a/lib/models/SOAP/GetAllergiesResModel.dart
+++ b/lib/core/model/SOAP/GetAllergiesResModel.dart
@@ -15,17 +15,18 @@ class GetAllergiesResModel {
GetAllergiesResModel(
{this.allergyDiseaseId,
- this.allergyDiseaseName,
- this.allergyDiseaseType,
- this.appointmentNo,
- this.createdBy,
- this.createdByName,
- this.createdOn,
- this.episodeID,
- this.isChecked,
- this.isUpdatedByNurse,
- this.severity,
- this.severityName, this.remarks=''});
+ this.allergyDiseaseName,
+ this.allergyDiseaseType,
+ this.appointmentNo,
+ this.createdBy,
+ this.createdByName,
+ this.createdOn,
+ this.episodeID,
+ this.isChecked,
+ this.isUpdatedByNurse,
+ this.severity,
+ this.severityName,
+ this.remarks = ''});
GetAllergiesResModel.fromJson(Map json) {
allergyDiseaseId = json['allergyDiseaseId'];
diff --git a/lib/models/SOAP/GetAssessmentReqModel.dart b/lib/core/model/SOAP/GetAssessmentReqModel.dart
similarity index 85%
rename from lib/models/SOAP/GetAssessmentReqModel.dart
rename to lib/core/model/SOAP/GetAssessmentReqModel.dart
index 965382b5..0c71982e 100644
--- a/lib/models/SOAP/GetAssessmentReqModel.dart
+++ b/lib/core/model/SOAP/GetAssessmentReqModel.dart
@@ -10,13 +10,13 @@ class GetAssessmentReqModel {
GetAssessmentReqModel(
{this.patientMRN,
- this.appointmentNo,
- this.episodeID,
- this.from,
- this.to,
- this.clinicID,
- this.editedBy,
- this.doctorID});
+ this.appointmentNo,
+ this.episodeID,
+ this.from,
+ this.to,
+ this.clinicID,
+ this.editedBy,
+ this.doctorID});
GetAssessmentReqModel.fromJson(Map json) {
patientMRN = json['PatientMRN'];
diff --git a/lib/models/SOAP/GetAssessmentResModel.dart b/lib/core/model/SOAP/GetAssessmentResModel.dart
similarity index 83%
rename from lib/models/SOAP/GetAssessmentResModel.dart
rename to lib/core/model/SOAP/GetAssessmentResModel.dart
index 4d1b1b68..ca460c81 100644
--- a/lib/models/SOAP/GetAssessmentResModel.dart
+++ b/lib/core/model/SOAP/GetAssessmentResModel.dart
@@ -17,20 +17,20 @@ class GetAssessmentResModel {
GetAssessmentResModel(
{this.appointmentNo,
- this.asciiDesc,
- this.clinicDescription,
- this.clinicID,
- this.complexDiagnosis,
- this.conditionID,
- this.createdBy,
- this.createdOn,
- this.diagnosisTypeID,
- this.doctorID,
- this.doctorName,
- this.episodeId,
- this.icdCode10ID,
- this.patientMRN,
- this.remarks});
+ this.asciiDesc,
+ this.clinicDescription,
+ this.clinicID,
+ this.complexDiagnosis,
+ this.conditionID,
+ this.createdBy,
+ this.createdOn,
+ this.diagnosisTypeID,
+ this.doctorID,
+ this.doctorName,
+ this.episodeId,
+ this.icdCode10ID,
+ this.patientMRN,
+ this.remarks});
GetAssessmentResModel.fromJson(Map json) {
appointmentNo = json['appointmentNo'];
diff --git a/lib/models/SOAP/GetGetProgressNoteReqModel.dart b/lib/core/model/SOAP/GetGetProgressNoteReqModel.dart
similarity index 86%
rename from lib/models/SOAP/GetGetProgressNoteReqModel.dart
rename to lib/core/model/SOAP/GetGetProgressNoteReqModel.dart
index 1da4a8bf..47f1861a 100644
--- a/lib/models/SOAP/GetGetProgressNoteReqModel.dart
+++ b/lib/core/model/SOAP/GetGetProgressNoteReqModel.dart
@@ -10,13 +10,13 @@ class GetGetProgressNoteReqModel {
GetGetProgressNoteReqModel(
{this.patientMRN,
- this.appointmentNo,
- this.episodeID,
- this.from,
- this.to,
- this.clinicID,
- this.editedBy,
- this.doctorID});
+ this.appointmentNo,
+ this.episodeID,
+ this.from,
+ this.to,
+ this.clinicID,
+ this.editedBy,
+ this.doctorID});
GetGetProgressNoteReqModel.fromJson(Map json) {
patientMRN = json['PatientMRN'];
@@ -27,7 +27,6 @@ class GetGetProgressNoteReqModel {
clinicID = json['ClinicID'];
doctorID = json['DoctorID'];
editedBy = json['EditedBy'];
-
}
Map toJson() {
diff --git a/lib/models/SOAP/GetGetProgressNoteResModel.dart b/lib/core/model/SOAP/GetGetProgressNoteResModel.dart
similarity index 82%
rename from lib/models/SOAP/GetGetProgressNoteResModel.dart
rename to lib/core/model/SOAP/GetGetProgressNoteResModel.dart
index 4ae7ed8c..1e5cae66 100644
--- a/lib/models/SOAP/GetGetProgressNoteResModel.dart
+++ b/lib/core/model/SOAP/GetGetProgressNoteResModel.dart
@@ -1,4 +1,4 @@
-class GetPatientProgressNoteResModel {
+class GetPatientProgressNoteResModel {
int appointmentNo;
int createdBy;
String createdByName;
@@ -13,16 +13,16 @@ class GetPatientProgressNoteResModel {
GetPatientProgressNoteResModel(
{this.appointmentNo,
- this.createdBy,
- this.createdByName,
- this.createdOn,
- this.dName,
- this.editedByName,
- this.editedOn,
- this.episodeId,
- this.mName,
- this.patientMRN,
- this.planNote});
+ this.createdBy,
+ this.createdByName,
+ this.createdOn,
+ this.dName,
+ this.editedByName,
+ this.editedOn,
+ this.episodeId,
+ this.mName,
+ this.patientMRN,
+ this.planNote});
GetPatientProgressNoteResModel.fromJson(Map json) {
appointmentNo = json['appointmentNo'];
diff --git a/lib/models/SOAP/GetHistoryReqModel.dart b/lib/core/model/SOAP/GetHistoryReqModel.dart
similarity index 99%
rename from lib/models/SOAP/GetHistoryReqModel.dart
rename to lib/core/model/SOAP/GetHistoryReqModel.dart
index 720b6342..2211c4f4 100644
--- a/lib/models/SOAP/GetHistoryReqModel.dart
+++ b/lib/core/model/SOAP/GetHistoryReqModel.dart
@@ -30,7 +30,6 @@ class GetHistoryReqModel {
doctorID = json['DoctorID'];
appointmentNo = json['AppointmentNo'];
editedBy = json['EditedBy'];
-
}
Map toJson() {
diff --git a/lib/models/SOAP/GetHistoryResModel.dart b/lib/core/model/SOAP/GetHistoryResModel.dart
similarity index 86%
rename from lib/models/SOAP/GetHistoryResModel.dart
rename to lib/core/model/SOAP/GetHistoryResModel.dart
index c4b4f129..078a2caa 100644
--- a/lib/models/SOAP/GetHistoryResModel.dart
+++ b/lib/core/model/SOAP/GetHistoryResModel.dart
@@ -9,12 +9,12 @@ class GetHistoryResModel {
GetHistoryResModel(
{this.appointmentNo,
- this.episodeId,
- this.historyId,
- this.historyType,
- this.isChecked,
- this.patientMRN,
- this.remarks});
+ this.episodeId,
+ this.historyId,
+ this.historyType,
+ this.isChecked,
+ this.patientMRN,
+ this.remarks});
GetHistoryResModel.fromJson(Map json) {
appointmentNo = json['appointmentNo'];
diff --git a/lib/models/SOAP/GetPhysicalExamListResModel.dart b/lib/core/model/SOAP/GetPhysicalExamListResModel.dart
similarity index 82%
rename from lib/models/SOAP/GetPhysicalExamListResModel.dart
rename to lib/core/model/SOAP/GetPhysicalExamListResModel.dart
index c97189b1..c8f825ad 100644
--- a/lib/models/SOAP/GetPhysicalExamListResModel.dart
+++ b/lib/core/model/SOAP/GetPhysicalExamListResModel.dart
@@ -21,24 +21,24 @@ class GetPhysicalExamResModel {
GetPhysicalExamResModel(
{this.appointmentNo,
- this.createdBy,
- this.createdByName,
- this.createdOn,
- this.editedBy,
- this.editedByName,
- this.editedOn,
- this.episodeId,
- this.examId,
- this.examName,
- this.examType,
- this.examinationType,
- this.examinationTypeName,
- this.isAbnormal,
- this.isNew,
- this.isNormal,
- this.notExamined,
- this.patientMRN,
- this.remarks});
+ this.createdBy,
+ this.createdByName,
+ this.createdOn,
+ this.editedBy,
+ this.editedByName,
+ this.editedOn,
+ this.episodeId,
+ this.examId,
+ this.examName,
+ this.examType,
+ this.examinationType,
+ this.examinationTypeName,
+ this.isAbnormal,
+ this.isNew,
+ this.isNormal,
+ this.notExamined,
+ this.patientMRN,
+ this.remarks});
GetPhysicalExamResModel.fromJson(Map json) {
appointmentNo = json['appointmentNo'];
diff --git a/lib/models/SOAP/GetPhysicalExamReqModel.dart b/lib/core/model/SOAP/GetPhysicalExamReqModel.dart
similarity index 100%
rename from lib/models/SOAP/GetPhysicalExamReqModel.dart
rename to lib/core/model/SOAP/GetPhysicalExamReqModel.dart
diff --git a/lib/models/SOAP/PatchAssessmentReqModel.dart b/lib/core/model/SOAP/PatchAssessmentReqModel.dart
similarity index 85%
rename from lib/models/SOAP/PatchAssessmentReqModel.dart
rename to lib/core/model/SOAP/PatchAssessmentReqModel.dart
index 8cbf5cb7..fb229127 100644
--- a/lib/models/SOAP/PatchAssessmentReqModel.dart
+++ b/lib/core/model/SOAP/PatchAssessmentReqModel.dart
@@ -11,14 +11,14 @@ class PatchAssessmentReqModel {
PatchAssessmentReqModel(
{this.patientMRN,
- this.appointmentNo,
- this.episodeID,
- this.icdcode10Id,
- this.prevIcdCode10ID,
- this.conditionId,
- this.diagnosisTypeId,
- this.complexDiagnosis,
- this.remarks});
+ this.appointmentNo,
+ this.episodeID,
+ this.icdcode10Id,
+ this.prevIcdCode10ID,
+ this.conditionId,
+ this.diagnosisTypeId,
+ this.complexDiagnosis,
+ this.remarks});
PatchAssessmentReqModel.fromJson(Map json) {
patientMRN = json['PatientMRN'];
diff --git a/lib/models/SOAP/PostEpisodeReqModel.dart b/lib/core/model/SOAP/PostEpisodeReqModel.dart
similarity index 89%
rename from lib/models/SOAP/PostEpisodeReqModel.dart
rename to lib/core/model/SOAP/PostEpisodeReqModel.dart
index 6d3ee45a..bfc4e4bc 100644
--- a/lib/models/SOAP/PostEpisodeReqModel.dart
+++ b/lib/core/model/SOAP/PostEpisodeReqModel.dart
@@ -6,9 +6,9 @@ class PostEpisodeReqModel {
PostEpisodeReqModel(
{this.appointmentNo,
- this.patientMRN,
- this.doctorID,
- this.vidaAuthTokenID});
+ this.patientMRN,
+ this.doctorID,
+ this.vidaAuthTokenID});
PostEpisodeReqModel.fromJson(Map json) {
appointmentNo = json['AppointmentNo'];
diff --git a/lib/models/SOAP/get_Allergies_request_model.dart b/lib/core/model/SOAP/get_Allergies_request_model.dart
similarity index 88%
rename from lib/models/SOAP/get_Allergies_request_model.dart
rename to lib/core/model/SOAP/get_Allergies_request_model.dart
index 7676d530..2220f243 100644
--- a/lib/models/SOAP/get_Allergies_request_model.dart
+++ b/lib/core/model/SOAP/get_Allergies_request_model.dart
@@ -7,10 +7,10 @@ class GetAllergiesRequestModel {
GetAllergiesRequestModel(
{this.vidaAuthTokenID,
- this.patientMRN,
- this.appointmentNo,
- this.episodeId,
- this.doctorID});
+ this.patientMRN,
+ this.appointmentNo,
+ this.episodeId,
+ this.doctorID});
GetAllergiesRequestModel.fromJson(Map json) {
vidaAuthTokenID = json['VidaAuthTokenID'];
diff --git a/lib/models/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart b/lib/core/model/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart
similarity index 100%
rename from lib/models/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart
rename to lib/core/model/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart
diff --git a/lib/models/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart b/lib/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart
similarity index 100%
rename from lib/models/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart
rename to lib/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart
diff --git a/lib/models/SOAP/master_key_model.dart b/lib/core/model/SOAP/master_key_model.dart
similarity index 82%
rename from lib/models/SOAP/master_key_model.dart
rename to lib/core/model/SOAP/master_key_model.dart
index a1c32039..070eab08 100644
--- a/lib/models/SOAP/master_key_model.dart
+++ b/lib/core/model/SOAP/master_key_model.dart
@@ -18,21 +18,21 @@ class MasterKeyModel {
MasterKeyModel(
{this.alias,
- this.aliasN,
- this.code,
- this.description,
- this.detail1,
- this.detail2,
- this.detail3,
- this.detail4,
- this.detail5,
- this.groupID,
- this.id,
- this.nameAr,
- this.nameEn,
- this.remarks,
- this.typeId,
- this.valueList});
+ this.aliasN,
+ this.code,
+ this.description,
+ this.detail1,
+ this.detail2,
+ this.detail3,
+ this.detail4,
+ this.detail5,
+ this.groupID,
+ this.id,
+ this.nameAr,
+ this.nameEn,
+ this.remarks,
+ this.typeId,
+ this.valueList});
MasterKeyModel.fromJson(Map json) {
alias = json['alias'];
diff --git a/lib/models/SOAP/order-procedure.dart b/lib/core/model/SOAP/order-procedure.dart
similarity index 81%
rename from lib/models/SOAP/order-procedure.dart
rename to lib/core/model/SOAP/order-procedure.dart
index 4e134a07..b49305ef 100644
--- a/lib/models/SOAP/order-procedure.dart
+++ b/lib/core/model/SOAP/order-procedure.dart
@@ -1,5 +1,4 @@
class OrderProcedure {
-
String achiCode;
String appointmentDate;
int appointmentNo;
@@ -27,29 +26,29 @@ class OrderProcedure {
OrderProcedure(
{this.achiCode,
- this.appointmentDate,
- this.appointmentNo,
- this.categoryID,
- this.clinicDescription,
- this.cptCode,
- this.createdBy,
- this.createdOn,
- this.doctorName,
- this.isApprovalCreated,
- this.isApprovalRequired,
- this.isCovered,
- this.isInvoiced,
- this.isReferralInvoiced,
- this.isUncoveredByDoctor,
- this.lineItemNo,
- this.orderDate,
- this.orderNo,
- this.orderType,
- this.procedureId,
- this.procedureName,
- this.remarks,
- this.status,
- this.template});
+ this.appointmentDate,
+ this.appointmentNo,
+ this.categoryID,
+ this.clinicDescription,
+ this.cptCode,
+ this.createdBy,
+ this.createdOn,
+ this.doctorName,
+ this.isApprovalCreated,
+ this.isApprovalRequired,
+ this.isCovered,
+ this.isInvoiced,
+ this.isReferralInvoiced,
+ this.isUncoveredByDoctor,
+ this.lineItemNo,
+ this.orderDate,
+ this.orderNo,
+ this.orderType,
+ this.procedureId,
+ this.procedureName,
+ this.remarks,
+ this.status,
+ this.template});
OrderProcedure.fromJson(Map json) {
achiCode = json['achiCode'];
@@ -106,5 +105,4 @@ class OrderProcedure {
data['template'] = this.template;
return data;
}
-
-}
\ No newline at end of file
+}
diff --git a/lib/models/SOAP/post_allergy_request_model.dart b/lib/core/model/SOAP/post_allergy_request_model.dart
similarity index 86%
rename from lib/models/SOAP/post_allergy_request_model.dart
rename to lib/core/model/SOAP/post_allergy_request_model.dart
index 6783d885..a179da06 100644
--- a/lib/models/SOAP/post_allergy_request_model.dart
+++ b/lib/core/model/SOAP/post_allergy_request_model.dart
@@ -1,13 +1,13 @@
class PostAllergyRequestModel {
List
- listHisProgNotePatientAllergyDiseaseVM;
+ listHisProgNotePatientAllergyDiseaseVM;
PostAllergyRequestModel({this.listHisProgNotePatientAllergyDiseaseVM});
PostAllergyRequestModel.fromJson(Map json) {
if (json['listHisProgNotePatientAllergyDiseaseVM'] != null) {
listHisProgNotePatientAllergyDiseaseVM =
- new List();
+ new List();
json['listHisProgNotePatientAllergyDiseaseVM'].forEach((v) {
listHisProgNotePatientAllergyDiseaseVM
.add(new ListHisProgNotePatientAllergyDiseaseVM.fromJson(v));
@@ -44,18 +44,18 @@ class ListHisProgNotePatientAllergyDiseaseVM {
ListHisProgNotePatientAllergyDiseaseVM(
{this.patientMRN,
- this.allergyDiseaseType,
- this.allergyDiseaseId,
- this.episodeId,
- this.appointmentNo,
- this.severity,
- this.isChecked,
- this.isUpdatedByNurse,
- this.remarks,
- this.createdBy,
- this.createdOn,
- this.editedBy,
- this.editedOn});
+ this.allergyDiseaseType,
+ this.allergyDiseaseId,
+ this.episodeId,
+ this.appointmentNo,
+ this.severity,
+ this.isChecked,
+ this.isUpdatedByNurse,
+ this.remarks,
+ this.createdBy,
+ this.createdOn,
+ this.editedBy,
+ this.editedOn});
ListHisProgNotePatientAllergyDiseaseVM.fromJson(Map json) {
patientMRN = json['patientMRN'];
diff --git a/lib/models/SOAP/post_assessment_request_model.dart b/lib/core/model/SOAP/post_assessment_request_model.dart
similarity index 90%
rename from lib/models/SOAP/post_assessment_request_model.dart
rename to lib/core/model/SOAP/post_assessment_request_model.dart
index af577671..5cda0524 100644
--- a/lib/models/SOAP/post_assessment_request_model.dart
+++ b/lib/core/model/SOAP/post_assessment_request_model.dart
@@ -6,9 +6,9 @@ class PostAssessmentRequestModel {
PostAssessmentRequestModel(
{this.patientMRN,
- this.appointmentNo,
- this.episodeId,
- this.icdCodeDetails});
+ this.appointmentNo,
+ this.episodeId,
+ this.icdCodeDetails});
PostAssessmentRequestModel.fromJson(Map json) {
patientMRN = json['PatientMRN'];
@@ -44,10 +44,10 @@ class IcdCodeDetails {
IcdCodeDetails(
{this.icdcode10Id,
- this.conditionId,
- this.diagnosisTypeId,
- this.complexDiagnosis,
- this.remarks});
+ this.conditionId,
+ this.diagnosisTypeId,
+ this.complexDiagnosis,
+ this.remarks});
IcdCodeDetails.fromJson(Map json) {
icdcode10Id = json['icdcode10Id'];
diff --git a/lib/models/SOAP/post_chief_complaint_request_model.dart b/lib/core/model/SOAP/post_chief_complaint_request_model.dart
similarity index 100%
rename from lib/models/SOAP/post_chief_complaint_request_model.dart
rename to lib/core/model/SOAP/post_chief_complaint_request_model.dart
diff --git a/lib/models/SOAP/post_histories_request_model.dart b/lib/core/model/SOAP/post_histories_request_model.dart
similarity index 92%
rename from lib/models/SOAP/post_histories_request_model.dart
rename to lib/core/model/SOAP/post_histories_request_model.dart
index d8be3fb2..7d15974c 100644
--- a/lib/models/SOAP/post_histories_request_model.dart
+++ b/lib/core/model/SOAP/post_histories_request_model.dart
@@ -36,12 +36,12 @@ class ListMedicalHistoryVM {
ListMedicalHistoryVM(
{this.patientMRN,
- this.historyType,
- this.historyId,
- this.episodeId,
- this.appointmentNo,
- this.isChecked,
- this.remarks});
+ this.historyType,
+ this.historyId,
+ this.episodeId,
+ this.appointmentNo,
+ this.isChecked,
+ this.remarks});
ListMedicalHistoryVM.fromJson(Map json) {
patientMRN = json['patientMRN'];
diff --git a/lib/models/SOAP/post_physical_exam_request_model.dart b/lib/core/model/SOAP/post_physical_exam_request_model.dart
similarity index 100%
rename from lib/models/SOAP/post_physical_exam_request_model.dart
rename to lib/core/model/SOAP/post_physical_exam_request_model.dart
diff --git a/lib/models/SOAP/post_progress_note_request_model.dart b/lib/core/model/SOAP/post_progress_note_request_model.dart
similarity index 100%
rename from lib/models/SOAP/post_progress_note_request_model.dart
rename to lib/core/model/SOAP/post_progress_note_request_model.dart
diff --git a/lib/models/SOAP/selected_items/my_selected_allergy.dart b/lib/core/model/SOAP/selected_items/my_selected_allergy.dart
similarity index 86%
rename from lib/models/SOAP/selected_items/my_selected_allergy.dart
rename to lib/core/model/SOAP/selected_items/my_selected_allergy.dart
index 512a4f64..86fad1ec 100644
--- a/lib/models/SOAP/selected_items/my_selected_allergy.dart
+++ b/lib/core/model/SOAP/selected_items/my_selected_allergy.dart
@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
class MySelectedAllergy {
MasterKeyModel selectedAllergySeverity;
@@ -19,5 +19,4 @@ class MySelectedAllergy {
this.isLocal = true,
this.createdBy,
this.hasValidationError = false});
-
}
diff --git a/lib/models/SOAP/selected_items/my_selected_assement.dart b/lib/core/model/SOAP/selected_items/my_selected_assement.dart
similarity index 63%
rename from lib/models/SOAP/selected_items/my_selected_assement.dart
rename to lib/core/model/SOAP/selected_items/my_selected_assement.dart
index 01572e6d..ab4c9965 100644
--- a/lib/models/SOAP/selected_items/my_selected_assement.dart
+++ b/lib/core/model/SOAP/selected_items/my_selected_assement.dart
@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
class MySelectedAssessment {
MasterKeyModel selectedICD;
@@ -16,9 +16,11 @@ class MySelectedAssessment {
{this.selectedICD,
this.selectedDiagnosisCondition,
this.selectedDiagnosisType,
- this.remark, this.appointmentId, this.createdBy,
- this.createdOn,
- this.doctorID,
- this.doctorName,
- this.icdCode10ID});
+ this.remark,
+ this.appointmentId,
+ this.createdBy,
+ this.createdOn,
+ this.doctorID,
+ this.doctorName,
+ this.icdCode10ID});
}
diff --git a/lib/models/SOAP/selected_items/my_selected_examination.dart b/lib/core/model/SOAP/selected_items/my_selected_examination.dart
similarity index 87%
rename from lib/models/SOAP/selected_items/my_selected_examination.dart
rename to lib/core/model/SOAP/selected_items/my_selected_examination.dart
index 75f67ae2..1e8a128f 100644
--- a/lib/models/SOAP/selected_items/my_selected_examination.dart
+++ b/lib/core/model/SOAP/selected_items/my_selected_examination.dart
@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
class MySelectedExamination {
MasterKeyModel selectedExamination;
diff --git a/lib/models/SOAP/selected_items/my_selected_history.dart b/lib/core/model/SOAP/selected_items/my_selected_history.dart
similarity index 74%
rename from lib/models/SOAP/selected_items/my_selected_history.dart
rename to lib/core/model/SOAP/selected_items/my_selected_history.dart
index 3769c418..2aa0b3e3 100644
--- a/lib/models/SOAP/selected_items/my_selected_history.dart
+++ b/lib/core/model/SOAP/selected_items/my_selected_history.dart
@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
class MySelectedHistory {
MasterKeyModel selectedHistory;
diff --git a/lib/core/model/admissionRequest/clinic-model.dart b/lib/core/model/admissionRequest/clinic-model.dart
index 05d34645..3905e67b 100644
--- a/lib/core/model/admissionRequest/clinic-model.dart
+++ b/lib/core/model/admissionRequest/clinic-model.dart
@@ -7,10 +7,10 @@ class Clinic {
Clinic(
{this.clinicGroupID,
- this.clinicGroupName,
- this.clinicID,
- this.clinicNameArabic,
- this.clinicNameEnglish});
+ this.clinicGroupName,
+ this.clinicID,
+ this.clinicNameArabic,
+ this.clinicNameEnglish});
Clinic.fromJson(Map json) {
clinicGroupID = json['clinicGroupID'];
@@ -29,5 +29,4 @@ class Clinic {
data['clinicNameEnglish'] = this.clinicNameEnglish;
return data;
}
-
-}
\ No newline at end of file
+}
diff --git a/lib/core/model/admissionRequest/ward-model.dart b/lib/core/model/admissionRequest/ward-model.dart
index 606758d3..98479fca 100644
--- a/lib/core/model/admissionRequest/ward-model.dart
+++ b/lib/core/model/admissionRequest/ward-model.dart
@@ -1,12 +1,10 @@
-class WardModel{
-
+class WardModel {
String description;
String descriptionN;
int floorID;
bool isActive;
- WardModel(
- {this.description, this.descriptionN, this.floorID, this.isActive});
+ WardModel({this.description, this.descriptionN, this.floorID, this.isActive});
WardModel.fromJson(Map json) {
description = json['description'];
@@ -23,4 +21,4 @@ class WardModel{
data['isActive'] = this.isActive;
return data;
}
-}
\ No newline at end of file
+}
diff --git a/lib/models/admisson_orders/admission_orders_model.dart b/lib/core/model/admisson_orders/admission_orders_model.dart
similarity index 100%
rename from lib/models/admisson_orders/admission_orders_model.dart
rename to lib/core/model/admisson_orders/admission_orders_model.dart
diff --git a/lib/models/admisson_orders/admission_orders_request_model.dart b/lib/core/model/admisson_orders/admission_orders_request_model.dart
similarity index 100%
rename from lib/models/admisson_orders/admission_orders_request_model.dart
rename to lib/core/model/admisson_orders/admission_orders_request_model.dart
diff --git a/lib/core/model/auth/activation_Code_req_model.dart b/lib/core/model/auth/activation_Code_req_model.dart
index 85d7f1d3..f6094b9d 100644
--- a/lib/core/model/auth/activation_Code_req_model.dart
+++ b/lib/core/model/auth/activation_Code_req_model.dart
@@ -15,7 +15,8 @@ class ActivationCodeModel {
this.memberID,
this.facilityId,
this.otpSendType,
- this.generalid,this.loginDoctorID});
+ this.generalid,
+ this.loginDoctorID});
ActivationCodeModel.fromJson(Map json) {
channel = json['Channel'];
diff --git a/lib/core/model/auth/activation_code_for_verification_screen_model.dart b/lib/core/model/auth/activation_code_for_verification_screen_model.dart
index dae31f8c..631ac0ca 100644
--- a/lib/core/model/auth/activation_code_for_verification_screen_model.dart
+++ b/lib/core/model/auth/activation_code_for_verification_screen_model.dart
@@ -13,6 +13,7 @@ class ActivationCodeForVerificationScreenModel {
String vidaAuthTokenID;
String vidaRefreshTokenID;
String iMEI;
+
ActivationCodeForVerificationScreenModel(
{this.oTPSendType,
this.mobileNumber,
@@ -26,7 +27,8 @@ class ActivationCodeForVerificationScreenModel {
this.isMobileFingerPrint,
this.vidaAuthTokenID,
this.vidaRefreshTokenID,
- this.iMEI,this.loginDoctorID});
+ this.iMEI,
+ this.loginDoctorID});
ActivationCodeForVerificationScreenModel.fromJson(Map json) {
oTPSendType = json['OTP_SendType'];
diff --git a/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart b/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
index e39518e6..6fb7eb70 100644
--- a/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
+++ b/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
+import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart';
class CheckActivationCodeForDoctorAppResponseModel {
String authenticationTokenID;
diff --git a/lib/core/model/auth/check_activation_code_request_model.dart b/lib/core/model/auth/check_activation_code_request_model.dart
index 94502a71..c8040671 100644
--- a/lib/core/model/auth/check_activation_code_request_model.dart
+++ b/lib/core/model/auth/check_activation_code_request_model.dart
@@ -19,6 +19,7 @@ class CheckActivationCodeRequestModel {
String iMEI;
bool isForSilentLogin;
int oTPSendType;
+
CheckActivationCodeRequestModel(
{this.mobileNumber,
this.zipCode,
@@ -33,7 +34,13 @@ class CheckActivationCodeRequestModel {
this.activationCode,
this.vidaAuthTokenID,
this.vidaRefreshTokenID,
- this.oTPSendType,this.password,this.facilityId,this.memberID,this.isForSilentLogin=false,this.iMEI,this.loginDoctorID});
+ this.oTPSendType,
+ this.password,
+ this.facilityId,
+ this.memberID,
+ this.isForSilentLogin = false,
+ this.iMEI,
+ this.loginDoctorID});
CheckActivationCodeRequestModel.fromJson(Map json) {
mobileNumber = json['MobileNumber'];
diff --git a/lib/core/model/auth/imei_details.dart b/lib/core/model/auth/imei_details.dart
index eb37e736..21416074 100644
--- a/lib/core/model/auth/imei_details.dart
+++ b/lib/core/model/auth/imei_details.dart
@@ -28,6 +28,7 @@ class GetIMEIDetailsModel {
String vidaAuthTokenID;
String vidaRefreshTokenID;
String password;
+
GetIMEIDetailsModel(
{this.iD,
this.iMEI,
diff --git a/lib/core/model/auth/insert_imei_model.dart b/lib/core/model/auth/insert_imei_model.dart
index 25e22b7a..e779da77 100644
--- a/lib/core/model/auth/insert_imei_model.dart
+++ b/lib/core/model/auth/insert_imei_model.dart
@@ -32,6 +32,7 @@ class InsertIMEIDetailsModel {
String vidaAuthTokenID;
String vidaRefreshTokenID;
dynamic password;
+
InsertIMEIDetailsModel(
{this.iMEI,
this.logInTypeID,
diff --git a/lib/core/model/auth/new_login_information_response_model.dart b/lib/core/model/auth/new_login_information_response_model.dart
index 117060e4..36aa33eb 100644
--- a/lib/core/model/auth/new_login_information_response_model.dart
+++ b/lib/core/model/auth/new_login_information_response_model.dart
@@ -11,14 +11,14 @@ class NewLoginInformationModel {
NewLoginInformationModel(
{this.doctorID,
- this.listMemberInformation,
- this.logInTokenID,
- this.mobileNumber,
- this.sELECTDeviceIMEIbyIMEIList,
- this.userID,
- this.zipCode,
- this.isActiveCode,
- this.isSMSSent});
+ this.listMemberInformation,
+ this.logInTokenID,
+ this.mobileNumber,
+ this.sELECTDeviceIMEIbyIMEIList,
+ this.userID,
+ this.zipCode,
+ this.isActiveCode,
+ this.isSMSSent});
NewLoginInformationModel.fromJson(Map json) {
doctorID = json['DoctorID'];
@@ -70,16 +70,16 @@ class ListMemberInformation {
ListMemberInformation(
{this.setupID,
- this.memberID,
- this.memberName,
- this.memberNameN,
- this.preferredLang,
- this.pIN,
- this.saltHash,
- this.referenceID,
- this.employeeID,
- this.roleID,
- this.projectid});
+ this.memberID,
+ this.memberName,
+ this.memberNameN,
+ this.preferredLang,
+ this.pIN,
+ this.saltHash,
+ this.referenceID,
+ this.employeeID,
+ this.roleID,
+ this.projectid});
ListMemberInformation.fromJson(Map json) {
setupID = json['SetupID'];
diff --git a/lib/core/model/auth/send_activation_code_for_doctor_app_response_model.dart b/lib/core/model/auth/send_activation_code_for_doctor_app_response_model.dart
index ceaf4c65..099ac738 100644
--- a/lib/core/model/auth/send_activation_code_for_doctor_app_response_model.dart
+++ b/lib/core/model/auth/send_activation_code_for_doctor_app_response_model.dart
@@ -6,9 +6,9 @@ class SendActivationCodeForDoctorAppResponseModel {
SendActivationCodeForDoctorAppResponseModel(
{this.logInTokenID,
- this.verificationCode,
- this.vidaAuthTokenID,
- this.vidaRefreshTokenID});
+ this.verificationCode,
+ this.vidaAuthTokenID,
+ this.vidaRefreshTokenID});
SendActivationCodeForDoctorAppResponseModel.fromJson(
Map json) {
diff --git a/lib/models/chart_axis_model.dart b/lib/core/model/chart_axis_model.dart
similarity index 100%
rename from lib/models/chart_axis_model.dart
rename to lib/core/model/chart_axis_model.dart
diff --git a/lib/models/countriesModel.dart b/lib/core/model/countriesModel.dart
similarity index 100%
rename from lib/models/countriesModel.dart
rename to lib/core/model/countriesModel.dart
diff --git a/lib/models/dashboard/dashboard_model.dart b/lib/core/model/dashboard/dashboard_model.dart
similarity index 100%
rename from lib/models/dashboard/dashboard_model.dart
rename to lib/core/model/dashboard/dashboard_model.dart
diff --git a/lib/models/dashboard/get_special_clinical_care_List_Respose_Model.dart b/lib/core/model/dashboard/get_special_clinical_care_List_Respose_Model.dart
similarity index 88%
rename from lib/models/dashboard/get_special_clinical_care_List_Respose_Model.dart
rename to lib/core/model/dashboard/get_special_clinical_care_List_Respose_Model.dart
index ec19abb0..4048a402 100644
--- a/lib/models/dashboard/get_special_clinical_care_List_Respose_Model.dart
+++ b/lib/core/model/dashboard/get_special_clinical_care_List_Respose_Model.dart
@@ -7,10 +7,10 @@ class GetSpecialClinicalCareListResponseModel {
GetSpecialClinicalCareListResponseModel(
{this.projectID,
- this.clinicID,
- this.clinicDescription,
- this.clinicDescriptionN,
- this.isActive});
+ this.clinicID,
+ this.clinicDescription,
+ this.clinicDescriptionN,
+ this.isActive});
GetSpecialClinicalCareListResponseModel.fromJson(Map json) {
projectID = json['ProjectID'];
diff --git a/lib/models/dashboard/get_special_clinical_care_mapping_List_Respose_Model.dart b/lib/core/model/dashboard/get_special_clinical_care_mapping_List_Respose_Model.dart
similarity index 88%
rename from lib/models/dashboard/get_special_clinical_care_mapping_List_Respose_Model.dart
rename to lib/core/model/dashboard/get_special_clinical_care_mapping_List_Respose_Model.dart
index 287f40f1..2a5e3565 100644
--- a/lib/models/dashboard/get_special_clinical_care_mapping_List_Respose_Model.dart
+++ b/lib/core/model/dashboard/get_special_clinical_care_mapping_List_Respose_Model.dart
@@ -8,11 +8,11 @@ class GetSpecialClinicalCareMappingListResponseModel {
GetSpecialClinicalCareMappingListResponseModel(
{this.mappingProjectID,
- this.clinicID,
- this.nursingStationID,
- this.isActive,
- this.projectID,
- this.description});
+ this.clinicID,
+ this.nursingStationID,
+ this.isActive,
+ this.projectID,
+ this.description});
GetSpecialClinicalCareMappingListResponseModel.fromJson(
Map json) {
diff --git a/lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart b/lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart
index 7fad3106..7d42014a 100644
--- a/lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart
+++ b/lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart
@@ -10,13 +10,13 @@ class GetDiabeticChartValuesRequestModel {
GetDiabeticChartValuesRequestModel(
{this.deviceTypeID,
- this.patientID,
- this.resultType,
- this.admissionNo,
- this.setupID,
- this.patientOutSA,
- this.patientType,
- this.patientTypeID});
+ this.patientID,
+ this.resultType,
+ this.admissionNo,
+ this.setupID,
+ this.patientOutSA,
+ this.patientType,
+ this.patientTypeID});
GetDiabeticChartValuesRequestModel.fromJson(Map json) {
deviceTypeID = json['DeviceTypeID'];
diff --git a/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart b/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart
index fa2c1ca2..4696f6be 100644
--- a/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart
+++ b/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart
@@ -8,11 +8,11 @@ class GetDiabeticChartValuesResponseModel {
GetDiabeticChartValuesResponseModel(
{this.resultType,
- this.admissionNo,
- this.dateChart,
- this.resultValue,
- this.createdBy,
- this.createdOn});
+ this.admissionNo,
+ this.dateChart,
+ this.resultValue,
+ this.createdBy,
+ this.createdOn});
GetDiabeticChartValuesResponseModel.fromJson(Map json) {
resultType = json['ResultType'];
diff --git a/lib/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart b/lib/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart
index 310cfb50..cb588e1a 100644
--- a/lib/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart
+++ b/lib/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart
@@ -7,10 +7,10 @@ class GetDiagnosisForInPatientRequestModel {
GetDiagnosisForInPatientRequestModel(
{this.patientID,
- this.admissionNo,
- this.setupID,
- this.patientType,
- this.patientTypeID});
+ this.admissionNo,
+ this.setupID,
+ this.patientType,
+ this.patientTypeID});
GetDiagnosisForInPatientRequestModel.fromJson(Map json) {
patientID = json['PatientID'];
diff --git a/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart b/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart
index 1ec48964..d35d1022 100644
--- a/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart
+++ b/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart
@@ -13,14 +13,15 @@ class GetDiagnosisForInPatientResponseModel {
GetDiagnosisForInPatientResponseModel(
{this.iCDCode10ID,
- this.diagnosisTypeID,
- this.conditionID,
- this.complexDiagnosis,
- this.asciiDesc,
- this.createdBy,
- this.createdOn,
- this.editedBy,
- this.editedOn, this.createdByName});
+ this.diagnosisTypeID,
+ this.conditionID,
+ this.complexDiagnosis,
+ this.asciiDesc,
+ this.createdBy,
+ this.createdOn,
+ this.editedBy,
+ this.editedOn,
+ this.createdByName});
GetDiagnosisForInPatientResponseModel.fromJson(Map json) {
iCDCode10ID = json['ICDCode10ID'];
diff --git a/lib/models/discharge_summary/GetDischargeSummaryReqModel.dart b/lib/core/model/discharge_summary/GetDischargeSummaryReqModel.dart
similarity index 87%
rename from lib/models/discharge_summary/GetDischargeSummaryReqModel.dart
rename to lib/core/model/discharge_summary/GetDischargeSummaryReqModel.dart
index 2d2c14ad..3bc5f931 100644
--- a/lib/models/discharge_summary/GetDischargeSummaryReqModel.dart
+++ b/lib/core/model/discharge_summary/GetDischargeSummaryReqModel.dart
@@ -5,7 +5,10 @@ class GetDischargeSummaryReqModel {
int patientTypeID;
GetDischargeSummaryReqModel(
- {this.patientID, this.admissionNo, this.patientType = 1, this.patientTypeID=1});
+ {this.patientID,
+ this.admissionNo,
+ this.patientType = 1,
+ this.patientTypeID = 1});
GetDischargeSummaryReqModel.fromJson(Map json) {
patientID = json['PatientID'];
diff --git a/lib/models/discharge_summary/GetDischargeSummaryResModel.dart b/lib/core/model/discharge_summary/GetDischargeSummaryResModel.dart
similarity index 100%
rename from lib/models/discharge_summary/GetDischargeSummaryResModel.dart
rename to lib/core/model/discharge_summary/GetDischargeSummaryResModel.dart
diff --git a/lib/models/doctor/clinic_model.dart b/lib/core/model/doctor/clinic_model.dart
similarity index 100%
rename from lib/models/doctor/clinic_model.dart
rename to lib/core/model/doctor/clinic_model.dart
diff --git a/lib/models/doctor/doctor_profile_model.dart b/lib/core/model/doctor/doctor_profile_model.dart
similarity index 100%
rename from lib/models/doctor/doctor_profile_model.dart
rename to lib/core/model/doctor/doctor_profile_model.dart
diff --git a/lib/models/doctor/list_doctor_working_hours_table_model.dart b/lib/core/model/doctor/list_doctor_working_hours_table_model.dart
similarity index 100%
rename from lib/models/doctor/list_doctor_working_hours_table_model.dart
rename to lib/core/model/doctor/list_doctor_working_hours_table_model.dart
index 4712d285..ebb63574 100644
--- a/lib/models/doctor/list_doctor_working_hours_table_model.dart
+++ b/lib/core/model/doctor/list_doctor_working_hours_table_model.dart
@@ -7,7 +7,6 @@ class ListDoctorWorkingHoursTable {
String projectName;
String clinicName;
-
ListDoctorWorkingHoursTable({
this.date,
this.dayName,
@@ -37,5 +36,6 @@ class ListDoctorWorkingHoursTable {
class WorkingHours {
String from;
String to;
+
WorkingHours({this.from, this.to});
}
diff --git a/lib/models/doctor/list_gt_my_patients_question_model.dart b/lib/core/model/doctor/list_gt_my_patients_question_model.dart
similarity index 81%
rename from lib/models/doctor/list_gt_my_patients_question_model.dart
rename to lib/core/model/doctor/list_gt_my_patients_question_model.dart
index 656a43dd..9b80518d 100644
--- a/lib/models/doctor/list_gt_my_patients_question_model.dart
+++ b/lib/core/model/doctor/list_gt_my_patients_question_model.dart
@@ -35,38 +35,38 @@ class ListGtMyPatientsQuestions {
ListGtMyPatientsQuestions(
{this.rowID,
- this.setupID,
- this.projectID,
- this.transactionNo,
- this.patientType,
- this.patientID,
- this.doctorID,
- this.requestType,
- this.requestDate,
- this.requestTime,
- this.remarks,
- this.status,
- this.createdBy,
- this.createdOn,
- this.editedBy,
- this.editedOn,
- this.patientName,
- this.patientNameN,
- this.gender,
- this.dateofBirth,
- this.mobileNumber,
- this.emailAddress,
- this.infoStatus,
- this.infoDesc,
- this.doctorResponse,
- this.responseDate,
- this.memberID,
- this.memberName,
- this.memberNameN,
- this.age,
- this.genderDescription,
- this.isVidaCall,
- this.requestTypeDescription});
+ this.setupID,
+ this.projectID,
+ this.transactionNo,
+ this.patientType,
+ this.patientID,
+ this.doctorID,
+ this.requestType,
+ this.requestDate,
+ this.requestTime,
+ this.remarks,
+ this.status,
+ this.createdBy,
+ this.createdOn,
+ this.editedBy,
+ this.editedOn,
+ this.patientName,
+ this.patientNameN,
+ this.gender,
+ this.dateofBirth,
+ this.mobileNumber,
+ this.emailAddress,
+ this.infoStatus,
+ this.infoDesc,
+ this.doctorResponse,
+ this.responseDate,
+ this.memberID,
+ this.memberName,
+ this.memberNameN,
+ this.age,
+ this.genderDescription,
+ this.isVidaCall,
+ this.requestTypeDescription});
ListGtMyPatientsQuestions.fromJson(Map json) {
rowID = json['RowID'];
diff --git a/lib/models/doctor/profile_req_Model.dart b/lib/core/model/doctor/profile_req_Model.dart
similarity index 100%
rename from lib/models/doctor/profile_req_Model.dart
rename to lib/core/model/doctor/profile_req_Model.dart
diff --git a/lib/models/doctor/replay/request_create_doctor_response.dart b/lib/core/model/doctor/replay/request_create_doctor_response.dart
similarity index 84%
rename from lib/models/doctor/replay/request_create_doctor_response.dart
rename to lib/core/model/doctor/replay/request_create_doctor_response.dart
index 49e421d9..c169eeec 100644
--- a/lib/models/doctor/replay/request_create_doctor_response.dart
+++ b/lib/core/model/doctor/replay/request_create_doctor_response.dart
@@ -11,14 +11,14 @@ class CreateDoctorResponseModel {
CreateDoctorResponseModel(
{this.setupID,
- this.projectID,
- this.transactionNo,
- this.infoEnteredBy,
- this.infoStatus,
- this.createdBy,
- this.editedBy,
- this.doctorResponse,
- this.doctorID});
+ this.projectID,
+ this.transactionNo,
+ this.infoEnteredBy,
+ this.infoStatus,
+ this.createdBy,
+ this.editedBy,
+ this.doctorResponse,
+ this.doctorID});
CreateDoctorResponseModel.fromJson(Map json) {
setupID = json['SetupID'];
diff --git a/lib/models/doctor/replay/request_doctor_reply.dart b/lib/core/model/doctor/replay/request_doctor_reply.dart
similarity index 96%
rename from lib/models/doctor/replay/request_doctor_reply.dart
rename to lib/core/model/doctor/replay/request_doctor_reply.dart
index 82384586..15d1f37d 100644
--- a/lib/models/doctor/replay/request_doctor_reply.dart
+++ b/lib/core/model/doctor/replay/request_doctor_reply.dart
@@ -68,8 +68,7 @@ class RequestDoctorReply {
data['PatientOutSA'] = this.patientOutSA;
data['PageIndex'] = this.pageIndex;
data['PageSize'] = this.pageSize;
- if(this.infoStatus != null)
- data['InfoStatus'] = this.infoStatus;
+ if (this.infoStatus != null) data['InfoStatus'] = this.infoStatus;
return data;
}
}
diff --git a/lib/models/doctor/request_add_referred_doctor_remarks.dart b/lib/core/model/doctor/request_add_referred_doctor_remarks.dart
similarity index 79%
rename from lib/models/doctor/request_add_referred_doctor_remarks.dart
rename to lib/core/model/doctor/request_add_referred_doctor_remarks.dart
index b396c47f..f74b3dca 100644
--- a/lib/models/doctor/request_add_referred_doctor_remarks.dart
+++ b/lib/core/model/doctor/request_add_referred_doctor_remarks.dart
@@ -17,25 +17,24 @@ class RequestAddReferredDoctorRemarks {
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
-
RequestAddReferredDoctorRemarks(
{this.projectID,
- this.admissionNo,
- this.lineItemNo,
- this.referredDoctorRemarks,
- this.editedBy,
- this.patientID,
- this.referringDoctor,
- this.languageID = LANGUAGE_ID,
- this.stamp = STAMP,
- this.iPAdress = IP_ADDRESS,
- this.versionID = VERSION_ID,
- this.channel= CHANNEL,
- this.tokenID,
- this.sessionID = SESSION_ID,
- this.isLoginForDoctorApp = IS_LOGIN_FOR_DOCTOR_APP,
- this.patientOutSA = PATIENT_OUT_SA});
+ this.admissionNo,
+ this.lineItemNo,
+ this.referredDoctorRemarks,
+ this.editedBy,
+ this.patientID,
+ this.referringDoctor,
+ this.languageID = LANGUAGE_ID,
+ this.stamp = STAMP,
+ this.iPAdress = IP_ADDRESS,
+ this.versionID = VERSION_ID,
+ this.channel = CHANNEL,
+ this.tokenID,
+ this.sessionID = SESSION_ID,
+ this.isLoginForDoctorApp = IS_LOGIN_FOR_DOCTOR_APP,
+ this.patientOutSA = PATIENT_OUT_SA});
RequestAddReferredDoctorRemarks.fromJson(Map json) {
projectID = json['ProjectID'];
diff --git a/lib/models/doctor/request_schedule.dart b/lib/core/model/doctor/request_schedule.dart
similarity index 99%
rename from lib/models/doctor/request_schedule.dart
rename to lib/core/model/doctor/request_schedule.dart
index ae7b80aa..9c5b0fe9 100644
--- a/lib/models/doctor/request_schedule.dart
+++ b/lib/core/model/doctor/request_schedule.dart
@@ -1,5 +1,3 @@
-
-
class RequestSchedule {
int projectID;
int clinicID;
diff --git a/lib/models/doctor/statstics_for_certain_doctor_request.dart b/lib/core/model/doctor/statstics_for_certain_doctor_request.dart
similarity index 100%
rename from lib/models/doctor/statstics_for_certain_doctor_request.dart
rename to lib/core/model/doctor/statstics_for_certain_doctor_request.dart
diff --git a/lib/models/doctor/user_model.dart b/lib/core/model/doctor/user_model.dart
similarity index 100%
rename from lib/models/doctor/user_model.dart
rename to lib/core/model/doctor/user_model.dart
diff --git a/lib/models/doctor/verify_referral_doctor_remarks.dart b/lib/core/model/doctor/verify_referral_doctor_remarks.dart
similarity index 70%
rename from lib/models/doctor/verify_referral_doctor_remarks.dart
rename to lib/core/model/doctor/verify_referral_doctor_remarks.dart
index b9bfce0a..57cfa743 100644
--- a/lib/models/doctor/verify_referral_doctor_remarks.dart
+++ b/lib/core/model/doctor/verify_referral_doctor_remarks.dart
@@ -17,36 +17,36 @@ class VerifyReferralDoctorRemarks {
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
- String firstName;
+ String firstName;
String middleName;
String lastName;
String patientMobileNumber;
String patientIdentificationID;
- VerifyReferralDoctorRemarks(
- {this.projectID,
- this.admissionNo,
- this.lineItemNo,
- this.referredDoctorRemarks,
- this.editedBy,
- this.patientID,
- this.referringDoctor,
- this.languageID = LANGUAGE_ID,
- this.stamp = STAMP,
- this.iPAdress = IP_ADDRESS,
- this.versionID = VERSION_ID,
- this.channel= CHANNEL,
- this.tokenID,
- this.sessionID = SESSION_ID,
- this.isLoginForDoctorApp = IS_LOGIN_FOR_DOCTOR_APP,
- this.patientOutSA = PATIENT_OUT_SA,
- this.firstName,
- this.middleName,
- this.lastName,
- this.patientMobileNumber,
- this.patientIdentificationID,
- });
+ VerifyReferralDoctorRemarks({
+ this.projectID,
+ this.admissionNo,
+ this.lineItemNo,
+ this.referredDoctorRemarks,
+ this.editedBy,
+ this.patientID,
+ this.referringDoctor,
+ this.languageID = LANGUAGE_ID,
+ this.stamp = STAMP,
+ this.iPAdress = IP_ADDRESS,
+ this.versionID = VERSION_ID,
+ this.channel = CHANNEL,
+ this.tokenID,
+ this.sessionID = SESSION_ID,
+ this.isLoginForDoctorApp = IS_LOGIN_FOR_DOCTOR_APP,
+ this.patientOutSA = PATIENT_OUT_SA,
+ this.firstName,
+ this.middleName,
+ this.lastName,
+ this.patientMobileNumber,
+ this.patientIdentificationID,
+ });
VerifyReferralDoctorRemarks.fromJson(Map json) {
projectID = json['ProjectID'];
@@ -65,14 +65,11 @@ class VerifyReferralDoctorRemarks {
sessionID = json['SessionID'];
isLoginForDoctorApp = json['IsLoginForDoctorApp'];
patientOutSA = json['PatientOutSA'];
- firstName= json["FirstName"];
- middleName= json["MiddleName"];
- lastName= json["LastName"];
- patientMobileNumber= json["PatientMobileNumber"];
- patientIdentificationID = json["PatientIdentificationID"];
-
-
-
+ firstName = json["FirstName"];
+ middleName = json["MiddleName"];
+ lastName = json["LastName"];
+ patientMobileNumber = json["PatientMobileNumber"];
+ patientIdentificationID = json["PatientIdentificationID"];
}
Map toJson() {
diff --git a/lib/core/model/hospitals/get_hospitals_request_model.dart b/lib/core/model/hospitals/get_hospitals_request_model.dart
index 8a5f1bc1..b858bba4 100644
--- a/lib/core/model/hospitals/get_hospitals_request_model.dart
+++ b/lib/core/model/hospitals/get_hospitals_request_model.dart
@@ -11,14 +11,14 @@ class GetHospitalsRequestModel {
GetHospitalsRequestModel(
{this.languageID,
- this.stamp,
- this.iPAdress,
- this.versionID,
- this.channel,
- this.tokenID,
- this.sessionID,
- this.isLoginForDoctorApp,
- this.memberID});
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
+ this.tokenID,
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.memberID});
GetHospitalsRequestModel.fromJson(Map json) {
languageID = json['LanguageID'];
diff --git a/lib/core/model/hospitals_model.dart b/lib/core/model/hospitals_model.dart
index b09807d6..3e9690ba 100644
--- a/lib/core/model/hospitals_model.dart
+++ b/lib/core/model/hospitals_model.dart
@@ -16,22 +16,23 @@ class HospitalsModel {
dynamic projectOutSA;
bool usingInDoctorApp;
- HospitalsModel({this.desciption,
- this.desciptionN,
- this.iD,
- this.legalName,
- this.legalNameN,
- this.name,
- this.nameN,
- this.phoneNumber,
- this.setupID,
- this.distanceInKilometers,
- this.isActive,
- this.latitude,
- this.longitude,
- this.mainProjectID,
- this.projectOutSA,
- this.usingInDoctorApp});
+ HospitalsModel(
+ {this.desciption,
+ this.desciptionN,
+ this.iD,
+ this.legalName,
+ this.legalNameN,
+ this.name,
+ this.nameN,
+ this.phoneNumber,
+ this.setupID,
+ this.distanceInKilometers,
+ this.isActive,
+ this.latitude,
+ this.longitude,
+ this.mainProjectID,
+ this.projectOutSA,
+ this.usingInDoctorApp});
HospitalsModel.fromJson(Map json) {
desciption = json['Desciption'];
diff --git a/lib/core/model/insurance/insurance_approval.dart b/lib/core/model/insurance/insurance_approval.dart
index a3717c42..3320e69b 100644
--- a/lib/core/model/insurance/insurance_approval.dart
+++ b/lib/core/model/insurance/insurance_approval.dart
@@ -2,6 +2,7 @@ class ApporvalDetails {
int approvalNo;
String procedureName;
+
//String procedureNameN;
String status;
diff --git a/lib/core/model/labs/LabOrderResult.dart b/lib/core/model/labs/LabOrderResult.dart
index ecb4ae65..22bcb801 100644
--- a/lib/core/model/labs/LabOrderResult.dart
+++ b/lib/core/model/labs/LabOrderResult.dart
@@ -21,24 +21,24 @@ class LabOrderResult {
LabOrderResult(
{this.description,
- this.femaleInterpretativeData,
- this.gender,
- this.lineItemNo,
- this.maleInterpretativeData,
- this.notes,
- this.packageID,
- this.patientID,
- this.projectID,
- this.referanceRange,
- this.resultValue,
- this.sampleCollectedOn,
- this.sampleReceivedOn,
- this.setupID,
- this.superVerifiedOn,
- this.testCode,
- this.uOM,
- this.verifiedOn,
- this.verifiedOnDateTime});
+ this.femaleInterpretativeData,
+ this.gender,
+ this.lineItemNo,
+ this.maleInterpretativeData,
+ this.notes,
+ this.packageID,
+ this.patientID,
+ this.projectID,
+ this.referanceRange,
+ this.resultValue,
+ this.sampleCollectedOn,
+ this.sampleReceivedOn,
+ this.setupID,
+ this.superVerifiedOn,
+ this.testCode,
+ this.uOM,
+ this.verifiedOn,
+ this.verifiedOnDateTime});
LabOrderResult.fromJson(Map json) {
description = json['Description'];
diff --git a/lib/core/model/labs/LabResultHistory.dart b/lib/core/model/labs/LabResultHistory.dart
index 7c4221ca..fed140f8 100644
--- a/lib/core/model/labs/LabResultHistory.dart
+++ b/lib/core/model/labs/LabResultHistory.dart
@@ -26,29 +26,29 @@ class LabResultHistory {
LabResultHistory(
{this.description,
- this.femaleInterpretativeData,
- this.gender,
- this.isCertificateAllowed,
- this.lineItemNo,
- this.maleInterpretativeData,
- this.notes,
- this.orderLineItemNo,
- this.orderNo,
- this.packageID,
- this.patientID,
- this.projectID,
- this.referanceRange,
- this.resultValue,
- this.resultValueBasedLineItemNo,
- this.resultValueFlag,
- this.sampleCollectedOn,
- this.sampleReceivedOn,
- this.setupID,
- this.superVerifiedOn,
- this.testCode,
- this.uOM,
- this.verifiedOn,
- this.verifiedOnDateTime});
+ this.femaleInterpretativeData,
+ this.gender,
+ this.isCertificateAllowed,
+ this.lineItemNo,
+ this.maleInterpretativeData,
+ this.notes,
+ this.orderLineItemNo,
+ this.orderNo,
+ this.packageID,
+ this.patientID,
+ this.projectID,
+ this.referanceRange,
+ this.resultValue,
+ this.resultValueBasedLineItemNo,
+ this.resultValueFlag,
+ this.sampleCollectedOn,
+ this.sampleReceivedOn,
+ this.setupID,
+ this.superVerifiedOn,
+ this.testCode,
+ this.uOM,
+ this.verifiedOn,
+ this.verifiedOnDateTime});
LabResultHistory.fromJson(Map json) {
description = json['Description'];
@@ -105,4 +105,4 @@ class LabResultHistory {
data['VerifiedOnDateTime'] = this.verifiedOnDateTime;
return data;
}
-}
\ No newline at end of file
+}
diff --git a/lib/core/model/labs/all_special_lab_result_model.dart b/lib/core/model/labs/all_special_lab_result_model.dart
index ffdc5ee5..b1a9cd4b 100644
--- a/lib/core/model/labs/all_special_lab_result_model.dart
+++ b/lib/core/model/labs/all_special_lab_result_model.dart
@@ -46,6 +46,7 @@ class AllSpecialLabResultModel {
String resultDataHTML;
dynamic resultDataTxt;
String setupID;
+
//List speciality;
dynamic status;
dynamic statusDesc;
diff --git a/lib/core/model/labs/lab_result.dart b/lib/core/model/labs/lab_result.dart
index ee9f981d..046ab169 100644
--- a/lib/core/model/labs/lab_result.dart
+++ b/lib/core/model/labs/lab_result.dart
@@ -110,10 +110,9 @@ class LabResult {
} else {
return 0;
}
- }catch (e){
+ } catch (e) {
return 0;
}
-
}
}
diff --git a/lib/core/model/labs/patient_lab_orders.dart b/lib/core/model/labs/patient_lab_orders.dart
index af60f86f..0aa732a5 100644
--- a/lib/core/model/labs/patient_lab_orders.dart
+++ b/lib/core/model/labs/patient_lab_orders.dart
@@ -26,6 +26,7 @@ class PatientLabOrders {
String nationalityFlagURL;
int noOfPatientsRate;
DateTime orderDate;
+ DateTime createdOn;
String orderNo;
String patientID;
String projectID;
@@ -35,6 +36,7 @@ class PatientLabOrders {
String setupID;
List speciality;
bool isLiveCareAppointment;
+
PatientLabOrders(
{this.actualDoctorRate,
this.clinicDescription,
@@ -68,11 +70,12 @@ class PatientLabOrders {
this.projectNameN,
this.qR,
this.setupID,
- this.speciality,this.isLiveCareAppointment});
+ this.speciality,
+ this.isLiveCareAppointment});
PatientLabOrders.fromJson(Map json) {
actualDoctorRate = json['ActualDoctorRate'];
- clinicDescription = json['ClinicDescription']?? json['ClinicName'];
+ clinicDescription = json['ClinicDescription'] ?? json['ClinicName'];
clinicDescriptionEnglish = json['ClinicDescriptionEnglish'];
clinicDescriptionN = json['ClinicDescriptionN'];
clinicID = json['ClinicID'];
@@ -96,6 +99,7 @@ class PatientLabOrders {
nationalityFlagURL = json['NationalityFlagURL'];
noOfPatientsRate = json['NoOfPatientsRate'];
orderDate = AppDateUtils.convertStringToDate(json['OrderDate']);
+ createdOn = AppDateUtils.convertStringToDate(json['CreatedOn']);
orderNo = json['OrderNo'].toString();
patientID = json['PatientID'].toString();
projectID = json['ProjectID'].toString();
@@ -104,7 +108,7 @@ class PatientLabOrders {
qR = json['QR'];
setupID = json['SetupID'];
isLiveCareAppointment = json['IsLiveCareAppointment'];
- // speciality = json['Speciality'].cast();
+ // speciality = json['Speciality'].cast();
}
Map toJson() {
diff --git a/lib/core/model/labs/patient_lab_special_result.dart b/lib/core/model/labs/patient_lab_special_result.dart
index 2fbcb832..dc53010b 100644
--- a/lib/core/model/labs/patient_lab_special_result.dart
+++ b/lib/core/model/labs/patient_lab_special_result.dart
@@ -7,10 +7,10 @@ class PatientLabSpecialResult {
PatientLabSpecialResult(
{this.invoiceNo,
- this.moduleID,
- this.resultData,
- this.resultDataHTML,
- this.resultDataTxt});
+ this.moduleID,
+ this.resultData,
+ this.resultDataHTML,
+ this.resultDataTxt});
PatientLabSpecialResult.fromJson(Map json) {
invoiceNo = json['InvoiceNo'];
diff --git a/lib/core/model/labs/request_patient_lab_orders.dart b/lib/core/model/labs/request_patient_lab_orders.dart
index ce9263ef..3ee099a5 100644
--- a/lib/core/model/labs/request_patient_lab_orders.dart
+++ b/lib/core/model/labs/request_patient_lab_orders.dart
@@ -15,18 +15,18 @@ class RequestPatientLabOrders {
RequestPatientLabOrders(
{this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.patientID,
- this.tokenID,
- this.patientTypeID,
- this.patientType});
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.patientID,
+ this.tokenID,
+ this.patientTypeID,
+ this.patientType});
RequestPatientLabOrders.fromJson(Map json) {
versionID = json['VersionID'];
diff --git a/lib/core/model/labs/request_patient_lab_special_result.dart b/lib/core/model/labs/request_patient_lab_special_result.dart
index b48cf0e1..1a149bcd 100644
--- a/lib/core/model/labs/request_patient_lab_special_result.dart
+++ b/lib/core/model/labs/request_patient_lab_special_result.dart
@@ -20,23 +20,23 @@ class RequestPatientLabSpecialResult {
RequestPatientLabSpecialResult(
{this.invoiceNo,
- this.orderNo,
- this.setupID,
- this.projectID,
- this.clinicID,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.patientID,
- this.tokenID,
- this.patientTypeID,
- this.patientType});
+ this.orderNo,
+ this.setupID,
+ this.projectID,
+ this.clinicID,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.patientID,
+ this.tokenID,
+ this.patientTypeID,
+ this.patientType});
RequestPatientLabSpecialResult.fromJson(Map json) {
invoiceNo = json['InvoiceNo'];
diff --git a/lib/core/model/labs/request_send_lab_report_email.dart b/lib/core/model/labs/request_send_lab_report_email.dart
index 118da906..dd8769bb 100644
--- a/lib/core/model/labs/request_send_lab_report_email.dart
+++ b/lib/core/model/labs/request_send_lab_report_email.dart
@@ -27,30 +27,30 @@ class RequestSendLabReportEmail {
RequestSendLabReportEmail(
{this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.patientID,
- this.tokenID,
- this.patientTypeID,
- this.patientType,
- this.to,
- this.dateofBirth,
- this.patientIditificationNum,
- this.patientMobileNumber,
- this.patientName,
- this.setupID,
- this.projectName,
- this.clinicName,
- this.doctorName,
- this.projectID,
- this.invoiceNo,
- this.orderDate});
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.patientID,
+ this.tokenID,
+ this.patientTypeID,
+ this.patientType,
+ this.to,
+ this.dateofBirth,
+ this.patientIditificationNum,
+ this.patientMobileNumber,
+ this.patientName,
+ this.setupID,
+ this.projectName,
+ this.clinicName,
+ this.doctorName,
+ this.projectID,
+ this.invoiceNo,
+ this.orderDate});
RequestSendLabReportEmail.fromJson(Map json) {
versionID = json['VersionID'];
diff --git a/lib/core/model/live_care/AlternativeServicesList.dart b/lib/core/model/live_care/AlternativeServicesList.dart
index 11f27b95..fc511da3 100644
--- a/lib/core/model/live_care/AlternativeServicesList.dart
+++ b/lib/core/model/live_care/AlternativeServicesList.dart
@@ -25,7 +25,7 @@ class AlternativeService {
class AlternativeServicesList with ChangeNotifier {
List _alternativeServicesList;
- getServicesList(){
+ getServicesList() {
return _alternativeServicesList;
}
@@ -35,7 +35,9 @@ class AlternativeServicesList with ChangeNotifier {
}
setSelected(AlternativeService service, bool isSelected) {
- List alternativeService = _alternativeServicesList.where((element) => service.serviceID == element.serviceID).toList();
+ List alternativeService = _alternativeServicesList
+ .where((element) => service.serviceID == element.serviceID)
+ .toList();
alternativeService[0].isSelected = isSelected;
notifyListeners();
diff --git a/lib/core/model/live_care/add_patient_to_doctor_list_request_model.dart b/lib/core/model/live_care/add_patient_to_doctor_list_request_model.dart
index 1d63e885..809af1b4 100644
--- a/lib/core/model/live_care/add_patient_to_doctor_list_request_model.dart
+++ b/lib/core/model/live_care/add_patient_to_doctor_list_request_model.dart
@@ -5,7 +5,8 @@ class AddPatientToDoctorListRequestModel {
int doctorId;
bool isOutKsa;
- AddPatientToDoctorListRequestModel({this.vCID, this.tokenID, this.generalid, this.doctorId, this.isOutKsa});
+ AddPatientToDoctorListRequestModel(
+ {this.vCID, this.tokenID, this.generalid, this.doctorId, this.isOutKsa});
AddPatientToDoctorListRequestModel.fromJson(Map json) {
vCID = json['VC_ID'];
diff --git a/lib/core/model/live_care/live_care_login_reguest_model.dart b/lib/core/model/live_care/live_care_login_reguest_model.dart
index e14d4223..b1218420 100644
--- a/lib/core/model/live_care/live_care_login_reguest_model.dart
+++ b/lib/core/model/live_care/live_care_login_reguest_model.dart
@@ -5,7 +5,12 @@ class LiveCareUserLoginRequestModel {
int isOutKsa;
int isLogin;
- LiveCareUserLoginRequestModel({this.tokenID, this.generalid, this.doctorId, this.isOutKsa, this.isLogin});
+ LiveCareUserLoginRequestModel(
+ {this.tokenID,
+ this.generalid,
+ this.doctorId,
+ this.isOutKsa,
+ this.isLogin});
LiveCareUserLoginRequestModel.fromJson(Map json) {
tokenID = json['TokenID'];
diff --git a/lib/models/livecare/end_call_req.dart b/lib/core/model/livecare/end_call_req.dart
similarity index 100%
rename from lib/models/livecare/end_call_req.dart
rename to lib/core/model/livecare/end_call_req.dart
diff --git a/lib/models/livecare/get_panding_req_list.dart b/lib/core/model/livecare/get_panding_req_list.dart
similarity index 100%
rename from lib/models/livecare/get_panding_req_list.dart
rename to lib/core/model/livecare/get_panding_req_list.dart
diff --git a/lib/models/livecare/get_pending_res_list.dart b/lib/core/model/livecare/get_pending_res_list.dart
similarity index 100%
rename from lib/models/livecare/get_pending_res_list.dart
rename to lib/core/model/livecare/get_pending_res_list.dart
diff --git a/lib/models/livecare/session_status_model.dart b/lib/core/model/livecare/session_status_model.dart
similarity index 89%
rename from lib/models/livecare/session_status_model.dart
rename to lib/core/model/livecare/session_status_model.dart
index 7e7a3e43..29f925d7 100644
--- a/lib/models/livecare/session_status_model.dart
+++ b/lib/core/model/livecare/session_status_model.dart
@@ -6,9 +6,9 @@ class SessionStatusModel {
SessionStatusModel(
{this.isAuthenticated,
- this.messageStatus,
- this.result,
- this.sessionStatus});
+ this.messageStatus,
+ this.result,
+ this.sessionStatus});
SessionStatusModel.fromJson(Map json) {
isAuthenticated = json['IsAuthenticated'];
diff --git a/lib/models/livecare/start_call_req.dart b/lib/core/model/livecare/start_call_req.dart
similarity index 84%
rename from lib/models/livecare/start_call_req.dart
rename to lib/core/model/livecare/start_call_req.dart
index b3ceabb5..c298298d 100644
--- a/lib/models/livecare/start_call_req.dart
+++ b/lib/core/model/livecare/start_call_req.dart
@@ -13,16 +13,16 @@ class StartCallReq {
StartCallReq(
{this.clincName,
- this.clinicId,
- this.docSpec,
- this.docotrName,
- this.doctorId,
- this.generalid,
- this.isOutKsa,
- this.isrecall,
- this.projectName,
- this.tokenID,
- this.vCID});
+ this.clinicId,
+ this.docSpec,
+ this.docotrName,
+ this.doctorId,
+ this.generalid,
+ this.isOutKsa,
+ this.isrecall,
+ this.projectName,
+ this.tokenID,
+ this.vCID});
StartCallReq.fromJson(Map json) {
clincName = json['clincName'];
@@ -53,4 +53,4 @@ class StartCallReq {
data['VC_ID'] = this.vCID;
return data;
}
-}
\ No newline at end of file
+}
diff --git a/lib/models/livecare/start_call_res.dart b/lib/core/model/livecare/start_call_res.dart
similarity index 82%
rename from lib/models/livecare/start_call_res.dart
rename to lib/core/model/livecare/start_call_res.dart
index 44921d5f..36127da9 100644
--- a/lib/models/livecare/start_call_res.dart
+++ b/lib/core/model/livecare/start_call_res.dart
@@ -7,15 +7,15 @@ class StartCallRes {
String appointmentNo;
bool isRecording;
- StartCallRes(
- {this.result,
- this.openSessionID,
- this.openTokenID,
- this.isAuthenticated,
- this.appointmentNo,
- this.messageStatus,
- this.isRecording = true,
- });
+ StartCallRes({
+ this.result,
+ this.openSessionID,
+ this.openTokenID,
+ this.isAuthenticated,
+ this.appointmentNo,
+ this.messageStatus,
+ this.isRecording = true,
+ });
StartCallRes.fromJson(Map json) {
result = json['Result'];
diff --git a/lib/models/livecare/transfer_to_admin.dart b/lib/core/model/livecare/transfer_to_admin.dart
similarity index 100%
rename from lib/models/livecare/transfer_to_admin.dart
rename to lib/core/model/livecare/transfer_to_admin.dart
diff --git a/lib/core/model/medical_report/medical_file_request_model.dart b/lib/core/model/medical_report/medical_file_request_model.dart
index 8703141a..b7fcb095 100644
--- a/lib/core/model/medical_report/medical_file_request_model.dart
+++ b/lib/core/model/medical_report/medical_file_request_model.dart
@@ -3,7 +3,8 @@ class MedicalFileRequestModel {
String vidaAuthTokenID;
String iPAdress;
- MedicalFileRequestModel({this.patientMRN, this.vidaAuthTokenID,this.iPAdress});
+ MedicalFileRequestModel(
+ {this.patientMRN, this.vidaAuthTokenID, this.iPAdress});
MedicalFileRequestModel.fromJson(Map json) {
patientMRN = json['PatientMRN'];
diff --git a/lib/core/model/note/CreateNoteModel.dart b/lib/core/model/note/CreateNoteModel.dart
index ce076705..20e27289 100644
--- a/lib/core/model/note/CreateNoteModel.dart
+++ b/lib/core/model/note/CreateNoteModel.dart
@@ -18,27 +18,29 @@ class CreateNoteModel {
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
+ int conditionId;
CreateNoteModel(
{this.visitType,
- this.admissionNo,
- this.projectID,
- this.patientTypeID,
- this.patientID,
- this.clinicID,
- this.notes,
- this.createdBy,
- this.editedBy,
- this.nursingRemarks,
- this.languageID,
- this.stamp,
- this.iPAdress,
- this.versionID,
- this.channel,
- this.tokenID,
- this.sessionID,
- this.isLoginForDoctorApp,
- this.patientOutSA});
+ this.admissionNo,
+ this.projectID,
+ this.patientTypeID,
+ this.patientID,
+ this.clinicID,
+ this.notes,
+ this.createdBy,
+ this.editedBy,
+ this.nursingRemarks,
+ this.languageID,
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
+ this.tokenID,
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.patientOutSA,
+ this.conditionId});
CreateNoteModel.fromJson(Map json) {
visitType = json['VisitType'];
@@ -60,6 +62,7 @@ class CreateNoteModel {
sessionID = json['SessionID'];
isLoginForDoctorApp = json['IsLoginForDoctorApp'];
patientOutSA = json['PatientOutSA'];
+ conditionId = json['ConditionId'];
}
Map toJson() {
@@ -83,6 +86,7 @@ class CreateNoteModel {
data['SessionID'] = this.sessionID;
data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
data['PatientOutSA'] = this.patientOutSA;
+ data['ConditionId'] = this.conditionId;
return data;
}
}
diff --git a/lib/core/model/note/GetNursingProgressNoteRequestModel.dart b/lib/core/model/note/GetNursingProgressNoteRequestModel.dart
index 4335053c..8cad6ea8 100644
--- a/lib/core/model/note/GetNursingProgressNoteRequestModel.dart
+++ b/lib/core/model/note/GetNursingProgressNoteRequestModel.dart
@@ -1,5 +1,3 @@
-import 'package:doctor_app_flutter/config/config.dart';
-
class GetNursingProgressNoteRequestModel {
int patientID;
int admissionNo;
@@ -8,7 +6,11 @@ class GetNursingProgressNoteRequestModel {
String setupID;
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 json) {
patientID = json['PatientID'];
diff --git a/lib/core/model/note/note_model.dart b/lib/core/model/note/note_model.dart
index 797f9b6d..bef3a973 100644
--- a/lib/core/model/note/note_model.dart
+++ b/lib/core/model/note/note_model.dart
@@ -19,28 +19,33 @@ class NoteModel {
Null doctorClinicName;
String doctorName;
String visitTypeDesc;
+ int condition;
+ String conditionDescription;
NoteModel(
{this.setupID,
- this.projectID,
- this.patientID,
- this.patientType,
- this.admissionNo,
- this.lineItemNo,
- this.visitType,
- this.notes,
- this.assessmentDate,
- this.visitTime,
- this.status,
- this.nursingRemarks,
- this.createdOn,
- this.editedOn,
- this.createdBy,
- this.admissionClinicID,
- this.admissionClinicName,
- this.doctorClinicName,
- this.doctorName,
- this.visitTypeDesc});
+ this.projectID,
+ this.patientID,
+ this.patientType,
+ this.admissionNo,
+ this.lineItemNo,
+ this.visitType,
+ this.notes,
+ this.assessmentDate,
+ this.visitTime,
+ this.status,
+ this.nursingRemarks,
+ this.createdOn,
+ this.editedOn,
+ this.createdBy,
+ this.admissionClinicID,
+ this.admissionClinicName,
+ this.doctorClinicName,
+ this.doctorName,
+ this.visitTypeDesc,
+ this.condition,
+ this.conditionDescription,
+ });
NoteModel.fromJson(Map json) {
setupID = json['SetupID'];
@@ -63,6 +68,8 @@ class NoteModel {
doctorClinicName = json['DoctorClinicName'];
doctorName = json['DoctorName'];
visitTypeDesc = json['VisitTypeDesc'];
+ condition = json['Condition'];
+ conditionDescription = json['ConditionDescription'];
}
Map toJson() {
@@ -87,6 +94,8 @@ class NoteModel {
data['DoctorClinicName'] = this.doctorClinicName;
data['DoctorName'] = this.doctorName;
data['VisitTypeDesc'] = this.visitTypeDesc;
+ data['Condition'] = this.condition;
+ data['ConditionDescription'] = this.conditionDescription;
return data;
}
}
diff --git a/lib/core/model/note/stp_master_list_req_model.dart b/lib/core/model/note/stp_master_list_req_model.dart
new file mode 100644
index 00000000..067a1623
--- /dev/null
+++ b/lib/core/model/note/stp_master_list_req_model.dart
@@ -0,0 +1,32 @@
+class StpMasterListRequestModel {
+ bool isDentalAllowedBackend;
+ int languageID;
+ int projectID;
+ int parameterGroup;
+ int parameterType;
+
+ StpMasterListRequestModel(
+ {this.isDentalAllowedBackend,
+ this.languageID,
+ this.projectID,
+ this.parameterGroup,
+ this.parameterType});
+
+ StpMasterListRequestModel.fromJson(Map json) {
+ isDentalAllowedBackend = json['isDentalAllowedBackend'];
+ languageID = json['LanguageID'];
+ projectID = json['ProjectID'];
+ parameterGroup = json['parameterGroup'];
+ parameterType = json['parameterType'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
+ data['LanguageID'] = this.languageID;
+ data['ProjectID'] = this.projectID;
+ data['parameterGroup'] = this.parameterGroup;
+ data['parameterType'] = this.parameterType;
+ return data;
+ }
+}
\ No newline at end of file
diff --git a/lib/core/model/note/stp_master_list_res_model.dart b/lib/core/model/note/stp_master_list_res_model.dart
new file mode 100644
index 00000000..2533605a
--- /dev/null
+++ b/lib/core/model/note/stp_master_list_res_model.dart
@@ -0,0 +1,22 @@
+class StpMasterListResponseModel {
+ int parameterCode;
+ String description;
+ Null descriptionN;
+
+ StpMasterListResponseModel(
+ {this.parameterCode, this.description, this.descriptionN});
+
+ StpMasterListResponseModel.fromJson(Map json) {
+ parameterCode = json['ParameterCode'];
+ description = json['Description'];
+ descriptionN = json['DescriptionN'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['ParameterCode'] = this.parameterCode;
+ data['Description'] = this.description;
+ data['DescriptionN'] = this.descriptionN;
+ return data;
+ }
+}
\ No newline at end of file
diff --git a/lib/core/model/note/update_note_model.dart b/lib/core/model/note/update_note_model.dart
index 20fd4b86..faedb6f7 100644
--- a/lib/core/model/note/update_note_model.dart
+++ b/lib/core/model/note/update_note_model.dart
@@ -16,25 +16,27 @@ class UpdateNoteReqModel {
bool isLoginForDoctorApp;
bool patientOutSA;
int patientTypeID;
+ int conditionId;
UpdateNoteReqModel(
{this.projectID,
- this.createdBy,
- this.admissionNo,
- this.lineItemNo,
- this.notes,
- this.verifiedNote,
- this.cancelledNote,
- this.languageID,
- this.stamp,
- this.iPAdress,
- this.versionID,
- this.channel,
- this.tokenID,
- this.sessionID,
- this.isLoginForDoctorApp,
- this.patientOutSA,
- this.patientTypeID});
+ this.createdBy,
+ this.admissionNo,
+ this.lineItemNo,
+ this.notes,
+ this.verifiedNote,
+ this.cancelledNote,
+ this.languageID,
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
+ this.tokenID,
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.patientOutSA,
+ this.patientTypeID,
+ this.conditionId});
UpdateNoteReqModel.fromJson(Map json) {
projectID = json['ProjectID'];
@@ -54,6 +56,7 @@ class UpdateNoteReqModel {
isLoginForDoctorApp = json['IsLoginForDoctorApp'];
patientOutSA = json['PatientOutSA'];
patientTypeID = json['PatientTypeID'];
+ conditionId = json['ConditionId'];
}
Map toJson() {
@@ -75,6 +78,7 @@ class UpdateNoteReqModel {
data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
data['PatientOutSA'] = this.patientOutSA;
data['PatientTypeID'] = this.patientTypeID;
+ data['ConditionId'] = this.conditionId;
return data;
}
}
diff --git a/lib/models/operation_report/create_update_operation_report_request_model.dart b/lib/core/model/operation_report/create_update_operation_report_request_model.dart
similarity index 82%
rename from lib/models/operation_report/create_update_operation_report_request_model.dart
rename to lib/core/model/operation_report/create_update_operation_report_request_model.dart
index f6d72b1b..1bc6d51e 100644
--- a/lib/models/operation_report/create_update_operation_report_request_model.dart
+++ b/lib/core/model/operation_report/create_update_operation_report_request_model.dart
@@ -26,29 +26,29 @@ class CreateUpdateOperationReportRequestModel {
CreateUpdateOperationReportRequestModel(
{this.setupID,
- this.patientID,
- this.reservationNo,
- this.admissionNo,
- this.preOpDiagmosis,
- this.postOpDiagmosis,
- this.surgeon,
- this.assistant,
- this.anasthetist,
- this.operation,
- this.inasion,
- this.finding,
- this.surgeryProcedure,
- this.postOpInstruction,
- this.createdBy,
- this.editedBy,
- this.complicationDetails,
- this.bloodLossDetail,
- this.histopathSpecimen,
- this.microbiologySpecimen,
- this.otherSpecimen,
- this.scrubNurse,
- this.circulatingNurse,
- this.bloodTransfusedDetail});
+ this.patientID,
+ this.reservationNo,
+ this.admissionNo,
+ this.preOpDiagmosis,
+ this.postOpDiagmosis,
+ this.surgeon,
+ this.assistant,
+ this.anasthetist,
+ this.operation,
+ this.inasion,
+ this.finding,
+ this.surgeryProcedure,
+ this.postOpInstruction,
+ this.createdBy,
+ this.editedBy,
+ this.complicationDetails,
+ this.bloodLossDetail,
+ this.histopathSpecimen,
+ this.microbiologySpecimen,
+ this.otherSpecimen,
+ this.scrubNurse,
+ this.circulatingNurse,
+ this.bloodTransfusedDetail});
CreateUpdateOperationReportRequestModel.fromJson(Map json) {
setupID = json['SetupID'];
diff --git a/lib/models/operation_report/get_operation_details_request_modle.dart b/lib/core/model/operation_report/get_operation_details_request_modle.dart
similarity index 84%
rename from lib/models/operation_report/get_operation_details_request_modle.dart
rename to lib/core/model/operation_report/get_operation_details_request_modle.dart
index 7e23b503..6c8e27fd 100644
--- a/lib/models/operation_report/get_operation_details_request_modle.dart
+++ b/lib/core/model/operation_report/get_operation_details_request_modle.dart
@@ -16,19 +16,19 @@ class GetOperationDetailsRequestModel {
GetOperationDetailsRequestModel(
{this.isDentalAllowedBackend = false,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.deviceTypeID,
- this.tokenID,
- this.patientID,
- this.reservationNo,
- this.sessionID,
- this.projectID,
- this.setupID,
- this.patientOutSA});
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.deviceTypeID,
+ this.tokenID,
+ this.patientID,
+ this.reservationNo,
+ this.sessionID,
+ this.projectID,
+ this.setupID,
+ this.patientOutSA});
GetOperationDetailsRequestModel.fromJson(Map json) {
isDentalAllowedBackend = json['isDentalAllowedBackend'];
diff --git a/lib/models/operation_report/get_operation_details_response_modle.dart b/lib/core/model/operation_report/get_operation_details_response_modle.dart
similarity index 81%
rename from lib/models/operation_report/get_operation_details_response_modle.dart
rename to lib/core/model/operation_report/get_operation_details_response_modle.dart
index 04540ea6..f050eca3 100644
--- a/lib/models/operation_report/get_operation_details_response_modle.dart
+++ b/lib/core/model/operation_report/get_operation_details_response_modle.dart
@@ -36,39 +36,39 @@ class GetOperationDetailsResponseModel {
GetOperationDetailsResponseModel(
{this.setupID,
- this.projectID,
- this.reservationNo,
- this.patientID,
- this.admissionID,
- this.surgeryDate,
- this.preOpDiagnosis,
- this.postOpDiagnosis,
- this.surgeon,
- this.assistant,
- this.anasthetist,
- this.operation,
- this.inasion,
- this.finding,
- this.surgeryProcedure,
- this.postOpInstruction,
- this.isActive,
- this.createdBy,
- this.createdName,
- this.createdNameN,
- this.createdOn,
- this.editedBy,
- this.editedByName,
- this.editedByNameN,
- this.editedOn,
- this.oRBookStatus,
- this.complicationDetail,
- this.bloodLossDetail,
- this.histopathSpecimen,
- this.microbiologySpecimen,
- this.otherSpecimen,
- this.scrubNurse,
- this.circulatingNurse,
- this.bloodTransfusedDetail});
+ this.projectID,
+ this.reservationNo,
+ this.patientID,
+ this.admissionID,
+ this.surgeryDate,
+ this.preOpDiagnosis,
+ this.postOpDiagnosis,
+ this.surgeon,
+ this.assistant,
+ this.anasthetist,
+ this.operation,
+ this.inasion,
+ this.finding,
+ this.surgeryProcedure,
+ this.postOpInstruction,
+ this.isActive,
+ this.createdBy,
+ this.createdName,
+ this.createdNameN,
+ this.createdOn,
+ this.editedBy,
+ this.editedByName,
+ this.editedByNameN,
+ this.editedOn,
+ this.oRBookStatus,
+ this.complicationDetail,
+ this.bloodLossDetail,
+ this.histopathSpecimen,
+ this.microbiologySpecimen,
+ this.otherSpecimen,
+ this.scrubNurse,
+ this.circulatingNurse,
+ this.bloodTransfusedDetail});
GetOperationDetailsResponseModel.fromJson(Map json) {
setupID = json['SetupID'];
diff --git a/lib/models/operation_report/get_reservations_request_model.dart b/lib/core/model/operation_report/get_reservations_request_model.dart
similarity index 100%
rename from lib/models/operation_report/get_reservations_request_model.dart
rename to lib/core/model/operation_report/get_reservations_request_model.dart
diff --git a/lib/models/operation_report/get_reservations_response_model.dart b/lib/core/model/operation_report/get_reservations_response_model.dart
similarity index 100%
rename from lib/models/operation_report/get_reservations_response_model.dart
rename to lib/core/model/operation_report/get_reservations_response_model.dart
diff --git a/lib/models/patient/MedicalReport/MedicalReportTemplate.dart b/lib/core/model/patient/MedicalReport/MedicalReportTemplate.dart
similarity index 83%
rename from lib/models/patient/MedicalReport/MedicalReportTemplate.dart
rename to lib/core/model/patient/MedicalReport/MedicalReportTemplate.dart
index f00e84a0..f847c9d5 100644
--- a/lib/models/patient/MedicalReport/MedicalReportTemplate.dart
+++ b/lib/core/model/patient/MedicalReport/MedicalReportTemplate.dart
@@ -14,17 +14,17 @@ class MedicalReportTemplate {
MedicalReportTemplate(
{this.setupID,
- this.projectID,
- this.templateID,
- this.procedureID,
- this.reportType,
- this.templateName,
- this.templateNameN,
- this.templateText,
- this.templateTextN,
- this.isActive,
- this.templateTextHtml,
- this.templateTextNHtml});
+ this.projectID,
+ this.templateID,
+ this.procedureID,
+ this.reportType,
+ this.templateName,
+ this.templateNameN,
+ this.templateText,
+ this.templateTextN,
+ this.isActive,
+ this.templateTextHtml,
+ this.templateTextNHtml});
MedicalReportTemplate.fromJson(Map json) {
setupID = json['SetupID'];
diff --git a/lib/models/patient/MedicalReport/MeidcalReportModel.dart b/lib/core/model/patient/MedicalReport/MeidcalReportModel.dart
similarity index 81%
rename from lib/models/patient/MedicalReport/MeidcalReportModel.dart
rename to lib/core/model/patient/MedicalReport/MeidcalReportModel.dart
index 74ee53a5..1fe7609b 100644
--- a/lib/models/patient/MedicalReport/MeidcalReportModel.dart
+++ b/lib/core/model/patient/MedicalReport/MeidcalReportModel.dart
@@ -28,31 +28,31 @@ class MedicalReportModel {
MedicalReportModel(
{this.reportData,
- this.setupID,
- this.projectID,
- this.projectName,
- this.projectNameN,
- this.patientID,
- this.invoiceNo,
- this.status,
- this.verifiedOn,
- this.verifiedBy,
- this.editedOn,
- this.editedBy,
- this.lineItemNo,
- this.createdOn,
- this.templateID,
- this.doctorID,
- this.doctorGender,
- this.doctorGenderDescription,
- this.doctorGenderDescriptionN,
- this.doctorImageURL,
- this.doctorName,
- this.doctorNameN,
- this.clinicID,
- this.clinicName,
- this.clinicNameN,
- this.reportDataHtml});
+ this.setupID,
+ this.projectID,
+ this.projectName,
+ this.projectNameN,
+ this.patientID,
+ this.invoiceNo,
+ this.status,
+ this.verifiedOn,
+ this.verifiedBy,
+ this.editedOn,
+ this.editedBy,
+ this.lineItemNo,
+ this.createdOn,
+ this.templateID,
+ this.doctorID,
+ this.doctorGender,
+ this.doctorGenderDescription,
+ this.doctorGenderDescriptionN,
+ this.doctorImageURL,
+ this.doctorName,
+ this.doctorNameN,
+ this.clinicID,
+ this.clinicName,
+ this.clinicNameN,
+ this.reportDataHtml});
MedicalReportModel.fromJson(Map json) {
reportData = json['ReportData'];
diff --git a/lib/models/patient/PatientArrivalEntity.dart b/lib/core/model/patient/PatientArrivalEntity.dart
similarity index 82%
rename from lib/models/patient/PatientArrivalEntity.dart
rename to lib/core/model/patient/PatientArrivalEntity.dart
index 54622cd7..347cc60f 100644
--- a/lib/models/patient/PatientArrivalEntity.dart
+++ b/lib/core/model/patient/PatientArrivalEntity.dart
@@ -20,23 +20,23 @@ class PatientArrivalEntity {
PatientArrivalEntity(
{this.age,
- this.appointmentDate,
- this.appointmentNo,
- this.appointmentType,
- this.arrivedOn,
- this.companyName,
- this.endTime,
- this.episodeNo,
- this.fallRiskScore,
- this.gender,
- this.medicationOrders,
- this.mobileNumber,
- this.nationality,
- this.patientMRN,
- this.patientName,
- this.rowCount,
- this.startTime,
- this.visitType});
+ this.appointmentDate,
+ this.appointmentNo,
+ this.appointmentType,
+ this.arrivedOn,
+ this.companyName,
+ this.endTime,
+ this.episodeNo,
+ this.fallRiskScore,
+ this.gender,
+ this.medicationOrders,
+ this.mobileNumber,
+ this.nationality,
+ this.patientMRN,
+ this.patientName,
+ this.rowCount,
+ this.startTime,
+ this.visitType});
PatientArrivalEntity.fromJson(Map json) {
age = json['age'];
@@ -81,4 +81,4 @@ class PatientArrivalEntity {
data['visitType'] = this.visitType;
return data;
}
-}
\ No newline at end of file
+}
diff --git a/lib/models/patient/get_clinic_by_project_id_request.dart b/lib/core/model/patient/get_clinic_by_project_id_request.dart
similarity index 96%
rename from lib/models/patient/get_clinic_by_project_id_request.dart
rename to lib/core/model/patient/get_clinic_by_project_id_request.dart
index 47122bf1..5dc820be 100644
--- a/lib/models/patient/get_clinic_by_project_id_request.dart
+++ b/lib/core/model/patient/get_clinic_by_project_id_request.dart
@@ -1,9 +1,8 @@
class ClinicByProjectIdRequest {
-
- /*
- *@author: Ibrahim Albitar
- *@Date:03/06/2020
- *@param:
+ /*
+ *@author: Ibrahim Albitar
+ *@Date:03/06/2020
+ *@param:
*@return:
*@desc: ClinicByProjectIdRequest
*/
@@ -19,6 +18,7 @@ class ClinicByProjectIdRequest {
bool isLoginForDoctorApp;
bool patientOutSA;
int patientTypeID;
+
/*
{
"ProjectID": 21,
diff --git a/lib/models/patient/get_doctor_by_clinic_id_request.dart b/lib/core/model/patient/get_doctor_by_clinic_id_request.dart
similarity index 78%
rename from lib/models/patient/get_doctor_by_clinic_id_request.dart
rename to lib/core/model/patient/get_doctor_by_clinic_id_request.dart
index 9504fc35..0ac6ee62 100644
--- a/lib/models/patient/get_doctor_by_clinic_id_request.dart
+++ b/lib/core/model/patient/get_doctor_by_clinic_id_request.dart
@@ -1,5 +1,4 @@
class DoctorsByClinicIdRequest {
-
int clinicID;
int projectID;
bool continueDentalPlan;
@@ -13,23 +12,20 @@ class DoctorsByClinicIdRequest {
bool license;
bool isDentalAllowedBackend;
-
- DoctorsByClinicIdRequest(
- {
- this.clinicID,
- this.projectID,
- this.continueDentalPlan = false,
- this.isSearchAppointmnetByClinicID = true,
- this.patientID,
- this.gender,
- this.isGetNearAppointment = false,
- this.isVoiceCommand = true,
- this.latitude = 0,
- this.longitude = 0,
- this.license = true,
- this.isDentalAllowedBackend = false,
- });
-
+ DoctorsByClinicIdRequest({
+ this.clinicID,
+ this.projectID,
+ this.continueDentalPlan = false,
+ this.isSearchAppointmnetByClinicID = true,
+ this.patientID,
+ this.gender,
+ this.isGetNearAppointment = false,
+ this.isVoiceCommand = true,
+ this.latitude = 0,
+ this.longitude = 0,
+ this.license = true,
+ this.isDentalAllowedBackend = false,
+ });
DoctorsByClinicIdRequest.fromJson(Map json) {
clinicID = json['ClinicID'];
@@ -61,6 +57,5 @@ class DoctorsByClinicIdRequest {
data['License'] = this.license;
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
return data;
-
}
}
diff --git a/lib/models/patient/get_list_stp_referral_frequency_request.dart b/lib/core/model/patient/get_list_stp_referral_frequency_request.dart
similarity index 95%
rename from lib/models/patient/get_list_stp_referral_frequency_request.dart
rename to lib/core/model/patient/get_list_stp_referral_frequency_request.dart
index edae9f18..597ed6de 100644
--- a/lib/models/patient/get_list_stp_referral_frequency_request.dart
+++ b/lib/core/model/patient/get_list_stp_referral_frequency_request.dart
@@ -1,11 +1,10 @@
class STPReferralFrequencyRequest {
-
-/*
- *@author: Ibrahim Albitar
- *@Date:03/06/2020
- *@param:
+/*
+ *@author: Ibrahim Albitar
+ *@Date:03/06/2020
+ *@param:
*@return:
- *@desc:
+ *@desc:
*/
int languageID;
@@ -18,6 +17,7 @@ class STPReferralFrequencyRequest {
bool isLoginForDoctorApp;
bool patientOutSA;
int patientTypeID;
+
/*
{
"LanguageID": 2,
diff --git a/lib/core/model/patient/get_pending_patient_er_model.dart b/lib/core/model/patient/get_pending_patient_er_model.dart
new file mode 100644
index 00000000..7791926a
--- /dev/null
+++ b/lib/core/model/patient/get_pending_patient_er_model.dart
@@ -0,0 +1,187 @@
+/*
+ *@author: Amjad Amireh
+ *@Date:15/6/2020
+ *@param:
+ *@return:
+ *@desc: Find list of pending patients Model
+ */
+import 'dart:convert';
+
+ListPendingPatientListModel listPendingPatientListModelFromJson(String str) =>
+ ListPendingPatientListModel.fromJson(json.decode(str));
+
+String listPendingPatientListModelToJson(ListPendingPatientListModel data) =>
+ json.encode(data.toJson());
+
+class ListPendingPatientListModel {
+ ListPendingPatientListModel({
+ this.acceptedBy,
+ this.acceptedOn,
+ this.age,
+ this.appointmentNo,
+ this.arrivalTime,
+ this.arrivalTimeD,
+ this.callStatus,
+ this.clientRequestId,
+ this.clinicName,
+ this.consoltationEnd,
+ this.consultationNotes,
+ this.createdOn,
+ this.dateOfBirth,
+ this.deviceToken,
+ this.deviceType,
+ this.doctorName,
+ this.editOn,
+ this.gender,
+ this.isFollowUp,
+ this.isFromVida,
+ this.isLoginB,
+ this.isOutKsa,
+ this.isRejected,
+ this.language,
+ this.latitude,
+ this.longitude,
+ this.mobileNumber,
+ this.openSession,
+ this.openTokenId,
+ this.patientId,
+ this.patientName,
+ this.patientStatus,
+ this.preferredLanguage,
+ this.projectId,
+ this.scoring,
+ this.serviceId,
+ this.tokenId,
+ this.vcId,
+ this.voipToken,
+ });
+
+ dynamic acceptedBy;
+ dynamic acceptedOn;
+ int age;
+ dynamic appointmentNo;
+ String arrivalTime;
+ String arrivalTimeD;
+ int callStatus;
+ String clientRequestId;
+ String clinicName;
+ dynamic consoltationEnd;
+ dynamic consultationNotes;
+ dynamic createdOn;
+ DateTime dateOfBirth;
+ String deviceToken;
+ String deviceType;
+ dynamic doctorName;
+ String editOn;
+ String gender;
+ bool isFollowUp;
+ dynamic isFromVida;
+ int isLoginB;
+ bool isOutKsa;
+ int isRejected;
+ String language;
+ double latitude;
+ double longitude;
+ String mobileNumber;
+ dynamic openSession;
+ dynamic openTokenId;
+ String patientId;
+ String patientName;
+ int patientStatus;
+ String preferredLanguage;
+ int projectId;
+ int scoring;
+ int serviceId;
+ dynamic tokenId;
+ int vcId;
+ String voipToken;
+
+ factory ListPendingPatientListModel.fromJson(Map json) =>
+ ListPendingPatientListModel(
+ acceptedBy: json["AcceptedBy"],
+ acceptedOn: json["AcceptedOn"],
+ age: json["Age"],
+ appointmentNo: json["AppointmentNo"],
+ arrivalTime: json["ArrivalTime"],
+ arrivalTimeD: json["ArrivalTimeD"],
+ callStatus: json["CallStatus"],
+ clientRequestId: json["ClientRequestID"],
+ clinicName: json["ClinicName"],
+ consoltationEnd: json["ConsoltationEnd"],
+ consultationNotes: json["ConsultationNotes"],
+ createdOn: json["CreatedOn"],
+ dateOfBirth: DateTime.parse(json["DateOfBirth"]),
+ deviceToken: json["DeviceToken"],
+ deviceType: json["DeviceType"],
+ doctorName: json["DoctorName"],
+ editOn: json["EditOn"],
+ gender: json["Gender"],
+ isFollowUp: json["IsFollowUP"],
+ isFromVida: json["IsFromVida"],
+ isLoginB: json["IsLoginB"],
+ isOutKsa: json["IsOutKSA"],
+ isRejected: json["IsRejected"],
+ language: json["Language"],
+ latitude: json["Latitude"].toDouble(),
+ longitude: json["Longitude"].toDouble(),
+ mobileNumber: json["MobileNumber"],
+ openSession: json["OpenSession"],
+ openTokenId: json["OpenTokenID"],
+ patientId: json["PatientID"],
+ patientName: json["PatientName"],
+ patientStatus: json["PatientStatus"],
+ preferredLanguage: json["PreferredLanguage"],
+ projectId: json["ProjectID"],
+ scoring: json["Scoring"],
+ serviceId: json["ServiceID"],
+ tokenId: json["TokenID"],
+ vcId: json["VC_ID"],
+ voipToken: json["VoipToken"],
+ );
+
+ Map toJson() => {
+ "AcceptedBy": acceptedBy,
+ "AcceptedOn": acceptedOn,
+ "Age": age,
+ "AppointmentNo": appointmentNo,
+ "ArrivalTime": arrivalTime,
+ "ArrivalTimeD": arrivalTimeD,
+ "CallStatus": callStatus,
+ "ClientRequestID": clientRequestId,
+ "ClinicName": clinicName,
+ "ConsoltationEnd": consoltationEnd,
+ "ConsultationNotes": consultationNotes,
+ "CreatedOn": createdOn,
+ "DateOfBirth":
+ "${dateOfBirth.year.toString().padLeft(4, '0')}-${dateOfBirth.month.toString().padLeft(2, '0')}-${dateOfBirth.day.toString().padLeft(2, '0')}",
+ "DeviceToken": deviceToken,
+ "DeviceType": deviceType,
+ "DoctorName": doctorName,
+ "EditOn": editOn,
+ "Gender": gender,
+ "IsFollowUP": isFollowUp,
+ "IsFromVida": isFromVida,
+ "IsLoginB": isLoginB,
+ "IsOutKSA": isOutKsa,
+ "IsRejected": isRejected,
+ "Language": language,
+ "Latitude": latitude,
+ "Longitude": longitude,
+ "MobileNumber": mobileNumber,
+ "OpenSession": openSession,
+ "OpenTokenID": openTokenId,
+ "PatientID": patientId,
+ "PatientName": patientName,
+ "PatientStatus": patientStatus,
+ "PreferredLanguage": preferredLanguage,
+ "ProjectID": projectId,
+ "Scoring": scoring,
+ "ServiceID": serviceId,
+ "TokenID": tokenId,
+ "VC_ID": vcId,
+ "VoipToken": voipToken,
+ };
+}
+// To parse this JSON data, do
+//
+// final listPendingPatientListModel = listPendingPatientListModelFromJson(jsonString);
diff --git a/lib/models/patient/insurance_aprovals_request.dart b/lib/core/model/patient/insurance_aprovals_request.dart
similarity index 97%
rename from lib/models/patient/insurance_aprovals_request.dart
rename to lib/core/model/patient/insurance_aprovals_request.dart
index 2d3ac663..f1e4e7bd 100644
--- a/lib/models/patient/insurance_aprovals_request.dart
+++ b/lib/core/model/patient/insurance_aprovals_request.dart
@@ -36,8 +36,7 @@ class InsuranceAprovalsRequest {
int patientTypeID;
InsuranceAprovalsRequest(
- {
- this.exuldAppNO,
+ {this.exuldAppNO,
this.patientID,
this.channel = 9,
this.projectID = 12,
@@ -46,7 +45,7 @@ class InsuranceAprovalsRequest {
this.stamp = '2020-04-23T21:01:21.492Z',
this.ipAdress = '11.11.11.11',
this.versionID = 5.8,
- this.tokenID ,
+ this.tokenID,
this.sessionID = 'e29zoooEJ4',
this.isLoginForDoctorApp = true,
this.patientOutSA = false});
diff --git a/lib/models/patient/lab_orders/lab_orders_req_model.dart b/lib/core/model/patient/lab_orders/lab_orders_req_model.dart
similarity index 89%
rename from lib/models/patient/lab_orders/lab_orders_req_model.dart
rename to lib/core/model/patient/lab_orders/lab_orders_req_model.dart
index a97f4093..29928f4e 100644
--- a/lib/models/patient/lab_orders/lab_orders_req_model.dart
+++ b/lib/core/model/patient/lab_orders/lab_orders_req_model.dart
@@ -1,5 +1,4 @@
-
-/*
+/*
*@author: Elham Rababah
*@Date:6/5/2020
*@param:
@@ -27,12 +26,12 @@ class LabOrdersReqModel {
this.languageID,
this.tokenID,
this.stamp = '2020-04-26T09:32:18.317Z',
- this.iPAdress='11.11.11.11',
- this.versionID=5.5,
- this.channel=9,
- this.sessionID='E2bsEeYEJo',
- this.isLoginForDoctorApp =true,
- this.patientOutSA=false});
+ this.iPAdress = '11.11.11.11',
+ this.versionID = 5.5,
+ this.channel = 9,
+ this.sessionID = 'E2bsEeYEJo',
+ this.isLoginForDoctorApp = true,
+ this.patientOutSA = false});
LabOrdersReqModel.fromJson(Map json) {
patientID = json['PatientID'];
diff --git a/lib/models/patient/lab_orders/lab_orders_res_model.dart b/lib/core/model/patient/lab_orders/lab_orders_res_model.dart
similarity index 99%
rename from lib/models/patient/lab_orders/lab_orders_res_model.dart
rename to lib/core/model/patient/lab_orders/lab_orders_res_model.dart
index 7f463933..86646cee 100644
--- a/lib/models/patient/lab_orders/lab_orders_res_model.dart
+++ b/lib/core/model/patient/lab_orders/lab_orders_res_model.dart
@@ -1,5 +1,3 @@
-
-
import 'package:doctor_app_flutter/util/date-utils.dart';
class LabOrdersResModel {
diff --git a/lib/models/patient/lab_result/lab_result.dart b/lib/core/model/patient/lab_result/lab_result.dart
similarity index 81%
rename from lib/models/patient/lab_result/lab_result.dart
rename to lib/core/model/patient/lab_result/lab_result.dart
index ca753f2d..30925f12 100644
--- a/lib/models/patient/lab_result/lab_result.dart
+++ b/lib/core/model/patient/lab_result/lab_result.dart
@@ -30,33 +30,33 @@ class LabResult {
LabResult(
{this.setupID,
- this.projectID,
- this.orderNo,
- this.lineItemNo,
- this.packageID,
- this.testID,
- this.description,
- this.resultValue,
- this.referenceRange,
- this.convertedResultValue,
- this.convertedReferenceRange,
- this.resultValueFlag,
- this.status,
- this.createdBy,
- this.createdByN,
- this.createdOn,
- this.editedBy,
- this.editedByN,
- this.editedOn,
- this.verifiedBy,
- this.verifiedByN,
- this.verifiedOn,
- this.patientID,
- this.gender,
- this.maleInterpretativeData,
- this.femaleInterpretativeData,
- this.testCode,
- this.statusDescription});
+ this.projectID,
+ this.orderNo,
+ this.lineItemNo,
+ this.packageID,
+ this.testID,
+ this.description,
+ this.resultValue,
+ this.referenceRange,
+ this.convertedResultValue,
+ this.convertedReferenceRange,
+ this.resultValueFlag,
+ this.status,
+ this.createdBy,
+ this.createdByN,
+ this.createdOn,
+ this.editedBy,
+ this.editedByN,
+ this.editedOn,
+ this.verifiedBy,
+ this.verifiedByN,
+ this.verifiedOn,
+ this.patientID,
+ this.gender,
+ this.maleInterpretativeData,
+ this.femaleInterpretativeData,
+ this.testCode,
+ this.statusDescription});
LabResult.fromJson(Map json) {
setupID = json['SetupID'];
diff --git a/lib/models/patient/lab_result/lab_result_req_model.dart b/lib/core/model/patient/lab_result/lab_result_req_model.dart
similarity index 83%
rename from lib/models/patient/lab_result/lab_result_req_model.dart
rename to lib/core/model/patient/lab_result/lab_result_req_model.dart
index 5e58a4a5..f070d4c2 100644
--- a/lib/models/patient/lab_result/lab_result_req_model.dart
+++ b/lib/core/model/patient/lab_result/lab_result_req_model.dart
@@ -16,19 +16,19 @@ class RequestLabResult {
RequestLabResult(
{this.projectID,
- this.setupID,
- this.orderNo,
- this.invoiceNo,
- this.patientTypeID,
- this.languageID,
- this.stamp,
- this.iPAdress,
- this.versionID,
- this.channel,
- this.tokenID,
- this.sessionID,
- this.isLoginForDoctorApp,
- this.patientOutSA});
+ this.setupID,
+ this.orderNo,
+ this.invoiceNo,
+ this.patientTypeID,
+ this.languageID,
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
+ this.tokenID,
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.patientOutSA});
RequestLabResult.fromJson(Map json) {
projectID = json['ProjectID'];
diff --git a/lib/models/patient/my_referral/PendingReferral.dart b/lib/core/model/patient/my_referral/PendingReferral.dart
similarity index 100%
rename from lib/models/patient/my_referral/PendingReferral.dart
rename to lib/core/model/patient/my_referral/PendingReferral.dart
diff --git a/lib/models/patient/my_referral/clinic-doctor.dart b/lib/core/model/patient/my_referral/clinic-doctor.dart
similarity index 81%
rename from lib/models/patient/my_referral/clinic-doctor.dart
rename to lib/core/model/patient/my_referral/clinic-doctor.dart
index 843f636c..0679f4c8 100644
--- a/lib/models/patient/my_referral/clinic-doctor.dart
+++ b/lib/core/model/patient/my_referral/clinic-doctor.dart
@@ -41,44 +41,44 @@ class ClinicDoctor {
ClinicDoctor(
{this.clinicID,
- this.clinicName,
- this.doctorTitle,
- this.iD,
- this.name,
- this.projectID,
- this.projectName,
- this.actualDoctorRate,
- this.clinicRoomNo,
- this.date,
- this.dayName,
- this.doctorID,
- this.doctorImageURL,
- this.doctorProfile,
- this.doctorProfileInfo,
- this.doctorRate,
- this.gender,
- this.genderDescription,
- this.isAppointmentAllowed,
- this.isDoctorAllowVedioCall,
- this.isDoctorDummy,
- this.isLiveCare,
- this.latitude,
- this.longitude,
- this.nationalityFlagURL,
- this.nationalityID,
- this.nationalityName,
- this.nearestFreeSlot,
- this.noOfPatientsRate,
- this.originalClinicID,
- this.personRate,
- this.projectDistanceInKiloMeters,
- this.qR,
- this.qRString,
- this.rateNumber,
- this.serviceID,
- this.setupID,
- this.speciality,
- this.workingHours});
+ this.clinicName,
+ this.doctorTitle,
+ this.iD,
+ this.name,
+ this.projectID,
+ this.projectName,
+ this.actualDoctorRate,
+ this.clinicRoomNo,
+ this.date,
+ this.dayName,
+ this.doctorID,
+ this.doctorImageURL,
+ this.doctorProfile,
+ this.doctorProfileInfo,
+ this.doctorRate,
+ this.gender,
+ this.genderDescription,
+ this.isAppointmentAllowed,
+ this.isDoctorAllowVedioCall,
+ this.isDoctorDummy,
+ this.isLiveCare,
+ this.latitude,
+ this.longitude,
+ this.nationalityFlagURL,
+ this.nationalityID,
+ this.nationalityName,
+ this.nearestFreeSlot,
+ this.noOfPatientsRate,
+ this.originalClinicID,
+ this.personRate,
+ this.projectDistanceInKiloMeters,
+ this.qR,
+ this.qRString,
+ this.rateNumber,
+ this.serviceID,
+ this.setupID,
+ this.speciality,
+ this.workingHours});
ClinicDoctor.fromJson(Map json) {
clinicID = json['ClinicID'];
@@ -165,5 +165,4 @@ class ClinicDoctor {
data['WorkingHours'] = this.workingHours;
return data;
}
-
-}
\ No newline at end of file
+}
diff --git a/lib/models/patient/my_referral/my_referral_patient_model.dart b/lib/core/model/patient/my_referral/my_referral_patient_model.dart
similarity index 81%
rename from lib/models/patient/my_referral/my_referral_patient_model.dart
rename to lib/core/model/patient/my_referral/my_referral_patient_model.dart
index f1506f8e..dc7bcdbe 100644
--- a/lib/models/patient/my_referral/my_referral_patient_model.dart
+++ b/lib/core/model/patient/my_referral/my_referral_patient_model.dart
@@ -53,54 +53,54 @@ class MyReferralPatientModel {
MyReferralPatientModel(
{this.projectID,
- this.lineItemNo,
- this.doctorID,
- this.patientID,
- this.doctorName,
- this.doctorNameN,
- this.firstName,
- this.middleName,
- this.lastName,
- this.firstNameN,
- this.middleNameN,
- this.lastNameN,
- this.gender,
- this.dateofBirth,
- this.mobileNumber,
- this.emailAddress,
- this.patientIdentificationNo,
- this.patientType,
- this.admissionNo,
- this.admissionDate,
- this.roomID,
- this.bedID,
- this.nursingStationID,
- this.description,
- this.nationalityName,
- this.nationalityNameN,
- this.clinicDescription,
- this.clinicDescriptionN,
- this.referralDoctor,
- this.referringDoctor,
- this.referralClinic,
- this.referringClinic,
- this.referralStatus,
- this.referralDate,
- this.referringDoctorRemarks,
- this.referredDoctorRemarks,
- this.referralResponseOn,
- this.priority,
- this.frequency,
- this.mAXResponseTime,
- this.age,
- this.frequencyDescription,
- this.genderDescription,
- this.isDoctorLate,
- this.isDoctorResponse,
- this.nursingStationName,
- this.priorityDescription,
- this.referringClinicDescription,
- this.referringDoctorName});
+ this.lineItemNo,
+ this.doctorID,
+ this.patientID,
+ this.doctorName,
+ this.doctorNameN,
+ this.firstName,
+ this.middleName,
+ this.lastName,
+ this.firstNameN,
+ this.middleNameN,
+ this.lastNameN,
+ this.gender,
+ this.dateofBirth,
+ this.mobileNumber,
+ this.emailAddress,
+ this.patientIdentificationNo,
+ this.patientType,
+ this.admissionNo,
+ this.admissionDate,
+ this.roomID,
+ this.bedID,
+ this.nursingStationID,
+ this.description,
+ this.nationalityName,
+ this.nationalityNameN,
+ this.clinicDescription,
+ this.clinicDescriptionN,
+ this.referralDoctor,
+ this.referringDoctor,
+ this.referralClinic,
+ this.referringClinic,
+ this.referralStatus,
+ this.referralDate,
+ this.referringDoctorRemarks,
+ this.referredDoctorRemarks,
+ this.referralResponseOn,
+ this.priority,
+ this.frequency,
+ this.mAXResponseTime,
+ this.age,
+ this.frequencyDescription,
+ this.genderDescription,
+ this.isDoctorLate,
+ this.isDoctorResponse,
+ this.nursingStationName,
+ this.priorityDescription,
+ this.referringClinicDescription,
+ this.referringDoctorName});
MyReferralPatientModel.fromJson(Map json) {
projectID = json['ProjectID'];
diff --git a/lib/models/patient/my_referral/my_referred_patient_model.dart b/lib/core/model/patient/my_referral/my_referred_patient_model.dart
similarity index 79%
rename from lib/models/patient/my_referral/my_referred_patient_model.dart
rename to lib/core/model/patient/my_referral/my_referred_patient_model.dart
index b353e587..4f9aabad 100644
--- a/lib/models/patient/my_referral/my_referred_patient_model.dart
+++ b/lib/core/model/patient/my_referral/my_referred_patient_model.dart
@@ -1,5 +1,3 @@
-
-
class MyReferredPatientModel {
String rowID;
int projectID;
@@ -66,71 +64,71 @@ class MyReferredPatientModel {
bool isReferralDoctorSameBranch;
String referralStatusDesc;
- MyReferredPatientModel({
- this.rowID,
- this.projectID,
- this.lineItemNo,
- this.doctorID,
- this.patientID,
- this.doctorName,
- this.doctorNameN,
- this.firstName,
- this.middleName,
- this.lastName,
- this.firstNameN,
- this.middleNameN,
- this.lastNameN,
- this.gender,
- this.dateofBirth,
- this.mobileNumber,
- this.emailAddress,
- this.patientIdentificationNo,
- this.patientType,
- this.admissionNo,
- this.admissionDate,
- this.roomID,
- this.bedID,
- this.nursingStationID,
- this.description,
- this.nationalityName,
- this.nationalityNameN,
- this.clinicDescription,
- this.clinicDescriptionN,
- this.referralDoctor,
- this.referringDoctor,
- this.referralClinic,
- this.referringClinic,
- this.referralStatus,
- this.referralDate,
- this.referringDoctorRemarks,
- this.referredDoctorRemarks,
- this.referralResponseOn,
- this.priority,
- this.frequency,
- this.mAXResponseTime,
- this.episodeID,
- this.appointmentNo,
- this.appointmentDate,
- this.appointmentType,
- this.patientMRN,
- this.createdOn,
- this.clinicID,
- this.nationalityID,
- this.age,
- this.doctorImageURL,
- this.frequencyDescription,
- this.genderDescription,
- this.isDoctorLate,
- this.isDoctorResponse,
- this.nationalityFlagURL,
- this.nursingStationName,
- this.priorityDescription,
- this.referringClinicDescription,
- this.referringDoctorName,
- this.isReferralDoctorSameBranch,
- this.referralDoctorName,
- this.referralClinicDescription,this.referralStatusDesc
- });
+ MyReferredPatientModel(
+ {this.rowID,
+ this.projectID,
+ this.lineItemNo,
+ this.doctorID,
+ this.patientID,
+ this.doctorName,
+ this.doctorNameN,
+ this.firstName,
+ this.middleName,
+ this.lastName,
+ this.firstNameN,
+ this.middleNameN,
+ this.lastNameN,
+ this.gender,
+ this.dateofBirth,
+ this.mobileNumber,
+ this.emailAddress,
+ this.patientIdentificationNo,
+ this.patientType,
+ this.admissionNo,
+ this.admissionDate,
+ this.roomID,
+ this.bedID,
+ this.nursingStationID,
+ this.description,
+ this.nationalityName,
+ this.nationalityNameN,
+ this.clinicDescription,
+ this.clinicDescriptionN,
+ this.referralDoctor,
+ this.referringDoctor,
+ this.referralClinic,
+ this.referringClinic,
+ this.referralStatus,
+ this.referralDate,
+ this.referringDoctorRemarks,
+ this.referredDoctorRemarks,
+ this.referralResponseOn,
+ this.priority,
+ this.frequency,
+ this.mAXResponseTime,
+ this.episodeID,
+ this.appointmentNo,
+ this.appointmentDate,
+ this.appointmentType,
+ this.patientMRN,
+ this.createdOn,
+ this.clinicID,
+ this.nationalityID,
+ this.age,
+ this.doctorImageURL,
+ this.frequencyDescription,
+ this.genderDescription,
+ this.isDoctorLate,
+ this.isDoctorResponse,
+ this.nationalityFlagURL,
+ this.nursingStationName,
+ this.priorityDescription,
+ this.referringClinicDescription,
+ this.referringDoctorName,
+ this.isReferralDoctorSameBranch,
+ this.referralDoctorName,
+ this.referralClinicDescription,
+ this.referralStatusDesc});
MyReferredPatientModel.fromJson(Map json) {
rowID = json['RowID'];
@@ -167,7 +165,13 @@ class MyReferredPatientModel {
referralClinic = json['ReferralClinic'];
referringClinic = json['ReferringClinic'];
createdOn = json['CreatedOn'];
- referralStatus = json["ReferralStatus"] is String?json['ReferralStatus']== "Accepted"?46:json['ReferralStatus']=="Pending"?1:0 : json['ReferralStatus'];
+ referralStatus = json["ReferralStatus"] is String
+ ? json['ReferralStatus'] == "Accepted"
+ ? 46
+ : json['ReferralStatus'] == "Pending"
+ ? 1
+ : 0
+ : json['ReferralStatus'];
referralDate = json['ReferralDate'] ?? createdOn;
referringDoctorRemarks = json['ReferringDoctorRemarks'];
referredDoctorRemarks = json['ReferredDoctorRemarks'];
diff --git a/lib/models/patient/orders_request.dart b/lib/core/model/patient/orders_request.dart
similarity index 97%
rename from lib/models/patient/orders_request.dart
rename to lib/core/model/patient/orders_request.dart
index 1372cfd6..4adab686 100644
--- a/lib/models/patient/orders_request.dart
+++ b/lib/core/model/patient/orders_request.dart
@@ -1,5 +1,4 @@
-
-/*
+/*
*@author: Ibrahim Albitar
*@Date:15/5/2020
@@ -38,14 +37,14 @@ class OrdersRequest {
double versionID;
OrdersRequest(
- {this.visitType ,
+ {this.visitType,
this.admissionNo,
this.projectID = 12,
this.stamp = '2020-04-23T21:01:21.492Z',
this.languageID = 2,
this.iPAdress = '11.11.11.11',
this.channel = 9,
- this.tokenID ,
+ this.tokenID,
this.sessionID = "LlBk8lUEJY",
this.isLoginForDoctorApp = true,
this.patientTypeID = 1,
@@ -85,4 +84,4 @@ class OrdersRequest {
data['VersionID'] = this.versionID;
return data;
}
-}
\ No newline at end of file
+}
diff --git a/lib/models/patient/patiant_info_model.dart b/lib/core/model/patient/patiant_info_model.dart
similarity index 88%
rename from lib/models/patient/patiant_info_model.dart
rename to lib/core/model/patient/patiant_info_model.dart
index df966f03..99127cc9 100644
--- a/lib/models/patient/patiant_info_model.dart
+++ b/lib/core/model/patient/patiant_info_model.dart
@@ -1,6 +1,7 @@
// TODO = it have to be changed.
import 'package:doctor_app_flutter/util/date-utils.dart';
+import 'package:doctor_app_flutter/util/helpers.dart';
class PatiantInformtion {
PatiantInformtion patientDetails;
@@ -158,7 +159,9 @@ class PatiantInformtion {
PatiantInformtion.fromJson(Map json) {
{
- patientDetails = json['patientDetails'] != null ? new PatiantInformtion.fromJson(json['patientDetails']) : null;
+ patientDetails = json['patientDetails'] != null
+ ? new PatiantInformtion.fromJson(json['patientDetails'])
+ : null;
projectId = json["ProjectID"] ?? json["projectID"];
clinicId = json["ClinicID"] ?? json["clinicID"];
doctorId = json["DoctorID"] ?? json["doctorID"];
@@ -186,7 +189,8 @@ class PatiantInformtion {
nationalityId = json["NationalityID"] ?? json["nationalityID"];
mobileNumber = json["MobileNumber"] ?? json["mobileNumber"];
emailAddress = json["EmailAddress"] ?? json["emailAddress"];
- patientIdentificationNo = json["PatientIdentificationNo"] ?? json["patientIdentificationNo"];
+ patientIdentificationNo =
+ json["PatientIdentificationNo"] ?? json["patientIdentificationNo"];
//TODO make 7 dynamic when the backend retrun it in patient arrival
patientType = json["PatientType"] ?? json["patientType"] ?? 1;
admissionNo = json["AdmissionNo"] ?? json["admissionNo"];
@@ -196,10 +200,16 @@ class PatiantInformtion {
bedId = json["BedID"] ?? json["bedID"];
nursingStationId = json["NursingStationID"] ?? json["nursingStationID"];
description = json["Description"] ?? json["description"];
- clinicDescription = json["ClinicDescription"] ?? json["clinicDescription"];
- clinicDescriptionN = json["ClinicDescriptionN"] ?? json["clinicDescriptionN"];
- nationalityName = json["NationalityName"] ?? json["nationalityName"] ?? json['NationalityName'];
- nationalityNameN = json["NationalityNameN"] ?? json["nationalityNameN"] ?? json['NationalityNameN'];
+ clinicDescription = Helpers.convertToTitleCase(
+ json["ClinicDescription"] ?? json["clinicDescription"]??'');
+ clinicDescriptionN =
+ json["ClinicDescriptionN"] ?? json["clinicDescriptionN"];
+ nationalityName = json["NationalityName"] ??
+ json["nationalityName"] ??
+ json['NationalityName'];
+ nationalityNameN = json["NationalityNameN"] ??
+ json["nationalityNameN"] ??
+ json['NationalityNameN'];
age = json["Age"] ?? json["age"];
genderDescription = json["GenderDescription"];
nursingStationName = json["NursingStationName"];
@@ -207,7 +217,8 @@ class PatiantInformtion {
startTime = json["startTime"] ?? json['StartTime'];
appointmentNo = json['appointmentNo'] ?? json['AppointmentNo'];
appointmentType = json['appointmentType'];
- appointmentTypeId = json['appointmentTypeId'] ?? json['appointmentTypeid'];
+ appointmentTypeId =
+ json['appointmentTypeId'] ?? json['appointmentTypeid'];
arrivedOn = json['ArrivedOn'] ?? json['arrivedOn'] ?? json['ArrivedOn'];
clinicGroupId = json['clinicGroupId'];
companyName = json['companyName'];
@@ -229,9 +240,12 @@ class PatiantInformtion {
? int?.parse(json["patientId"].toString())
: '');
visitType = json['visitType'] ?? json['visitType'] ?? json['visitType'];
- nationalityFlagURL = json['NationalityFlagURL'] ?? json['NationalityFlagURL'];
- patientStatusType = json['patientStatusType'] ?? json['PatientStatusType'];
- visitTypeId = json['visitTypeId'] ?? json['visitTypeId'] ?? json['visitTypeid'];
+ nationalityFlagURL =
+ json['NationalityFlagURL'] ?? json['NationalityFlagURL'];
+ patientStatusType =
+ json['patientStatusType'] ?? json['PatientStatusType'];
+ visitTypeId =
+ json['visitTypeId'] ?? json['visitTypeId'] ?? json['visitTypeid'];
startTimes = json['StartTime'] ?? json['StartTime'];
dischargeDate = json['DischargeDate'];
status = json['Status'];
@@ -254,8 +268,9 @@ class PatiantInformtion {
? AppDateUtils.convertStringToDate(json["admissionDate"])
: null;
- appointmentDateWithDateTimeForm =
- json["AppointmentDate"] != null ? AppDateUtils.convertStringToDate(json["AppointmentDate"]) : null;
+ appointmentDateWithDateTimeForm = json["AppointmentDate"] != null
+ ? AppDateUtils.convertStringToDate(json["AppointmentDate"])
+ : null;
}
}
@@ -303,7 +318,8 @@ class PatiantInformtion {
data["gender"] = this.gender;
data['Age'] = this.age;
- data['AppointmentDate'] = this.appointmentDate.isNotEmpty ? this.appointmentDate : null;
+ data['AppointmentDate'] =
+ this.appointmentDate.isNotEmpty ? this.appointmentDate : null;
data['AppointmentNo'] = this.appointmentNo;
data['ArrivalTime'] = this.arrivalTime;
diff --git a/lib/models/patient/patient_arrival/get_patient_arrival_list_request_model.dart b/lib/core/model/patient/patient_arrival/get_patient_arrival_list_request_model.dart
similarity index 99%
rename from lib/models/patient/patient_arrival/get_patient_arrival_list_request_model.dart
rename to lib/core/model/patient/patient_arrival/get_patient_arrival_list_request_model.dart
index 1d0da9c5..5ec16352 100644
--- a/lib/models/patient/patient_arrival/get_patient_arrival_list_request_model.dart
+++ b/lib/core/model/patient/patient_arrival/get_patient_arrival_list_request_model.dart
@@ -40,7 +40,6 @@ class GetPatientArrivalListRequestModel {
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
data['PatientMRN'] = this.patientMRN;
-
return data;
}
}
diff --git a/lib/models/patient/patient_model.dart b/lib/core/model/patient/patient_model.dart
similarity index 99%
rename from lib/models/patient/patient_model.dart
rename to lib/core/model/patient/patient_model.dart
index 7368c538..3a8eb9ae 100644
--- a/lib/models/patient/patient_model.dart
+++ b/lib/core/model/patient/patient_model.dart
@@ -31,6 +31,7 @@ class PatientModel {
int Searchtype;
String IdentificationNo;
String MobileNo;
+
int get getProjectID => ProjectID;
set setProjectID(int ProjectID) => this.ProjectID = ProjectID;
@@ -42,6 +43,7 @@ class PatientModel {
int get getDoctorID => DoctorID;
set setDoctorID(int DoctorID) => this.DoctorID = DoctorID;
+
String get getFirstName => FirstName;
set setFirstName(String FirstName) => this.FirstName = FirstName;
@@ -141,6 +143,7 @@ class PatientModel {
FirstName: json["FirstName"],
LastName: json["LasttName"],
);
+
Map toJson() {
final Map data = new Map();
data['ProjectID'] = this.ProjectID;
diff --git a/lib/models/patient/prescription/prescription_report.dart b/lib/core/model/patient/prescription/prescription_report.dart
similarity index 81%
rename from lib/models/patient/prescription/prescription_report.dart
rename to lib/core/model/patient/prescription/prescription_report.dart
index 05d28bdc..d559b9d0 100644
--- a/lib/models/patient/prescription/prescription_report.dart
+++ b/lib/core/model/patient/prescription/prescription_report.dart
@@ -34,37 +34,37 @@ class PrescriptionReport {
PrescriptionReport(
{this.address,
- this.appointmentNo,
- this.clinic,
- this.companyName,
- this.days,
- this.doctorName,
- this.doseDailyQuantity,
- this.frequency,
- this.frequencyNumber,
- this.imageExtension,
- this.imageSRCUrl,
- this.imageString,
- this.imageThumbUrl,
- this.isCovered,
- this.itemDescription,
- this.itemID,
- this.orderDate,
- this.patientID,
- this.patientName,
- this.phoneOffice1,
- this.prescriptionQR,
- this.prescriptionTimes,
- this.productImage,
- this.productImageBase64,
- this.productImageString,
- this.projectID,
- this.projectName,
- this.remarks,
- this.route,
- this.sKU,
- this.scaleOffset,
- this.startDate});
+ this.appointmentNo,
+ this.clinic,
+ this.companyName,
+ this.days,
+ this.doctorName,
+ this.doseDailyQuantity,
+ this.frequency,
+ this.frequencyNumber,
+ this.imageExtension,
+ this.imageSRCUrl,
+ this.imageString,
+ this.imageThumbUrl,
+ this.isCovered,
+ this.itemDescription,
+ this.itemID,
+ this.orderDate,
+ this.patientID,
+ this.patientName,
+ this.phoneOffice1,
+ this.prescriptionQR,
+ this.prescriptionTimes,
+ this.productImage,
+ this.productImageBase64,
+ this.productImageString,
+ this.projectID,
+ this.projectName,
+ this.remarks,
+ this.route,
+ this.sKU,
+ this.scaleOffset,
+ this.startDate});
PrescriptionReport.fromJson(Map json) {
address = json['Address'];
diff --git a/lib/models/patient/prescription/prescription_report_for_in_patient.dart b/lib/core/model/patient/prescription/prescription_report_for_in_patient.dart
similarity index 80%
rename from lib/models/patient/prescription/prescription_report_for_in_patient.dart
rename to lib/core/model/patient/prescription/prescription_report_for_in_patient.dart
index 21cb13b1..12b5e1e6 100644
--- a/lib/models/patient/prescription/prescription_report_for_in_patient.dart
+++ b/lib/core/model/patient/prescription/prescription_report_for_in_patient.dart
@@ -51,52 +51,52 @@ class PrescriptionReportForInPatient {
PrescriptionReportForInPatient(
{this.admissionNo,
- this.authorizedBy,
- this.bedNo,
- this.comments,
- this.createdBy,
- this.createdByName,
- this.createdByNameN,
- this.createdOn,
- this.direction,
- this.directionID,
- this.directionN,
- this.dose,
- this.editedBy,
- this.iVDiluentLine,
- this.iVDiluentType,
- this.iVDiluentVolume,
- this.iVRate,
- this.iVStability,
- this.itemDescription,
- this.itemID,
- this.lineItemNo,
- this.locationId,
- this.noOfDoses,
- this.orderNo,
- this.patientID,
- this.pharmacyRemarks,
- this.prescriptionDatetime,
- this.prescriptionNo,
- this.processedBy,
- this.projectID,
- this.refillID,
- this.refillType,
- this.refillTypeN,
- this.reviewedPharmacist,
- this.roomId,
- this.route,
- this.routeId,
- this.routeN,
- this.setupID,
- this.startDatetime,
- this.status,
- this.statusDescription,
- this.statusDescriptionN,
- this.stopDatetime,
- this.unitofMeasurement,
- this.unitofMeasurementDescription,
- this.unitofMeasurementDescriptionN});
+ this.authorizedBy,
+ this.bedNo,
+ this.comments,
+ this.createdBy,
+ this.createdByName,
+ this.createdByNameN,
+ this.createdOn,
+ this.direction,
+ this.directionID,
+ this.directionN,
+ this.dose,
+ this.editedBy,
+ this.iVDiluentLine,
+ this.iVDiluentType,
+ this.iVDiluentVolume,
+ this.iVRate,
+ this.iVStability,
+ this.itemDescription,
+ this.itemID,
+ this.lineItemNo,
+ this.locationId,
+ this.noOfDoses,
+ this.orderNo,
+ this.patientID,
+ this.pharmacyRemarks,
+ this.prescriptionDatetime,
+ this.prescriptionNo,
+ this.processedBy,
+ this.projectID,
+ this.refillID,
+ this.refillType,
+ this.refillTypeN,
+ this.reviewedPharmacist,
+ this.roomId,
+ this.route,
+ this.routeId,
+ this.routeN,
+ this.setupID,
+ this.startDatetime,
+ this.status,
+ this.statusDescription,
+ this.statusDescriptionN,
+ this.stopDatetime,
+ this.unitofMeasurement,
+ this.unitofMeasurementDescription,
+ this.unitofMeasurementDescriptionN});
PrescriptionReportForInPatient.fromJson(Map json) {
admissionNo = json['AdmissionNo'];
@@ -125,7 +125,8 @@ class PrescriptionReportForInPatient {
orderNo = json['OrderNo'];
patientID = json['PatientID'];
pharmacyRemarks = json['PharmacyRemarks'];
- prescriptionDatetime = AppDateUtils.convertStringToDate(json['PrescriptionDatetime']);
+ prescriptionDatetime =
+ AppDateUtils.convertStringToDate(json['PrescriptionDatetime']);
prescriptionNo = json['PrescriptionNo'];
processedBy = json['ProcessedBy'];
projectID = json['ProjectID'];
@@ -138,7 +139,7 @@ class PrescriptionReportForInPatient {
routeId = json['RouteId'];
routeN = json['RouteN'];
setupID = json['SetupID'];
- startDatetime = AppDateUtils.convertStringToDate(json['StartDatetime']) ;
+ startDatetime = AppDateUtils.convertStringToDate(json['StartDatetime']);
status = json['Status'];
statusDescription = json['StatusDescription'];
statusDescriptionN = json['StatusDescriptionN'];
diff --git a/lib/models/patient/prescription/prescription_req_model.dart b/lib/core/model/patient/prescription/prescription_req_model.dart
similarity index 100%
rename from lib/models/patient/prescription/prescription_req_model.dart
rename to lib/core/model/patient/prescription/prescription_req_model.dart
diff --git a/lib/models/patient/prescription/prescription_res_model.dart b/lib/core/model/patient/prescription/prescription_res_model.dart
similarity index 97%
rename from lib/models/patient/prescription/prescription_res_model.dart
rename to lib/core/model/patient/prescription/prescription_res_model.dart
index 9c7e296d..eed34296 100644
--- a/lib/models/patient/prescription/prescription_res_model.dart
+++ b/lib/core/model/patient/prescription/prescription_res_model.dart
@@ -16,7 +16,6 @@ class PrescriptionResModel {
String name;
int episodeID;
int actualDoctorRate;
- int admission;
int clinicID;
String companyName;
String despensedStatus;
@@ -51,7 +50,6 @@ class PrescriptionResModel {
this.name,
this.episodeID,
this.actualDoctorRate,
- this.admission,
this.clinicID,
this.companyName,
this.despensedStatus,
@@ -86,7 +84,6 @@ class PrescriptionResModel {
name = json['Name'];
episodeID = json['EpisodeID'];
actualDoctorRate = json['ActualDoctorRate'];
- admission = json['Admission'];
clinicID = json['ClinicID'];
companyName = json['CompanyName'];
despensedStatus = json['Despensed_Status'];
@@ -123,7 +120,6 @@ class PrescriptionResModel {
data['Name'] = this.name;
data['EpisodeID'] = this.episodeID;
data['ActualDoctorRate'] = this.actualDoctorRate;
- data['Admission'] = this.admission;
data['ClinicID'] = this.clinicID;
data['CompanyName'] = this.companyName;
data['Despensed_Status'] = this.despensedStatus;
diff --git a/lib/models/patient/prescription/request_prescription_report.dart b/lib/core/model/patient/prescription/request_prescription_report.dart
similarity index 83%
rename from lib/models/patient/prescription/request_prescription_report.dart
rename to lib/core/model/patient/prescription/request_prescription_report.dart
index 0581692e..99b9762a 100644
--- a/lib/models/patient/prescription/request_prescription_report.dart
+++ b/lib/core/model/patient/prescription/request_prescription_report.dart
@@ -16,19 +16,19 @@ class RequestPrescriptionReport {
RequestPrescriptionReport(
{this.projectID,
- this.appointmentNo,
- this.episodeID,
- this.setupID,
- this.patientTypeID,
- this.languageID,
- this.stamp,
- this.iPAdress,
- this.versionID,
- this.channel,
- this.tokenID,
- this.sessionID,
- this.isLoginForDoctorApp,
- this.patientOutSA});
+ this.appointmentNo,
+ this.episodeID,
+ this.setupID,
+ this.patientTypeID,
+ this.languageID,
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
+ this.tokenID,
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.patientOutSA});
RequestPrescriptionReport.fromJson(Map json) {
projectID = json['ProjectID'];
diff --git a/lib/models/patient/progress_note_request.dart b/lib/core/model/patient/progress_note_request.dart
similarity index 97%
rename from lib/models/patient/progress_note_request.dart
rename to lib/core/model/patient/progress_note_request.dart
index 13e1b571..77920b25 100644
--- a/lib/models/patient/progress_note_request.dart
+++ b/lib/core/model/patient/progress_note_request.dart
@@ -1,5 +1,4 @@
-
-/*
+/*
*@author: Ibrahim Albitar
*@Date:15/5/2020
@@ -35,15 +34,16 @@ class ProgressNoteRequest {
bool isLoginForDoctorApp;
bool patientOutSA;
int patientTypeID;
+
ProgressNoteRequest(
- {this.visitType ,
+ {this.visitType,
this.admissionNo,
this.projectID = 12,
this.stamp = '2020-04-23T21:01:21.492Z',
this.languageID = 2,
this.iPAdress = '11.11.11.11',
this.channel = 9,
- this.tokenID ,
+ this.tokenID,
this.sessionID = "LlBk8lUEJY",
this.isLoginForDoctorApp = true,
this.patientTypeID = 1,
@@ -80,4 +80,4 @@ class ProgressNoteRequest {
data['PatientTypeID'] = this.patientTypeID;
return data;
}
-}
\ No newline at end of file
+}
diff --git a/lib/models/patient/radiology/radiology_req_model.dart b/lib/core/model/patient/radiology/radiology_req_model.dart
similarity index 100%
rename from lib/models/patient/radiology/radiology_req_model.dart
rename to lib/core/model/patient/radiology/radiology_req_model.dart
diff --git a/lib/models/patient/radiology/radiology_res_model.dart b/lib/core/model/patient/radiology/radiology_res_model.dart
similarity index 100%
rename from lib/models/patient/radiology/radiology_res_model.dart
rename to lib/core/model/patient/radiology/radiology_res_model.dart
diff --git a/lib/models/patient/reauest_prescription_report_for_in_patient.dart b/lib/core/model/patient/reauest_prescription_report_for_in_patient.dart
similarity index 84%
rename from lib/models/patient/reauest_prescription_report_for_in_patient.dart
rename to lib/core/model/patient/reauest_prescription_report_for_in_patient.dart
index 857705c4..6299908d 100644
--- a/lib/models/patient/reauest_prescription_report_for_in_patient.dart
+++ b/lib/core/model/patient/reauest_prescription_report_for_in_patient.dart
@@ -15,18 +15,18 @@ class RequestPrescriptionReportForInPatient {
RequestPrescriptionReportForInPatient(
{this.patientID,
- this.projectID,
- this.admissionNo,
- this.languageID,
- this.stamp,
- this.iPAdress,
- this.versionID,
- this.channel,
- this.tokenID,
- this.sessionID,
- this.isLoginForDoctorApp,
- this.patientOutSA,
- this.patientTypeID});
+ this.projectID,
+ this.admissionNo,
+ this.languageID,
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
+ this.tokenID,
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.patientOutSA,
+ this.patientTypeID});
RequestPrescriptionReportForInPatient.fromJson(Map json) {
patientID = json['PatientID'];
diff --git a/lib/models/patient/refer_to_doctor_request.dart b/lib/core/model/patient/refer_to_doctor_request.dart
similarity index 95%
rename from lib/models/patient/refer_to_doctor_request.dart
rename to lib/core/model/patient/refer_to_doctor_request.dart
index 83db54f4..11e1ca01 100644
--- a/lib/models/patient/refer_to_doctor_request.dart
+++ b/lib/core/model/patient/refer_to_doctor_request.dart
@@ -1,11 +1,10 @@
import 'package:flutter/cupertino.dart';
class ReferToDoctorRequest {
-
-/*
- *@author: Ibrahim Albitar
- *@Date:03/06/2020
- *@param:
+/*
+ *@author: Ibrahim Albitar
+ *@Date:03/06/2020
+ *@param:
*@return:
*@desc: ReferToDoctor
*/
@@ -35,7 +34,6 @@ class ReferToDoctorRequest {
bool isLoginForDoctorApp;
bool patientOutSA;
-
/*
{
"ProjectID": 21,
@@ -68,17 +66,17 @@ class ReferToDoctorRequest {
ReferToDoctorRequest(
{@required this.projectID,
@required this.admissionNo,
- @required this.roomID ,
+ @required this.roomID,
@required this.referralClinic,
- @required this.referralDoctor ,
+ @required this.referralDoctor,
@required this.createdBy,
- @required this.editedBy ,
+ @required this.editedBy,
@required this.patientID,
@required this.patientTypeID,
@required this.referringClinic,
@required this.referringDoctor,
@required this.referringDoctorRemarks,
- @required this.priority ,
+ @required this.priority,
@required this.frequency,
@required this.extension,
this.languageID = 2,
diff --git a/lib/models/patient/request_my_referral_patient_model.dart b/lib/core/model/patient/request_my_referral_patient_model.dart
similarity index 92%
rename from lib/models/patient/request_my_referral_patient_model.dart
rename to lib/core/model/patient/request_my_referral_patient_model.dart
index 219b7b2a..382f6309 100644
--- a/lib/models/patient/request_my_referral_patient_model.dart
+++ b/lib/core/model/patient/request_my_referral_patient_model.dart
@@ -1,5 +1,3 @@
-
-
class RequestMyReferralPatientModel {
int projectID;
int clinicID;
@@ -34,15 +32,15 @@ class RequestMyReferralPatientModel {
this.patientID = 0,
this.from = "0",
this.to = "0",
- this.languageID ,
- this.stamp ,
- this.iPAdress ,
- this.versionID ,
- this.channel ,
+ this.languageID,
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
this.tokenID,
- this.sessionID ,
- this.isLoginForDoctorApp ,
- this.patientOutSA });
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.patientOutSA});
RequestMyReferralPatientModel.fromJson(Map json) {
projectID = json['ProjectID'];
diff --git a/lib/models/patient/topten_users_res_model.dart b/lib/core/model/patient/topten_users_res_model.dart
similarity index 69%
rename from lib/models/patient/topten_users_res_model.dart
rename to lib/core/model/patient/topten_users_res_model.dart
index 3454568f..cc47a2f8 100644
--- a/lib/models/patient/topten_users_res_model.dart
+++ b/lib/core/model/patient/topten_users_res_model.dart
@@ -1,5 +1,4 @@
-
-/*
+/*
*@author: Amjad Amireh
*@Date:27/4/2020
*@param:
@@ -7,26 +6,25 @@
*@desc:
*/
-import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
+import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
+
//ModelResponse
class ModelResponse {
final List list;
- String firstName;
+ String firstName;
+
ModelResponse({
this.list,
this.firstName,
});
factory ModelResponse.fromJson(List parsedJson) {
-
-
- List list = new List();
-
+ List list = new List();
+
list = parsedJson.map((i) => PatiantInformtion.fromJson(i)).toList();
return new ModelResponse(list: list);
}
}
-class PatiantInformtionl {
-}
\ No newline at end of file
+class PatiantInformtionl {}
diff --git a/lib/models/patient/vital_sign/patient-vital-sign-data.dart b/lib/core/model/patient/vital_sign/patient-vital-sign-data.dart
similarity index 81%
rename from lib/models/patient/vital_sign/patient-vital-sign-data.dart
rename to lib/core/model/patient/vital_sign/patient-vital-sign-data.dart
index 57133a08..7c0448b9 100644
--- a/lib/models/patient/vital_sign/patient-vital-sign-data.dart
+++ b/lib/core/model/patient/vital_sign/patient-vital-sign-data.dart
@@ -33,36 +33,36 @@ class VitalSignData {
VitalSignData(
{this.appointmentNo,
- this.bloodPressureCuffLocation,
- this.bloodPressureCuffSize,
- this.bloodPressureHigher,
- this.bloodPressureLower,
- this.bloodPressurePatientPosition,
- this.bodyMassIndex,
- this.fio2,
- this.headCircumCm,
- this.heightCm,
- this.idealBodyWeightLbs,
- this.isPainManagementDone,
- this.isVitalsRequired,
- this.leanBodyWeightLbs,
- this.painCharacter,
- this.painDuration,
- this.painFrequency,
- this.painLocation,
- this.painScore,
- this.patientMRN,
- this.patientType,
- this.pulseBeatPerMinute,
- this.pulseRhythm,
- this.respirationBeatPerMinute,
- this.respirationPattern,
- this.sao2,
- this.status,
- this.temperatureCelcius,
- this.temperatureCelciusMethod,
- this.waistSizeInch,
- this.weightKg});
+ this.bloodPressureCuffLocation,
+ this.bloodPressureCuffSize,
+ this.bloodPressureHigher,
+ this.bloodPressureLower,
+ this.bloodPressurePatientPosition,
+ this.bodyMassIndex,
+ this.fio2,
+ this.headCircumCm,
+ this.heightCm,
+ this.idealBodyWeightLbs,
+ this.isPainManagementDone,
+ this.isVitalsRequired,
+ this.leanBodyWeightLbs,
+ this.painCharacter,
+ this.painDuration,
+ this.painFrequency,
+ this.painLocation,
+ this.painScore,
+ this.patientMRN,
+ this.patientType,
+ this.pulseBeatPerMinute,
+ this.pulseRhythm,
+ this.respirationBeatPerMinute,
+ this.respirationPattern,
+ this.sao2,
+ this.status,
+ this.temperatureCelcius,
+ this.temperatureCelciusMethod,
+ this.waistSizeInch,
+ this.weightKg});
VitalSignData.fromJson(Map json) {
appointmentNo = json['appointmentNo'];
@@ -133,5 +133,4 @@ class VitalSignData {
data['weightKg'] = this.weightKg;
return data;
}
-
}
diff --git a/lib/models/patient/vital_sign/patient-vital-sign-history.dart b/lib/core/model/patient/vital_sign/patient-vital-sign-history.dart
similarity index 100%
rename from lib/models/patient/vital_sign/patient-vital-sign-history.dart
rename to lib/core/model/patient/vital_sign/patient-vital-sign-history.dart
diff --git a/lib/models/patient/vital_sign/vital_sign_req_model.dart b/lib/core/model/patient/vital_sign/vital_sign_req_model.dart
similarity index 90%
rename from lib/models/patient/vital_sign/vital_sign_req_model.dart
rename to lib/core/model/patient/vital_sign/vital_sign_req_model.dart
index 8f5be6ba..4861bf8d 100644
--- a/lib/models/patient/vital_sign/vital_sign_req_model.dart
+++ b/lib/core/model/patient/vital_sign/vital_sign_req_model.dart
@@ -1,5 +1,4 @@
-
-/*
+/*
*@author: Elham Rababah
*@Date:27/4/2020
*@param:
@@ -13,7 +12,8 @@ class VitalSignReqModel {
int inOutpatientType;
int transNo;
int languageID;
- String stamp ;
+ String stamp;
+
String iPAdress;
double versionID;
int channel;
@@ -30,12 +30,12 @@ class VitalSignReqModel {
this.languageID,
this.tokenID,
this.stamp = '2020-04-26T09:32:18.317Z',
- this.iPAdress='11.11.11.11',
- this.channel=9,
- this.sessionID='E2bsEeYEJo',
- this.isLoginForDoctorApp=true,
+ this.iPAdress = '11.11.11.11',
+ this.channel = 9,
+ this.sessionID = 'E2bsEeYEJo',
+ this.isLoginForDoctorApp = true,
this.patientTypeID,
- this.patientOutSA=false});
+ this.patientOutSA = false});
VitalSignReqModel.fromJson(Map json) {
projectID = json['ProjectID'];
@@ -72,5 +72,4 @@ class VitalSignReqModel {
data['PatientTypeID'] = this.patientTypeID;
return data;
}
-
}
diff --git a/lib/models/patient/vital_sign/vital_sign_res_model.dart b/lib/core/model/patient/vital_sign/vital_sign_res_model.dart
similarity index 97%
rename from lib/models/patient/vital_sign/vital_sign_res_model.dart
rename to lib/core/model/patient/vital_sign/vital_sign_res_model.dart
index 78af108d..0645bf1f 100644
--- a/lib/models/patient/vital_sign/vital_sign_res_model.dart
+++ b/lib/core/model/patient/vital_sign/vital_sign_res_model.dart
@@ -38,7 +38,7 @@ class VitalSignResModel {
var status;
bool isVitalsRequired;
var patientID;
- var createdOn;
+ var createdOn;
var doctorID;
var clinicID;
var triageCategory;
@@ -61,9 +61,9 @@ class VitalSignResModel {
var bloodPressureCuffLocationDesc;
var bloodPressureCuffSizeDesc;
var bloodPressurePatientPositionDesc;
- var clinicName;
- var doctorImageURL;
- var doctorName;
+ var clinicName;
+ var doctorImageURL;
+ var doctorName;
var painScoreDesc;
var pulseRhythmDesc;
var respirationPatternDesc;
@@ -170,7 +170,9 @@ class VitalSignResModel {
triageCategory = json['TriageCategory'];
gCScore = json['GCScore'];
lineItemNo = json['LineItemNo'];
- vitalSignDate = json['VitalSignDate'] !=null? AppDateUtils.convertStringToDate(json['VitalSignDate']): new DateTime.now();
+ vitalSignDate = json['VitalSignDate'] != null
+ ? AppDateUtils.convertStringToDate(json['VitalSignDate'])
+ : new DateTime.now();
actualTimeTaken = json['ActualTimeTaken'];
sugarLevel = json['SugarLevel'];
fBS = json['FBS'];
diff --git a/lib/core/model/patient_muse/PatientMuseResultsModel.dart b/lib/core/model/patient_muse/PatientMuseResultsModel.dart
index 401fd1a7..33f2cac2 100644
--- a/lib/core/model/patient_muse/PatientMuseResultsModel.dart
+++ b/lib/core/model/patient_muse/PatientMuseResultsModel.dart
@@ -42,7 +42,8 @@ class PatientMuseResultsModel {
imageURL = json['ImageURL'];
createdBy = json['CreatedBy'];
createdOn = json['CreatedOn'];
- createdOnDateTime = AppDateUtils.getDateTimeFromServerFormat(json['CreatedOn']);
+ createdOnDateTime =
+ AppDateUtils.getDateTimeFromServerFormat(json['CreatedOn']);
}
Map toJson() {
diff --git a/lib/models/pending_orders/pending_order_request_model.dart b/lib/core/model/pending_orders/pending_order_request_model.dart
similarity index 100%
rename from lib/models/pending_orders/pending_order_request_model.dart
rename to lib/core/model/pending_orders/pending_order_request_model.dart
diff --git a/lib/models/pending_orders/pending_orders_model.dart b/lib/core/model/pending_orders/pending_orders_model.dart
similarity index 100%
rename from lib/models/pending_orders/pending_orders_model.dart
rename to lib/core/model/pending_orders/pending_orders_model.dart
diff --git a/lib/models/pharmacies/pharmacies_List_request_model.dart b/lib/core/model/pharmacies/pharmacies_List_request_model.dart
similarity index 99%
rename from lib/models/pharmacies/pharmacies_List_request_model.dart
rename to lib/core/model/pharmacies/pharmacies_List_request_model.dart
index a00e217a..69341f09 100644
--- a/lib/models/pharmacies/pharmacies_List_request_model.dart
+++ b/lib/core/model/pharmacies/pharmacies_List_request_model.dart
@@ -1,5 +1,4 @@
-
-/*
+/*
*@author: Ibrahim Albitar
*@Date:27/4/2020
*@param:
@@ -61,4 +60,4 @@ class PharmaciesListRequestModel {
data['Channel'] = this.channel;
return data;
}
-}
\ No newline at end of file
+}
diff --git a/lib/models/pharmacies/pharmacies_items_request_model.dart b/lib/core/model/pharmacies/pharmacies_items_request_model.dart
similarity index 97%
rename from lib/models/pharmacies/pharmacies_items_request_model.dart
rename to lib/core/model/pharmacies/pharmacies_items_request_model.dart
index e81ce9b3..a09736e2 100644
--- a/lib/models/pharmacies/pharmacies_items_request_model.dart
+++ b/lib/core/model/pharmacies/pharmacies_items_request_model.dart
@@ -59,6 +59,8 @@ class PharmaciesItemsRequestModel {
data['SessionID'] = this.sessionID;
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
data['DeviceTypeID'] = this.deviceTypeID;
+ //TODO Elham* fix it later
+ data['VersionID'] = 40;
return data;
}
}
diff --git a/lib/core/model/pharmacy-intervention-model/accept_or_reject_req_model.dart b/lib/core/model/pharmacy-intervention-model/accept_or_reject_req_model.dart
new file mode 100644
index 00000000..67b234de
--- /dev/null
+++ b/lib/core/model/pharmacy-intervention-model/accept_or_reject_req_model.dart
@@ -0,0 +1,66 @@
+class AcceptOrRejectReqModel {
+ int patientID;
+ int projectID;
+ int admissionNo;
+ int prescriptionNo;
+ int orderNo;
+ String remarks;
+ int memberID;
+ int accessLevel;
+ int languageID;
+ int lineItemNo;
+ bool patientOutSA;
+ int interventionStatus;
+ int status;
+
+ AcceptOrRejectReqModel(
+ {this.patientID,
+ this.projectID,
+ this.admissionNo,
+ this.prescriptionNo,
+ this.orderNo,
+ this.remarks,
+ this.memberID,
+ this.accessLevel,
+ this.languageID,
+ this.lineItemNo,
+ this.patientOutSA,
+ this.interventionStatus,
+ this.status
+ });
+
+ AcceptOrRejectReqModel.fromJson(Map json) {
+ patientID = json['PatientID'];
+ projectID = json['ProjectID'];
+ admissionNo = json['AdmissionNo'];
+ prescriptionNo = json['PrescriptionNo'];
+ orderNo = json['OrderNo'];
+ remarks = json['Remarks'];
+ memberID = json['MemberID'];
+ accessLevel = json['AccessLevel'];
+ languageID = json['LanguageID'];
+ lineItemNo = json['LineItemNo'];
+ patientOutSA = json['PatientOutSA'];
+ interventionStatus = json['InterventionStatus'];
+ status = json['Status'];
+
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['PatientID'] = this.patientID;
+ data['ProjectID'] = this.projectID;
+ data['AdmissionNo'] = this.admissionNo;
+ data['PrescriptionNo'] = this.prescriptionNo;
+ data['OrderNo'] = this.orderNo;
+ data['Remarks'] = this.remarks;
+ data['MemberID'] = this.memberID;
+ data['AccessLevel'] = this.accessLevel;
+ data['LanguageID'] = this.languageID;
+ data['LineItemNo'] = this.lineItemNo;
+ data['PatientOutSA'] = this.patientOutSA;
+ data['InterventionStatus'] = this.interventionStatus;
+ data['Status'] = this.status;
+ return data;
+ }
+}
\ No newline at end of file
diff --git a/lib/core/model/pharmacy-intervention-model/accept_or_reject_res_model.dart b/lib/core/model/pharmacy-intervention-model/accept_or_reject_res_model.dart
new file mode 100644
index 00000000..7e2448f6
--- /dev/null
+++ b/lib/core/model/pharmacy-intervention-model/accept_or_reject_res_model.dart
@@ -0,0 +1,4 @@
+class AcceptOrRejectResModel {
+
+
+}
\ No newline at end of file
diff --git a/lib/core/model/pharmacy-intervention-model/intervention_medication_history_req_model.dart b/lib/core/model/pharmacy-intervention-model/intervention_medication_history_req_model.dart
new file mode 100644
index 00000000..122212b7
--- /dev/null
+++ b/lib/core/model/pharmacy-intervention-model/intervention_medication_history_req_model.dart
@@ -0,0 +1,32 @@
+class InterventionMedicationHistoryReqModel {
+ int projectID;
+ int patientID;
+ int admissionNo;
+ int orderNo;
+ int prescriptionNo;
+
+ InterventionMedicationHistoryReqModel(
+ {this.projectID,
+ this.patientID,
+ this.admissionNo,
+ this.orderNo,
+ this.prescriptionNo});
+
+ InterventionMedicationHistoryReqModel.fromJson(Map json) {
+ projectID = json['ProjectID'];
+ patientID = json['PatientID'];
+ admissionNo = json['AdmissionNo'];
+ orderNo = json['OrderNo'];
+ prescriptionNo = json['PrescriptionNo'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['ProjectID'] = this.projectID;
+ data['PatientID'] = this.patientID;
+ data['AdmissionNo'] = this.admissionNo;
+ data['OrderNo'] = this.orderNo;
+ data['PrescriptionNo'] = this.prescriptionNo;
+ return data;
+ }
+}
\ No newline at end of file
diff --git a/lib/core/model/pharmacy-intervention-model/intervention_medication_history_res_model.dart b/lib/core/model/pharmacy-intervention-model/intervention_medication_history_res_model.dart
new file mode 100644
index 00000000..451cccb8
--- /dev/null
+++ b/lib/core/model/pharmacy-intervention-model/intervention_medication_history_res_model.dart
@@ -0,0 +1,96 @@
+class InterventionMedicationHistoryResModel {
+ String setupId;
+ String projectId;
+ int patientId;
+ int admissionNo;
+ int prescriptionId;
+ int orderNo;
+ int id;
+ int interventionId;
+ Null intervention;
+ String remark;
+ int commentedBy;
+ bool isDoctor;
+ bool isActive;
+ int createdBy;
+ String createdByName;
+ String createdByNameN;
+ String createdOn;
+ Null editedBy;
+ Null editedByName;
+ Null editedByNameN;
+ Null editedOn;
+
+ InterventionMedicationHistoryResModel(
+ {this.setupId,
+ this.projectId,
+ this.patientId,
+ this.admissionNo,
+ this.prescriptionId,
+ this.orderNo,
+ this.id,
+ this.interventionId,
+ this.intervention,
+ this.remark,
+ this.commentedBy,
+ this.isDoctor,
+ this.isActive,
+ this.createdBy,
+ this.createdByName,
+ this.createdByNameN,
+ this.createdOn,
+ this.editedBy,
+ this.editedByName,
+ this.editedByNameN,
+ this.editedOn});
+
+ InterventionMedicationHistoryResModel.fromJson(Map json) {
+ setupId = json['SetupId'];
+ projectId = json['ProjectId'];
+ patientId = json['PatientId'];
+ admissionNo = json['AdmissionNo'];
+ prescriptionId = json['PrescriptionId'];
+ orderNo = json['OrderNo'];
+ id = json['Id'];
+ interventionId = json['InterventionId'];
+ intervention = json['Intervention'];
+ remark = json['Remark'];
+ commentedBy = json['CommentedBy'];
+ isDoctor = json['IsDoctor'];
+ isActive = json['IsActive'];
+ createdBy = json['CreatedBy'];
+ createdByName = json['CreatedByName'];
+ createdByNameN = json['CreatedByNameN'];
+ createdOn = json['CreatedOn'];
+ editedBy = json['EditedBy'];
+ editedByName = json['EditedByName'];
+ editedByNameN = json['EditedByNameN'];
+ editedOn = json['EditedOn'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['SetupId'] = this.setupId;
+ data['ProjectId'] = this.projectId;
+ data['PatientId'] = this.patientId;
+ data['AdmissionNo'] = this.admissionNo;
+ data['PrescriptionId'] = this.prescriptionId;
+ data['OrderNo'] = this.orderNo;
+ data['Id'] = this.id;
+ data['InterventionId'] = this.interventionId;
+ data['Intervention'] = this.intervention;
+ data['Remark'] = this.remark;
+ data['CommentedBy'] = this.commentedBy;
+ data['IsDoctor'] = this.isDoctor;
+ data['IsActive'] = this.isActive;
+ data['CreatedBy'] = this.createdBy;
+ data['CreatedByName'] = this.createdByName;
+ data['CreatedByNameN'] = this.createdByNameN;
+ data['CreatedOn'] = this.createdOn;
+ data['EditedBy'] = this.editedBy;
+ data['EditedByName'] = this.editedByName;
+ data['EditedByNameN'] = this.editedByNameN;
+ data['EditedOn'] = this.editedOn;
+ return data;
+ }
+}
\ No newline at end of file
diff --git a/lib/core/model/pharmacy-intervention-model/new_medication_req_model.dart b/lib/core/model/pharmacy-intervention-model/new_medication_req_model.dart
new file mode 100644
index 00000000..92cde706
--- /dev/null
+++ b/lib/core/model/pharmacy-intervention-model/new_medication_req_model.dart
@@ -0,0 +1,25 @@
+class InterventionMedicationReqModel {
+ int projectID;
+ int patientID;
+ String fromDate;
+ String toDate;
+
+ InterventionMedicationReqModel(
+ {this.projectID, this.patientID, this.fromDate, this.toDate});
+
+ InterventionMedicationReqModel.fromJson(Map json) {
+ projectID = json['ProjectID'];
+ patientID = json['PatientID'];
+ fromDate = json['FromDate'];
+ toDate = json['ToDate'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['ProjectID'] = this.projectID;
+ data['PatientID'] = this.patientID;
+ data['FromDate'] = this.fromDate;
+ data['ToDate'] = this.toDate;
+ return data;
+ }
+}
\ No newline at end of file
diff --git a/lib/core/model/pharmacy-intervention-model/new_medication_res_model.dart b/lib/core/model/pharmacy-intervention-model/new_medication_res_model.dart
new file mode 100644
index 00000000..5d3dca39
--- /dev/null
+++ b/lib/core/model/pharmacy-intervention-model/new_medication_res_model.dart
@@ -0,0 +1,100 @@
+class InterventionMedicationResModel {
+ String cS;
+ String iHR;
+ String setupID;
+ int projectID;
+ int accessLevel;
+ int patientID;
+ String patientName;
+ String description;
+ int admissionNo;
+ int orderNo;
+ int prescriptionNo;
+ int lineItemNo;
+ int itemID;
+ String medication;
+ String doctorComments;
+ String startDatetime;
+ String stopDatetime;
+ int status;
+ int createdBy;
+ int authorizedby;
+ Null pharmacyRemarks;
+ String statusDescription;
+
+ InterventionMedicationResModel(
+ {this.cS,
+ this.iHR,
+ this.setupID,
+ this.projectID,
+ this.accessLevel,
+ this.patientID,
+ this.patientName,
+ this.description,
+ this.admissionNo,
+ this.orderNo,
+ this.prescriptionNo,
+ this.lineItemNo,
+ this.itemID,
+ this.medication,
+ this.doctorComments,
+ this.startDatetime,
+ this.stopDatetime,
+ this.status,
+ this.createdBy,
+ this.authorizedby,
+ this.pharmacyRemarks,
+ this.statusDescription});
+
+ InterventionMedicationResModel.fromJson(Map json) {
+ cS = json['CS'];
+ iHR = json['IHR'];
+ setupID = json['SetupID'];
+ projectID = json['ProjectID'];
+ accessLevel = json['AccessLevel'];
+ patientID = json['PatientID'];
+ patientName = json['PatientName'];
+ description = json['Description'];
+ admissionNo = json['AdmissionNo'];
+ orderNo = json['OrderNo'];
+ prescriptionNo = json['PrescriptionNo'];
+ lineItemNo = json['LineItemNo'];
+ itemID = json['ItemID'];
+ medication = json['Medication'];
+ doctorComments = json['DoctorComments'];
+ startDatetime = json['StartDatetime'];
+ stopDatetime = json['StopDatetime'];
+ status = json['Status'];
+ createdBy = json['CreatedBy'];
+ authorizedby = json['Authorizedby'];
+ pharmacyRemarks = json['PharmacyRemarks'];
+ statusDescription = json['StatusDescription'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['CS'] = this.cS;
+ data['IHR'] = this.iHR;
+ data['SetupID'] = this.setupID;
+ data['ProjectID'] = this.projectID;
+ data['AccessLevel'] = this.accessLevel;
+ data['PatientID'] = this.patientID;
+ data['PatientName'] = this.patientName;
+ data['Description'] = this.description;
+ data['AdmissionNo'] = this.admissionNo;
+ data['OrderNo'] = this.orderNo;
+ data['PrescriptionNo'] = this.prescriptionNo;
+ data['LineItemNo'] = this.lineItemNo;
+ data['ItemID'] = this.itemID;
+ data['Medication'] = this.medication;
+ data['DoctorComments'] = this.doctorComments;
+ data['StartDatetime'] = this.startDatetime;
+ data['StopDatetime'] = this.stopDatetime;
+ data['Status'] = this.status;
+ data['CreatedBy'] = this.createdBy;
+ data['Authorizedby'] = this.authorizedby;
+ data['PharmacyRemarks'] = this.pharmacyRemarks;
+ data['StatusDescription'] = this.statusDescription;
+ return data;
+ }
+}
\ No newline at end of file
diff --git a/lib/core/model/procedure/get_ordered_procedure_request_model.dart b/lib/core/model/procedure/get_ordered_procedure_request_model.dart
index 5178ab14..454559f9 100644
--- a/lib/core/model/procedure/get_ordered_procedure_request_model.dart
+++ b/lib/core/model/procedure/get_ordered_procedure_request_model.dart
@@ -3,7 +3,8 @@ class GetOrderedProcedureRequestModel {
int patientMRN;
int appointmentNo;
- GetOrderedProcedureRequestModel({this.vidaAuthTokenID, this.patientMRN, this.appointmentNo});
+ GetOrderedProcedureRequestModel(
+ {this.vidaAuthTokenID, this.patientMRN, this.appointmentNo});
GetOrderedProcedureRequestModel.fromJson(Map json) {
vidaAuthTokenID = json['VidaAuthTokenID'];
diff --git a/lib/core/model/procedure/procedure_template_details_model.dart b/lib/core/model/procedure/procedure_template_details_model.dart
index 1fc797ae..96e13765 100644
--- a/lib/core/model/procedure/procedure_template_details_model.dart
+++ b/lib/core/model/procedure/procedure_template_details_model.dart
@@ -104,13 +104,16 @@ class ProcedureTempleteDetailsModel {
return data;
}
}
+
class ProcedureTempleteDetailsModelList {
List procedureTemplate = List();
String templateName;
int templateId;
ProcedureTempleteDetailsModelList(
- {this.templateName, this.templateId, ProcedureTempleteDetailsModel template}) {
+ {this.templateName,
+ this.templateId,
+ ProcedureTempleteDetailsModel template}) {
procedureTemplate.add(template);
}
}
diff --git a/lib/core/model/radiology/final_radiology.dart b/lib/core/model/radiology/final_radiology.dart
index e09f269a..bb50e6bc 100644
--- a/lib/core/model/radiology/final_radiology.dart
+++ b/lib/core/model/radiology/final_radiology.dart
@@ -85,7 +85,8 @@ class FinalRadiology {
this.reportDataTextdynamic,
this.speciality,
this.isCVI,
- this.isRadMedicalReport,this.isLiveCareAppodynamicment});
+ this.isRadMedicalReport,
+ this.isLiveCareAppodynamicment});
FinalRadiology.fromJson(Map json) {
try {
@@ -108,7 +109,7 @@ class FinalRadiology {
admissionNo = json['AdmissionNo'];
isInOutPatient = json['IsInOutPatient'];
actualDoctorRate = json['ActualDoctorRate'];
- clinicDescription = json['ClinicDescription']?? json['ClinicName'];
+ clinicDescription = json['ClinicDescription'] ?? json['ClinicName'];
dIAPACSURL = json['DIA_PACS_URL'];
doctorImageURL = json['DoctorImageURL'];
doctorName = json['DoctorName'];
@@ -128,13 +129,11 @@ class FinalRadiology {
isLiveCareAppodynamicment = json['IsLiveCareAppointment'];
reportDataHTML = json['ReportDataHTML'];
reportDataTextdynamic = json['ReportDataTextdynamic'];
- // speciality = json['Speciality'].cast();
+ // speciality = json['Speciality'].cast();
isCVI = json['isCVI'];
isRadMedicalReport = json['isRadMedicalReport'];
-
} catch (e) {
print(e);
-
}
}
diff --git a/lib/core/model/radiology/request_patient_rad_orders_details.dart b/lib/core/model/radiology/request_patient_rad_orders_details.dart
index 9e3458d5..c511a1fc 100644
--- a/lib/core/model/radiology/request_patient_rad_orders_details.dart
+++ b/lib/core/model/radiology/request_patient_rad_orders_details.dart
@@ -22,25 +22,25 @@ class RequestPatientRadOrdersDetails {
RequestPatientRadOrdersDetails(
{this.projectID,
- this.orderNo,
- this.invoiceNo,
- this.setupID,
- this.procedureID,
- this.isMedicalReport,
- this.isCVI,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.patientID,
- this.tokenID,
- this.patientTypeID,
- this.patientType});
+ this.orderNo,
+ this.invoiceNo,
+ this.setupID,
+ this.procedureID,
+ this.isMedicalReport,
+ this.isCVI,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.patientID,
+ this.tokenID,
+ this.patientTypeID,
+ this.patientType});
RequestPatientRadOrdersDetails.fromJson(Map json) {
projectID = json['ProjectID'];
diff --git a/lib/core/model/radiology/request_send_rad_report_email.dart b/lib/core/model/radiology/request_send_rad_report_email.dart
index 6d68653d..fc778571 100644
--- a/lib/core/model/radiology/request_send_rad_report_email.dart
+++ b/lib/core/model/radiology/request_send_rad_report_email.dart
@@ -28,31 +28,31 @@ class RequestSendRadReportEmail {
RequestSendRadReportEmail(
{this.channel,
- this.clinicName,
- this.dateofBirth,
- this.deviceTypeID,
- this.doctorName,
- this.generalid,
- this.invoiceNo,
- this.iPAdress,
- this.isDentalAllowedBackend,
- this.languageID,
- this.orderDate,
- this.patientID,
- this.patientIditificationNum,
- this.patientMobileNumber,
- this.patientName,
- this.patientOutSA,
- this.patientType,
- this.patientTypeID,
- this.projectID,
- this.projectName,
- this.radResult,
- this.sessionID,
- this.setupID,
- this.to,
- this.tokenID,
- this.versionID});
+ this.clinicName,
+ this.dateofBirth,
+ this.deviceTypeID,
+ this.doctorName,
+ this.generalid,
+ this.invoiceNo,
+ this.iPAdress,
+ this.isDentalAllowedBackend,
+ this.languageID,
+ this.orderDate,
+ this.patientID,
+ this.patientIditificationNum,
+ this.patientMobileNumber,
+ this.patientName,
+ this.patientOutSA,
+ this.patientType,
+ this.patientTypeID,
+ this.projectID,
+ this.projectName,
+ this.radResult,
+ this.sessionID,
+ this.setupID,
+ this.to,
+ this.tokenID,
+ this.versionID});
RequestSendRadReportEmail.fromJson(Map json) {
channel = json['Channel'];
diff --git a/lib/core/model/referral/DischargeReferralPatient.dart b/lib/core/model/referral/DischargeReferralPatient.dart
index dff63bfc..84e7dae4 100644
--- a/lib/core/model/referral/DischargeReferralPatient.dart
+++ b/lib/core/model/referral/DischargeReferralPatient.dart
@@ -55,56 +55,56 @@ class DischargeReferralPatient {
DischargeReferralPatient(
{this.rowID,
- this.projectID,
- this.lineItemNo,
- this.doctorID,
- this.patientID,
- this.doctorName,
- this.doctorNameN,
- this.firstName,
- this.middleName,
- this.lastName,
- this.firstNameN,
- this.middleNameN,
- this.lastNameN,
- this.gender,
- this.dateofBirth,
- this.mobileNumber,
- this.emailAddress,
- this.patientIdentificationNo,
- this.patientType,
- this.admissionNo,
- this.admissionDate,
- this.roomID,
- this.bedID,
- this.nursingStationID,
- this.description,
- this.nationalityName,
- this.nationalityNameN,
- this.referralDoctor,
- this.referringDoctor,
- this.referralClinic,
- this.referringClinic,
- this.referralStatus,
- this.referralDate,
- this.referringDoctorRemarks,
- this.referredDoctorRemarks,
- this.referralResponseOn,
- this.priority,
- this.frequency,
- this.mAXResponseTime,
- this.dischargeDate,
- this.clinicID,
- this.age,
- this.clinicDescription,
- this.frequencyDescription,
- this.genderDescription,
- this.isDoctorLate,
- this.isDoctorResponse,
- this.nursingStationName,
- this.priorityDescription,
- this.referringClinicDescription,
- this.referringDoctorName});
+ this.projectID,
+ this.lineItemNo,
+ this.doctorID,
+ this.patientID,
+ this.doctorName,
+ this.doctorNameN,
+ this.firstName,
+ this.middleName,
+ this.lastName,
+ this.firstNameN,
+ this.middleNameN,
+ this.lastNameN,
+ this.gender,
+ this.dateofBirth,
+ this.mobileNumber,
+ this.emailAddress,
+ this.patientIdentificationNo,
+ this.patientType,
+ this.admissionNo,
+ this.admissionDate,
+ this.roomID,
+ this.bedID,
+ this.nursingStationID,
+ this.description,
+ this.nationalityName,
+ this.nationalityNameN,
+ this.referralDoctor,
+ this.referringDoctor,
+ this.referralClinic,
+ this.referringClinic,
+ this.referralStatus,
+ this.referralDate,
+ this.referringDoctorRemarks,
+ this.referredDoctorRemarks,
+ this.referralResponseOn,
+ this.priority,
+ this.frequency,
+ this.mAXResponseTime,
+ this.dischargeDate,
+ this.clinicID,
+ this.age,
+ this.clinicDescription,
+ this.frequencyDescription,
+ this.genderDescription,
+ this.isDoctorLate,
+ this.isDoctorResponse,
+ this.nursingStationName,
+ this.priorityDescription,
+ this.referringClinicDescription,
+ this.referringDoctorName});
DischargeReferralPatient.fromJson(Map json) {
rowID = json['RowID'];
diff --git a/lib/core/model/referral/MyReferralPatientModel.dart b/lib/core/model/referral/MyReferralPatientModel.dart
index 4f00f455..1bba70d7 100644
--- a/lib/core/model/referral/MyReferralPatientModel.dart
+++ b/lib/core/model/referral/MyReferralPatientModel.dart
@@ -113,27 +113,36 @@ class MyReferralPatientModel {
this.referralResponseOn,
this.priority,
this.frequency,
- this.mAXResponseTime,
- this.episodeID,
- this.appointmentNo,
- this.appointmentDate,
- this.appointmentType,
- this.patientMRN,
- this.createdOn,
- this.clinicID,
- this.nationalityID,
- this.age,
- this.doctorImageURL,
- this.frequencyDescription,
- this.genderDescription,
- this.isDoctorLate,
- this.isDoctorResponse,
- this.nationalityFlagURL,
- this.nursingStationName,
- this.priorityDescription,
- this.referringClinicDescription,
- this.referringDoctorName,
- this.referalStatus, this.sourceSetupID, this.sourceAppointmentNo, this.sourceProjectId, this.targetProjectId, this.targetAppointmentNo, this.targetClinicID, this.targetSetupID, this.targetDoctorID, this.remarksFromSource});
+ this.mAXResponseTime,
+ this.episodeID,
+ this.appointmentNo,
+ this.appointmentDate,
+ this.appointmentType,
+ this.patientMRN,
+ this.createdOn,
+ this.clinicID,
+ this.nationalityID,
+ this.age,
+ this.doctorImageURL,
+ this.frequencyDescription,
+ this.genderDescription,
+ this.isDoctorLate,
+ this.isDoctorResponse,
+ this.nationalityFlagURL,
+ this.nursingStationName,
+ this.priorityDescription,
+ this.referringClinicDescription,
+ this.referringDoctorName,
+ this.referalStatus,
+ this.sourceSetupID,
+ this.sourceAppointmentNo,
+ this.sourceProjectId,
+ this.targetProjectId,
+ this.targetAppointmentNo,
+ this.targetClinicID,
+ this.targetSetupID,
+ this.targetDoctorID,
+ this.remarksFromSource});
MyReferralPatientModel.fromJson(Map json) {
rowID = json['RowID'];
@@ -219,7 +228,6 @@ class MyReferralPatientModel {
sourceAppointmentNo = json['SourceAppointmentNo'];
targetAppointmentNo = json['TargetAppointmentNo'];
remarksFromSource = json['RemarksFromSource'];
-
}
Map toJson() {
diff --git a/lib/core/model/referral/MyReferralPatientRequestModel.dart b/lib/core/model/referral/MyReferralPatientRequestModel.dart
index 08b98a99..437f5a0d 100644
--- a/lib/core/model/referral/MyReferralPatientRequestModel.dart
+++ b/lib/core/model/referral/MyReferralPatientRequestModel.dart
@@ -25,28 +25,28 @@ class MyReferralPatientRequestModel {
MyReferralPatientRequestModel(
{this.channel,
- this.clinicID,
- this.doctorID,
- this.editedBy,
- this.firstName,
- this.from,
- this.iPAdress,
- this.isLoginForDoctorApp,
- this.languageID,
- this.lastName,
- this.middleName,
- this.patientID,
- this.patientIdentificationID,
- this.patientMobileNumber,
- this.patientOutSA,
- this.patientTypeID,
- this.projectID,
- this.sessionID,
- this.stamp,
- this.to,
- this.tokenID,
- this.versionID,
- this.vidaAuthTokenID});
+ this.clinicID,
+ this.doctorID,
+ this.editedBy,
+ this.firstName,
+ this.from,
+ this.iPAdress,
+ this.isLoginForDoctorApp,
+ this.languageID,
+ this.lastName,
+ this.middleName,
+ this.patientID,
+ this.patientIdentificationID,
+ this.patientMobileNumber,
+ this.patientOutSA,
+ this.patientTypeID,
+ this.projectID,
+ this.sessionID,
+ this.stamp,
+ this.to,
+ this.tokenID,
+ this.versionID,
+ this.vidaAuthTokenID});
MyReferralPatientRequestModel.fromJson(Map json) {
channel = json['Channel'];
diff --git a/lib/core/model/referral/ReferralRequest.dart b/lib/core/model/referral/ReferralRequest.dart
index b3ad1f03..cf3c20fb 100644
--- a/lib/core/model/referral/ReferralRequest.dart
+++ b/lib/core/model/referral/ReferralRequest.dart
@@ -26,29 +26,29 @@ class ReferralRequest {
ReferralRequest(
{this.roomID,
- this.referralClinic,
- this.referralDoctor,
- this.createdBy,
- this.editedBy,
- this.patientID,
- this.patientTypeID,
- this.referringClinic,
- this.referringDoctor,
- this.projectID,
- this.admissionNo,
- this.referringDoctorRemarks,
- this.priority,
- this.frequency,
- this.extension,
- this.languageID,
- this.stamp,
- this.iPAdress,
- this.versionID,
- this.channel,
- this.tokenID,
- this.sessionID,
- this.isLoginForDoctorApp,
- this.patientOutSA});
+ this.referralClinic,
+ this.referralDoctor,
+ this.createdBy,
+ this.editedBy,
+ this.patientID,
+ this.patientTypeID,
+ this.referringClinic,
+ this.referringDoctor,
+ this.projectID,
+ this.admissionNo,
+ this.referringDoctorRemarks,
+ this.priority,
+ this.frequency,
+ this.extension,
+ this.languageID,
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
+ this.tokenID,
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.patientOutSA});
ReferralRequest.fromJson(Map json) {
roomID = json['RoomID'];
diff --git a/lib/core/model/search_drug/get_medication_response_model.dart b/lib/core/model/search_drug/get_medication_response_model.dart
index a42a8b47..e48c41fe 100644
--- a/lib/core/model/search_drug/get_medication_response_model.dart
+++ b/lib/core/model/search_drug/get_medication_response_model.dart
@@ -8,6 +8,7 @@ class GetMedicationResponseModel {
dynamic mediSpanGPICode;
bool isNarcotic;
String uom;
+
GetMedicationResponseModel(
{this.description,
this.genericName,
diff --git a/lib/core/model/search_drug/search_drug_request_model.dart b/lib/core/model/search_drug/search_drug_request_model.dart
index b64e7d18..8548fd32 100644
--- a/lib/core/model/search_drug/search_drug_request_model.dart
+++ b/lib/core/model/search_drug/search_drug_request_model.dart
@@ -1,5 +1,6 @@
class SearchDrugRequestModel {
List search;
+
// String vidaAuthTokenID;
SearchDrugRequestModel({this.search});
diff --git a/lib/core/model/sick_leave/sick_leave_doctor_request_model.dart b/lib/core/model/sick_leave/sick_leave_doctor_request_model.dart
index 26bb76bd..c6837c03 100644
--- a/lib/core/model/sick_leave/sick_leave_doctor_request_model.dart
+++ b/lib/core/model/sick_leave/sick_leave_doctor_request_model.dart
@@ -6,7 +6,11 @@ class GetSickLeaveDoctorRequestModel {
String vidaRefreshTokenID;
GetSickLeaveDoctorRequestModel(
- {this.patientMRN, this.appointmentNo, this.status, this.vidaAuthTokenID, this.vidaRefreshTokenID});
+ {this.patientMRN,
+ this.appointmentNo,
+ this.status,
+ this.vidaAuthTokenID,
+ this.vidaRefreshTokenID});
GetSickLeaveDoctorRequestModel.fromJson(Map json) {
patientMRN = json['PatientMRN'];
diff --git a/lib/core/model/sick_leave/sick_leave_patient_model.dart b/lib/core/model/sick_leave/sick_leave_patient_model.dart
index 1e79833c..d4c15368 100644
--- a/lib/core/model/sick_leave/sick_leave_patient_model.dart
+++ b/lib/core/model/sick_leave/sick_leave_patient_model.dart
@@ -1,5 +1,3 @@
-import 'package:doctor_app_flutter/widgets/shared/StarRating.dart';
-
class SickLeavePatientModel {
dynamic setupID;
dynamic projectID;
@@ -32,6 +30,7 @@ class SickLeavePatientModel {
dynamic patientName;
dynamic projectName;
dynamic qR;
+
// List speciality;
dynamic strRequestDate;
dynamic startDate;
diff --git a/lib/models/sickleave/add_sickleave_request.dart b/lib/core/model/sickleave/add_sickleave_request.dart
similarity index 100%
rename from lib/models/sickleave/add_sickleave_request.dart
rename to lib/core/model/sickleave/add_sickleave_request.dart
diff --git a/lib/models/sickleave/extend_sick_leave_request.dart b/lib/core/model/sickleave/extend_sick_leave_request.dart
similarity index 100%
rename from lib/models/sickleave/extend_sick_leave_request.dart
rename to lib/core/model/sickleave/extend_sick_leave_request.dart
diff --git a/lib/models/sickleave/get_all_sickleave_response.dart b/lib/core/model/sickleave/get_all_sickleave_response.dart
similarity index 99%
rename from lib/models/sickleave/get_all_sickleave_response.dart
rename to lib/core/model/sickleave/get_all_sickleave_response.dart
index de831213..cc8f489c 100644
--- a/lib/models/sickleave/get_all_sickleave_response.dart
+++ b/lib/core/model/sickleave/get_all_sickleave_response.dart
@@ -8,6 +8,7 @@ class GetAllSickLeaveResponse {
String startDate;
int status;
String statusDescription;
+
GetAllSickLeaveResponse(
{this.appointmentNo,
this.isExtendedLeave,
diff --git a/lib/models/sickleave/sick_leave_statisitics_model.dart b/lib/core/model/sickleave/sick_leave_statisitics_model.dart
similarity index 91%
rename from lib/models/sickleave/sick_leave_statisitics_model.dart
rename to lib/core/model/sickleave/sick_leave_statisitics_model.dart
index f679807c..aa715e3f 100644
--- a/lib/models/sickleave/sick_leave_statisitics_model.dart
+++ b/lib/core/model/sickleave/sick_leave_statisitics_model.dart
@@ -5,8 +5,8 @@ class SickLeaveStatisticsModel {
SickLeaveStatisticsModel(
{this.recommendedSickLeaveDays,
- this.totalLeavesByAllClinics,
- this.totalLeavesByDoctor});
+ this.totalLeavesByAllClinics,
+ this.totalLeavesByDoctor});
SickLeaveStatisticsModel.fromJson(Map json) {
recommendedSickLeaveDays = json['recommendedSickLeaveDays'];
diff --git a/lib/core/model/vte_assessment/vte_assessment_req_model.dart b/lib/core/model/vte_assessment/vte_assessment_req_model.dart
new file mode 100644
index 00000000..1f0bd1fa
--- /dev/null
+++ b/lib/core/model/vte_assessment/vte_assessment_req_model.dart
@@ -0,0 +1,22 @@
+class VteAssessmentRequestModel {
+ String setupID;
+ int parameterGroup;
+ int transactionNo;
+
+ VteAssessmentRequestModel(
+ {this.setupID = "010266", this.parameterGroup = 7, this.transactionNo});
+
+ VteAssessmentRequestModel.fromJson(Map json) {
+ setupID = json['SetupID'];
+ parameterGroup = json['ParameterGroup'];
+ transactionNo = json['TransactionNo'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['SetupID'] = this.setupID;
+ data['ParameterGroup'] = this.parameterGroup;
+ data['TransactionNo'] = this.transactionNo;
+ return data;
+ }
+}
diff --git a/lib/core/model/vte_assessment/vte_assessment_res_model.dart b/lib/core/model/vte_assessment/vte_assessment_res_model.dart
new file mode 100644
index 00000000..8bd2c441
--- /dev/null
+++ b/lib/core/model/vte_assessment/vte_assessment_res_model.dart
@@ -0,0 +1,48 @@
+class VteAssessmentResponseModel {
+ int lineItemNo;
+ String vTEType;
+ String ambulationProtocol;
+ String pharmacology;
+ String reasonsThrombo;
+ String riskScore;
+ int totalScore;
+ int createdBy;
+ String createdOn;
+
+ VteAssessmentResponseModel(
+ {this.lineItemNo,
+ this.vTEType,
+ this.ambulationProtocol,
+ this.pharmacology,
+ this.reasonsThrombo,
+ this.riskScore,
+ this.totalScore,
+ this.createdBy,
+ this.createdOn});
+
+ VteAssessmentResponseModel.fromJson(Map json) {
+ lineItemNo = json['LineItemNo'];
+ vTEType = json['VTE_Type'];
+ ambulationProtocol = json['AmbulationProtocol'];
+ pharmacology = json['Pharmacology'];
+ reasonsThrombo = json['ReasonsThrombo'];
+ riskScore = json['Risk_Score'];
+ totalScore = json['Total_Score'];
+ createdBy = json['Created_By'];
+ createdOn = json['Created_On'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['LineItemNo'] = this.lineItemNo;
+ data['VTE_Type'] = this.vTEType;
+ data['AmbulationProtocol'] = this.ambulationProtocol;
+ data['Pharmacology'] = this.pharmacology;
+ data['ReasonsThrombo'] = this.reasonsThrombo;
+ data['Risk_Score'] = this.riskScore;
+ data['Total_Score'] = this.totalScore;
+ data['Created_By'] = this.createdBy;
+ data['Created_On'] = this.createdOn;
+ return data;
+ }
+}
diff --git a/lib/core/provider/robot_provider.dart b/lib/core/provider/robot_provider.dart
index a01b1318..4a6f2826 100644
--- a/lib/core/provider/robot_provider.dart
+++ b/lib/core/provider/robot_provider.dart
@@ -8,6 +8,7 @@ class RobotProvider {
getData() {
// return data;
}
+
intStream() {
controller.add({});
}
diff --git a/lib/core/service/AnalyticsService.dart b/lib/core/service/AnalyticsService.dart
index 0ad669ab..e194ed9a 100644
--- a/lib/core/service/AnalyticsService.dart
+++ b/lib/core/service/AnalyticsService.dart
@@ -5,9 +5,11 @@ import 'package:flutter/cupertino.dart';
class AnalyticsService {
final FirebaseAnalytics _analytics = FirebaseAnalytics();
- FirebaseAnalyticsObserver getAnalyticsObserver() => FirebaseAnalyticsObserver(analytics: _analytics);
+ FirebaseAnalyticsObserver getAnalyticsObserver() =>
+ FirebaseAnalyticsObserver(analytics: _analytics);
- Future logEvent({@required String eventCategory, @required String eventAction}) async {
+ Future logEvent(
+ {@required String eventCategory, @required String eventAction}) async {
await _analytics.logEvent(name: 'event', parameters: {
"eventCategory": eventCategory,
"eventAction": eventAction,
diff --git a/lib/core/service/NavigationService.dart b/lib/core/service/NavigationService.dart
index 5690c01e..b94306b9 100644
--- a/lib/core/service/NavigationService.dart
+++ b/lib/core/service/NavigationService.dart
@@ -2,25 +2,28 @@ import 'package:flutter/material.dart';
class NavigationService {
final GlobalKey navigatorKey =
- new GlobalKey();
- Future navigateTo(String routeName,{Object arguments}) {
- return navigatorKey.currentState.pushNamed(routeName,arguments: arguments);
- }
+ new GlobalKey();
- Future pushReplacementNamed(String routeName,{Object arguments}) {
- return navigatorKey.currentState.pushReplacementNamed(routeName,arguments: arguments);
+ Future navigateTo(String routeName, {Object arguments}) {
+ return navigatorKey.currentState.pushNamed(routeName, arguments: arguments);
}
+ Future pushReplacementNamed(String routeName, {Object arguments}) {
+ return navigatorKey.currentState
+ .pushReplacementNamed(routeName, arguments: arguments);
+ }
Future pushNamedAndRemoveUntil(String routeName) {
- return navigatorKey.currentState.pushNamedAndRemoveUntil(routeName,(asd)=>false);
+ return navigatorKey.currentState
+ .pushNamedAndRemoveUntil(routeName, (asd) => false);
}
Future pushAndRemoveUntil(Route newRoute) {
- return navigatorKey.currentState.pushAndRemoveUntil(newRoute,(asd)=>false);
+ return navigatorKey.currentState
+ .pushAndRemoveUntil(newRoute, (asd) => false);
}
- pop() {
+ pop() {
return navigatorKey.currentState.pop();
}
-}
\ No newline at end of file
+}
diff --git a/lib/core/service/PatientRegistrationService.dart b/lib/core/service/PatientRegistrationService.dart
index 236bcd42..d9ad718f 100644
--- a/lib/core/service/PatientRegistrationService.dart
+++ b/lib/core/service/PatientRegistrationService.dart
@@ -63,7 +63,7 @@ class PatientRegistrationService extends BaseService {
isDentalAllowedBackend: false,
projectOutSA: 0,
searchType: 1,
- versionID: 7.1,
+ versionID: 7.1,
channel: 3,
nationalID:
model.checkPatientForRegistrationModel.patientIdentificationID,
@@ -74,8 +74,9 @@ class PatientRegistrationService extends BaseService {
logInTokenID: logInTokenID);
hasError = false;
- await baseAppClient.post(SEND_ACTIVATION_CODE_BY_OTP_NOT_TYPE_FOR_REGISTRATION,
- onSuccess: (dynamic response, int statusCode) {
+ await baseAppClient
+ .post(SEND_ACTIVATION_CODE_BY_OTP_NOT_TYPE_FOR_REGISTRATION,
+ onSuccess: (dynamic response, int statusCode) {
registrationModel =
SendActivationCodeByOTPNotificationTypeForRegistrationModel.fromJson(
response);
diff --git a/lib/core/service/VideoCallService.dart b/lib/core/service/VideoCallService.dart
index 31cc2cd6..6fdbf045 100644
--- a/lib/core/service/VideoCallService.dart
+++ b/lib/core/service/VideoCallService.dart
@@ -2,11 +2,11 @@ import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/core/service/patient/LiveCarePatientServices.dart';
-import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
-import 'package:doctor_app_flutter/models/livecare/end_call_req.dart';
-import 'package:doctor_app_flutter/models/livecare/session_status_model.dart';
-import 'package:doctor_app_flutter/models/livecare/start_call_res.dart';
-import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
+import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart';
+import 'package:doctor_app_flutter/core/model/livecare/end_call_req.dart';
+import 'package:doctor_app_flutter/core/model/livecare/session_status_model.dart';
+import 'package:doctor_app_flutter/core/model/livecare/start_call_res.dart';
+import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/VideoChannel.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
@@ -22,17 +22,21 @@ class VideoCallService extends BaseService {
LiveCarePatientServices _liveCarePatientServices =
locator();
- openVideo(StartCallRes startModel, PatiantInformtion patientModel,
- bool isRecording,VoidCallback onCallConnected, VoidCallback onCallDisconnected) async {
+ openVideo(
+ StartCallRes startModel,
+ PatiantInformtion patientModel,
+ bool isRecording,
+ VoidCallback onCallConnected,
+ VoidCallback onCallDisconnected) async {
this.startCallRes = startModel;
this.patient = patientModel;
DoctorProfileModel doctorProfile =
await getDoctorProfile(isGetProfile: true);
await VideoChannel.openVideoCallScreen(
- // TODO MOSA TEST
- kToken: startCallRes.openTokenID,
- kSessionId: startCallRes.openSessionID,
- kApiKey:'46209962',
+ // TODO MOSA TEST
+ kToken: startCallRes.openTokenID,
+ kSessionId: startCallRes.openSessionID,
+ kApiKey: '46209962',
// kToken: "T1==cGFydG5lcl9pZD00NzI0Nzk1NCZzaWc9NGUyZjgxMjFlYTFkNzU5NjcxNDY2ZTM2ZjM3YTVhNTI2NGY0NTI2NzpzZXNzaW9uX2lkPTJfTVg0ME56STBOemsxTkg1LU1UWXlOVGN5TmpnMk5qZzNOMzQ1YUhCcGRtcDFXbVpDTDFkNE1qbDRkWFY2TTA4cmIySi1mZyZjcmVhdGVfdGltZT0xNjI1NzI2ODg5Jm5vbmNlPTAuNjc2Nzc4OTQxNjA1MTMxNSZyb2xlPXB1Ymxpc2hlciZleHBpcmVfdGltZT0xNjI4MzE4ODg4JmluaXRpYWxfbGF5b3V0X2NsYXNzX2xpc3Q9",
// kSessionId: "2_MX40NzI0Nzk1NH5-MTYyNTcyNjg2Njg3N345aHBpdmp1WmZCL1d4Mjl4dXV6M08rb2J-fg",
// kApiKey:'47247954',
@@ -57,7 +61,6 @@ class VideoCallService extends BaseService {
endCall(
patient.vcId,
false,
-
).then((value) {
GifLoaderDialogUtils.hideDialog(
locator().navigatorKey.currentContext);
diff --git a/lib/core/service/authentication_service.dart b/lib/core/service/authentication_service.dart
index 49e89881..4de0a7e4 100644
--- a/lib/core/service/authentication_service.dart
+++ b/lib/core/service/authentication_service.dart
@@ -8,32 +8,42 @@ import 'package:doctor_app_flutter/core/model/auth/insert_imei_model.dart';
import 'package:doctor_app_flutter/core/model/auth/new_login_information_response_model.dart';
import 'package:doctor_app_flutter/core/model/auth/send_activation_code_for_doctor_app_response_model.dart';
import 'package:doctor_app_flutter/core/service/base/base_service.dart';
-import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
-import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart';
-import 'package:doctor_app_flutter/models/doctor/user_model.dart';
+import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart';
+import 'package:doctor_app_flutter/core/model/doctor/profile_req_Model.dart';
+import 'package:doctor_app_flutter/core/model/doctor/user_model.dart';
class AuthenticationService extends BaseService {
List _imeiDetails = [];
+
List get dashboardItemsList => _imeiDetails;
NewLoginInformationModel _loginInfo = NewLoginInformationModel();
- NewLoginInformationModel get loginInfo => _loginInfo;
- SendActivationCodeForDoctorAppResponseModel _activationCodeVerificationScreenRes = SendActivationCodeForDoctorAppResponseModel();
-
- SendActivationCodeForDoctorAppResponseModel get activationCodeVerificationScreenRes => _activationCodeVerificationScreenRes;
-
- SendActivationCodeForDoctorAppResponseModel _activationCodeForDoctorAppRes = SendActivationCodeForDoctorAppResponseModel();
- SendActivationCodeForDoctorAppResponseModel get activationCodeForDoctorAppRes => _activationCodeForDoctorAppRes;
- CheckActivationCodeForDoctorAppResponseModel _checkActivationCodeForDoctorAppRes = CheckActivationCodeForDoctorAppResponseModel();
-
- CheckActivationCodeForDoctorAppResponseModel get checkActivationCodeForDoctorAppRes => _checkActivationCodeForDoctorAppRes;
+ NewLoginInformationModel get loginInfo => _loginInfo;
+ SendActivationCodeForDoctorAppResponseModel
+ _activationCodeVerificationScreenRes =
+ SendActivationCodeForDoctorAppResponseModel();
+
+ SendActivationCodeForDoctorAppResponseModel
+ get activationCodeVerificationScreenRes =>
+ _activationCodeVerificationScreenRes;
+
+ SendActivationCodeForDoctorAppResponseModel _activationCodeForDoctorAppRes =
+ SendActivationCodeForDoctorAppResponseModel();
+
+ SendActivationCodeForDoctorAppResponseModel
+ get activationCodeForDoctorAppRes => _activationCodeForDoctorAppRes;
+ CheckActivationCodeForDoctorAppResponseModel
+ _checkActivationCodeForDoctorAppRes =
+ CheckActivationCodeForDoctorAppResponseModel();
+
+ CheckActivationCodeForDoctorAppResponseModel
+ get checkActivationCodeForDoctorAppRes =>
+ _checkActivationCodeForDoctorAppRes;
Map _insertDeviceImeiRes = {};
List _doctorProfilesList = [];
- List get doctorProfilesList => _doctorProfilesList;
-
-
+ List get doctorProfilesList => _doctorProfilesList;
Future selectDeviceImei(imei) async {
try {
@@ -68,94 +78,99 @@ class AuthenticationService extends BaseService {
hasError = true;
super.error = error;
}
-
}
- Future sendActivationCodeVerificationScreen(ActivationCodeForVerificationScreenModel activationCodeModel) async {
+ Future sendActivationCodeVerificationScreen(
+ ActivationCodeForVerificationScreenModel activationCodeModel) async {
hasError = false;
- _activationCodeVerificationScreenRes = SendActivationCodeForDoctorAppResponseModel();
+ _activationCodeVerificationScreenRes =
+ SendActivationCodeForDoctorAppResponseModel();
try {
await baseAppClient.post(SEND_ACTIVATION_CODE_FOR_VERIFICATION_SCREEN,
onSuccess: (dynamic response, int statusCode) {
- _activationCodeVerificationScreenRes = SendActivationCodeForDoctorAppResponseModel.fromJson(response);
- }, onFailure: (String error, int statusCode) {
- hasError = true;
- super.error = error;
- }, body: activationCodeModel.toJson());
+ _activationCodeVerificationScreenRes =
+ SendActivationCodeForDoctorAppResponseModel.fromJson(response);
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: activationCodeModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
}
-
}
- Future sendActivationCodeForDoctorApp(ActivationCodeModel activationCodeModel)async {
+ Future sendActivationCodeForDoctorApp(
+ ActivationCodeModel activationCodeModel) async {
hasError = false;
- _activationCodeForDoctorAppRes = SendActivationCodeForDoctorAppResponseModel();
+ _activationCodeForDoctorAppRes =
+ SendActivationCodeForDoctorAppResponseModel();
try {
await baseAppClient.post(SEND_ACTIVATION_CODE_FOR_DOCTOR_APP,
onSuccess: (dynamic response, int statusCode) {
- _activationCodeForDoctorAppRes = SendActivationCodeForDoctorAppResponseModel.fromJson(response);
- }, onFailure: (String error, int statusCode) {
- hasError = true;
- super.error = error;
- }, body: activationCodeModel.toJson());
+ _activationCodeForDoctorAppRes =
+ SendActivationCodeForDoctorAppResponseModel.fromJson(response);
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: activationCodeModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
}
}
- Future checkActivationCodeForDoctorApp(CheckActivationCodeRequestModel checkActivationCodeRequestModel)async {
+ Future checkActivationCodeForDoctorApp(
+ CheckActivationCodeRequestModel checkActivationCodeRequestModel) async {
hasError = false;
- _checkActivationCodeForDoctorAppRes = CheckActivationCodeForDoctorAppResponseModel();
+ _checkActivationCodeForDoctorAppRes =
+ CheckActivationCodeForDoctorAppResponseModel();
try {
await baseAppClient.post(CHECK_ACTIVATION_CODE_FOR_DOCTOR_APP,
onSuccess: (dynamic response, int statusCode) {
- _checkActivationCodeForDoctorAppRes = CheckActivationCodeForDoctorAppResponseModel.fromJson(response);
- }, onFailure: (String error, int statusCode) {
- hasError = true;
- super.error = error;
- }, body: checkActivationCodeRequestModel.toJson());
+ _checkActivationCodeForDoctorAppRes =
+ CheckActivationCodeForDoctorAppResponseModel.fromJson(response);
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: checkActivationCodeRequestModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
}
-
}
-
- Future insertDeviceImei(InsertIMEIDetailsModel insertIMEIDetailsModel)async {
+ Future insertDeviceImei(InsertIMEIDetailsModel insertIMEIDetailsModel) async {
hasError = false;
- // insertIMEIDetailsModel.tokenID = "@dm!n";
+ // insertIMEIDetailsModel.tokenID = "@dm!n";
_insertDeviceImeiRes = {};
try {
await baseAppClient.post(INSERT_DEVICE_IMEI,
onSuccess: (dynamic response, int statusCode) {
- _insertDeviceImeiRes = response;
- }, onFailure: (String error, int statusCode) {
- hasError = true;
- super.error = error;
- }, body: insertIMEIDetailsModel.toJson());
+ _insertDeviceImeiRes = response;
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: insertIMEIDetailsModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
}
}
- Future getDoctorProfileBasedOnClinic(ProfileReqModel profileReqModel)async {
+ Future getDoctorProfileBasedOnClinic(ProfileReqModel profileReqModel) async {
hasError = false;
try {
await baseAppClient.post(GET_DOC_PROFILES,
onSuccess: (dynamic response, int statusCode) {
- _doctorProfilesList.clear();
- response['DoctorProfileList'].forEach((v) {
- _doctorProfilesList.add(DoctorProfileModel.fromJson(v));
- });
- }, onFailure: (String error, int statusCode) {
- hasError = true;
- super.error = error;
- }, body: profileReqModel.toJson());
+ _doctorProfilesList.clear();
+ response['DoctorProfileList'].forEach((v) {
+ _doctorProfilesList.add(DoctorProfileModel.fromJson(v));
+ });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: profileReqModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
diff --git a/lib/core/service/base/base_service.dart b/lib/core/service/base/base_service.dart
index 58526da7..9334a61b 100644
--- a/lib/core/service/base/base_service.dart
+++ b/lib/core/service/base/base_service.dart
@@ -1,7 +1,7 @@
import 'package:doctor_app_flutter/client/base_app_client.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
-import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
-import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
+import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart';
+import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
class BaseService {
@@ -13,14 +13,14 @@ class BaseService {
List patientArrivalList = [];
- BaseService(){
+ BaseService() {
doctorProfile = null;
}
//TODO add the user login model when we need it
- Future getDoctorProfile({bool isGetProfile = false}) async {
- if(isGetProfile)
- {
+ Future getDoctorProfile(
+ {bool isGetProfile = false}) async {
+ if (isGetProfile) {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
if (profile != null) {
doctorProfile = DoctorProfileModel.fromJson(profile);
@@ -42,6 +42,4 @@ class BaseService {
return doctorProfile;
}
}
-
-
}
diff --git a/lib/core/service/base/lookup-service.dart b/lib/core/service/base/lookup-service.dart
index 7f277fa8..f68aa01a 100644
--- a/lib/core/service/base/lookup-service.dart
+++ b/lib/core/service/base/lookup-service.dart
@@ -1,7 +1,7 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart';
-import 'package:doctor_app_flutter/models/SOAP/GetAssessmentResModel.dart';
-import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
import 'base_service.dart';
@@ -17,6 +17,7 @@ class LookupService extends BaseService {
List medicationFrequencyList = [];
List medicationDoseTimeList = [];
List medicationIndicationsList = [];
+
// TODO make the person who create the list dynamic to change it.
List medicationStrengthListWithModel = [];
List medicationFrequencyListWithModel = [];
@@ -52,7 +53,7 @@ class LookupService extends BaseService {
List