Commit Graph

261 Commits (cc26053bc186c8ff0b3ba463df875331f0cc9878)

Author SHA1 Message Date
Elham Rababah ff33afd124 fix DA-149 5 years ago
Elham Rababah a5a7425a09 fix DA-149 5 years ago
mosazaid b63c7aff25 Fix DA-331 vital signs uncorrect temperature value 5 years ago
Elham Rababah 00543a759a fix remarks in allergies 5 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 5 years ago
mosazaid 3be693337a some fixes 5 years ago
Elham Rababah 02167afa6b fix 143,144 5 years ago
Elham Rababah 4a3175830d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_loader
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/dashboard_screen.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah 9674eb89d9 add modification on so 5 years ago
Sultan Khan 417ca9401b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan a99b3847ac login completed 5 years ago
Mohammad Aljammal f75ab83981 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
mosazaid dcb71e5c22 Add charts to patient vital signs feature
&
Merge branch 'development' into feature-ucaf

# Conflicts:
#	lib/util/translations_delegate_base.dart
#	pubspec.yaml
5 years ago
Elham Rababah 23fb2e7297 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah 6bab2e0b2d fix referral patient issue 5 years ago
mosazaid 8424e92c4b working on vital Sign feature with Charts 5 years ago
Sultan Khan ad99cebf02 login and drug to drug 5 years ago
Sultan Khan 909940a6d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 40e9ab864a login changes 5 years ago
Elham 9e7a7210c4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!244
5 years ago
Elham Rababah 4f1a892be4 first step form create episode 5 years ago
Elham 8494f6e0f4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!241
5 years ago
Elham Rababah caddbdb53c small fixes in progress note 5 years ago
Elham Rababah 34b7b4564c assessment work fine now 5 years ago
Elham Rababah a46a61c5cf fix get and post issue to make it works with vida 5 years ago
mosazaid 50d7f733b6 working on UCAF datails and add patient procedure list and diagnosis 5 years ago
Elham Rababah 9aa5ab4228 small changes 5 years ago
Elham Rababah ffe7e7c57f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah bbcd218a94 history delete is fixed 5 years ago
mosazaid 2f9d4a1034 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 5 years ago
Elham Rababah 9194d8a44b delete Allergy 5 years ago
Elham Rababah 856777c648 finish updating functions 5 years ago
Elham Rababah 3cadd532d8 finish Updating 5 years ago
Elham Rababah 4caf40a2ab finish plan page 5 years ago
Elham Rababah 46043efb42 Finish Update objective code Page 5 years ago
Elham Rababah c92a848851 Finish Update Subjective Page 5 years ago
Elham Rababah 39970fe1a8 get update_subjective_page.dart 5 years ago
Elham Rababah f0fd5d30e1 First step from update process 5 years ago
Elham Rababah 05e7762533 fix obj page 5 years ago
Elham Rababah 61209663f3 Finish arrived 5 years ago
Elham Rababah dccf474e70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_arrival_ist
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
	lib/core/service/patient_service.dart
	lib/core/viewModel/patient_view_model.dart
	lib/lookups/patient_lookup.dart
	lib/models/patient/patiant_info_model.dart
	lib/screens/patients/patients_screen.dart
5 years ago
Elham Rababah df4eb94042 work with patient model 5 years ago
Mohammad Aljammal 6f2e764deb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hack_login
 Conflicts:
	lib/client/base_app_client.dart
	lib/routes.dart
5 years ago
Elham Rababah 2f273dcde8 add ICD10 5 years ago
Elham Rababah efee00c79e finish add assessment 5 years ago
mosazaid 25d884c774 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/routes.dart
#	lib/util/helpers.dart
#	lib/util/translations_delegate_base.dart
#	lib/widgets/patients/profile/SOAP/add_SOAP_index.dart
#	pubspec.lock
5 years ago
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
5 years ago
Elham Rababah edef444534 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/config/config.dart
	lib/core/service/base/lookup-service.dart
