Commit Graph

250 Commits (51234b80591bd3473e2acee795d2ffa1af8dabce)

Author SHA1 Message Date
Elham Rababah 96d07e7a59 fix small issue in radiology 5 years ago
Elham Rababah 7ebf36f98f add radiology open image 5 years ago
Mohammad Aljammal ee25102c2d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ecg_services
 Conflicts:
	lib/screens/patients/profile/patient_profile_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
Mohammad Aljammal e7e4aad962 add ECG service 5 years ago
mosazaid 6c46e21031 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
5 years ago
mosazaid 92e60bd3fd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
5 years ago
mosazaid fdc893c3d6 make search patient profile have preview services 5 years ago
Sultan Khan a8ef4a98a5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 376653a344 dashboard changes 5 years ago
Mohammad Aljammal 893fc05449 Merge branch 'patinet_profile_with_all_service' into 'development'
Patinet profile with all service

See merge request Cloud_Solution/doctor_app_flutter!345
5 years ago
Elham Rababah a329c447a2 fix allergic in header 5 years ago
mosazaid 9b02bdc541 inhancements 5 years ago
mosazaid a047255f2c add referral get facilties 5 years ago
mosazaid 498c6c00af fix minor issue bugs (DA-273, DA-361, DA-362, DA-363) 5 years ago
mosazaid 87f67ea2e8 DA-273 solve 5 years ago
mosazaid 1207339b01 Merge branch 'development' into admission-request 5 years ago
mosazaid 8d154239bb finish admission request feature 5 years ago
Elham Rababah a1c60e692f Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Elham Rababah 248367fbe9 fix DA-220 5 years ago
mosazaid a618292d20 bug fixes for DA-284-DA-285 5 years ago
mosazaid f87f851100 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/core/service/base/lookup-service.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 2b3a7f33d1 working on some bug fixes and finish addmission request 5 years ago
Elham Rababah 1e84b73cf0 fix DA-279 5 years ago
mosazaid 5b5954c6f3 working on Admission request feature adding lookup 5 years ago
mosazaid de1d0283d2 some lables and translation changes and add search functionality for ListSelectDialog 5 years ago
mosazaid a64088320f DA-259 translation bug 5 years ago
mosazaid c2df291029 DA - 286 Fix 5 years ago
mosazaid cca4e33fce Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid ebc5ba7743 some fixes 5 years ago
Elham Rababah 7db8a42adc Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
mosazaid ac9fd8c936 samll fixes for labels and msges 5 years ago
Elham Rababah 905818b532 add admission no to orders 5 years ago
Elham Rababah b9eaee1887 fix design 5 years ago
Elham Rababah 537f53c3de Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
mosazaid cd95a581f0 simple changes 5 years ago
Elham Rababah e32c360f85 fix DA-154,DA-150 5 years ago
mosazaid 88f1dc637f some fixes 5 years ago
mosazaid eae0bb443f solve problem with vital signs charts depend on date 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
mosazaid 8424e92c4b working on vital Sign feature with Charts 5 years ago
mosazaid 8726653ffb working on Referral feature 5 years ago
mosazaid 2f17167e2f some design enhancments 5 years ago
mosazaid fd2a86dca4 some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral 5 years ago
mosazaid 9a5cafaaf5 working on UCAF detail screen , and some cahgnes on referral list 5 years ago
mosazaid 50d7f733b6 working on UCAF datails and add patient procedure list and diagnosis 5 years ago
mosazaid b67fd55aac Merge branch 'development' into feature-ucaf 5 years ago
mosazaid e75e7801aa working on UCAF get data 5 years ago
Mohammad Aljammal d7b8e29455 Merge branch 'medical-file' into 'development'
drug list

See merge request Cloud_Solution/doctor_app_flutter!234
5 years ago
hussam al-habibeh f997561bb8 drug list 5 years ago
mosazaid c9aac6e2e9 vital signs solve overflow of the width 5 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 5 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 5 years ago
mosazaid ee9ca72057 change empty referral message 5 years ago
mosazaid ce164c3cb6 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 0c39dc6693 change on vital signs for uncoment the service 5 years ago
mosazaid 4b5bec8c50 working on UCAF design 5 years ago
mosazaid b60bac6d6e working on UCAF design 5 years ago
mosazaid cb4ee05b40 working on ucaf 5 years ago
mosazaid 5142b5b6c7 finish admission request design 5 years ago
mosazaid 433b2933c4 working with admission request and some changes in vital signs 5 years ago
mosazaid f35eff1220 working with admission request 5 years ago
mosazaid 78e2c662c8 finish vital sign feature, and adding makeReferralResponse 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
mosazaid a71da8e4ef working on vital signs 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
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
mosazaid 7cefbb4dbd add referral pages 5 years ago
mosazaid bb1f101e94 finish re-design refer-patient screen 5 years ago
hussam al-habibeh cbb8937b1d '12/14' 5 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
5 years ago
hussam al-habibeh c581638e00 refer_patient_screen 'not finshed' 5 years ago
Elham Rababah 64dbcce06f finish and remove patient provider 5 years ago
Elham 6057e6a266 Merge branch 'refactor' into 'development'
Refactor

