Commit Graph

1172 Commits (29d24ed68f0af737ced57372ecb7da8cd063b372)

Author SHA1 Message Date
hussam al-habibeh c239dbc620 Claculate Box Quantity while adding prescrption 4 years ago
Sultan Khan 817718f897 drug to drug intraction 4 years ago
Sultan Khan 12f936d045 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 531e7f497b drug to drug intraction 4 years ago
Mohammad Aljammal 780599a8b2 Merge branch 'fix-issues' into 'development'
categories that can update

See merge request Cloud_Solution/doctor_app_flutter!335
4 years ago
hussam al-habibeh 0411462360 update procedure for agreed categorise 4 years ago
hussam al-habibeh 46b5f2a5f3 update procedure for agreed categories 4 years ago
hussam al-habibeh b00b739e79 categories that can update 4 years ago
Mohammad Aljammal 68dc39eb94 Merge branch 'fix-issues' into 'development'
Procedure update valdation

See merge request Cloud_Solution/doctor_app_flutter!334
4 years ago
hussam al-habibeh 24d13b06c5 Procedure update valdation 4 years ago
Mohammad Aljammal 5a4b084446 Merge branch 'fix-issues' into 'development'
procedure updates

See merge request Cloud_Solution/doctor_app_flutter!333
4 years ago
hussam al-habibeh 6ae8cf8048 procedure updates 4 years ago
Mohammad Aljammal 3a703da5d5 Merge branch 'fix-issues' into 'development'
Prescription update filters

See merge request Cloud_Solution/doctor_app_flutter!332
4 years ago
hussam al-habibeh 4e01bcb758 Prescription update filters 4 years ago
Mohammad Aljammal 4235ecda81 Merge branch 'fix-issues' into 'development'
update prescription

See merge request Cloud_Solution/doctor_app_flutter!331
4 years ago
hussam al-habibeh 8aeb749596 prescription update 4 years ago
hussam al-habibeh 7063e924de update prescription 4 years ago
Mohammad Aljammal 6f46e89346 Merge branch 'fix-issues' into 'development'
DA-185

See merge request Cloud_Solution/doctor_app_flutter!330
4 years ago
hussam al-habibeh bfe73ebe1d DA-185 4 years ago
Mohammad Aljammal e03d2c6ab6 Merge branch 'fix-issues' into 'development'
jira bug

See merge request Cloud_Solution/doctor_app_flutter!329
4 years ago
hussam al-habibeh dc941b709f DA-396 4 years ago
hussam al-habibeh eb88bea880 jira bug 4 years ago
Elham Rababah bedf6e7bbe fix DA-346 4 years ago
Elham Rababah 74e408f2d1 Merge branches 'add_medication_details' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_medication_details 4 years ago
Mohammad Aljammal 88a5750d22 Merge branch 'fix-issues' into 'development'
jira bugs fix

See merge request Cloud_Solution/doctor_app_flutter!327
4 years ago
hussam al-habibeh 066ac94d4a jira bugs 4 years ago
hussam al-habibeh 3250f33b43 jira bugs fix 4 years ago
Sultan Khan 332caaae2f dashboard issue 4 years ago
Mohammad Aljammal 9ffe1eabd2 revert the code 4 years ago
Mohammad Aljammal 63db56a66b fix issue 4 years ago
Elham Rababah 12b78d0a3b fix DA-391: return back my comment code in base app client 4 years ago
Elham Rababah 8238e9569a fix DA-391: return back my comment code in dashboard 4 years ago
Elham Rababah 219ab8d4ac fix DA-391 4 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
4 years ago
Elham Rababah f3220be735 fix DA-350 4 years ago
Mohammad Aljammal d3ffa31261 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!322
4 years ago
Elham Rababah f819e6353e fix DA-350 4 years ago
Mohammad Aljammal 68462b04d8 Merge branch 'fix-issues' into 'development'
updating prescription after backend fix

See merge request Cloud_Solution/doctor_app_flutter!321
4 years ago
Sultan Khan 63d73b60e1 ios faceid issue 4 years ago
hussam al-habibeh f32d25b007 updating prescription after backend fix 4 years ago
Sultan Khan 449540504c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 214dfecb3c DA-422 4 years ago
Mohammad Aljammal 3c090ecdaf Merge branch 'fix-issues' into 'development'
design inhancment

