Commit Graph

166 Commits (b9831adeb20b4ffacba331e151f6ddc21ef4e6ba)

Author SHA1 Message Date
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 269c8e21f6 hot fix 5 years ago
Mohammad Aljammal 2de29f0b83 Merge branch 'prescription_changes' into 'development'
adding validation and voice speach to prescription form

See merge request Cloud_Solution/doctor_app_flutter!684
5 years ago
hussam al-habibeh b6cb6362f6 adding validation and voice speach to prescription form 5 years ago
Elham Rababah 6d989e3fc3 finish new service for live care 5 years ago
Mohammad Aljammal 42275b41fd Merge branch 'load_medical_report' into 'development'
Load medical report

See merge request Cloud_Solution/doctor_app_flutter!665
5 years ago
Mohammad Aljammal 8541ddc0f8 fix LabOrderResult 5 years ago
Mohammad Aljammal 5c73f3b3b6 Merge branch 'prescription_changes' into 'development'
prescreption hot fix

See merge request Cloud_Solution/doctor_app_flutter!659
5 years ago
hussam al-habibeh bf589e703e prescreption hot fix 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 292bc2a97f prescription changes 5 years ago
hussam al-habibeh c50a483663 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/core/service/patient_medical_file/prescription/prescription_service.dart
	lib/core/viewModel/prescription_view_model.dart
	lib/screens/prescription/add_prescription_form.dart
5 years ago
hussam al-habibeh cecc1a725d pescription changes 5 years ago
hussam al-habibeh bc340693ba project refactoring 5 years ago
hussam al-habibeh 9457e04825 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
 Conflicts:
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/screens/patients/PatientsInPatientScreen.dart
	lib/screens/patients/out_patient/out_patient_screen.dart
	lib/screens/patients/patient_search/patient_search_result_screen.dart
	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
	lib/screens/sick-leave/add-sickleave.dart
5 years ago
hussam al-habibeh 6107f88c16 prescription changes 5 years ago
hussam al-habibeh d2814f610e hot fix 5 years ago
hussam al-habibeh 68e9470273 hot fix 5 years ago
hussam al-habibeh ed8da38bc9 hot fix 5 years ago
hussam al-habibeh ca11da36b3 hot fix 5 years ago
hussam al-habibeh c17d3d63e0 hot fix 5 years ago
Mohammad Aljammal 06706ad9a6 Fix prescription item 5 years ago
hussam al-habibeh e16d91a1b8 add prescription form changes 5 years ago
Mohammad Aljammal eb0fda3555 hot fix 5 years ago
hussam al-habibeh a82a3fa38d add prescription changes 5 years ago
hussam al-habibeh f07208586d Add Prescription changes 5 years ago
hussam al-habibeh c4a6d9ad6f prescription changes 5 years ago
hussam al-habibeh 4eba6d9f5a Project refactoring 5 years ago
hussam al-habibeh c24bb604d4 DashBoard design fix 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
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
5 years ago
Mohammad Aljammal 357e01c846 hot fixes 5 years ago
Mohammad Aljammal 29e2d962bc Optimize imports 5 years ago
hussam al-habibeh 1d09bcf251 hot fixes 5 years ago
hussam al-habibeh 017074ba56 Prescriptions for in patient 5 years ago
Elham Rababah bd01624f5a create New order widget 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 b59bd0bd43 small fix in prescription_items_page 5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
mosazaid b8f6c35e75 working on buttons widgets 5 years ago
Elham Rababah e73ca8af71 first step from change text fields 5 years ago
Sultan Khan 5aa4569c6b bug fix 5 years ago
Mohammad Aljammal b0bd37d991 Merge branch 'fix-issues' into 'development'
removing lookup list call in page opening

See merge request Cloud_Solution/doctor_app_flutter!489
5 years ago
hussam al-habibeh ff2f456b46 removing lookup list call in page opening 5 years ago
Mohammad Aljammal 9fbb5f026b Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!487
5 years ago
Sultan Khan 9268b13312 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5c4aee849e bug fixes 5 years ago