Commit Graph

341 Commits (10ef8f79548df08a92fc7ba3841b88967d4f35d6)

Author SHA1 Message Date
mosazaid b67fd55aac Merge branch 'development' into feature-ucaf 4 years ago
mosazaid e75e7801aa working on UCAF get data 4 years ago
Mohammad Aljammal d7b8e29455 Merge branch 'medical-file' into 'development'
drug list

See merge request Cloud_Solution/doctor_app_flutter!234
4 years ago
hussam al-habibeh f997561bb8 drug list 4 years ago
mosazaid c9aac6e2e9 vital signs solve overflow of the width 4 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 4 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 4 years ago
mosazaid ee9ca72057 change empty referral message 4 years ago
mosazaid ce164c3cb6 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
mosazaid 0c39dc6693 change on vital signs for uncoment the service 4 years ago
mosazaid 4b5bec8c50 working on UCAF design 4 years ago
Elham Rababah ba14d23c05 Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Elham Rababah e65740761a add improvement on create episode 4 years ago
mosazaid b60bac6d6e working on UCAF design 4 years ago
mosazaid e9ffbf06a6 Merge branch 'development' into feature_admission_request 4 years ago
mosazaid 3578c82f62 solve hacking patient screen 4 years ago
mosazaid 095a915a89 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
4 years ago
mosazaid cb4ee05b40 working on ucaf 4 years ago
Mohammad Aljammal a723ecbf1d fix merger 4 years ago
mosazaid ae6cd0e5f8 Merge branch 'development' into feature_admission_request 4 years ago
mosazaid 5142b5b6c7 finish admission request design 4 years ago
Elham Rababah 05e7762533 fix obj page 4 years ago
Elham Rababah 61209663f3 Finish arrived 4 years ago
mosazaid 4d44d54806 Merge branch 'development' into feature_admission_request 4 years ago
Mohammad Aljammal 806682b921 hack login 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
mosazaid 433b2933c4 working with admission request and some changes in vital signs 4 years ago
mosazaid f35eff1220 working with admission request 4 years ago
mosazaid 78e2c662c8 finish vital sign feature, and adding makeReferralResponse 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
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
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
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
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
mosazaid 7cefbb4dbd add referral pages 4 years ago
Sultan Khan 8d58348267 dashboard changes 4 years ago
Elham Rababah c15300125e First step objective_page.dart 4 years ago
Elham Rababah 518c30bdeb Merge branches 'SOAP' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Elham Rababah 44779e6ee7 patient screen 4 years ago
Elham Rababah 9c018d3c55 first step from patient arrival 4 years ago
Elham Rababah 46cdd9482c First step from SOAP 4 years ago
mosazaid bb1f101e94 finish re-design refer-patient screen 4 years ago
hussam al-habibeh cbb8937b1d '12/14' 4 years ago
hussam al-habibeh 7de6a8e99f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/landing_page.dart
	lib/screens/patients/profile/refer_patient_screen.dart
4 years ago
hussam al-habibeh c581638e00 refer_patient_screen 'not finshed' 4 years ago
Elham Rababah 9f19b2566f finish refactor provider 4 years ago
Elham Rababah 64dbcce06f finish and remove patient provider 4 years ago
Elham 6057e6a266 Merge branch 'refactor' into 'development'
Refactor

See merge request Cloud_Solution/doctor_app_flutter!180
4 years ago
Elham 746765f4d7 Merge branch 'design-updates' into 'development'
patients_screen design update

See merge request Cloud_Solution/doctor_app_flutter!179
4 years ago
Elham Rababah 1b1e8f0712 second step from patient provider 4 years ago
hussam al-habibeh 6f90c31f9f patients_screen design update 4 years ago
Elham Rababah 6ab73916eb first step from patient provider 4 years ago
mosazaid e5341e3031 Merge branch 'development' into replay-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/patients/patients_screen.dart
4 years ago
mosazaid 5ed9aea5a7 fix HexColor library error 4 years ago
hussam al-habibeh 6bbc629060 patients out and patients in screens design updates 4 years ago
hussam al-habibeh 911921e0b8 in-patient && out-patient 4 years ago
Elham Rababah 91cc76a9cf medicine search fix bugs = 4 years ago
Elham Rababah 53862ec1b3 fix bugs in patient search 4 years ago
Elham Rababah f1721b686d fix loader inside pharmacies_list 4 years ago
Elham Rababah b308dc5826 change doctor app icons and optimization 4 years ago
Elham Rababah 8980fc03aa Finish Patient search design 4 years ago
Elham Rababah fbc99d681f First step from medicine search and change the logo 4 years ago
Elham 7fe2a96065 Merge branch 'hussam' into 'development'
translation 'updates'

See merge request Cloud_Solution/doctor_app_flutter!136
4 years ago
hussam al-habibeh 000315ac0e translation 'updates' 4 years ago
ibrahim albitar c07f84ff78 fixing and enhancments 4 years ago
hussam al-habibeh 91ffdabd73 Translation stage five 4 years ago
hussam al-habibeh fb6d54faaf Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
 Conflicts:
	lib/screens/dashboard_screen.dart
4 years ago
hussam al-habibeh 054933b280 Translation stage four 4 years ago
Elham Rababah bd3ce0a4d4 refactor models 4 years ago
erababah cad096d8c7 fix issue on ios and improve structure by Elham & mohammad 4 years ago
hussam al-habibeh b63d8906bc Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/profile_screen.dart
4 years ago
hussam alhababieh a02fe9c83d translation stage two 4 years ago
amjad nabil amireh 640829f454 Merge branch 'Amjad_search' into 'development'
Modify patiant screen icon avatar