See merge request Cloud_Solution/doctor_app_flutter!319
4 years ago
hussam al-habibeh ae17998e0a Design inhancment 4 years ago
hussam al-habibeh 0f15732728 design inhancment 4 years ago
hussam al-habibeh 54ad8bde0b design inhancment 4 years ago
Mohammad Aljammal 1424941f94 Merge branch 'fix-issues' into 'development'
new changes

See merge request Cloud_Solution/doctor_app_flutter!317
4 years ago
Sultan Khan 8c6a29669a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 9ed5a294ab dashboard changes 4 years ago
hussam al-habibeh 2ee2429c70 Date Formate change 4 years ago
hussam al-habibeh 57aea2ba4f pharmacy remarks 4 years ago
hussam al-habibeh 963fe42cd8 new changes 4 years ago
Mohammad Aljammal 98bc5f7812 Merge branch 'fix-issues' into 'development'
DA-355

See merge request Cloud_Solution/doctor_app_flutter!316
4 years ago
Sultan Khan 958a341c3b sick leave 4 years ago
hussam al-habibeh d115564cc1 DA-355 4 years ago
Sultan Khan 6bdd4e06a1 dashboard changes 4 years ago
Sultan Khan 388c095d7f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan a309acbf46 dashboard changes 4 years ago
Mohammad Aljammal cd6a31f0d5 Merge branch 'fix_issue_feb' into 'development'
Fix issue feb

See merge request Cloud_Solution/doctor_app_flutter!314
4 years ago
hussam al-habibeh 2563b10216 DA-367 4 years ago
Elham Rababah 07edbc4fe5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issue_feb 4 years ago
Elham Rababah 083b49aa0a fix DA-341 4 years ago
Elham Rababah 344d70793c fix DA-421 4 years ago
hussam al-habibeh cb8b7a4ec4 jira bug fixing 4 years ago
hussam al-habibeh 925d21f29a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/screens/prescription/update_prescription_form.dart
4 years ago
hussam al-habibeh 39d2fe879c jira bug fixing 4 years ago
Mohammad Aljammal 21ead3b219 Merge branch 'referral-facilities-changes' into 'development'
add referral get facilties

See merge request Cloud_Solution/doctor_app_flutter!310
4 years ago
Mohammad Aljammal d8d2e7f1d6 fix ios issues 4 years ago
mosazaid a047255f2c add referral get facilties 4 years ago
hussam al-habibeh d20e83faa5 bug fixing 4 years ago
hussam al-habibeh 8bf578082b bug fixing 4 years ago
hussam al-habibeh bd69219a86 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/screens/prescription/add_prescription_form.dart
4 years ago
hussam al-habibeh cd94b835b5 bug fixing 4 years ago
Mohammad Aljammal ba8ecf04bf Merge branch 'done_button_keyboard' into 'development'
hide the keyboard when the user click on background

See merge request Cloud_Solution/doctor_app_flutter!308
4 years ago
Mohammad Aljammal 62d45d4e1c hide the keyboard when the user click on background 4 years ago
Sultan Khan fa80d62e7d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 0dc25a4a03 bug fixes 4 years ago
Mohammad Aljammal 60e416e632 add done button in all pages user keyboard and hide the keyboard when the user click on background 4 years ago
hussam al-habibeh 28370e7492 fix bugs 4 years ago
hussam al-habibeh 255f36598b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues 4 years ago
hussam al-habibeh d4ea901906 bugs fix 4 years ago
Mohammad Aljammal 8deba06957 Merge branch 'fix_patient_card' into 'development'
fix PatientCard

See merge request Cloud_Solution/doctor_app_flutter!304
4 years ago
Mohammad Aljammal bf747d5427 Merge branch 'fix-issues' into 'development'
bug fixing

See merge request Cloud_Solution/doctor_app_flutter!302
4 years ago
Elham Rababah c8e5a7eeef fix PatientCard 4 years ago
mosazaid 4f302694b3 Merge branch 'development' into fix-bugs10_2 4 years ago
mosazaid 498c6c00af fix minor issue bugs (DA-273, DA-361, DA-362, DA-363) 4 years ago
hussam al-habibeh 3d60813146 bug fixing 4 years ago
Mohammad Aljammal d41fd496b6 Merge branch 'fix-issues' into 'development'
fixing bugs

