Commit Graph

1217 Commits (0562d7f3cb59ea87d657cf8e565aa873e201f022)

Author SHA1 Message Date
Elham Rababah 7d85c8b692 return back the condition 5 years ago
Elham Rababah 51c6329517 return back my code 5 years ago
Elham Rababah e7d1a6c805 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
 Conflicts:
	lib/screens/patients/patients_screen.dart
5 years ago
Mohammad Aljammal 22fc45ce16 Merge branch 'ecg_services' into 'development'
Ecg services

See merge request Cloud_Solution/doctor_app_flutter!353
5 years ago
Mohammad Aljammal 1af6115365 add ECG and Show sick leave 5 years ago
Elham Rababah 42666e2200 move clinic list to its own file 5 years ago
Sultan Khan 704d2484cf Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal ee25102c2d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ecg_services
 Conflicts:
	lib/screens/patients/profile/patient_profile_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
Mohammad Aljammal e7e4aad962 add ECG service 5 years ago
Sultan Khan cf7d494944 search pages and dashboard updated 5 years ago
Elham Rababah e2e92c1c59 Clinic List widget 5 years ago
hussam al-habibeh 15774e5b05 hussam 5 years ago
Elham Rababah 64c7dae97c Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service
 Conflicts:
	lib/screens/patients/patients_screen.dart
5 years ago
Elham Rababah a40bec844b Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service
 Conflicts:
	lib/screens/patients/patients_screen.dart
5 years ago
Elham Rababah 340bfd0a1c add clinic to arrival search patient 5 years ago
mosazaid 6c46e21031 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
5 years ago
mosazaid 92e60bd3fd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
5 years ago
mosazaid fdc893c3d6 make search patient profile have preview services 5 years ago
Sultan Khan a8ef4a98a5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 376653a344 dashboard changes 5 years ago
hussam al-habibeh 983f03108f adding prescription history & Medical file for all patient types 5 years ago
Mohammad Aljammal 893fc05449 Merge branch 'patinet_profile_with_all_service' into 'development'
Patinet profile with all service

See merge request Cloud_Solution/doctor_app_flutter!345
5 years ago
Elham Rababah a329c447a2 fix allergic in header 5 years ago
Elham Rababah 4190f32cdb return radiology and insurance approval 5 years ago
Mohammad Aljammal 982e075e41 Merge branch 'app_changes' into 'development'
App changes

See merge request Cloud_Solution/doctor_app_flutter!344
5 years ago
Elham Rababah 1843acbcb1 Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service 5 years ago
Elham Rababah 4d6795fcc0 show all services for all type of patient. 5 years ago
mosazaid 7c5d88f169 Merge branch 'development' into app_changes 5 years ago
mosazaid 9b02bdc541 inhancements 5 years ago
Sultan Khan 8039460a38 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 1536632cd4 dashboard updated 5 years ago
Mohammad Aljammal 929a515a7c Merge branch 'fix-issues' into 'development'
Medical Report & update Prescription form update

See merge request Cloud_Solution/doctor_app_flutter!342
5 years ago
hussam al-habibeh bcf25d7b95 Medical Report & update Prescription form update 5 years ago
Sultan Khan 3f7961b50c dashboard sreen updated 5 years ago
Sultan Khan 05ef7a4b25 dashboard page updated 5 years ago
Mohammad Aljammal c00d4107b9 Merge branch 'fix-issues' into 'development'
hussam

See merge request Cloud_Solution/doctor_app_flutter!339
5 years ago
hussam al-habibeh 53d22a8d6d hussam 5 years ago
Mohammad Aljammal 7f91978d29 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!338
5 years ago
hussam al-habibeh d099ac9b57 hussam 5 years ago
hussam al-habibeh cf44e6f77a hussam 5 years ago
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 b64a388a1d update procedure without entering any data 5 years ago
Sultan Khan be832bfd4b dashboard design 5 years ago
hussam al-habibeh 8d8aa78ccb Claculate Box Quantity while adding prescrption 5 years ago
hussam al-habibeh aa7b18dbb0 Claculate Box Quantity while adding prescrption 5 years ago
hussam al-habibeh c239dbc620 Claculate Box Quantity while adding prescrption 5 years ago
Sultan Khan 817718f897 drug to drug intraction 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 780599a8b2 Merge branch 'fix-issues' into 'development'
categories that can update

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

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

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

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