See merge request Cloud_Solution/doctor_app_flutter!121
4 years ago
Amjad Amireh 4e62947df2 Modify patiant screen icon avatar 4 years ago
Elham Rababah 574a951fcf finish clinic exept design 4 years ago
hussam alhababieh b0005e72f9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 4 years ago
hussam alhababieh b4570d7bd1 translation for pages stage one 4 years ago
ibrahim albitar 09ca836ea7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
ibrahim albitar 6fd43a281d fixing 4 years ago
Mohammad Aljammal f6aec27788 Merge branch 'mohammad' into 'development'
fix issues in Patient

See merge request Cloud_Solution/doctor_app_flutter!115
4 years ago
Mohammad ALjammal d52429564d fix issues in Patient 4 years ago
hussam alhababieh dcbf1312b7 translate dashboard/patient search 4 years ago
hussam alhababieh 097d8df8c0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 4 years ago
hussam alhababieh b178f08278 translate dashboard and patient search 4 years ago
Mohammad ALjammal b758ae8196 fix issues 4 years ago
Mohammad ALjammal 79eb6b19d0 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/config/config.dart
	lib/presentation/doctor_app_icons.dart
	lib/screens/dashboard_screen.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Mohammad ALjammal edd25ff437 Merge branch 'Amjad_search' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/config/config.dart
4 years ago
Mohammad ALjammal 692674fac0 merge ibrahim 4 years ago
Mohammad ALjammal 80664439d9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge 4 years ago
ibrahim albitar e0c65222d2 enhancment insurance approvals 4 years ago
Amjad Amireh 3eeac2734b Modify Patiant screen List style 4 years ago
Amjad Amireh 3410d691f8 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search
 Conflicts:
	lib/config/config.dart
4 years ago
Mohammad ALjammal 513fcd24b1 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	lib/config/config.dart
4 years ago
Mohammad ALjammal 9b065036ae fix issues in get patients service 4 years ago
Salman Afzal 11f10f1eea Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
4 years ago
Amjad Amireh f3c20d9866 Modify Patiant screen List style 4 years ago
ibrahim albitar 937f8ecd6a fix 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 0c94188405 Done Prescription Details Screen 4 years ago
Mohammad ALjammal c1b21dc1c3 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
ibrahim albitar 14527e19b1 fix issues 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
Salman Afzal a48ad33f36 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Salman Afzal a914ff9367 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/presentation/doctor_app_icons.dart
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 2ad96dad88 create Prescription In and Out Patient 4 years ago
Mohammad ALjammal c16c8897be Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/screens/dashboard_screen.dart
4 years ago
Mohammad ALjammal 6d8289a0d4 change bottom bar navigation 4 years ago
Amjad Amireh cc2c0f9a1e Modify Patiant screen List style 4 years ago
Mohammad ALjammal c8b2604110 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/widgets/doctor/my_referred_patient_widget.dart
4 years ago
Mohammad ALjammal 8157e1bc31 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 4 years ago
Mohammad ALjammal 644cfac790 change design prescription and add new services 4 years ago
Elham Rababah 40eb7f8064 improve vital sgin and return the correct color to login header 4 years ago
Mohammad ALjammal c7ad16cbcd update design Radiology Screen and create Radiology Report Screen 4 years ago
Amjad Amireh 86d0d52f05 SVG female 4 years ago
Mohammad ALjammal b3befa12db Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Mohammad ALjammal 5d7937c08d add arrow back in PatientProfileScreen , PatientSearchScreen and PatientsScreen 4 years ago
Salman Afzal ac612f0eda dashboard and patient app 4 years ago
Elham Rababah 55a4bfba83 hot fix 4 years ago
Elham Rababah 489ad9e729 improve code and add AppExpandableNotifier 4 years ago
Elham Rababah 10877ac658 improve vital sign item details 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 c6bbc1c2f5 fix patient profile details 4 years ago
Mohammad ALjammal 14edbff8b4 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/screens/patients/profile/vital_sign/body_measurements_screen.dart
4 years ago
Mohammad ALjammal 1f5bca3adc patient profile details 4 years ago
Elham Rababah 0d30fd6212 vitalsign details 4 years ago
Amjad Amireh 29239fddde modify search 4 years ago
Amjad Amireh 505b3383ff patient screen Modify 4 years ago
ibrahim albitar d9f7f586f8 Merge branch 'develop' into 'master'
Develop

See merge request Cloud_Solution/doctor_app_flutter!79
4 years ago
unknown 0c112ebca5 finished new screens 4 years ago
Elham Rababah bd24b7c196 TimeSeriesChart as widget 4 years ago
Elham Rababah 1347198928 Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 4 years ago
Elham Rababah 92dd877042 chart works 4 years ago
Mohammad ALjammal ef48a995eb Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
Elham Rababah 6ebee5dbf6 first step form chart 4 years ago
Amjad Amireh d3c2efc45d svg avatar Icon and library 4 years ago
unknown 8c46c93e86 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 4 years ago
unknown 9f4802c225 progress note 4 years ago
Amjad Amireh 317742b55a Svg component 4 years ago
Elham f9e2fd58ab Merge branch 'elham' into 'master'
add login logic with silent options

See merge request Cloud_Solution/doctor_app_flutter!75
4 years ago
Elham Rababah c5bbb0495a add login logic with silent options 4 years ago