Compare commits

...

208 Commits

Author SHA1 Message Date
Elham Ali bc7f3e9f35 Merge branch 'Er_signin' into 'development'
Er signin

See merge request Cloud_Solution/doctor_app_flutter!999
4 years ago
Elham Rababh 3a9c64779e small fix 4 years ago
Elham Ali 4fe2a4444d Merge branch 'add_doctor_id' into 'development'
Add doctor

See merge request Cloud_Solution/doctor_app_flutter!997
4 years ago
Elham Rababh bcb1e90ae6 ER Done form our side 4 years ago
Elham Rababh 6bdb2a1600 fix operation_report_servive.dart 4 years ago
Elham Rababh 092cfbc891 fix some issue in prescription 4 years ago
Elham Rababh f2bb245c25 return insert back 4 years ago
Elham Rababh 8b79b0041c design issue 4 years ago
Elham Rababh 5f7b52a529 fix issue 4 years ago
Elham Rababh 17f32c4dc8 fixes on procedure 4 years ago
Elham Rababh 986af6ba9c fix issue 4 years ago
Elham Rababh d717d9e0cf fix in patient_service 4 years ago
Elham Rababh 10798f73de Merge branch 'add_doctor_id' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_doctor_id 4 years ago
Elham Rababh d4f01c19f7 session management update 4 years ago
Elham Ali 6c1425ad5a Merge branch 'procedures_refactoring' into 'add_doctor_id'
Procedures refactoring

See merge request Cloud_Solution/doctor_app_flutter!994
4 years ago
Elham Rababh 46760ffc77 session management update 4 years ago
Elham Rababh 8069e89a61 session management update 4 years ago
Elham Rababh c30d6bebd8 session management update 4 years ago
Elham Rababh 5422472ccc update procedure 4 years ago
Elham Rababh 33b8d6d78d update procedure 4 years ago
Elham Rababh 1a3ad32aa5 Fix issue on procedure_card.dart 4 years ago
Elham Rababh 70573d190a first step from procedures 4 years ago
RoaaGhali98 379bfd5bb3 Merge branch 'procedures_refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedures_refactoring 4 years ago
RoaaGhali98 041c652b86 Fixing some issues in procedure pages 4 years ago
ruaa ghali 89d4a7aacb Merge branch 'DAPP_9_less_25' into 'procedures_refactoring'
DAPP-9: remove 25 letter validation

See merge request Cloud_Solution/doctor_app_flutter!995
4 years ago
RoaaGhali98 9ecfe896f9 DAPP-9: remove 25 letter validation 4 years ago
RoaaGhali98 f84ae8b4e7 Delete add-procedure-page.dart 4 years ago
RoaaGhali98 447ca6d4dc Merge branch 'procedures_refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedures_refactoring
 Conflicts:
	lib/screens/procedures/add-procedure-page.dart
	lib/screens/procedures/favorite_procedure/add_favourite_procedure.dart
4 years ago
Elham Ali 4b7b4fda7f Merge branch 'hot_fix' into 'development'
hot fix the progress_note_screen.dart

See merge request Cloud_Solution/doctor_app_flutter!993
4 years ago
Elham Rababh e242aa19bc hot fix the progress_note_screen.dart 4 years ago
RoaaGhali98 9f7cdba8b7 Refactoring procedure pages 4 years ago
Elham Ali 8bdde45d81 Merge branch 'hot_fix' into 'development'
fix the keyborad issue on real device

See merge request Cloud_Solution/doctor_app_flutter!991
4 years ago
Elham Rababh 8c93d5c450 fix the keyborad issue on real device 4 years ago
RoaaGhali98 28defc2582 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedures_refactoring
 Conflicts:
	lib/screens/patients/profile/lab_result/labs_home_page.dart
4 years ago
RoaaGhali98 f1dd50d7bf Doing some refactoring 4 years ago
Elham Ali 31082249e5 Merge branch 'renaming_file_1' into 'development'
DAPP-100 : renames file

See merge request Cloud_Solution/doctor_app_flutter!990
4 years ago
Elham Rababh 5ec07bb931 DAPP-100 : renames file 4 years ago
Elham Ali 36e245dd7d Merge branch 'renaming_file_1' into 'development'
refactor names

See merge request Cloud_Solution/doctor_app_flutter!989
4 years ago
Elham Rababh 077cad7df5 refactor names 4 years ago
Elham Rababh a019319589 some fixes 4 years ago
Elham Ali 323e3f3538 Merge branch 'DAPP_99_soap_model' into 'development'
episode refactor names  part 2

See merge request Cloud_Solution/doctor_app_flutter!987
4 years ago
Elham Rababh e73271cb29 episode refactor names part 2 4 years ago
RoaaGhali98 1ac24bee90 Refactoring some issues in procedures screen 4 years ago
RoaaGhali98 e85a32274a Refactoring some issues in procedures screen 4 years ago
Elham Ali 010310eb48 Merge branch 'DAPP_99_soap_model' into 'development'
Dapp 99 soap model

See merge request Cloud_Solution/doctor_app_flutter!984
4 years ago
Elham Rababh 47352ae77d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into DAPP_99_soap_model
 Conflicts:
	lib/config/config.dart
4 years ago
Elham Rababh 4e6c940cdf fix issues 4 years ago
Elham Rababh 1ca7b28590 first step from refactor soap 4 years ago
Elham Rababh e935014776 add todo 4 years ago
Elham Ali e3a71945de Merge branch 'fix_refere_desgin' into 'development'
Fix some design issues in admission request screens

See merge request Cloud_Solution/doctor_app_flutter!982
4 years ago
RoaaGhali98 d743c2c99c Rename to bottom_sheet_dialog_button and two_bottom_sheet_dialog_buttons 4 years ago
RoaaGhali98 e1c635a911 Rename to bottom_sheet_dialog_button and two_bottom_sheet_dialog_buttons 4 years ago
Elham Rababh 7fc52ecad4 finish fix lab result 4 years ago
RoaaGhali98 31cf229763 Fixing the comments 4 years ago
Elham Rababh 286dbe0a3f refactor the lab result structure 4 years ago
RoaaGhali98 dfc792ce64 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin 4 years ago
RoaaGhali98 fa4e4b0dfd Rename to files name of admission request screens to match our standard 4 years ago
RoaaGhali98 b7892fc18e Rename to files name of admission request screens to match our standard 4 years ago
Elham Ali 6107639ecd Merge branch 'refactor_part' into 'development'
refactor some name and add todos

See merge request Cloud_Solution/doctor_app_flutter!983
4 years ago
RoaaGhali98 3f41ff267a Fix some design issue in admission request screens and make new component called two_bottom_sheet_dialog_buttons and use it in admission-request_second-screen.dart and admission-request-third-screen 4 years ago
Elham Rababh c96939e6b0 refactor some name and add todos 4 years ago
RoaaGhali98 fcdec6dbf7 Fix some design issue in admission request screens 4 years ago
Elham Ali 9a1a7ed247 Merge branch 'fix_refere_desgin' into 'development'
Fix refere desgin

See merge request Cloud_Solution/doctor_app_flutter!981
4 years ago
RoaaGhali98 7dc71d01de Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin 4 years ago
RoaaGhali98 4eaa62a48c convert text in dailog-list-select to titleCase to match the app texts theme 4 years ago
Elham Ali 1dd66803fa Merge branch 'fix_refere_desgin' into 'development'
Fixing small design issues in admission-request-first-screen

See merge request Cloud_Solution/doctor_app_flutter!980
4 years ago
RoaaGhali98 4d820728e8 Fixing small design issues in admission-request-first-screen 4 years ago
Elham Ali eaea16e480 Merge branch 'fix_refere_desgin' into 'development'
Fix refere desgin

See merge request Cloud_Solution/doctor_app_flutter!979
4 years ago
RoaaGhali98 65ae00cec2 fix the remark validation, make the bottomSheet show after loading and edit the order numbers of priority refer-patient-screen-in-patient 4 years ago
RoaaGhali98 41e79d5e00 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin 4 years ago
RoaaGhali98 7962d9b1be fix the remark validation, make the bottomSheet show after loading and edit the order numbers of priority refer-patient-screen-in-patient 4 years ago
RoaaGhali98 8980f6f440 replace the TabBar in refer-patient-screen-in-patient with our dropDownList 4 years ago
RoaaGhali98 39c64779aa Merge branch 'fix_refere_desgin' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin 4 years ago
Elham Rababh 95321a9305 fix the bug 4 years ago
Elham Rababh ed6af7f26e change the file structure 4 years ago
Elham Ali f7770c0315 Merge branch 'roaa_prescription' into 'development'
Fixing update in update_note