5 years ago
Elham Rababah 1672d9a3a0 add assessment_page code 5 years ago
Elham Rababah dc4250a4de Post progress Note 5 years ago
Elham Rababah b22fd3f7ba fix listHisProgNotePhysicalExaminationVM 5 years ago
Elham Rababah f97d11183d progress Note 5 years ago
mosazaid a71da8e4ef working on vital signs 5 years ago
hussam al-habibeh d3bf97fdd8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_buttons_widget.dart
	lib/widgets/shared/app_text_form_field.dart
	lib/widgets/shared/app_texts_widget.dart
5 years ago
Elham Rababah a362901da8 improve code inside my eam 5 years ago
Elham Rababah cde56a82f2 Finish subjective 5 years ago
mosazaid d11a8e6209 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/core/service/base/base_service.dart
#	lib/locator.dart
5 years ago
mosazaid aafcd89222 working on vitalSigns feature 5 years ago
hussam al-habibeh 1ce6571668 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/screens/patients/profile/refer_patient_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_text_form_field.dart
5 years ago
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah d4a1dcfc81 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
	lib/core/service/base/lookup-service.dart
5 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 5 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 74d315b887 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Elham Rababah 4560706d55 improve code inside my eam 5 years ago
mosazaid 47e9d2a558 Merge branch 'development' into feature--patient-referral
# Conflicts:
#	lib/client/base_app_client.dart
5 years ago
Elham Rababah bb651478a0 Finish subjective 5 years ago
mosazaid 4ac8fe4681 finish refferal module except accept/reject referral
&
Merge branch 'development' into feature--patient-referral

# Conflicts:
#	lib/client/base_app_client.dart
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah 9b0731d5c8 check activation code 5 years ago
Elham Rababah 7001940d0d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new 5 years ago
mosazaid 7cefbb4dbd add referral pages 5 years ago
Elham Rababah a3dff8c9f8 Post Allergies service 5 years ago
Elham Rababah df68e912b5 first step from calling history 5 years ago
Sultan Khan e61f3f0281 add sick leave 5 years ago
Elham Rababah 9c018d3c55 first step from patient arrival 5 years ago
Elham Rababah 46cdd9482c First step from SOAP 5 years ago
Sultan Khan ba2697c917 sick leave 5 years ago
Elham Rababah 4eee5cd9d8 new login type 5 years ago
Elham Rababah 716cb28bf1 fix issue on vital_sign_res_model.dart 5 years ago
Mohammad Aljammal 146a53a6e5 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/config/config.dart
	lib/models/pharmacies/pharmacies_List_request_model.dart
	lib/screens/medicine/medicine_search_screen.dart
6 years ago
Sultan Khan 6eb2da3770 voice search 6 years ago
hussam al-habibeh efc5db9f5b versionID update 6 years ago
Sultan Khan e942999784 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 3f7ef48fd5 live care chages 6 years ago
Elham 2fe33bd57d Merge branch 'hussam' into 'development'
LogIn function refactoring

See merge request Cloud_Solution/doctor_app_flutter!152
6 years ago
hussam al-habibeh d3bb85129c LogIn function refactoring 6 years ago
Elham Rababah 6ea72f5ffa make things daynamic 6 years ago
Mohammad ALjammal d22ce32cdb add call back android 6 years ago
Sultan Khan 3b0aff2efa overflow issue and model mapped 6 years ago
Sultan Khan dd3154a498 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
6 years ago
Sultan Khan bde86ef829 live care features added. 6 years ago
ibrahim albitar ee8d481504 live care web service 6 years ago
Elham Rababah bd3ce0a4d4 refactor models 6 years ago
Amjad Amireh 4e62947df2 Modify patiant screen icon avatar 6 years ago
ibrahim albitar 480c64d25a complete refer patient 6 years ago
Mohammad ALjammal 4a8b97b189 Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/providers/patients_provider.dart
	lib/routes.dart
6 years ago
Mohammad ALjammal c1b21dc1c3 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
unknown ce5ee4a21e Merge branch 'develop' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/providers/patients_provider.dart
	lib/routes.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