See merge request Cloud_Solution/doctor_app_flutter!180
5 years ago
Elham Rababah 1b1e8f0712 second step from patient provider 5 years ago
Elham Rababah 6ab73916eb first step from patient provider 5 years ago
mosazaid 5ed9aea5a7 fix HexColor library error 5 years ago
Elham Rababah 53862ec1b3 fix bugs in patient search 5 years ago
Elham Rababah f1721b686d fix loader inside pharmacies_list 5 years ago
ibrahim albitar c07f84ff78 fixing and enhancments 6 years ago
hussam al-habibeh 91ffdabd73 Translation stage five 6 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
6 years ago
hussam al-habibeh 054933b280 Translation stage four 6 years ago
Elham Rababah bd3ce0a4d4 refactor models 6 years ago
erababah cad096d8c7 fix issue on ios and improve structure by Elham & mohammad 6 years ago
hussam alhababieh a02fe9c83d translation stage two 6 years ago
hussam alhababieh b0005e72f9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 6 years ago
hussam alhababieh b4570d7bd1 translation for pages stage one 6 years ago
ibrahim albitar 6fd43a281d fixing 6 years ago
Mohammad ALjammal b758ae8196 fix issues 6 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
6 years ago
Mohammad ALjammal 692674fac0 merge ibrahim 6 years ago
ibrahim albitar e0c65222d2 enhancment insurance approvals 6 years ago
Amjad Amireh 3eeac2734b Modify Patiant screen List style 6 years ago
Mohammad ALjammal 9b065036ae fix issues in get patients service 6 years ago
ibrahim albitar 937f8ecd6a fix 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 0c94188405 Done Prescription Details Screen 6 years ago
ibrahim albitar 14527e19b1 fix issues 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
unknown 39cc4fa4bf refere to doctor 6 years ago
Elham Rababah 610ae3c1fb add in patient prescription details screen 6 years ago
Mohammad ALjammal 2ad96dad88 create Prescription In and Out Patient 6 years ago
Mohammad ALjammal 6d8289a0d4 change bottom bar navigation 6 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
6 years ago
Mohammad ALjammal 644cfac790 change design prescription and add new services 6 years ago
Elham Rababah 40eb7f8064 improve vital sgin and return the correct color to login header 6 years ago
Mohammad ALjammal c7ad16cbcd update design Radiology Screen and create Radiology Report Screen 6 years ago
Mohammad ALjammal 5d7937c08d add arrow back in PatientProfileScreen , PatientSearchScreen and PatientsScreen 6 years ago
Elham Rababah 55a4bfba83 hot fix 6 years ago
Elham Rababah 489ad9e729 improve code and add AppExpandableNotifier 6 years ago
Elham Rababah 10877ac658 improve vital sign item details 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 c6bbc1c2f5 fix patient profile details 6 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
6 years ago
Mohammad ALjammal 1f5bca3adc patient profile details 6 years ago
Elham Rababah 0d30fd6212 vitalsign details 6 years ago
unknown 0c112ebca5 finished new screens 6 years ago
Elham Rababah bd24b7c196 TimeSeriesChart as widget 6 years ago
Elham Rababah 92dd877042 chart works 6 years ago
Elham Rababah 6ebee5dbf6 first step form chart 6 years ago
unknown 8c46c93e86 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 9f4802c225 progress note 6 years ago
Elham Rababah c5bbb0495a add login logic with silent options 6 years ago
ibrahim albitar 7f5831335b Merge branch 'develop' into 'master'
Develop

See merge request Cloud_Solution/doctor_app_flutter!70
6 years ago
unknown 7d1cfb7b4e add new screens 6 years ago
Mahmoud Shrouf 394bd514ab My Changes Before Demo 6 years ago
unknown 35205b7024 patient medical info 6 years ago
Elham Rababah 1e656af143 handelCatcherrorCase 6 years ago
Elham Rababah 142c8d97e3 first step from body measurements 6 years ago
Elham Rababah cabbf03eec vital_sign_details 6 years ago
Elham Rababah 51835c231a improtant fix in SliverGrid 6 years ago
Elham Rababah 00bce3403e first step from the vital details 6 years ago
Elham Rababah 8594f1a498 change the color desing in profile 6 years ago
Elham Rababah 7a370c29dc use ProfileImageWidget in patient profile 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
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 35f8c14b9a fix the design issues after merge 6 years ago
Elham Rababah 19558e13ac create VitalSignResModel 6 years ago
Elham Rababah bcf2b2aea6 read update card from the service and make the value static 6 years ago
Elham Rababah de683cb11c finish patient provider 6 years ago
Elham Rababah 5e7526f2c7 vital sign screen 6 years ago
Elham Rababah 691e7dbac6 first step in vital sign and fix some thing in master 6 years ago