See merge request Cloud_Solution/doctor_app_flutter!972
4 years ago
RoaaGhali98 505c3f470f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin 4 years ago
RoaaGhali98 dc37e2e559 replace the TabBar in refer-patient-screen-in-patient with our dropDownList 4 years ago
Elham Rababh 47dd2ecf56 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_prescription
 Conflicts:
	lib/screens/patients/profile/notes/note/update_note.dart
4 years ago
Elham Ali d32731451c Merge branch 'ucaf_design_refactor' into 'development'
ucaf design refactor  finished

See merge request Cloud_Solution/doctor_app_flutter!978
4 years ago
Elham Rababh 208aa9dd6e ucaf design refactor finished 4 years ago
RoaaGhali98 4c7db58489 replace the TabBar in refer-patient-screen-in-patient with our custom TabBar in tab_utils 4 years ago
Elham Ali 63b6a957b6 Merge branch 'fix_refere_desgin' into 'development'
Fix refere desgin

See merge request Cloud_Solution/doctor_app_flutter!976
4 years ago
RoaaGhali98 e61d1e78f6 Refactoring 4 years ago
RoaaGhali98 c93ea2f285 Refactoring 4 years ago
RoaaGhali98 240c9aa411 Refactoring 4 years ago
Elham Ali c083f9ffa3 Merge branch 'release_info' into 'development'
add the release key values

See merge request Cloud_Solution/doctor_app_flutter!977
4 years ago
Elham Rababh e732f9e61c add the release key values 4 years ago
RoaaGhali98 81d3aa5ad1 Fixing some design issues in refer-patient-screen-in-patient and refer-patient-screen 4 years ago
RoaaGhali98 177a2e8bc4 Fixing some design issues in refer-patient-screen-in-patient and refer-patient-screen 4 years ago
RoaaGhali98 01cd91ef93 Fixing some design issues in refer-patient-screen-in-patient and refer-patient-screen 4 years ago
RoaaGhali98 c4f2543471 Fixing some design issues 4 years ago
Elham Ali 40faef136d Merge branch 'hot_fix' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!973
4 years ago
Elham Rababh 70fa365377 hot fix
hot fix
4 years ago
RoaaGhali98 e5fe12f26b Fixing some issues 4 years ago
RoaaGhali98 9f7dbf5ec7 Fixing update in update_note 4 years ago
Elham Ali d22ea2e2fa Merge branch 'roaa_schedule_design' into 'development'
Fixing update in update_note

See merge request Cloud_Solution/doctor_app_flutter!971
4 years ago
RoaaGhali98 17a6ec5795 Fixing update in update_note 4 years ago
Elham Ali d4cef7ba5f Merge branch 'roaa_schedule_design' into 'development'
Delete repeated API's

See merge request Cloud_Solution/doctor_app_flutter!970
4 years ago
RoaaGhali98 7812d5081e Fixing some issues in progress_note_screen and update_note 4 years ago
RoaaGhali98 dceefadc06 Fixing some issues in progress_note_screen and update_note 4 years ago
RoaaGhali98 f3b39906f5 Add DropDownText to add progress note screen 4 years ago
RoaaGhali98 22c26c02de Delete repeated API's 4 years ago
Elham Ali 4505ef9d02 Merge branch 'roaa_schedule_design' into 'development'
add translation

See merge request Cloud_Solution/doctor_app_flutter!969
4 years ago
RoaaGhali98 40c1502a9b add translation 4 years ago
Elham Ali f4c7be6cc2 Merge branch 'new_prescreption' into 'development'
New prescreption

See merge request Cloud_Solution/doctor_app_flutter!968
4 years ago
Elham Rababh b1ddd9935c finish add Prescription 4 years ago
Elham Rababh ada10f595a finish add Prescription 4 years ago
Elham Rababh ba62056c4d finish add Prescription 4 years ago
Elham Rababh 954402fe52 show the list of prescription 4 years ago
Elham Rababh 9461d3d4a1 add new prescription 4 years ago
Elham Rababh 1f770793fd fix issue 4 years ago
RoaaGhali98 85a6f4965f Fix some issues in prescription pages 4 years ago
RoaaGhali98 cdc0d2f4a9 Finish prescription refactoring 4 years ago
RoaaGhali98 34f658a166 Add Translation to prescription pages 4 years ago
RoaaGhali98 f266f54be0 Fix the prescriptions pages 4 years ago
RoaaGhali98 c76900a868 Refactor add_prescription_form 4 years ago
RoaaGhali98 8cb5171bc9 Refactor add_prescription_form 4 years ago
RoaaGhali98 0147481c27 Fix the drug to drug page 4 years ago
RoaaGhali98 5f3f509b8c fix the DOCTYPE html error in getPrescription service 4 years ago
RoaaGhali98 e10c07f6a4 fix loader in prescriptions_page 4 years ago
RoaaGhali98 ce978db2dd Fix add medication button 4 years ago
RoaaGhali98 d5e3a79f85 Fix add medication button 4 years ago
RoaaGhali98 5b8211eec4 Refactor add_prescription_form 4 years ago
RoaaGhali98 c1956aee9b Refactor add_prescription_form 4 years ago
RoaaGhali98 2b38293d61 Refactor add_prescription_form 4 years ago
RoaaGhali98 113fb42d68 refactor some files in prescription screen 4 years ago
RoaaGhali98 3f25acda8f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design 4 years ago
RoaaGhali98 f769189bee Refactor add_prescription_form 4 years ago
RoaaGhali98 7afe24c2bc Refactor add_prescription_form 4 years ago
Elham Ali 11652e448d Merge branch 'pharmacy_redesign' into 'development'
fix issues in lab order

See merge request Cloud_Solution/doctor_app_flutter!966
4 years ago
Elham Rababh 65e9840418 fix issues in lab order 4 years ago
RoaaGhali98 228237bf96 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design
 Conflicts:
	lib/widgets/patients/dynamic_elements.dart
4 years ago
RoaaGhali98 182f890e92 Fix the form in prescription screen 4 years ago
Elham Ali d0bdf8c1e8 Merge branch 'pharmacy_redesign' into 'development'
Pharmacy redesign

See merge request Cloud_Solution/doctor_app_flutter!965
4 years ago
Elham Rababh cb19a5fcfe move models to the core file 4 years ago
Elham Rababh f8371f71a1 fix intervention_medication 4 years ago
RoaaGhali98 0257bb1f16 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design 4 years ago
Elham Ali 2a0148467e Merge branch 'pharmacy_redesign' into 'development'
first step form redesign pharmacy page

See merge request Cloud_Solution/doctor_app_flutter!964
4 years ago
Elham Rababh 1789eb8c5b first step form redesign pharmacy page 4 years ago
RoaaGhali98 994b43a590 Fix the form in prescription screen 4 years ago
Elham Ali b22023cdbc Merge branch 'pharmacy_redesign' into 'development'
Pharmacy redesign

See merge request Cloud_Solution/doctor_app_flutter!963
4 years ago
Elham Rababh 6905ed702e first step form redesign pharmacy page 4 years ago
Elham Rababh 25f902487c small fix in referal 4 years ago
Elham Ali 17998cbbf3 Merge branch 'roaa_schedule_design' into 'development'
fix referred-patient-screen

See merge request Cloud_Solution/doctor_app_flutter!962
4 years ago
RoaaGhali98 83ea30303b fix referred-patient-screen 4 years ago
Elham Ali df3ba10a54 Merge branch 'roaa_schedule_design' into 'development'
Roaa schedule design

See merge request Cloud_Solution/doctor_app_flutter!961
4 years ago
RoaaGhali98 e8b5165953 Fix some issues 4 years ago
RoaaGhali98 b8076f177b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design 4 years ago
RoaaGhali98 db83bec292 Fix referred-patient-screen design 4 years ago
Elham Ali 1ae6c4682b Merge branch 'hot_fixes' into 'development'
Hot fixes

