Commit Graph

100 Commits (ccdd6696be54fc4f2b1e4e2cb4c607836ef98521)

Author SHA1 Message Date
Mohammad Aljammal d7cd818a31 Merge branch 'expansion_procedure' into 'development'
Expansion procedure

See merge request Cloud_Solution/doctor_app_flutter!687
5 years ago
hussam al-habibeh 36ce997529 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/config/config.dart
5 years ago
hussam al-habibeh f26d870d5b procedure changes 5 years ago
Mohammad Aljammal dd23640a46 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into expansion_procedure 5 years ago
Mohammad Aljammal 5d5f9f6928 Fix issues on the add procedure 5 years ago
Elham Rababah 6d989e3fc3 finish new service for live care 5 years ago
hussam al-habibeh d50740b9b9 Procedure template service 5 years ago
Mohammad Aljammal 172b457092 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into expansion_procedure
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
5 years ago
Mohammad Aljammal 40b4a83c6b Fix Expansion Procedure 5 years ago
hussam al-habibeh c182928a5d favourite template Procedure service 5 years ago
hussam al-habibeh e1d00b87ad favourite template Procedure service 5 years ago
hussam al-habibeh 623f2730e8 Procedure card design update 5 years ago
hussam al-habibeh 066acc404a Procedure template service 5 years ago
hussam al-habibeh 84a7f44b68 favourite procedure templates 5 years ago
hussam al-habibeh 3b800bcd19 favourite procedure templates 5 years ago
Mohammad Aljammal b3ae86db31 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ZohaibKambrani
 Conflicts:
	lib/screens/patients/DischargedPatientPage.dart
	lib/screens/patients/ReferralDischargedPatientDetails.dart
	lib/screens/patients/insurance_approvals_details.dart
	lib/screens/patients/patients_screen.dart
	lib/screens/patients/profile/note/progress_note_screen.dart
	lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
	lib/screens/prescription/update_prescription_form.dart
	lib/screens/sick-leave/add-sickleave.dart
	lib/widgets/patients/PatientCard.dart
	pubspec.lock
5 years ago
hussam al-habibeh c86a3dabda page translation 5 years ago
Mohammad Aljammal dc9f75f0ca hot fixes 5 years ago
Mohammad Aljammal 60eb7adab1 hot fixes 5 years ago
hussam al-habibeh 8a564b34ac add procedure form update 5 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
5 years ago
Mohammad Aljammal f708689d00 hot fixes 5 years ago
Mohammad Aljammal 29e2d962bc Optimize imports 5 years ago
hussam al-habibeh 9a2cd1719b procedure screen hot fix 5 years ago
hussam al-habibeh 714c569a13 hot fix 5 years ago
hussam al-habibeh 1d09bcf251 hot fixes 5 years ago
hussam al-habibeh c7275a3106 small update in procedure 5 years ago
hussam al-habibeh 240f70d163 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
 Conflicts:
	lib/screens/procedures/ProcedureCard.dart
5 years ago
hussam al-habibeh 5bd50caa22 hot fixes 5 years ago
hussam al-habibeh 6c3d681387 hot fixes 5 years ago
mosazaid 74b0bac517 remove chart from procedure 5 years ago
mosazaid 72bb64b460 finish working on app text widget 5 years ago
mosazaid bbe94d2b9b Merge branch 'development' into design-fixes
# Conflicts:
#	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
#	lib/screens/patients/profile/refer_patient_screen.dart
#	lib/screens/patients/profile/referral/refer-patient-screen.dart
#	lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
#	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
#	lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
#	lib/screens/prescription/add_prescription_form.dart
#	lib/screens/prescription/prescription_warnings.dart
#	lib/widgets/auth/login_form.dart
#	lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
mosazaid b8f6c35e75 working on buttons widgets 5 years ago
mosazaid 65585ab586 add charts to procedures 5 years ago
hussam al-habibeh 99ef89fa16 Hot Fixes 5 years ago
hussam al-habibeh 9645791164 changeing add prescription behovior 5 years ago
Mohammad Aljammal b812ac4b06 add no data image in all pages 5 years ago
hussam al-habibeh 0578bb5ed3 insurance approval & medical file design fix 5 years ago
Mohammad Aljammal 915cf74d3c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/screens/patients/profile/radiology/radiology_home_page.dart
5 years ago
Mohammad Aljammal 8055fa17eb add the branch in all doctors card and add no data image 5 years ago
Mohammad Aljammal e1c67ad8ce Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!471
5 years ago
hussam al-habibeh 844bd9ba27 add lab & add radiology update 5 years ago
hussam al-habibeh 8dca476898 add lab & add radiology design update 5 years ago
Mohammad Aljammal 0dc6bbca34 finish the new design on the progress note (SOAP) 5 years ago
hussam al-habibeh c72d612646 add prescription & add lab test changes 5 years ago
Mohammad Aljammal c314bc7db7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/patients/profile/soap_update/update_soap_index.dart
5 years ago
Mohammad Aljammal c87f235cd2 fix the design issues 5 years ago
hussam al-habibeh 136c839c93 hot fixes 5 years ago