See merge request Cloud_Solution/doctor_app_flutter!300
4 years ago
Sultan Khan f0539860c2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 400f8e25f6 bug xis 4 years ago
hussam al-habibeh 5bde14813a fixing bugs 4 years ago
mosazaid 87f67ea2e8 DA-273 solve 4 years ago
mosazaid 1207339b01 Merge branch 'development' into admission-request 4 years ago
mosazaid 8d154239bb finish admission request feature 4 years ago
Elham Rababah a1c60e692f Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Elham Rababah ff33afd124 fix DA-149 4 years ago
Mohammad Aljammal 2f877b6257 Merge branch 'DA-284-DA-285' into 'development'
bug fixes for DA-284-DA-285

See merge request Cloud_Solution/doctor_app_flutter!297
4 years ago
Elham Rababah 248367fbe9 fix DA-220 4 years ago
Elham Rababah 753ef3bfb0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 4 years ago
Elham Rababah a5a7425a09 fix DA-149 4 years ago
mosazaid a618292d20 bug fixes for DA-284-DA-285 4 years ago
Mohammad Aljammal 2e19af335e Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!296
4 years ago
Mohammad Aljammal 63878281b3 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!295
4 years ago
Mohammad Aljammal 0c6ba54680 Merge branch 'fix-issues' into 'development'
jira bugs fix

See merge request Cloud_Solution/doctor_app_flutter!294
4 years ago
mosazaid f87f851100 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/core/service/base/lookup-service.dart
#	lib/util/translations_delegate_base.dart
4 years ago
mosazaid 2b3a7f33d1 working on some bug fixes and finish addmission request 4 years ago
hussam al-habibeh 9ec78763dc update prescription 4 years ago
hussam al-habibeh 539f7facc7 jira bugs fix 4 years ago
Mohammad Aljammal 05ed1202fe Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!293
4 years ago
Mohammad Aljammal 127b5eb4bd Merge branch 'fix-issues' into 'development'
fix bugs

See merge request Cloud_Solution/doctor_app_flutter!292
4 years ago
Sultan Khan efc4cf9443 reschedule issue fixed 4 years ago
Elham Rababah 98609b464b fix DA-279 4 years ago
Elham Rababah 1e84b73cf0 fix DA-279 4 years ago
Elham Rababah 34d5ac7d43 add label on assessment and fix DA-333 4 years ago
hussam al-habibeh 6dd1d9ef90 fix bugs 4 years ago
Sultan Khan 8b7acf7202 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 6a23c2a137 bug fix 4 years ago
Mohammad Aljammal 9f04ef8066 Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!290
4 years ago
hussam al-habibeh d78aa2321d bug fix 4 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
4 years ago
hussam al-habibeh 15dd0f7c1a bug fix 4 years ago
hussam al-habibeh d66811546f refactoring my code 4 years ago
Elham Rababah 7505a6b6b0 fix  allergy 4 years ago
mosazaid a71bf160e7 Merge branch 'development' into feature-ucaf 4 years ago
mosazaid 5b5954c6f3 working on Admission request feature adding lookup 4 years ago
Elham Rababah 6a5e134527 fix  remark and step widget 4 years ago
hussam al-habibeh 23c826b37f bug fix 4 years ago
Elham Rababah cfb9ea30cb fix : DA-335 4 years ago
Mohammad Aljammal 8f9e799070 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!287
4 years ago
Elham Rababah 2b07d16f00 fix : DA-303 4 years ago
Elham Rababah f84902b73b fix : DA-333 4 years ago
Elham Rababah e652752729 fix : DA-334 4 years ago
Mohammad Aljammal 8916b4a1f3 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!286
4 years ago
mosazaid e74de0b475 Merge branch 'development' into feature-ucaf 4 years ago
mosazaid b63c7aff25 Fix DA-331 vital signs uncorrect temperature value 4 years ago
hussam al-habibeh 29de472c66 bug fix 4 years ago
hussam al-habibeh 9b5899d4e6 bug fix 4 years ago
hussam al-habibeh deca96f62e bug fix 4 years ago
Mohammad Aljammal 8b992b4189 Merge branch 'development' into 'fix_issues'
# Conflicts:
#   lib/config/localized_values.dart
4 years ago
Elham Rababah 494479f1d9 fix : DA-264 fix merge error 4 years ago
Elham Rababah 437ae3dfb5 Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Elham Rababah febdadc924 fix : DA-264 4 years ago
Elham Rababah 34692b94c2 fix : DA-264 4 years ago
mosazaid de1d0283d2 some lables and translation changes and add search functionality for ListSelectDialog 4 years ago
hussam al-habibeh b267342c03 fixing issues 4 years ago
mosazaid a64088320f DA-259 translation bug 4 years ago
Elham Rababah b9b5ec09e4 fix : DA-248 4 years ago
mosazaid c2df291029 DA - 286 Fix 4 years ago
Mohammad Aljammal cb767e4d4c Merge branch 'fix-issues' into 'development'
bugs fix