See merge request Cloud_Solution/doctor_app_flutter!960
4 years ago
Elham Rababh 5ed3084130 fix clinic name 4 years ago
Elham Rababh 45f30a8d61 small fixes 4 years ago
Elham Rababh bbdc243f0f fix main issues 4 years ago
RoaaGhali98 06b2e7f194 Fixing the height in my_schedule_widget 4 years ago
Elham Ali 8f1d4f80bd Merge branch 'roaa_schedule_design' into 'development'
Roaa schedule design

See merge request Cloud_Solution/doctor_app_flutter!959
4 years ago
RoaaGhali98 47a077bd52 Edit some issues in the my_schedule_screen 4 years ago
RoaaGhali98 b1a65425c5 Edit the my_schedule_screen design 4 years ago
Elham Ali e6e5d8e03b Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
add translations to pharmacy_intervention_screen, intervention_medication and...

See merge request Cloud_Solution/doctor_app_flutter!958
4 years ago
RoaaGhali98 af72810b26 Merge remote-tracking branch 'origin/roaa2.8_addnewmedicationservice' into roaa2.8_addnewmedicationservice 4 years ago
RoaaGhali98 2ffa745e73 add translations to pharmacy_intervention_screen, intervention_medication and intervention_medication_history_screen 4 years ago
Elham Ali c6a091ae32 Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
Wrapping the Row cards with CustomRow in intervention_medication.dart and...

See merge request Cloud_Solution/doctor_app_flutter!957
4 years ago
Elham Rababh 90c74c2f06 small fix issues 4 years ago
RoaaGhali98 f7e509d967 Merge remote-tracking branch 'origin/roaa2.8_addnewmedicationservice' into roaa2.8_addnewmedicationservice 4 years ago
RoaaGhali98 8464c70f35 Replace static data 4 years ago
RoaaGhali98 4ef41e0c5a Replace static data 4 years ago
Elham Rababh fdc39f28e3 small change 4 years ago
RoaaGhali98 19d981d9e0 Wrapping the Row cards with CustomRow in intervention_medication.dart and intervention_medication_history_screen.dart and fix the accept or reject issue, fix the lable in intervention_medication_history_screen.dart and edit the initial date in pharmacy_intervention_screen.dart 4 years ago
Elham Ali 63e94e0d7b Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
Roaa2.8 addnewmedicationservice

See merge request Cloud_Solution/doctor_app_flutter!953
4 years ago
Elham Rababh a829532717 call service after accept or reject 4 years ago
RoaaGhali98 211990518f Editing the accept_or_reject_req_model 4 years ago
RoaaGhali98 9f77d080c0 Editing the schedule page 4 years ago
Elham Ali 74501dbf07 Merge branch 'jan_fix_bugs' into 'development'
plan for refactor prescriptions

See merge request Cloud_Solution/doctor_app_flutter!956
4 years ago
RoaaGhali98 de9dc0cb8c Merge branch 'roaa2.8_addnewmedicationservice' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice 4 years ago
RoaaGhali98 b38a153e22 Fix some issues 4 years ago
Elham Rababh 694be7315b fix issue on loading 4 years ago
RoaaGhali98 fec899ebb7 Add static data 4 years ago
RoaaGhali98 d3f0f1a141 Fix the date format in intervention_medication_view_model 4 years ago
Elham Rababh 0895a80d16 fix issues with date 4 years ago
RoaaGhali98 fde96fbce7 Fix some issues 4 years ago
Elham Rababh ad8d0f32b6 plan for refactor prescriptions 4 years ago
Elham Rababh 37928c1757 fix issues 4 years ago
Elham Ali 44bc3f1c3c Merge branch 'jan_fix_bugs' into 'development'
fix issues

See merge request Cloud_Solution/doctor_app_flutter!955
4 years ago
Elham Rababh 23e1fed349 fix issues 4 years ago
RoaaGhali98 be40076def Add new function in intervention_medication_service called accepted or rejected 4 years ago
RoaaGhali98 65d04b2d0f fix some issues 4 years ago
Elham Ali a5974ad584 Merge branch 'jan_fix_bugs' into 'development'
Jan fix bugs

See merge request Cloud_Solution/doctor_app_flutter!954
4 years ago
Elham Rababh b79eff7f6b fix issues 4 years ago
RoaaGhali98 e165ec5b1d add new service called intervention_medication_history_screen 4 years ago
RoaaGhali98 af9e8dd095 we edit a date format 4 years ago
RoaaGhali98 0d542a862e add new service 4 years ago
RoaaGhali98 6d0ff69386 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice 4 years ago
Elham Rababh d9b2a618f5 small fix 4 years ago
Elham Ali f300dbf315 Merge branch 'jan_fix_bugs' into 'development'
small fix

See merge request Cloud_Solution/doctor_app_flutter!952
4 years ago
Elham Rababh 05b656416d small fix 4 years ago
Elham Ali 278bd5e23f Merge branch 'jan_fix_bugs' into 'development'
Jan fix bugs

See merge request Cloud_Solution/doctor_app_flutter!951
4 years ago
Elham Rababh ed447f6b17 fix issue DAPP-48 4 years ago
Elham Rababh 0d61d0febc fix issues 4 years ago
Elham Rababh ed9c77465f fix chart issues 4 years ago
Elham Rababh 1b12354581 DAPP-66: fix date with design improvement 4 years ago
Elham Rababh 26fa1aec62 DAPP-66: fix date with design improvement 4 years ago
RoaaGhali98 79372b86c1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice
 Conflicts:
	lib/locator.dart
	lib/routes.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
4 years ago
RoaaGhali98 0a0aa6ba77 we add a new service called new_medication_screen 4 years ago
Elham Ali fec10319bf Merge branch 'point10' into 'development'
Point10

See merge request Cloud_Solution/doctor_app_flutter!950
4 years ago
Elham Rababh af1217dd67 finish assessment screen 4 years ago
RoaaGhali98 42feae9a2e add new medication service 4 years ago
RoaaGhali98 406165c348 we fix some issues -in-patient 4 years ago
Elham Rababh 5ed5a266e9 vte assessment fix path 4 years ago

