Commit Graph

74 Commits (3c968f0de11e8428a5a67cc9d8dbfd4731229396)

Author SHA1 Message Date
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
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
hussam al-habibeh 697f17f2cd prescription and procedure 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
Elham Rababah 46cdd9482c First step from SOAP 4 years ago
Sultan Khan ba2697c917 sick leave 4 years ago
Sultan Khan cc1a63786f sick leave 4 years ago
Elham Rababah 6ab73916eb first step from patient provider 4 years ago
Sultan Khan 3f7ef48fd5 live care chages 4 years ago
Sultan Khan bde86ef829 live care features added. 4 years ago
Sultan Khan 93936c3c55 video call screen added 4 years ago
Mohammad ALjammal 0dad77bfa2 fix issues in login 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
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
unknown 39cc4fa4bf refere to doctor 4 years ago
Elham Rababah 610ae3c1fb add in patient prescription details screen 4 years ago
Mohammad ALjammal 6d8289a0d4 change bottom bar navigation 4 years ago
Elham Rababah 10877ac658 improve vital sign item details 4 years ago
Amjad Amireh f41da183fb fix 4 years ago
Amjad Amireh 8f860ab4cf Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 4 years ago
Amjad Amireh 9aae4b8650 amjad modified to expand list 4 years ago
unknown 7d1cfb7b4e add new screens 4 years ago
unknown 35205b7024 patient medical info 5 years ago
Elham Rababah 142c8d97e3 first step from body measurements 5 years ago
Elham Rababah 00bce3403e first step from the vital details 5 years ago
Elham Rababah 7c291f8d63 add comment and fix some pugs 5 years ago
Elham Rababah 70c1faa5a6 retunt route to the correct name 5 years ago
Elham Rababah 1a98e37a7f add prescription add radiology 5 years ago
unknown ae524100f7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 5 years ago
unknown 22a21faff7 pharmacies screen 5 years ago
Elham Rababah c4c8609f3a fix bottom bar by Elham && mohammad 5 years ago
Elham Rababah 28d51edd59 fix route 5 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
5 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
5 years ago
unknown c30fcbc2b5 pharmacies list 5 years ago
unknown a59a2d5ad3 pharmacy web services 5 years ago
Elham Rababah 691e7dbac6 first step in vital sign and fix some thing in master 5 years ago
Amjad Amireh d7b7cc998e Patiant search 5 years ago
Elham Rababah 70ba45d924 hot fix 5 years ago
Elham Rababah e11f1d511e finish patient profile 5 years ago
unknown f43ec3c39d add route for search and profile 5 years ago