Commit Graph

193 Commits (376653a3440060ec5e5ba5c32bbe90e305dea52b)

Author SHA1 Message Date
hussam al-habibeh 0597cc4b00 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/core/model/get_medication_response_model.dart
	lib/core/service/prescription_service.dart
5 years ago
hussam al-habibeh c239dbc620 Claculate Box Quantity while adding prescrption 5 years ago
Sultan Khan 12f936d045 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 531e7f497b drug to drug intraction 5 years ago
Mohammad Aljammal 6f46e89346 Merge branch 'fix-issues' into 'development'
DA-185

See merge request Cloud_Solution/doctor_app_flutter!330
5 years ago
hussam al-habibeh bfe73ebe1d DA-185 5 years ago
Mohammad Aljammal 88a5750d22 Merge branch 'fix-issues' into 'development'
jira bugs fix

See merge request Cloud_Solution/doctor_app_flutter!327
5 years ago
hussam al-habibeh 3250f33b43 jira bugs fix 5 years ago
Elham Rababah 8615671095 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_medication_details
 Conflicts:
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah f819e6353e fix DA-350 5 years ago
hussam al-habibeh 0f15732728 design inhancment 5 years ago
hussam al-habibeh 57aea2ba4f pharmacy remarks 5 years ago
hussam al-habibeh 963fe42cd8 new changes 5 years ago
hussam al-habibeh d115564cc1 DA-355 5 years ago
mosazaid a047255f2c add referral get facilties 5 years ago
hussam al-habibeh 28370e7492 fix bugs 5 years ago
Mohammad Aljammal d41fd496b6 Merge branch 'fix-issues' into 'development'
fixing bugs

See merge request Cloud_Solution/doctor_app_flutter!300
5 years ago
hussam al-habibeh 5bde14813a fixing bugs 5 years ago
mosazaid 8d154239bb finish admission request feature 5 years ago
mosazaid f87f851100 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/core/service/base/lookup-service.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 2b3a7f33d1 working on some bug fixes and finish addmission request 5 years ago
hussam al-habibeh 6dd1d9ef90 fix bugs 5 years ago
hussam al-habibeh 546b520d7b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/core/enum/master_lookup_key.dart
	lib/core/service/base/lookup-service.dart
5 years ago
hussam al-habibeh 15dd0f7c1a bug fix 5 years ago
mosazaid 5b5954c6f3 working on Admission request feature adding lookup 5 years ago
mosazaid c2df291029 DA - 286 Fix 5 years ago
mosazaid ebc5ba7743 some fixes 5 years ago
mosazaid e75318799f Merge branch 'development' into feature-ucaf 5 years ago
mosazaid ac9fd8c936 samll fixes for labels and msges 5 years ago
Mohammad Aljammal 81fdcb2d8d Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!271
5 years ago
Mohammad Aljammal fbd509d6ec Merge branch 'fix-issues' into 'development'
bugs fix

See merge request Cloud_Solution/doctor_app_flutter!272
5 years ago
hussam al-habibeh fb8381ea61 bugs fix 5 years ago
Elham Rababah a5bccddf55 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 5 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 5 years ago
Sultan Khan d5d7ea6c49 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 63e8ee8dd0 sick leave 5 years ago
hussam alhababieh 3c55af7adc Merge branch 'development' into 'tasks-translation'
# Conflicts:
#   lib/screens/prescription/add_prescription_form.dart
5 years ago
hussam al-habibeh 7c800bdab4 medical file fix 5 years ago
Elham Rababah 00543a759a fix remarks in allergies 5 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 5 years ago
Mohammad Aljammal 35a9f34b18 Merge branch 'development' into 'sultan'
# Conflicts:
#   lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
Sultan Khan 135c852e8c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 735698ce90 bug fixes 5 years ago
hussam al-habibeh bada160cf5 Search Medacation 5 years ago
hussam al-habibeh d9fcf89c19 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
 Conflicts:
	lib/core/viewModel/medicine_view_model.dart
5 years ago
hussam al-habibeh 4a4cd03f63 Prescription date 5 years ago
Elham Rababah 537f53c3de Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah ba263ada44 fix DA-201 5 years ago
Elham Rababah 4e4e6a3600 fix DA-151 5 years ago
mosazaid e808d48035 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago