Commit Graph

142 Commits (cc14448d4883c6ed53b5dd294bce7b9ae1cdf4d0)

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

# Conflicts:
#	lib/routes.dart
6 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
6 years ago
Elham Rababah 1672d9a3a0 add assessment_page code 6 years ago
Elham Rababah dc4250a4de Post progress Note 6 years ago
Elham Rababah b22fd3f7ba fix listHisProgNotePhysicalExaminationVM 6 years ago
Elham Rababah f97d11183d progress Note 6 years ago
mosazaid a71da8e4ef working on vital signs 6 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
6 years ago
Elham Rababah a362901da8 improve code inside my eam 6 years ago
Elham Rababah cde56a82f2 Finish subjective 6 years ago
mosazaid d11a8e6209 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/core/service/base/base_service.dart
#	lib/locator.dart
6 years ago
mosazaid aafcd89222 working on vitalSigns feature 6 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
6 years ago
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 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
6 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 6 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 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
6 years ago
Elham Rababah 4560706d55 improve code inside my eam 6 years ago
mosazaid 47e9d2a558 Merge branch 'development' into feature--patient-referral
# Conflicts:
#	lib/client/base_app_client.dart
6 years ago
Elham Rababah bb651478a0 Finish subjective 6 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
6 years ago