@ -28,14 +28,14 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android { android {
compileSdkVersion 30 compileSdkVersion 30
// signingConfigs { signingConfigs {
// release { release {
// storeFile file('C:\\Users\\admin\\Downloads\\DQKey.jks') storeFile file('/Users/nextwo/Desktop/Elham/keys/doctor app key')
// storePassword 'HmGsa123' storePassword 'Hmgdoctor1234'
// keyAlias 'key' keyAlias 'hmgdoctor'
// keyPassword 'HmGsa123' keyPassword 'Hmgdoctor1234'
// } }
// } }
sourceSets { sourceSets {
main.java.srcDirs += 'src/main/kotlin' main.java.srcDirs += 'src/main/kotlin'
@ -59,7 +59,8 @@ android {
buildTypes { buildTypes {
release { release {
// TODO: Add your own signing config for the release build. // TODO: Add your own signing config for the release build.
signingConfig signingConfigs.debug signingConfig signingConfigs.release
} }
debug { debug {
// Signing with the debug keys for now, so `flutter run --release` works. // Signing with the debug keys for now, so `flutter run --release` works.

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

@ -310,7 +310,7 @@
"${BUILT_PRODUCTS_DIR}/speech_to_text/speech_to_text.framework", "${BUILT_PRODUCTS_DIR}/speech_to_text/speech_to_text.framework",
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework", "${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
"${BUILT_PRODUCTS_DIR}/video_player/video_player.framework", "${BUILT_PRODUCTS_DIR}/video_player_avfoundation/video_player_avfoundation.framework",
"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework", "${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
"${BUILT_PRODUCTS_DIR}/webview_flutter_wkwebview/webview_flutter_wkwebview.framework", "${BUILT_PRODUCTS_DIR}/webview_flutter_wkwebview/webview_flutter_wkwebview.framework",
); );
@ -352,7 +352,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/speech_to_text.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}/sqflite.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player_avfoundation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter_wkwebview.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter_wkwebview.framework",
); );

@ -7,10 +7,10 @@ import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/service/NavigationService.dart'; import 'package:doctor_app_flutter/core/service/NavigationService.dart';
import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_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'; import 'package:doctor_app_flutter/utils/dr_app_shared_pref.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/utils/utils.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -19,7 +19,7 @@ import '../locator.dart';
import '../routes.dart'; import '../routes.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
Helpers helpers = new Helpers(); Utils helpers = new Utils();
class BaseAppClient { class BaseAppClient {
//TODO change the post fun to nun static when you change all service //TODO change the post fun to nun static when you change all service
@ -40,10 +40,12 @@ class BaseAppClient {
try { try {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
String token = await sharedPref.getString(TOKEN); String token = await sharedPref.getString(TOKEN);
if (profile != null) { if (profile != null) {
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
if (body['DoctorID'] == null) if (body['DoctorID'] == null) {
body['DoctorID'] = doctorProfile?.doctorID; body['DoctorID'] = doctorProfile?.doctorID;
}
if (body['DoctorID'] == "") body['DoctorID'] = null; if (body['DoctorID'] == "") body['DoctorID'] = null;
if (body['EditedBy'] == null) if (body['EditedBy'] == null)
body['EditedBy'] = doctorProfile?.doctorID; body['EditedBy'] = doctorProfile?.doctorID;
@ -53,18 +55,19 @@ class BaseAppClient {
if (body['ClinicID'] == null) if (body['ClinicID'] == null)
body['ClinicID'] = doctorProfile?.clinicID; body['ClinicID'] = doctorProfile?.clinicID;
} else {
String doctorID = await sharedPref.getString(DOCTOR_ID);
if (body['DoctorID'] == '') {
body['DoctorID'] = null;
} else if (doctorID != null) body['DoctorID'] = int.parse(doctorID);
} }
if (body['DoctorID'] == '') {
body['DoctorID'] = null;
}
if (body['EditedBy'] == '') { if (body['EditedBy'] == '') {
body.remove("EditedBy"); body.remove("EditedBy");
} }
if (body['TokenID'] == null) { if (body['TokenID'] == null) {
body['TokenID'] = token ?? ''; body['TokenID'] = token ?? '';
} }
// body['TokenID'] = "@dm!n" ?? '';
body['TokenID'] = "@dm!n";///Todo Elham* Return back before the build body.containsKey('TokenID') ? body['TokenID'] : token;
if (!isFallLanguage) { if (!isFallLanguage) {
String lang = await sharedPref.getString(APP_Language); String lang = await sharedPref.getString(APP_Language);
@ -74,7 +77,6 @@ class BaseAppClient {
body['LanguageID'] = 2; body['LanguageID'] = 2;
} }
body['stamp'] = DateTime.now().toIso8601String(); body['stamp'] = DateTime.now().toIso8601String();
// if(!body.containsKey("IPAdress"))
body['IPAdress'] = IP_ADDRESS; body['IPAdress'] = IP_ADDRESS;
if (body['VersionID'] == null) { if (body['VersionID'] == null) {
body['VersionID'] = VERSION_ID; body['VersionID'] = VERSION_ID;
@ -110,7 +112,7 @@ class BaseAppClient {
print("Body : ${json.encode(body)}"); print("Body : ${json.encode(body)}");
var asd = json.encode(body); var asd = json.encode(body);
var asd2; var asd2;
if (await Helpers.checkConnection()) { if (await Utils.checkConnection()) {
final response = await http.post(Uri.parse(url), final response = await http.post(Uri.parse(url),
body: json.encode(body), body: json.encode(body),
headers: { headers: {
@ -119,7 +121,7 @@ class BaseAppClient {
}); });
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
if (statusCode < 200 || statusCode >= 400) { if (statusCode < 200 || statusCode >= 400) {
onFailure(Helpers.generateContactAdminMsg(), statusCode); onFailure(Utils.generateContactAdminMsg(), statusCode);
} else { } else {
var parsed = json.decode(response.body.toString()); var parsed = json.decode(response.body.toString());
if (parsed['ErrorType'] == 4) { if (parsed['ErrorType'] == 4) {
@ -135,7 +137,7 @@ class BaseAppClient {
listen: false) listen: false)
.logout(); .logout();
Helpers.showErrorToast('Your session expired Please login again'); Utils.showErrorToast('Your session expired Please login again');
locator<NavigationService>().pushNamedAndRemoveUntil(ROOT); locator<NavigationService>().pushNamedAndRemoveUntil(ROOT);
} }
if (isAllowAny) { if (isAllowAny) {
@ -174,6 +176,14 @@ class BaseAppClient {
}; };
String token = await sharedPref.getString(TOKEN); String token = await sharedPref.getString(TOKEN);
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
if (profile != null) {
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
if (body['DoctorID'] == null) {
body['DoctorID'] = doctorProfile?.doctorID;
}
}
var languageID = var languageID =
await sharedPref.getStringWithDefaultValue(APP_Language, 'en'); await sharedPref.getStringWithDefaultValue(APP_Language, 'en');
body['SetupID'] = body.containsKey('SetupID') body['SetupID'] = body.containsKey('SetupID')
@ -221,7 +231,7 @@ class BaseAppClient {
: PATIENT_TYPE_ID : PATIENT_TYPE_ID
: PATIENT_TYPE_ID; : PATIENT_TYPE_ID;
body['TokenID'] = body.containsKey('TokenID') ? body['TokenID'] : token; body['TokenID'] = body.containsKey('TokenID') ? body['TokenID']??token : token;
body['PatientID'] = body['PatientID'] != null body['PatientID'] = body['PatientID'] != null
? body['PatientID'] ? body['PatientID']
: patient.patientId ?? patient.patientMRN; : patient.patientId ?? patient.patientMRN;
@ -239,7 +249,7 @@ class BaseAppClient {
print("Body : ${json.encode(body)}"); print("Body : ${json.encode(body)}");
var asd = json.encode(body); var asd = json.encode(body);
var asd2; var asd2;
if (await Helpers.checkConnection()) { if (await Utils.checkConnection()) {
final response = await http.post(Uri.parse(url.trim()), final response = await http.post(Uri.parse(url.trim()),
body: json.encode(body), headers: headers); body: json.encode(body), headers: headers);
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
@ -336,7 +346,7 @@ class BaseAppClient {
} }
} }
if (error == null || error == "null" || error == "null\n") { if (error == null || error == "null" || error == "null\n") {
return Helpers.generateContactAdminMsg(); return Utils.generateContactAdminMsg();
} }
return error; return error;
} }

@ -13,8 +13,6 @@ const PATIENT_PROGRESS_NOTE_URL =
"Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient"; "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";
const PATIENT_INSURANCE_APPROVALS_URL = const PATIENT_INSURANCE_APPROVALS_URL =
"Services/DoctorApplication.svc/REST/GetApprovalStatusForInpatient"; "Services/DoctorApplication.svc/REST/GetApprovalStatusForInpatient";
const PATIENT_ORDERS_URL =
"Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";
const PATIENT_REFER_TO_DOCTOR_URL = const PATIENT_REFER_TO_DOCTOR_URL =
"Services/DoctorApplication.svc/REST/ReferToDoctor"; "Services/DoctorApplication.svc/REST/ReferToDoctor";
const PATIENT_GET_DOCTOR_BY_CLINIC_URL = const PATIENT_GET_DOCTOR_BY_CLINIC_URL =
@ -44,7 +42,6 @@ const GET_PATIENT_VITAL_SIGN_DATA =
const GET_PATIENT_LAB_OREDERS = const GET_PATIENT_LAB_OREDERS =
'Services/DoctorApplication.svc/REST/GetPatientLabOreders'; 'Services/DoctorApplication.svc/REST/GetPatientLabOreders';
const GET_PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList'; const GET_PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList';
const GET_RADIOLOGY = 'Services/DoctorApplication.svc/REST/GetPatientRadResult';
const GET_LIVECARE_PENDINGLIST = const GET_LIVECARE_PENDINGLIST =
'Services/DoctorApplication.svc/REST/GetPendingPatientER'; 'Services/DoctorApplication.svc/REST/GetPendingPatientER';
@ -138,7 +135,7 @@ const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave';
const GET_SICK_LEAVE = 'Services/Patients.svc/REST/GetPatientSickLeave'; const GET_SICK_LEAVE = 'Services/Patients.svc/REST/GetPatientSickLeave';
const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave'; const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave';
const GET_OFFTIME = 'Services/DoctorApplication.svc/REST/GetMasterLookUpList'; const GET_MASTER_LOOKUP_LIST = 'Services/DoctorApplication.svc/REST/GetMasterLookUpList';
const GET_COVERING_DOCTORS = const GET_COVERING_DOCTORS =
'Services/DoctorApplication.svc/REST/GetCoveringDoctor'; 'Services/DoctorApplication.svc/REST/GetCoveringDoctor';
const ADD_RESCHDEULE = 'Services/DoctorApplication.svc/REST/PostRequisition'; const ADD_RESCHDEULE = 'Services/DoctorApplication.svc/REST/PostRequisition';
@ -155,8 +152,6 @@ const GET_PROCEDURE_LIST =
'Services/DoctorApplication.svc/REST/GetOrderedProcedure'; 'Services/DoctorApplication.svc/REST/GetOrderedProcedure';
const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure'; const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure';
const GET_PATIENT_ARRIVAL_LIST =
'Services/DoctorApplication.svc/REST/PatientArrivalList';
const GET_PATIENT_IN_PATIENT_LIST = const GET_PATIENT_IN_PATIENT_LIST =
'Services/DoctorApplication.svc/REST/GetMyInPatient'; 'Services/DoctorApplication.svc/REST/GetMyInPatient';
@ -180,8 +175,6 @@ const GET_PATIENT_LAB_ORDERS_RESULT_HISTORY_BY_DESCRIPTION =
// SOAP // SOAP
const GET_ALLERGIES = 'Services/DoctorApplication.svc/REST/GetAllergies'; const GET_ALLERGIES = 'Services/DoctorApplication.svc/REST/GetAllergies';
const GET_MASTER_LOOKUP_LIST =
'Services/DoctorApplication.svc/REST/GetMasterLookUpList';
const POST_EPISODE = 'Services/DoctorApplication.svc/REST/PostEpisode'; const POST_EPISODE = 'Services/DoctorApplication.svc/REST/PostEpisode';
const POST_EPISODE_FOR_IN_PATIENT = const POST_EPISODE_FOR_IN_PATIENT =
@ -208,15 +201,13 @@ const PATCH_PROGRESS_NOTE =
'Services/DoctorApplication.svc/REST/PatchProgressNote'; 'Services/DoctorApplication.svc/REST/PatchProgressNote';
const PATCH_ASSESSMENT = 'Services/DoctorApplication.svc/REST/PatchAssessment'; const PATCH_ASSESSMENT = 'Services/DoctorApplication.svc/REST/PatchAssessment';
const GET_ALLERGY = 'Services/DoctorApplication.svc/REST/GetAllergies';
const GET_HISTORY = 'Services/DoctorApplication.svc/REST/GetHistory'; const GET_HISTORY = 'Services/DoctorApplication.svc/REST/GetHistory';
const GET_CHIEF_COMPLAINT = const GET_CHIEF_COMPLAINT =
'Services/DoctorApplication.svc/REST/GetChiefcomplaint'; 'Services/DoctorApplication.svc/REST/GetChiefcomplaint';
const GET_PHYSICAL_EXAM = 'Services/DoctorApplication.svc/REST/GetPhysicalExam'; const GET_PHYSICAL_EXAM = 'Services/DoctorApplication.svc/REST/GetPhysicalExam';
const GET_PROGRESS_NOTE = 'Services/DoctorApplication.svc/REST/GetProgressNote'; const GET_PROGRESS_NOTE = 'Services/DoctorApplication.svc/REST/GetProgressNote';
const GET_ASSESSMENT = 'Services/DoctorApplication.svc/REST/GetAssessment'; const GET_ASSESSMENT = 'Services/DoctorApplication.svc/REST/GetAssessment';
const GET_ORDER_PROCEDURE =
'Services/DoctorApplication.svc/REST/GetOrderedProcedure';
const GET_LIST_CATEGORISE = const GET_LIST_CATEGORISE =
'Services/DoctorApplication.svc/REST/GetProcedureCategories'; 'Services/DoctorApplication.svc/REST/GetProcedureCategories';
@ -271,7 +262,6 @@ const GET_IN_PATIENT_ORDERS =
'Services/DoctorApplication.svc/REST/GetPatientRadResult'; 'Services/DoctorApplication.svc/REST/GetPatientRadResult';
///Prescriptions ///Prescriptions
const PRESCRIPTIONS = 'Services/Patients.svc/REST/GetPrescriptionApptList';
const GET_PRESCRIPTIONS_ALL_ORDERS = const GET_PRESCRIPTIONS_ALL_ORDERS =
'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders'; 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
const GET_PRESCRIPTION_REPORT_NEW = const GET_PRESCRIPTION_REPORT_NEW =
@ -280,18 +270,11 @@ const SEND_PRESCRIPTION_EMAIL =
'Services/Notifications.svc/REST/SendPrescriptionEmail'; 'Services/Notifications.svc/REST/SendPrescriptionEmail';
const GET_PRESCRIPTION_REPORT_ENH = const GET_PRESCRIPTION_REPORT_ENH =
'Services/Patients.svc/REST/GetPrescriptionReport_enh'; 'Services/Patients.svc/REST/GetPrescriptionReport_enh';
const GET_PHARMACY_LIST = "Services/Patients.svc/REST/GetPharmcyList";
const UPDATE_PROGRESS_NOTE_FOR_INPATIENT = const UPDATE_PROGRESS_NOTE_FOR_INPATIENT =
"Services/DoctorApplication.svc/REST/UpdateProgressNoteForInPatient"; "Services/DoctorApplication.svc/REST/UpdateProgressNoteForInPatient";
const CREATE_PROGRESS_NOTE_FOR_INPATIENT = const CREATE_PROGRESS_NOTE_FOR_INPATIENT =
"Services/DoctorApplication.svc/REST/CreateProgressNoteForInPatient"; "Services/DoctorApplication.svc/REST/CreateProgressNoteForInPatient";
const GET_PRESCRIPTION_IN_PATIENT =
'Services/DoctorApplication.svc/REST/GetPrescriptionReportForInPatient';
const GET_INSURANCE_IN_PATIENT =
"Services/DoctorApplication.svc/REST/GetApprovalStatusForInpatient";
const GET_SICK_LEAVE_PATIENT = "Services/Patients.svc/REST/GetPatientSickLeave"; const GET_SICK_LEAVE_PATIENT = "Services/Patients.svc/REST/GetPatientSickLeave";
const GET_MY_OUT_PATIENT = const GET_MY_OUT_PATIENT =
"Services/DoctorApplication.svc/REST/GetMyOutPatient"; "Services/DoctorApplication.svc/REST/GetMyOutPatient";
@ -389,6 +372,22 @@ const GET_ALL_DISCHARGE_SUMMARY =
const VTE_ASSESSMENT = const VTE_ASSESSMENT =
"Services/Patients.svc/REST/INP_GetVTEHistoryByTransactionNo"; "Services/Patients.svc/REST/INP_GetVTEHistoryByTransactionNo";
const GET_INTERVENTION_MEDICATION =
"Services/DoctorApplication.svc/REST/DoctorApp_GetInterventionMedications";
const GET_INTERVENTION_MEDICATION_HISTORY =
"Services/DoctorApplication.svc/REST/DoctorApp_GetInterventionHistory";
const SET_ACCEPTED_OR_REJECTED =
"Services/DoctorApplication.svc/REST/DoctorApp_AcceptOrRejectIntervention";
const GET_STP_MASTER_LIST =
"Services/DoctorApplication.svc/REST/DoctorApp_GetSTPMasterList";
const DOCTOR_ER_SIGN_ASSESSMENT =
"Services/DoctorApplication.svc/REST/DoctorApp_DoctorERSignAssessment";
var selectedPatientType = 1; var selectedPatientType = 1;
//*********change value to decode json from Dropdown ************ //*********change value to decode json from Dropdown ************
@ -439,7 +438,7 @@ const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2; const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z'; const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '9.9.9.9'; const IP_ADDRESS = '9.9.9.9';
const VERSION_ID = 6.5; const VERSION_ID = 8.3;
const CHANNEL = 9; const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt'; const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true; const IS_LOGIN_FOR_DOCTOR_APP = true;
@ -451,7 +450,6 @@ const GENERAL_ID = 'Cs2020@2016\$2958';
const PATIENT_TYPE = 1; const PATIENT_TYPE = 1;
const PATIENT_TYPE_ID = 1; const PATIENT_TYPE_ID = 1;
const Color IN_PROGRESS_COLOR = Color(0xFFCC9B14);
/// Timer Info /// Timer Info
const TIMER_MIN = 10; const TIMER_MIN = 10;
@ -461,4 +459,7 @@ class AppGlobal {
static Color appRedColor = Color(0xFFD02127); static Color appRedColor = Color(0xFFD02127);
static Color appGreenColor = Color(0xFF359846); static Color appGreenColor = Color(0xFF359846);
static Color appTextColor = Color(0xFF2B353E); static Color appTextColor = Color(0xFF2B353E);
static Color scheduleTextColor = Color(0xFF2E303A);
static Color inProgressColor = Color(0xFFCC9B14);
} }

@ -20,6 +20,7 @@ const Map<String, Map<String, String>> localizedValues = {
"ar": "ليس لديك أي جدول" "ar": "ليس لديك أي جدول"
}, },
"verify": {"en": "VERIFY", "ar": "تحقق"}, "verify": {"en": "VERIFY", "ar": "تحقق"},
"pharmacy-intervention": {"en": "Pharmacy Intervention", "ar": "التدخل الصيدلاني"},
"referralDoctor": {"en": "Referral Doctor", "ar": "الطبيب المُحول إليه"}, "referralDoctor": {"en": "Referral Doctor", "ar": "الطبيب المُحول إليه"},
"referringClinic": {"en": "Referring Clinic", "ar": "العيادة المُحول إليها"}, "referringClinic": {"en": "Referring Clinic", "ar": "العيادة المُحول إليها"},
"frequency": {"en": "Frequency", "ar": "تكرر"}, "frequency": {"en": "Frequency", "ar": "تكرر"},
@ -83,8 +84,8 @@ const Map<String, Map<String, String>> localizedValues = {
"ar": "المريض الذي حضر للموعد" "ar": "المريض الذي حضر للموعد"
}, },
"searchMedicineNameHere": {"en": "Search Medicine ", "ar": "ابحث هنا"}, "searchMedicineNameHere": {"en": "Search Medicine ", "ar": "ابحث هنا"},
"youCanFind": {"en": "You Can Find ", "ar": "تستطيع ان تجد "}, "youCanFind": {"en": "You can find ", "ar": "تستطيع ان تجد "},
"itemsInSearch": {"en": "items in search", "ar": "عناصر في البحث"}, "medicineSearchResult": {"en": "as a search result for", "ar": "كنتيجة بحث عن"},
"qr": {"en": "QR", "ar": "QR"}, "qr": {"en": "QR", "ar": "QR"},
"reader": {"en": "Reader", "ar": "قارىء رمز ال"}, "reader": {"en": "Reader", "ar": "قارىء رمز ال"},
"startScanning": {"en": "Start Scanning", "ar": "بدء المسح"}, "startScanning": {"en": "Start Scanning", "ar": "بدء المسح"},
@ -92,6 +93,10 @@ const Map<String, Map<String, String>> localizedValues = {
"en": "scan Qr code to retrieve patient profile", "en": "scan Qr code to retrieve patient profile",
"ar": "مسح رمزاال QR لاسترداد ملف تعريف المريض" "ar": "مسح رمزاال QR لاسترداد ملف تعريف المريض"
}, },
"scanERQrCode": {
"en": "Scan Qr code to handle ER Sign In",
"ar": "امسح رمز ال ER للتعامل مع تسجيل الدخول"
},
"scanQr": {"en": "Scan Qr", "ar": "اقراء ال QR"}, "scanQr": {"en": "Scan Qr", "ar": "اقراء ال QR"},
"profile": {"en": "Profile", "ar": "ملفي الشخصي"}, "profile": {"en": "Profile", "ar": "ملفي الشخصي"},
"gender": {"en": "Gender", "ar": "الجنس"}, "gender": {"en": "Gender", "ar": "الجنس"},
@ -537,6 +542,10 @@ const Map<String, Map<String, String>> localizedValues = {
"selectSeverity": {"en": "Select Severity", "ar": "حدد الخطورة"}, "selectSeverity": {"en": "Select Severity", "ar": "حدد الخطورة"},
"leaveCreated": {"en": "Leave has been created", "ar": "تم إنشاء الإجازة"}, "leaveCreated": {"en": "Leave has been created", "ar": "تم إنشاء الإجازة"},
"medications": {"en": "Medications", "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": "الإجراءات"}, "procedures": {"en": "Procedures", "ar": "الإجراءات"},
"vitalSignEmptyMsg": { "vitalSignEmptyMsg": {
"en": "There is no vital signs for this patient", "en": "There is no vital signs for this patient",
@ -663,11 +672,12 @@ const Map<String, Map<String, String>> localizedValues = {
"progressNoteSOAP": {"en": "Progress Note", "ar": "ملاحظة التقدم"}, "progressNoteSOAP": {"en": "Progress Note", "ar": "ملاحظة التقدم"},
"addProgressNote": {"en": "Add Progress Note", "ar": "أضف ملاحظة التقدم"}, "addProgressNote": {"en": "Add Progress Note", "ar": "أضف ملاحظة التقدم"},
"createdBy": {"en": "Created By :", "ar": "أضيفت عن طريق: "}, "createdBy": {"en": "Created By :", "ar": "أضيفت عن طريق: "},
"riskScore": {"en": "Risk Score :", "ar": "درجة المخاطر"},
"editedBy": {"en": "Edited By :", "ar": "عدلت من : "}, "editedBy": {"en": "Edited By :", "ar": "عدلت من : "},
"currentMedications": {"en": "Current Medications", "ar": "الأدوية الحالية"}, "currentMedications": {"en": "Current Medications", "ar": "الأدوية الحالية"},
"noItem": { "noItem": {
"en": "No items exists in this list", "en": "sorry, there is no items exists in this list",
"ar": "لا توجد عناصر في هذه القائمة" "ar": "آسف ، لا توجد عناصر موجودة في هذه القائمة"
}, },
"postUcafSuccessMsg": { "postUcafSuccessMsg": {
"en": "UCAF request send successfully", "en": "UCAF request send successfully",
@ -783,7 +793,7 @@ const Map<String, Map<String, String>> localizedValues = {
}, },
"SpecialResult": {"en": "Special Result", "ar": "نتيجة خاصة"}, "SpecialResult": {"en": "Special Result", "ar": "نتيجة خاصة"},
"noDataAvailable": { "noDataAvailable": {
"en": "No data available", "en": "Sorry, no data is available",
"ar": " لا يوجد بيانات متاحة " "ar": " لا يوجد بيانات متاحة "
}, },
"show-more-btn": {"en": "Flowchart", "ar": "النتائج التراكمية"}, "show-more-btn": {"en": "Flowchart", "ar": "النتائج التراكمية"},
@ -1053,6 +1063,8 @@ const Map<String, Map<String, String>> localizedValues = {
"maritalStatus": {"en": "Marital Status", "ar": "الحالة الزوجية"}, "maritalStatus": {"en": "Marital Status", "ar": "الحالة الزوجية"},
"nursing": {"en": "Nursing", "ar": "تمريض"}, "nursing": {"en": "Nursing", "ar": "تمريض"},
"diabetic": {"en": "Diabetic", "ar": "مرض السكري"}, "diabetic": {"en": "Diabetic", "ar": "مرض السكري"},
"pharmacy": {"en": "Pharmacy", "ar": "الصيدلاني"},
"intervention": {"en": "Intervention", "ar": "التدخل"},
"chart": {"en": "Chart", "ar": "جدول"}, "chart": {"en": "Chart", "ar": "جدول"},
"operationTimeStart": { "operationTimeStart": {
"en": "Operation Time Start :", "en": "Operation Time Start :",
@ -1118,4 +1130,20 @@ const Map<String, Map<String, String>> localizedValues = {
}, },
"planedProcedure": {"en": "Planed Procedure", "ar": "الإجراء المخطط"}, "planedProcedure": {"en": "Planed Procedure", "ar": "الإجراء المخطط"},
"moreDetails": {"en": "More Details", "ar": "المزيد من التفاصيل"}, "moreDetails": {"en": "More Details", "ar": "المزيد من التفاصيل"},
"VTE_Type": {"en": "VTE Type", "ar": "VTE Type"},
"pharmacology": {"en": "Pharmacology", "ar": "علم العقاقير"},
"reasonsThrombo": {"en": "Reasons Thrombo", "ar": "أسباب ثرومبو"},
"youDoNotHaveFavoriteTemplate": {"en": "You Don't Have Favorite Template", "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":"لا يمكنك إضافة مسافات فقط"},
}; };

@ -2,3 +2,5 @@ enum PatientType {
IN_PATIENT, IN_PATIENT,
OUT_PATIENT, OUT_PATIENT,
} }
///TODO Elham* Merge the patient type.

@ -0,0 +1,25 @@
class DoctorErSignAssessmentReqModel {
String setupID;
int signInType;
int loginDoctorID;
int patientID;
DoctorErSignAssessmentReqModel(
{this.setupID, this.signInType, this.loginDoctorID, this.patientID});
DoctorErSignAssessmentReqModel.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID'];
signInType = json['SignInType'];
loginDoctorID = json['LoginDoctorID'];
patientID = json['PatientID'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['SetupID'] = this.setupID;
data['SignInType'] = this.signInType;
data['LoginDoctorID'] = this.loginDoctorID;
data['PatientID'] = this.patientID;
return data;
}
}

@ -1,4 +1,4 @@
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart';
class Prescriptions { class Prescriptions {
String setupID; String setupID;

@ -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<String, dynamic> 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<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
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;
}
}

@ -1,5 +1,7 @@
import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_entity_model.dart';
class PrescriptionModel { class PrescriptionModel {
List<EntityList> entityList; List<PrescriptionEntityModel> entityList;
dynamic rowcount; dynamic rowcount;
dynamic statusMessage; dynamic statusMessage;
@ -7,9 +9,9 @@ class PrescriptionModel {
PrescriptionModel.fromJson(Map<String, dynamic> json) { PrescriptionModel.fromJson(Map<String, dynamic> json) {
if (json['entityList'] != null) { if (json['entityList'] != null) {
entityList = new List<EntityList>(); entityList = new List<PrescriptionEntityModel>();
json['entityList'].forEach((v) { json['entityList'].forEach((v) {
entityList.add(new EntityList.fromJson(v)); entityList.add(new PrescriptionEntityModel.fromJson(v));
}); });
} }
rowcount = json['rowcount']; rowcount = json['rowcount'];
@ -26,149 +28,3 @@ class PrescriptionModel {
return data; 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<String, dynamic> 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<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
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;
}
}

@ -1,26 +1,20 @@
class PrescriptionReqModel { class PrescriptionReqModel {
String vidaAuthTokenID;
dynamic patientMRN; dynamic patientMRN;
dynamic appNo; dynamic appNo;
dynamic admissionNo;
PrescriptionReqModel( PrescriptionReqModel(
{this.vidaAuthTokenID, this.patientMRN, this.appNo, this.admissionNo}); { this.patientMRN, this.appNo});
PrescriptionReqModel.fromJson(Map<String, dynamic> json) { PrescriptionReqModel.fromJson(Map<String, dynamic> json) {
vidaAuthTokenID = json['VidaAuthTokenID'];
patientMRN = json['PatientMRN']; patientMRN = json['PatientMRN'];
appNo = json['AppointmentNo']; appNo = json['AppointmentNo'];
admissionNo = json['AdmissionNo'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
data['PatientMRN'] = this.patientMRN; data['PatientMRN'] = this.patientMRN;
data['AppointmentNo'] = this.appNo; data['AppointmentNo'] = this.appNo;
data['AdmissionNo'] = this.admissionNo;
return data; return data;
} }
} }

@ -1,4 +1,4 @@
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart';
class PrescriptionsOrder { class PrescriptionsOrder {
int iD; int iD;

@ -1,4 +1,4 @@
class GetGetProgressNoteReqModel { class GetProgressNoteReqModel {
int patientMRN; int patientMRN;
int appointmentNo; int appointmentNo;
String episodeID; String episodeID;
@ -8,7 +8,7 @@ class GetGetProgressNoteReqModel {
dynamic doctorID; dynamic doctorID;
dynamic editedBy; dynamic editedBy;
GetGetProgressNoteReqModel( GetProgressNoteReqModel(
{this.patientMRN, {this.patientMRN,
this.appointmentNo, this.appointmentNo,
this.episodeID, this.episodeID,
@ -18,7 +18,7 @@ class GetGetProgressNoteReqModel {
this.editedBy, this.editedBy,
this.doctorID}); this.doctorID});
GetGetProgressNoteReqModel.fromJson(Map<String, dynamic> json) { GetProgressNoteReqModel.fromJson(Map<String, dynamic> json) {
patientMRN = json['PatientMRN']; patientMRN = json['PatientMRN'];
appointmentNo = json['AppointmentNo']; appointmentNo = json['AppointmentNo'];
episodeID = json['EpisodeID']; episodeID = json['EpisodeID'];

@ -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 { class MySelectedAllergy {
MasterKeyModel selectedAllergySeverity; MasterKeyModel selectedAllergySeverity;

@ -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 { class MySelectedAssessment {
MasterKeyModel selectedICD; MasterKeyModel selectedICD;

@ -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 { class MySelectedExamination {
MasterKeyModel selectedExamination; MasterKeyModel selectedExamination;

@ -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 { class MySelectedHistory {
MasterKeyModel selectedHistory; MasterKeyModel selectedHistory;

@ -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 { class CheckActivationCodeForDoctorAppResponseModel {
String authenticationTokenID; String authenticationTokenID;

@ -32,6 +32,8 @@ class InsertIMEIDetailsModel {
String vidaAuthTokenID; String vidaAuthTokenID;
String vidaRefreshTokenID; String vidaRefreshTokenID;
dynamic password; dynamic password;
int loginDoctorID;
InsertIMEIDetailsModel( InsertIMEIDetailsModel(
{this.iMEI, {this.iMEI,
@ -66,7 +68,7 @@ class InsertIMEIDetailsModel {
this.patientOutSA, this.patientOutSA,
this.vidaAuthTokenID, this.vidaAuthTokenID,
this.vidaRefreshTokenID, this.vidaRefreshTokenID,
this.password}); this.password, this.loginDoctorID});
InsertIMEIDetailsModel.fromJson(Map<String, dynamic> json) { InsertIMEIDetailsModel.fromJson(Map<String, dynamic> json) {
iMEI = json['IMEI']; iMEI = json['IMEI'];
@ -102,7 +104,7 @@ class InsertIMEIDetailsModel {
vidaAuthTokenID = json['VidaAuthTokenID']; vidaAuthTokenID = json['VidaAuthTokenID'];
vidaRefreshTokenID = json['VidaRefreshTokenID']; vidaRefreshTokenID = json['VidaRefreshTokenID'];
password = json['Password']; password = json['Password'];
} loginDoctorID = json['LoginDoctorID']; }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
@ -139,6 +141,8 @@ class InsertIMEIDetailsModel {
data['VidaAuthTokenID'] = this.vidaAuthTokenID; data['VidaAuthTokenID'] = this.vidaAuthTokenID;
data['VidaRefreshTokenID'] = this.vidaRefreshTokenID; data['VidaRefreshTokenID'] = this.vidaRefreshTokenID;
data['Password'] = this.password; data['Password'] = this.password;
data['LoginDoctorID'] = this.loginDoctorID;
return data; return data;
} }
} }

@ -0,0 +1,19 @@
import 'package:charts_flutter/flutter.dart' as charts;
import 'package:charts_flutter/flutter.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/data_display/list/flexible_container.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';
class TimeSeriesSales {
final DateTime time;
final int sales;
TimeSeriesSales(this.time, this.sales);
}
class TimeSeriesSales2 {
final DateTime time;
final double sales;
TimeSeriesSales2(this.time, this.sales);
}

@ -1,20 +1,3 @@
// final List<Countries> countries = [
// new Countries(
// name: "Saudi Arabia", name_ar: "المملكة العربية السعودية", code: '966'),
// new Countries(
// name: "United Arab Emirates",
// name_ar: "الإمارات العربية المتحدة",
// code: '971'),
// ];
// class Countries {
// final String name;
// final String name_ar;
// final String code;
// Countries({this.name, this.name_ar, this.code});
// }
class Countries { class Countries {
String name; String name;
String nameAr; String nameAr;

@ -1,4 +1,4 @@
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart';
class ListDoctorWorkingHoursTable { class ListDoctorWorkingHoursTable {
DateTime date; DateTime date;

@ -1,4 +1,4 @@
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart';
class PatientLabOrders { class PatientLabOrders {
int actualDoctorRate; int actualDoctorRate;
@ -26,6 +26,7 @@ class PatientLabOrders {
String nationalityFlagURL; String nationalityFlagURL;
int noOfPatientsRate; int noOfPatientsRate;
DateTime orderDate; DateTime orderDate;
DateTime createdOn;
String orderNo; String orderNo;
String patientID; String patientID;
String projectID; String projectID;
@ -98,6 +99,7 @@ class PatientLabOrders {
nationalityFlagURL = json['NationalityFlagURL']; nationalityFlagURL = json['NationalityFlagURL'];
noOfPatientsRate = json['NoOfPatientsRate']; noOfPatientsRate = json['NoOfPatientsRate'];
orderDate = AppDateUtils.convertStringToDate(json['OrderDate']); orderDate = AppDateUtils.convertStringToDate(json['OrderDate']);
createdOn = AppDateUtils.convertStringToDate(json['CreatedOn']);
orderNo = json['OrderNo'].toString(); orderNo = json['OrderNo'].toString();
patientID = json['PatientID'].toString(); patientID = json['PatientID'].toString();
projectID = json['ProjectID'].toString(); projectID = json['ProjectID'].toString();

@ -1,64 +0,0 @@
class RequestPatientLabOrders {
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
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});
RequestPatientLabOrders.fromJson(Map<String, dynamic> json) {
versionID = json['VersionID'];
channel = json['Channel'];
languageID = json['LanguageID'];
iPAdress = json['IPAdress'];
generalid = json['generalid'];
patientOutSA = json['PatientOutSA'];
sessionID = json['SessionID'];
isDentalAllowedBackend = json['isDentalAllowedBackend'];
deviceTypeID = json['DeviceTypeID'];
patientID = json['PatientID'];
tokenID = json['TokenID'];
patientTypeID = json['PatientTypeID'];
patientType = json['PatientType'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['VersionID'] = this.versionID;
data['Channel'] = this.channel;
data['LanguageID'] = this.languageID;
data['IPAdress'] = this.iPAdress;
data['generalid'] = this.generalid;
data['PatientOutSA'] = this.patientOutSA;
data['SessionID'] = this.sessionID;
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
data['DeviceTypeID'] = this.deviceTypeID;
data['PatientID'] = this.patientID;
data['TokenID'] = this.tokenID;
data['PatientTypeID'] = this.patientTypeID;
data['PatientType'] = this.patientType;
return data;
}
}

@ -18,6 +18,7 @@ class CreateNoteModel {
String sessionID; String sessionID;
bool isLoginForDoctorApp; bool isLoginForDoctorApp;
bool patientOutSA; bool patientOutSA;
int conditionId;
CreateNoteModel( CreateNoteModel(
{this.visitType, {this.visitType,
@ -38,7 +39,8 @@ class CreateNoteModel {
this.tokenID, this.tokenID,
this.sessionID, this.sessionID,
this.isLoginForDoctorApp, this.isLoginForDoctorApp,
this.patientOutSA}); this.patientOutSA,
this.conditionId});
CreateNoteModel.fromJson(Map<String, dynamic> json) { CreateNoteModel.fromJson(Map<String, dynamic> json) {
visitType = json['VisitType']; visitType = json['VisitType'];
@ -60,6 +62,7 @@ class CreateNoteModel {
sessionID = json['SessionID']; sessionID = json['SessionID'];
isLoginForDoctorApp = json['IsLoginForDoctorApp']; isLoginForDoctorApp = json['IsLoginForDoctorApp'];
patientOutSA = json['PatientOutSA']; patientOutSA = json['PatientOutSA'];
conditionId = json['ConditionId'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -83,6 +86,7 @@ class CreateNoteModel {
data['SessionID'] = this.sessionID; data['SessionID'] = this.sessionID;
data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp; data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
data['PatientOutSA'] = this.patientOutSA; data['PatientOutSA'] = this.patientOutSA;
data['ConditionId'] = this.conditionId;
return data; return data;
} }
} }

@ -19,6 +19,8 @@ class NoteModel {
Null doctorClinicName; Null doctorClinicName;
String doctorName; String doctorName;
String visitTypeDesc; String visitTypeDesc;
int condition;
String conditionDescription;
NoteModel( NoteModel(
{this.setupID, {this.setupID,
@ -40,7 +42,10 @@ class NoteModel {
this.admissionClinicName, this.admissionClinicName,
this.doctorClinicName, this.doctorClinicName,
this.doctorName, this.doctorName,
this.visitTypeDesc}); this.visitTypeDesc,
this.condition,
this.conditionDescription,
});
NoteModel.fromJson(Map<String, dynamic> json) { NoteModel.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID']; setupID = json['SetupID'];
@ -63,6 +68,8 @@ class NoteModel {
doctorClinicName = json['DoctorClinicName']; doctorClinicName = json['DoctorClinicName'];
doctorName = json['DoctorName']; doctorName = json['DoctorName'];
visitTypeDesc = json['VisitTypeDesc']; visitTypeDesc = json['VisitTypeDesc'];
condition = json['Condition'];
conditionDescription = json['ConditionDescription'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -87,6 +94,8 @@ class NoteModel {
data['DoctorClinicName'] = this.doctorClinicName; data['DoctorClinicName'] = this.doctorClinicName;
data['DoctorName'] = this.doctorName; data['DoctorName'] = this.doctorName;
data['VisitTypeDesc'] = this.visitTypeDesc; data['VisitTypeDesc'] = this.visitTypeDesc;
data['Condition'] = this.condition;
data['ConditionDescription'] = this.conditionDescription;
return data; return data;
} }
} }

@ -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<String, dynamic> json) {
isDentalAllowedBackend = json['isDentalAllowedBackend'];
languageID = json['LanguageID'];
projectID = json['ProjectID'];
parameterGroup = json['parameterGroup'];
parameterType = json['parameterType'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
data['LanguageID'] = this.languageID;
data['ProjectID'] = this.projectID;
data['parameterGroup'] = this.parameterGroup;
data['parameterType'] = this.parameterType;
return data;
}
}

@ -0,0 +1,22 @@
class StpMasterListResponseModel {
int parameterCode;
String description;
Null descriptionN;
StpMasterListResponseModel(
{this.parameterCode, this.description, this.descriptionN});
StpMasterListResponseModel.fromJson(Map<String, dynamic> json) {
parameterCode = json['ParameterCode'];
description = json['Description'];
descriptionN = json['DescriptionN'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['ParameterCode'] = this.parameterCode;
data['Description'] = this.description;
data['DescriptionN'] = this.descriptionN;
return data;
}
}

@ -16,6 +16,7 @@ class UpdateNoteReqModel {
bool isLoginForDoctorApp; bool isLoginForDoctorApp;
bool patientOutSA; bool patientOutSA;
int patientTypeID; int patientTypeID;
int conditionId;
UpdateNoteReqModel( UpdateNoteReqModel(
{this.projectID, {this.projectID,
@ -34,7 +35,8 @@ class UpdateNoteReqModel {
this.sessionID, this.sessionID,
this.isLoginForDoctorApp, this.isLoginForDoctorApp,
this.patientOutSA, this.patientOutSA,
this.patientTypeID}); this.patientTypeID,
this.conditionId});
UpdateNoteReqModel.fromJson(Map<String, dynamic> json) { UpdateNoteReqModel.fromJson(Map<String, dynamic> json) {
projectID = json['ProjectID']; projectID = json['ProjectID'];
@ -54,6 +56,7 @@ class UpdateNoteReqModel {
isLoginForDoctorApp = json['IsLoginForDoctorApp']; isLoginForDoctorApp = json['IsLoginForDoctorApp'];
patientOutSA = json['PatientOutSA']; patientOutSA = json['PatientOutSA'];
patientTypeID = json['PatientTypeID']; patientTypeID = json['PatientTypeID'];
conditionId = json['ConditionId'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -75,6 +78,7 @@ class UpdateNoteReqModel {
data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp; data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
data['PatientOutSA'] = this.patientOutSA; data['PatientOutSA'] = this.patientOutSA;
data['PatientTypeID'] = this.patientTypeID; data['PatientTypeID'] = this.patientTypeID;
data['ConditionId'] = this.conditionId;
return data; return data;
} }
} }

@ -1,4 +1,4 @@
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart';
class LabOrdersResModel { class LabOrdersResModel {
String setupID; String setupID;

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

Loading…
Cancel
Save