Commit Graph

477 Commits (ced4edebdedff5aa8ad66ca71b43b275a85506ae)

Author SHA1 Message Date
mosazaid 3b471aebdc Merge branch 'development' into feature-ucaf 6 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 6 years ago
Elham b291572767 Merge branch 'soap_update' into 'development'
Fix profile widget

See merge request Cloud_Solution/doctor_app_flutter!223
6 years ago
Elham Rababah 8284f1d475 Fix profile widget 6 years ago
Mohammad Aljammal 812fe10db8 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!219
6 years ago
Elham Rababah e054c28234 hide text 6 years ago
mosazaid ce164c3cb6 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
6 years ago
mosazaid 4b5bec8c50 working on UCAF design 6 years ago
Mohammad Aljammal f0f98280b4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
6 years ago
Sultan Khan 9adc5ddd8e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Elham Rababah 7d550ca15f prevent null 6 years ago
Elham Rababah 2f80af6b74 small fix 6 years ago
Elham Rababah 71b50c8404 First step translations 6 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
6 years ago
Elham Rababah e65740761a add improvement on create episode 6 years ago
Sultan Khan 43a1e56a8b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
hussam al-habibeh 4ffeb31181 update procedure fixes 6 years ago
Mohammad Aljammal d975fb021c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/routes.dart
	lib/util/helpers.dart
6 years ago
Sultan Khan 4587fdda59 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Elham Rababah 423bd49aee Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/routes.dart
6 years ago
mosazaid b4f813fc2d Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/locator.dart
#	lib/routes.dart
6 years ago
Mohammad Aljammal 3cb96f35ca Merge branch 'design-updates' into 'development'
Design updates

See merge request Cloud_Solution/doctor_app_flutter!211
6 years ago
hussam al-habibeh 75eda8832d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 6 years ago
hussam al-habibeh d1a261c847 procedure update 6 years ago
Elham Rababah 856777c648 finish updating functions 6 years ago
mosazaid 0e645c2b1f Merge branch 'development' into feature_admission_request 6 years ago
mosazaid b60bac6d6e working on UCAF design 6 years ago
Elham Rababah f8b195e368 parseHtmlString now working :) 6 years ago
Elham Rababah 3cadd532d8 finish Updating 6 years ago
Sultan Khan 70d11bfe9e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Mohammad Aljammal 93c0bdf32a return login 6 years ago
Sultan Khan b2aef274bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 3c968f0de1 doctor leave 6 years ago
Elham Rababah 6a7f0e605f Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 6 years ago
Elham Rababah 4caf40a2ab finish plan page 6 years ago
Mohammad Aljammal 1af5f1040f add search in soap update 6 years ago
Mohammad Aljammal d5bde6228a add search in update assessment page 6 years ago
Elham Rababah d8ac550357 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 6 years ago
Elham Rababah 311bee5136 try to fix get 6 years ago
Elham Rababah 46043efb42 Finish Update objective code Page 6 years ago
Elham Rababah c92a848851 Finish Update Subjective Page 6 years ago
mosazaid 095a915a89 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
6 years ago
mosazaid cb4ee05b40 working on ucaf 6 years ago
Mohammad Aljammal a723ecbf1d fix merger 6 years ago
Mohammad Aljammal 5669021add Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
 Conflicts:
	lib/widgets/patients/profile/SOAP/assessment_page.dart
	lib/widgets/patients/profile/SOAP/subjective/add_allergies_widget.dart
	lib/widgets/patients/profile/SOAP/subjective/subjective_page.dart
6 years ago
Mohammad Aljammal 9bf08e81da Add search button name and hint search text in MasterKeyCheckboxSearchWidget 6 years ago
Elham Rababah 39970fe1a8 get update_subjective_page.dart 6 years ago
Mohammad Aljammal b60b45ab53 Merge branch 'design-updates' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
 Conflicts:
	lib/screens/patients/patient_search_screen.dart
6 years ago
Mohammad Aljammal 93bece09d7 add search in SOAP 6 years ago
Elham Rababah f0fd5d30e1 First step from update process 6 years ago
mosazaid ae6cd0e5f8 Merge branch 'development' into feature_admission_request 6 years ago
hussam al-habibeh b3345a86ef post prescription 6 years ago
Elham Rababah ea4bf159c6 commit issue 6 years ago
Elham Rababah 05e7762533 fix obj page 6 years ago
Elham Rababah 49f7dab008 Merge branches 'SOAP' and 'patient_arrival_ist' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 6 years ago
mosazaid 873ee67eb7 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
6 years ago
mosazaid 433b2933c4 working with admission request and some changes in vital signs 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
Mohammad Aljammal 04ed76069c hack login 6 years ago
Elham Rababah fc82665f1b add ICD10 6 years ago
Elham Rababah 2f273dcde8 add ICD10 6 years ago
Elham Rababah 4e8de52efe add commented code 6 years ago
Elham Rababah 14955201a9 fix things 6 years ago
Elham Rababah efee00c79e finish add assessment 6 years ago
Elham Rababah a47e9b69f5 add CDI service 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
Elham Rababah 8a6ea1c0c5 Fix SOAP 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 47a350a811 prscription and procedure 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 1491a04b39 PostPhysicalExam works 6 years ago
hussam al-habibeh 697f17f2cd prescription and procedure 6 years ago
Elham Rababah a362901da8 improve code inside my eam 6 years ago
Elham Rababah 4df3b1fb40 First step from examination 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 abbe891673 improve code quality 6 years ago
Elham Rababah 2658694b70 remove static value 6 years ago
Elham Rababah 9a614b25b5 Finish the login 6 years ago
Elham Rababah e96d38454c First step from examination 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
Elham Rababah 9b0731d5c8 check activation code 6 years ago
Elham Rababah 7001940d0d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new 6 years ago
Elham Rababah 9bb396c309 fix error in base app 6 years ago