Commit Graph

701 Commits (1cda48626813f8a0aad4e6a800da7a1c1b2a9d7e)

Author SHA1 Message Date
hussam al-habibeh b3567df020 medical file model 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 e9ffbf06a6 Merge branch 'development' into feature_admission_request 6 years ago
hussam al-habibeh 9210600e15 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 6 years ago
mosazaid 3578c82f62 solve hacking patient screen 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
hussam al-habibeh ce0303fbce Merge branch 'search_in_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/config.dart
6 years ago
hussam al-habibeh adb8033138 update prescription 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 45edddb49f Add search in Procedure Screen 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
mosazaid 5142b5b6c7 finish admission request design 6 years ago
hussam al-habibeh b3345a86ef post prescription 6 years ago
Elham Rababah ea4bf159c6 commit issue 6 years ago
Sultan Khan 669655307a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 49e9ecfa4a doctor leave 6 years ago
Elham 88c2c04d68 Merge branch 'design-updates' into 'development'
post prescription

See merge request Cloud_Solution/doctor_app_flutter!203
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
Elham Rababah 61209663f3 Finish arrived 6 years ago
mosazaid 4d44d54806 Merge branch 'development' into feature_admission_request 6 years ago
Mohammad Aljammal 806682b921 hack login 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
mosazaid 873ee67eb7 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
6 years ago
Elham Rababah df4eb94042 work with patient model 6 years ago
mosazaid 433b2933c4 working with admission request and some changes in vital signs 6 years ago
mosazaid f35eff1220 working with admission request 6 years ago
hussam al-habibeh 17079a1bd9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 6 years ago
hussam al-habibeh 9d8514c83b post prescription 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
Mohammad Aljammal 21252c6ae9 Merge branch 'feature-vital-sign' into 'development'
Feature vital sign

See merge request Cloud_Solution/doctor_app_flutter!201
6 years ago
Elham Rababah 2f273dcde8 add ICD10 6 years ago
Elham Rababah 4e8de52efe add commented code 6 years ago
mosazaid 78e2c662c8 finish vital sign feature, and adding makeReferralResponse 6 years ago
Elham Rababah 14955201a9 fix things 6 years ago
Elham Rababah efee00c79e finish add assessment 6 years ago
Elham Rababah 72886ccaa7 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 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
hussam al-habibeh 0c18d96ba2 post procedure 6 years ago
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
6 years ago
hussam al-habibeh b2aade9b2b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
6 years ago
hussam al-habibeh c7bfe24207 post procedure 6 years ago
Mohammad Aljammal df83883139 fix base app client 6 years ago
Mohammad Aljammal 7c4e0d929f fix base app client 6 years ago
Elham Rababah ab9740ccdd remove Vida Auth from config 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
Sultan Khan e45220829f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Elham Rababah e6af5a3e39 remove is Auth for test target 6 years ago
Elham Rababah cd46b4317c fix error null thing 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
Sultan Khan 1da12873c7 dashboard 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
Elham Rababah 18d58e7037 remove is Auth for test target 6 years ago
Sultan Khan 384c7cd58a code merged 6 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 6 years ago
Elham Rababah 26a25f44e0 fix error null thing 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
mosazaid f6ddf7a9eb make logout button close all screen stack and push to login 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
mosazaid 8ffb372573 rename llokup file 6 years ago
mosazaid 25063b9590 adding lookup service 6 years ago