Commit Graph

301 Commits (17eeaf2cc6f7441e68832e657d9c89c116f5ef09)

Author SHA1 Message Date
Haroon Amjad 0244334bb5 Update on store 4 years ago
Haroon Amjad 53a610213c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/home/home_screen.dart
#	lib/widgets/auth/login_form.dart
#	lib/widgets/auth/verfiy_account.dart
4 years ago
Mohammad Aljammal dc9f75f0ca hot fixes 4 years ago
Mohammad Aljammal c3ac50a859 hot fixes 4 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
4 years ago
Mohammad Aljammal 357e01c846 hot fixes 4 years ago
Mohammad Aljammal 29e2d962bc Optimize imports 4 years ago
Mohammad Aljammal 460a5293b9 add Discharged Patient 4 years ago
mosazaid 9d00440789 referral -re design 4 years ago
Mohammad Aljammal 704a4bd0be hot fixes 4 years ago
Mohammad Aljammal 0ded3a5a03 hot fixes 4 years ago
mosazaid b6a6f16b31 add vital sign inPatient 4 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 4 years ago
Haroon Amjad 6fc72328b7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
Haroon Amjad 27b4450dac versionID changed to 5.5 4 years ago
Elham Rababah 2fd30ae1be improve exam step 4 years ago
Mohammad Aljammal f4d1aac5e6 hot fixes on doctor replay and schedule 4 years ago
Mohammad Aljammal d450affa37 Merge branch 'Stepper_header' into 'development'
add doctor replay

See merge request Cloud_Solution/doctor_app_flutter!502
4 years ago
Elham Rababah 4ecf9fe4b9 add doctor replay 4 years ago
mosazaid 4b32487540 referral design and service changes 4 years ago
mosazaid a701b6e989 make referral changes 4 years ago
Sultan Khan 9268b13312 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 5c4aee849e bug fixes 4 years ago
Elham Rababah 14cf5a5a1c finish fix the assessment 4 years ago
Sultan Khan 212d1dc05f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 0498545e5c no data 4 years ago
mosazaid 9a0555b715 design fixes 4 years ago
Elham Rababah ed02bbc1f0 fix allergy 4 years ago
Elham Rababah 19d8b9170d update allergies fixes 4 years ago
mosazaid ffd77528a2 patient profile new design 4 years ago
Sultan Khan a491eee7f7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan e640bcf975 search updated 4 years ago
Mohammad Aljammal 55d4ff1436 Merge branch 'patient_type_fix' into 'development'
fix issue

See merge request Cloud_Solution/doctor_app_flutter!370
4 years ago
Sultan Khan 091234ad77 bug fix 4 years ago
Elham Rababah 56d3f6a9bb fix issue 4 years ago
Sultan Khan 12dc637163 bug fixes 4 years ago
Sultan Khan c16b7ffca0 arrival page updated 4 years ago
Sultan Khan bbb1a8ff74 arrival list updated 4 years ago
Elham Rababah 083b49aa0a fix DA-341 4 years ago
mosazaid 498c6c00af fix minor issue bugs (DA-273, DA-361, DA-362, DA-363) 4 years ago
Elham Rababah ff33afd124 fix DA-149 4 years ago
Elham Rababah a5a7425a09 fix DA-149 4 years ago
mosazaid b63c7aff25 Fix DA-331 vital signs uncorrect temperature value 4 years ago
Elham Rababah 00543a759a fix remarks in allergies 4 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 4 years ago
mosazaid 3be693337a some fixes 4 years ago
Elham Rababah 02167afa6b fix 143,144 4 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
4 years ago
Elham Rababah 9674eb89d9 add modification on so 4 years ago
Sultan Khan 417ca9401b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan a99b3847ac login completed 4 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
4 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
4 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
4 years ago
Elham Rababah 6bab2e0b2d fix referral patient issue 4 years ago
mosazaid 8424e92c4b working on vital Sign feature with Charts 4 years ago
Sultan Khan ad99cebf02 login and drug to drug 4 years ago
Sultan Khan 909940a6d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 40e9ab864a login changes 4 years ago
Elham 9e7a7210c4 Merge branch 'soap_update' into 'development'
Soap update

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