See merge request Cloud_Solution/doctor_app_flutter!331
5 years ago
hussam al-habibeh 8aeb749596 prescription update 5 years ago
hussam al-habibeh 7063e924de update prescription 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 e03d2c6ab6 Merge branch 'fix-issues' into 'development'
jira bug

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

See merge request Cloud_Solution/doctor_app_flutter!322
5 years ago
Elham Rababah f819e6353e fix DA-350 5 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
5 years ago
Sultan Khan 63d73b60e1 ios faceid issue 5 years ago
hussam al-habibeh f32d25b007 updating prescription after backend fix 5 years ago
Sultan Khan 449540504c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 214dfecb3c DA-422 5 years ago
Mohammad Aljammal 3c090ecdaf Merge branch 'fix-issues' into 'development'
design inhancment

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

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

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

See merge request Cloud_Solution/doctor_app_flutter!314
5 years ago
hussam al-habibeh 2563b10216 DA-367 5 years ago
Elham Rababah 07edbc4fe5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issue_feb 5 years ago
Elham Rababah 083b49aa0a fix DA-341 5 years ago
Elham Rababah 344d70793c fix DA-421 5 years ago
hussam al-habibeh cb8b7a4ec4 jira bug fixing 5 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
5 years ago
hussam al-habibeh 39d2fe879c jira bug fixing 5 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
5 years ago
Mohammad Aljammal d8d2e7f1d6 fix ios issues 5 years ago
mosazaid a047255f2c add referral get facilties 5 years ago
hussam al-habibeh d20e83faa5 bug fixing 5 years ago
hussam al-habibeh 8bf578082b bug fixing 5 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
5 years ago
hussam al-habibeh cd94b835b5 bug fixing 5 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
5 years ago
Mohammad Aljammal 62d45d4e1c hide the keyboard when the user click on background 5 years ago
Sultan Khan fa80d62e7d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 0dc25a4a03 bug fixes 5 years ago
Mohammad Aljammal 60e416e632 add done button in all pages user keyboard and hide the keyboard when the user click on background 5 years ago
hussam al-habibeh 28370e7492 fix bugs 5 years ago
hussam al-habibeh 255f36598b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues 5 years ago
hussam al-habibeh d4ea901906 bugs fix 5 years ago
Mohammad Aljammal 8deba06957 Merge branch 'fix_patient_card' into 'development'
fix PatientCard

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

See merge request Cloud_Solution/doctor_app_flutter!302
5 years ago
Elham Rababah c8e5a7eeef fix PatientCard 5 years ago
mosazaid 4f302694b3 Merge branch 'development' into fix-bugs10_2 5 years ago
mosazaid 498c6c00af fix minor issue bugs (DA-273, DA-361, DA-362, DA-363) 5 years ago
hussam al-habibeh 3d60813146 bug fixing 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
Sultan Khan f0539860c2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 400f8e25f6 bug xis 5 years ago
hussam al-habibeh 5bde14813a fixing bugs 5 years ago
mosazaid 87f67ea2e8 DA-273 solve 5 years ago
mosazaid 1207339b01 Merge branch 'development' into admission-request 5 years ago
mosazaid 8d154239bb finish admission request feature 5 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
5 years ago
Elham Rababah ff33afd124 fix DA-149 5 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
5 years ago
Elham Rababah 248367fbe9 fix DA-220 5 years ago
Elham Rababah 753ef3bfb0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 5 years ago
Elham Rababah a5a7425a09 fix DA-149 5 years ago
mosazaid a618292d20 bug fixes for DA-284-DA-285 5 years ago
Mohammad Aljammal 2e19af335e Merge branch 'feature-ucaf' into 'development'
Feature ucaf

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

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

See merge request Cloud_Solution/doctor_app_flutter!294
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 9ec78763dc update prescription 5 years ago
hussam al-habibeh 539f7facc7 jira bugs fix 5 years ago
Mohammad Aljammal 05ed1202fe Merge branch 'fix_issues' into 'development'
Fix issues

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

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

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

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

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

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

See merge request Cloud_Solution/doctor_app_flutter!280
5 years ago
Elham Rababah 6820e2d097 remark fix in allergies 5 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
5 years ago
Mohammad Aljammal 75efcde0bc fix ios 5 years ago
Mohammad Aljammal fa94b60711 Merge branch 'feature-ucaf' into 'development'
translation

See merge request Cloud_Solution/doctor_app_flutter!278
5 years ago