6 years ago
Mohammad ALjammal 76f8eba86e create Prescription In and Out Patient 6 years ago
unknown 39cc4fa4bf refere to doctor 6 years ago
Elham Rababah 610ae3c1fb add in patient prescription details screen 6 years ago
Mohammad ALjammal 644cfac790 change design prescription and add new services 6 years ago
unknown 40a0c1281a Merge branches 'develop' and 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 61674bec47 new pages 6 years ago
Mohammad ALjammal 540d902236 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/providers/patients_provider.dart
6 years ago
Mohammad ALjammal 1f5bca3adc patient profile details 6 years ago
Amjad Amireh 69a618018d MyPrefered Patiant 6 years ago
Amjad Amireh 3c3d85c255 My Referred Patient 6 years ago
unknown 0c112ebca5 finished new screens 6 years ago
Elham Rababah 6ebee5dbf6 first step form chart 6 years ago
Mohammad ALjammal 9572e16627 done My Referral Patient and create Base App Client 6 years ago
Mohammad ALjammal 7d3bfddd68 update design my schedule and doctor replay 6 years ago
ibrahim albitar 7f5831335b Merge branch 'develop' into 'master'
Develop

See merge request Cloud_Solution/doctor_app_flutter!70
6 years ago
Mohammad ALjammal 1f33e1a901 Add fix data for request in config file 6 years ago
unknown 3653c90665 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown b94011af47 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
her_username 111d90d56f Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/models/patient/patiant_info_model.dart
	pubspec.lock
6 years ago
her_username 7d3856f2b2 done QR reader 6 years ago
Elham Rababah 146e913113 add choose clinic to login process 6 years ago
unknown 0c44c57c2f Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 35205b7024 patient medical info 6 years ago
Amjad Amireh 2f0c400328 Modify time and date 6 years ago
Elham Rababah 0748a569ac Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 years ago
Elham Rababah 1e656af143 handelCatcherrorCase 6 years ago
Elham 54d1881ac0 Merge branch 'elham' into 'master'
add doctor profile to shaerd pref

See merge request Cloud_Solution/doctor_app_flutter!56
6 years ago
Elham Rababah bc395c3fcc add doctor profile to shaerd pref 6 years ago
Amjad Amireh ac4489c452 patiant model modify 6 years ago
her_username f098520a80 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
her_username cc929ba4a5 update Localizations 6 years ago
Elham Rababah 7c291f8d63 add comment and fix some pugs 6 years ago
Amjad Amireh c09c1599fc Filter search in outPatiant and format time 6 years ago
Elham Rababah 1a98e37a7f add prescription add radiology 6 years ago
Elham Rababah 4309a2141a small fix on desing and create model 6 years ago
Elham Rababah 49f9841079 add patient route 6 years ago
unknown 734b7b2c99 refactoring code 6 years ago
unknown ae524100f7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
Elham a7807a7e6d Revert "Merge branch 'Amjad_search' into 'master'"
This reverts merge request !39
6 years ago
amjad nabil amireh aafde2c311 Merge branch 'master' into 'Amjad_search'
# Conflicts:
#   lib/screens/patients/patient_search_screen.dart
6 years ago
Amjad Amireh 3f821e0c05 update pataintDesign 6 years ago
Elham f0201cfcbe Merge branch 'elham' into 'master'
finsih vital sign desing

See merge request Cloud_Solution/doctor_app_flutter!36
6 years ago
Elham Rababah 5e6722dde0 finsih vital sign desing 6 years ago
Amjad Amireh 50b8d543be Patiant search filter design 6 years ago
Elham Rababah 7e154e47c0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 years ago
Elham Rababah 9f87e5daf2 fix bug in vital sign model 6 years ago
her_username 84ebdb98ea Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/routes.dart
	lib/screens/patients/patients_screen.dart
6 years ago
her_username ce9530fdae DA-84 Apply Service on Dr reply List
update app scaffold -- Add arrow back
update card with bg widget -- set size changeable
6 years ago
Elham Rababah 19558e13ac create VitalSignResModel 6 years ago
unknown c30fcbc2b5 pharmacies list 6 years ago
unknown a59a2d5ad3 pharmacy web services 6 years ago