See merge request Cloud_Solution/doctor_app_flutter!241
4 years ago
Elham Rababah caddbdb53c small fixes in progress note 4 years ago
Elham Rababah 34b7b4564c assessment work fine now 4 years ago
Elham Rababah a46a61c5cf fix get and post issue to make it works with vida 4 years ago
mosazaid 50d7f733b6 working on UCAF datails and add patient procedure list and diagnosis 4 years ago
Elham Rababah 9aa5ab4228 small changes 4 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
4 years ago
Elham Rababah bbcd218a94 history delete is fixed 4 years ago
mosazaid 2f9d4a1034 Merge branch 'development' into feature-ucaf 4 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 4 years ago
Elham Rababah 9194d8a44b delete Allergy 4 years ago
Elham Rababah 856777c648 finish updating functions 4 years ago
Elham Rababah 3cadd532d8 finish Updating 4 years ago
Elham Rababah 4caf40a2ab finish plan page 4 years ago
Elham Rababah 46043efb42 Finish Update objective code Page 4 years ago
Elham Rababah c92a848851 Finish Update Subjective Page 4 years ago
Elham Rababah 39970fe1a8 get update_subjective_page.dart 4 years ago
Elham Rababah f0fd5d30e1 First step from update process 4 years ago
Elham Rababah 05e7762533 fix obj page 4 years ago
Elham Rababah 61209663f3 Finish arrived 4 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
4 years ago
Elham Rababah df4eb94042 work with patient model 4 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
4 years ago
Elham Rababah 2f273dcde8 add ICD10 4 years ago
Elham Rababah efee00c79e finish add assessment 4 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
4 years ago
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
4 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
4 years ago
Elham Rababah 1672d9a3a0 add assessment_page code 4 years ago
Elham Rababah dc4250a4de Post progress Note 4 years ago
Elham Rababah b22fd3f7ba fix listHisProgNotePhysicalExaminationVM 4 years ago
Elham Rababah f97d11183d progress Note 4 years ago
mosazaid a71da8e4ef working on vital signs 4 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
4 years ago
Elham Rababah a362901da8 improve code inside my eam 4 years ago
Elham Rababah cde56a82f2 Finish subjective 4 years ago
mosazaid d11a8e6209 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/core/service/base/base_service.dart
#	lib/locator.dart
4 years ago
mosazaid aafcd89222 working on vitalSigns feature 4 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
4 years ago
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 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
4 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 4 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 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
4 years ago
Elham Rababah 4560706d55 improve code inside my eam 4 years ago
mosazaid 47e9d2a558 Merge branch 'development' into feature--patient-referral
# Conflicts:
#	lib/client/base_app_client.dart
4 years ago
Elham Rababah bb651478a0 Finish subjective 4 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
4 years ago
Elham Rababah 9b0731d5c8 check activation code 4 years ago
Elham Rababah 7001940d0d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new 4 years ago
mosazaid 7cefbb4dbd add referral pages 4 years ago
Elham Rababah a3dff8c9f8 Post Allergies service 4 years ago
Elham Rababah df68e912b5 first step from calling history 4 years ago
Sultan Khan e61f3f0281 add sick leave 4 years ago
Elham Rababah 9c018d3c55 first step from patient arrival 4 years ago
Elham Rababah 46cdd9482c First step from SOAP 4 years ago
Sultan Khan ba2697c917 sick leave 4 years ago
Elham Rababah 4eee5cd9d8 new login type 4 years ago
Elham Rababah 716cb28bf1 fix issue on vital_sign_res_model.dart 4 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
4 years ago
Sultan Khan 6eb2da3770 voice search 4 years ago
hussam al-habibeh efc5db9f5b versionID update 4 years ago
Sultan Khan e942999784 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 3f7ef48fd5 live care chages 4 years ago
Elham 2fe33bd57d Merge branch 'hussam' into 'development'
LogIn function refactoring

See merge request Cloud_Solution/doctor_app_flutter!152
4 years ago
hussam al-habibeh d3bb85129c LogIn function refactoring 4 years ago
Elham Rababah 6ea72f5ffa make things daynamic 4 years ago
Mohammad ALjammal d22ce32cdb add call back android 4 years ago
Sultan Khan 3b0aff2efa overflow issue and model mapped 4 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
4 years ago
Sultan Khan bde86ef829 live care features added. 4 years ago
ibrahim albitar ee8d481504 live care web service 4 years ago
Elham Rababah bd3ce0a4d4 refactor models 4 years ago
Amjad Amireh 4e62947df2 Modify patiant screen icon avatar 4 years ago
ibrahim albitar 480c64d25a complete refer patient 4 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
4 years ago
Mohammad ALjammal c1b21dc1c3 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 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
4 years ago
Mohammad ALjammal 76f8eba86e create Prescription In and Out Patient 4 years ago
unknown 39cc4fa4bf refere to doctor 4 years ago
Elham Rababah 610ae3c1fb add in patient prescription details screen 4 years ago
Mohammad ALjammal 644cfac790 change design prescription and add new services 4 years ago
unknown 40a0c1281a Merge branches 'develop' and 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 4 years ago
unknown 61674bec47 new pages 4 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
4 years ago
Mohammad ALjammal 1f5bca3adc patient profile details 4 years ago
Amjad Amireh 69a618018d MyPrefered Patiant 4 years ago
Amjad Amireh 3c3d85c255 My Referred Patient 4 years ago
unknown 0c112ebca5 finished new screens 4 years ago