Commit Graph

2538 Commits (9d6a23c1a3b1e4b876c1d63dc6bccfc7b734daac)
 

Author SHA1 Message Date
mosazaid 27f940b473 home design 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
mosazaid 12bb283a68 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/screens/home/home_screen.dart
5 years ago
mosazaid 72ee88d567 working on dashboard 5 years ago
hussam al-habibeh bf589e703e prescreption hot fix 5 years ago
Mohammad Aljammal 8653d54a0d Merge branch 'zohaib_and_dev' into 'development'
showDailog Migration

See merge request Cloud_Solution/doctor_app_flutter!658
5 years ago
Mohammad Aljammal 8e4321b3da Migration dev to Zohaib branch 5 years ago
Mohammad Aljammal ff89fb95c8 Merge branch 'ucaf-hot-change' into 'development'
ucaf-change

See merge request Cloud_Solution/doctor_app_flutter!656
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
Mohammad Aljammal 4f167d5eec comment dependency_overrides 5 years ago
mosazaid 0bfa74f1c9 ucaf-change 5 years ago
Elham Rababah 7dbd4c9cc6 Merge branch 'auth_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor
 Conflicts:
	lib/screens/auth/login_screen.dart
5 years ago
Elham Rababah 301972f9b7 small fixes 5 years ago
Mohammad Aljammal bba0e48285 Merge branch 'prescription_changes' into 'development'
Prescription changes

See merge request Cloud_Solution/doctor_app_flutter!655
5 years ago
Mohammad Aljammal 081bfe3f61 add TODO to Elham 5 years ago
mosazaid 2023ce9b55 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/core/viewModel/dashboard_view_model.dart
#	lib/screens/home/home_screen.dart
5 years ago
hussam al-habibeh 292bc2a97f prescription changes 5 years ago
mosazaid 95a6893b59 home design 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
Mohammad Aljammal b871009033 Merge branch 'feature-modeical_profile' into 'development'
Feature modeical profile

See merge request Cloud_Solution/doctor_app_flutter!654
5 years ago
Mohammad Aljammal 349226861a Merge branch 'app_translation' into 'development'
App translation

See merge request Cloud_Solution/doctor_app_flutter!653
5 years ago
Mohammad Aljammal 74ded739c8 fix imports 5 years ago
Elham Rababah 745545ffc3 add models 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
Elham Rababah 333d1e3f50 first step from models 5 years ago
mosazaid b10fe8112a Merge branch 'development' into home-refactoring 5 years ago
mosazaid fc99023ecc Merge branch 'development' into feature-modeical_profile 5 years ago
mosazaid 444afa464e working on feature medical profile 5 years ago
hussam al-habibeh 6107f88c16 prescription changes 5 years ago
Elham Rababah 7af300d455 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor 5 years ago
Mohammad Aljammal 8daf3d2abf Merge branch 'prescription_changes' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!652
5 years ago
Elham Rababah 32d26c3c4b remove Verification Methods page and move some code to model 5 years ago
Elham Rababah 3ca4ac3632 create method card and remove future builder from verification method widget 5 years ago
mosazaid 1bb299fef4 Merge branch 'development' into home-refactoring 5 years ago
mosazaid 2cf77bac85 fit dashboard design 5 years ago
hussam al-habibeh d2814f610e hot fix 5 years ago
hussam al-habibeh 68e9470273 hot fix 5 years ago
Mohammad Aljammal 137fb560bc Merge branch 'prescription_changes' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!651
5 years ago
hussam al-habibeh ed8da38bc9 hot fix 5 years ago
hussam al-habibeh 498e65180b refactoring 5 years ago
Elham Rababah a3caf023e2 Add enum to verification_methods 5 years ago
Mohammad Aljammal 0e2cb9eb9d Merge branch 'prescription_changes' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!650
5 years ago
Mohammad Aljammal aab7808468 add medical report page design 5 years ago
hussam al-habibeh ca11da36b3 hot fix 5 years ago
mosazaid 89d2938003 Merge branch 'home-refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into home-refactoring 5 years ago
mosazaid fa194f5e00 hot fix 5 years ago
Mohammad Aljammal d3769d7452 Merge branch 'prescription_changes' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!649
5 years ago
Mohammad Aljammal f0039b491e fix home page 5 years ago