See merge request Cloud_Solution/doctor_app_flutter!282
4 years ago
hussam al-habibeh 6b0e87ce55 bugs fix 4 years ago
Mohammad Aljammal abcd7e9833 Merge branch 'fix_issues' into 'development'
remark fix in allergies

See merge request Cloud_Solution/doctor_app_flutter!280
4 years ago
Elham Rababah 6820e2d097 remark fix in allergies 4 years ago
Mohammad Aljammal 6253e2c9a3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_ios
 Conflicts:
	lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 75efcde0bc fix ios 4 years ago
Mohammad Aljammal fa94b60711 Merge branch 'feature-ucaf' into 'development'
translation

See merge request Cloud_Solution/doctor_app_flutter!278
4 years ago
Mohammad Aljammal 3cfb88b313 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!277
4 years ago
mosazaid 2273808333 translation 4 years ago
mosazaid cca4e33fce Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
Sultan Khan ed3b42d721 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan d34744e168 bug fix 4 years ago
mosazaid ebc5ba7743 some fixes 4 years ago
Elham Rababah 7db8a42adc Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 6d473be371 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!273
4 years ago
hussam al-habibeh 35bc8c03a4 bug fixing 4 years ago
mosazaid e75318799f Merge branch 'development' into feature-ucaf 4 years ago
mosazaid ac9fd8c936 samll fixes for labels and msges 4 years ago
Elham Rababah fd17fc4608 enforce user to add date in case referral 4 years ago
Elham Rababah c065dbbdb3 Fixed DA:266 4 years ago
Elham Rababah 913ffc3052 Fix DA-260,DA-267 4 years ago
Elham Rababah 905818b532 add admission no to orders 4 years ago
Elham Rababah b9eaee1887 fix design 4 years ago
Elham Rababah 13c879654b DA-250: fix age 4 years ago
Mohammad Aljammal 81fdcb2d8d Merge branch 'fix_issues' into 'development'
Fix issues

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

See merge request Cloud_Solution/doctor_app_flutter!272
4 years ago
hussam al-habibeh fb8381ea61 bugs fix 4 years ago
Elham Rababah 68d27a451d fix general issue 4 years ago
Sultan Khan b92bc85e8f bug fixes 4 years ago
Elham Rababah a5bccddf55 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 4 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 4 years ago
Sultan Khan d5d7ea6c49 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 63e8ee8dd0 sick leave 4 years ago
hussam alhababieh 3c55af7adc Merge branch 'development' into 'tasks-translation'
# Conflicts:
#   lib/screens/prescription/add_prescription_form.dart
4 years ago
hussam al-habibeh 7c800bdab4 medical file fix 4 years ago
Elham Rababah 00543a759a fix remarks in allergies 4 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 4 years ago
Elham Rababah cbf850da2f fix DA-201 4 years ago
Elham Rababah 484c737836 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 4 years ago
Mohammad Aljammal 35a9f34b18 Merge branch 'development' into 'sultan'
# Conflicts:
#   lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Mohammad Aljammal b89af8a5ab Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!266
4 years ago
Sultan Khan 135c852e8c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 735698ce90 bug fixes 4 years ago
Elham Rababah f0cd33ae43 fix issue on assessment design 4 years ago
Elham Rababah 1de25aae2f fix issue on assessment design 4 years ago
hussam al-habibeh bada160cf5 Search Medacation 4 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
4 years ago
hussam al-habibeh 4a4cd03f63 Prescription date 4 years ago
hussam al-habibeh 38d9881ed2 Prescription date 4 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
4 years ago
Elham Rababah ba263ada44 fix DA-201 4 years ago
mosazaid 5440fd1ef9 Merge branch 'development' into feature-ucaf 4 years ago