765 Commits (ccdd6696be54fc4f2b1e4e2cb4c607836ef98521)

Author SHA1 Message Date
Mohammad Aljammal d18ca12aac Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!587
6 years ago
Sultan Khan 3b43550cec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 099bf81d52 homepage and sms popup updated 6 years ago
mosazaid b3e8ecaef2 Merge branch 'development' into design-changes 6 years ago
mosazaid ddc266416d some functionality and design changes 6 years ago
Mohammad Aljammal 6fb565da17 Merge branch 'progress_note' into 'development'
Progress note

See merge request Cloud_Solution/doctor_app_flutter!585
6 years ago
Elham Rababah 70e394cfc7 change font size 6 years ago
Elham Rababah 5aa333ba2c fix design 6 years ago
Mohammad Aljammal f708689d00 hot fixes 6 years ago
Sultan Khan bbdbc3cc25 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 045584bb28 voice feature added 6 years ago
Mohammad Aljammal 29e2d962bc Optimize imports 6 years ago
Mohammad Aljammal 8523211e90 fix design 6 years ago
mosazaid 58f1b21ea3 Merge branch 'development' into in-patient-changes 6 years ago
mosazaid a3eb9dbb55 vital sign design 6 years ago
Mohammad Aljammal 86b5640fe6 Merge branch 'progress_note' into 'development'
fix radiology date

See merge request Cloud_Solution/doctor_app_flutter!578
6 years ago
Mohammad Aljammal 8b1c400f2b Merge branch 'referral_in_patient' into 'development'
Done Referral Discharged Patient

See merge request Cloud_Solution/doctor_app_flutter!576
6 years ago
Elham Rababah 5075a52a02 fix radiology date 6 years ago
mosazaid 9468450c4d Merge branch 'development' into in-patient-changes 6 years ago
mosazaid 3335147313 vital sign add oxygenation 6 years ago
Mohammad Aljammal b2bcb3dd6d Done Referral Discharged Patient 6 years ago
Elham Rababah fd7b8b19e3 fix progress_note_screen 6 years ago
mosazaid 5003b3a001 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 6 years ago
mosazaid 1b8e3eb895 some fixes 6 years ago
Mohammad Aljammal a8dc3a8933 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/screens/patients/profile/note/progress_note_screen.dart
6 years ago
Mohammad Aljammal 460a5293b9 add Discharged Patient 6 years ago
Mohammad Aljammal 6f6e2d3397 Merge branch 'progress_note' into 'development'
fix progress_note issue

See merge request Cloud_Solution/doctor_app_flutter!571
6 years ago
Elham Rababah 89f29d5de7 fix progress_note issue 6 years ago
Sultan Khan 872e9cd0bd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 648f6fd7cb bug fix 6 years ago
Mohammad Aljammal 2d52058a94 done replay onReferral Patient 6 years ago
Mohammad Aljammal a3cdacad08 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 6 years ago
Mohammad Aljammal 15aaeef157 Merge branch 'in_patient_services' into 'development'
add doctor image to in patient insurance approvals

See merge request Cloud_Solution/doctor_app_flutter!568
6 years ago
Mohammad Aljammal b924d404a8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 6 years ago
Mohammad Aljammal cd3002b0e4 done the referral 6 years ago
hussam al-habibeh 45e9ee60a9 add doctor image to in patient insurance approvals 6 years ago
Elham Rababah 1a830b7f44 make icon on top 6 years ago
Elham Rababah d8f27f6a98 add speech to text 6 years ago
Elham Rababah b1fc59aa0f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note 6 years ago
Mohammad Aljammal 89e0107b86 Merge branch 'referral_in_patient' into 'development'
Referral in patient

See merge request Cloud_Solution/doctor_app_flutter!566
6 years ago
Elham Rababah 09d2cbead5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note 6 years ago
Elham Rababah c0d568070c add icon 6 years ago
Mohammad Aljammal 9b7bb687c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 6 years ago
Mohammad Aljammal 0ab78827e3 Merge branch 'fridayf-fix-bug' into 'development'
finish in-patient referral

See merge request Cloud_Solution/doctor_app_flutter!563
6 years ago
Mohammad Aljammal 5811a39a9c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 6 years ago
mosazaid 3074dfd42e hot fix 6 years ago
Sultan Khan 9e87c63d22 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan acf74ab9fc bug fix 6 years ago
mosazaid a34db1b00c Merge branch 'development' into fridayf-fix-bug
# Conflicts:
#	lib/util/translations_delegate_base.dart
6 years ago
mosazaid 42d8fc0207 finish in-patient referral 6 years ago
Mohammad Aljammal 1cfc970051 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 6 years ago
Mohammad Aljammal d14659d2b7 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!562
6 years ago
Mohammad Aljammal 3c224ece41 Add replay on referral patient and add the time on the vital signs 6 years ago
Sultan Khan 94806c3601 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 19f0d7ede9 voice feature added 6 years ago
Elham Rababah 9c2f4e6adb finally fix updating state issue 6 years ago
Elham Rababah 66806ae8f1 Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note 6 years ago
Elham Rababah 98e0e1f078 return note back 6 years ago
Mohammad Aljammal 61d5f886ed Merge branch 'progress_note' into 'development'
Progress note

See merge request Cloud_Solution/doctor_app_flutter!560
6 years ago
Elham Rababah 23cb01daf5 prevent add spaces 6 years ago
Elham Rababah 4a6503c2cf fix design issue 6 years ago
Elham Rababah 2d4cb00716 fix design issue 6 years ago
mosazaid 6eb12b011f Merge branch 'development' into fridayf-fix-bug 6 years ago
mosazaid d9f9c3e36e REFERRAL DESIGN 6 years ago
Mohammad Aljammal 7ed64c9007 Merge branch 'referral_in_patient' into 'development'
done first page in ReferralInPatient

See merge request Cloud_Solution/doctor_app_flutter!559
6 years ago
Mohammad Aljammal 5333c0730b Merge branch 'progress_note' into 'development'
Progress note

See merge request Cloud_Solution/doctor_app_flutter!557
6 years ago
Mohammad Aljammal 6d530301b6 done first page in ReferralInPatient 6 years ago
Elham Rababah fceb351b6c fix the progress_note_screen 6 years ago
mosazaid 9d00440789 referral -re design 6 years ago
Elham Rababah 9e31cf5379 first step from modification 6 years ago
mosazaid 976da1e935 Merge branch 'development' into fridayf-fix-bug 6 years ago
mosazaid d06cf27724 vital-sign- fixes 6 years ago
Sultan Khan dad5aeb262 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan c9150ef088 bug fixes 6 years ago
Mohammad Aljammal 3127a09ecf Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 6 years ago
Mohammad Aljammal 704a4bd0be hot fixes 6 years ago
mosazaid 596f518525 Merge branch 'development' into release-hot-fix
# Conflicts:
#	lib/screens/patients/profile/patient_profile_screen.dart
#	lib/widgets/patients/profile/PatientProfileButton.dart
#	lib/widgets/patients/profile/profile_medical_info_widget.dart
6 years ago
mosazaid bf9ce4694f fix logic 6 years ago
Elham Rababah b2a2884586 Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
 Conflicts:
	lib/screens/patients/profile/radiology/radiology_home_page.dart
6 years ago
hussam al-habibeh 1d09bcf251 hot fixes 6 years ago
Elham Rababah d4ddfa21e5 add the new logic 6 years ago
Mohammad Aljammal 0ded3a5a03 hot fixes 6 years ago
Mohammad Aljammal 9e8aef0835 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 6 years ago
Mohammad Aljammal 8350d68397 Merge branch 'progress_note' into 'development'
add condition

See merge request Cloud_Solution/doctor_app_flutter!545
6 years ago
Mohammad Aljammal 414ccdde49 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 6 years ago
Mohammad Aljammal b37c607813 done the referral service 6 years ago
Sultan Khan 426aa03aa5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan b5503a8411 fixes 6 years ago
Elham Rababah 79037d8fc7 add condition 6 years ago
Mohammad Aljammal 650a949c6a Merge branch 'progress_note' into 'development'
Progress note

See merge request Cloud_Solution/doctor_app_flutter!542
6 years ago
Elham Rababah 9d780f72b4 remove commented code 6 years ago
Mohammad Aljammal 36189adf94 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/shared/doctor_card.dart
6 years ago
Mohammad Aljammal ae8882fbae Merge branch 'in-patient-changes' into 'development'
In patient changes

See merge request Cloud_Solution/doctor_app_flutter!539
6 years ago
Elham Rababah 8d7fef3db9 fix some issue on progress_note_screen 6 years ago
hussam al-habibeh e3102b3f5e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
 Conflicts:
	lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart
6 years ago
hussam al-habibeh 94e598c5f2 Insurance Approval In Patient 6 years ago
mosazaid 2bf003c100 Merge branch 'development' into in-patient-changes 6 years ago
mosazaid 33545d1180 work on in paitent referral 6 years ago
Mohammad Aljammal fd790978c4 add new referral service 6 years ago
Sultan Khan 608198762d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan d0a39ca3d4 fixes 6 years ago
Elham Rababah acc3ecdbbe cancel progress_note part 6 years ago
Elham Rababah 4a263dda8a Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
 Conflicts:
	lib/config/config.dart
6 years ago
Elham Rababah 82285ccf39 show progress_note part 6 years ago
Mohammad Aljammal e4aae762cc Merge branch 'in-patient-changes' into 'development'
In patient changes

See merge request Cloud_Solution/doctor_app_flutter!536
6 years ago
Sultan Khan feef001323 bug fixes 6 years ago
Elham Rababah f2011301c6 update progress_note 6 years ago
mosazaid 9aecc6fbdb add lap results to inpatient and some changes on patient profile 6 years ago
Elham Rababah 0909879ccf Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note 6 years ago
Elham Rababah 5199104d7a show progress_note 6 years ago
mosazaid b6a6f16b31 add vital sign inPatient 6 years ago
mosazaid 37edd8cef9 add in-patient cards and header 6 years ago
Elham Rababah f4ce9eb004 Merge branches 'development' and 'radilology' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into radilology 6 years ago
Elham Rababah 67abe2a5e7 first step from radiology 6 years ago
Mohammad Aljammal a95bb8be04 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!529
6 years ago
Sultan Khan 5afb44adfd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Mohammad Aljammal 0260b92f24 Merge branch 'soap_refactor' into 'development'
Soap refactor

See merge request Cloud_Solution/doctor_app_flutter!528
6 years ago
Sultan Khan 3aabb1537c in patient 6 years ago
Elham Rababah bd01624f5a create New order widget 6 years ago
mosazaid 4b3c5b9f37 Merge branch 'development' into app-changes 6 years ago
mosazaid dde8d9aa48 design hot fixes 6 years ago
mosazaid 54482bfb1d hot fix 6 years ago
Sultan Khan 6f52c9a7fd fixe 6 years ago
hussam al-habibeh 89451a3c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
 Conflicts:
	lib/screens/medical-file/medical_file_page.dart
	lib/screens/patients/profile/refer_patient_screen.dart
6 years ago
mosazaid 72bb64b460 finish working on app text widget 6 years ago
mosazaid 8ae0a91c05 working on text widget 6 years ago
hussam al-habibeh 17c878fa4c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
 Conflicts:
	lib/screens/patients/profile/lab_result/lab_orders_screen.dart
	lib/screens/patients/profile/refer_patient_screen.dart
6 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
6 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 6 years ago
hussam al-habibeh ebe05226e9 Delteing unused file & refactoring routes page 6 years ago
Elham Rababah 7579a21b83 Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor
 Conflicts:
	lib/widgets/auth/login_form.dart
6 years ago
Elham Rababah 8220ef7700 add auto complete search 6 years ago
mosazaid b8f6c35e75 working on buttons widgets 6 years ago
mosazaid 9f61c7eaa0 Merge branch 'design-fixes' into development 6 years ago
mosazaid 65585ab586 add charts to procedures 6 years ago
Elham Rababah e73ca8af71 first step from change text fields 6 years ago
Elham Rababah 59ec9d8e56 first step from change text fields 6 years ago
Haroon Amjad 6fc72328b7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 6 years ago
Haroon Amjad 27b4450dac versionID changed to 5.5 6 years ago
Mohammad Aljammal fac8473f59 Merge branch 'design-fixes' into 'development'
lap result re-design

See merge request Cloud_Solution/doctor_app_flutter!515
6 years ago
Mohammad Aljammal 43c254de05 Merge branch 'soap_refactor' into 'development'
Soap refactor

See merge request Cloud_Solution/doctor_app_flutter!513
6 years ago
mosazaid d543ce0f6f lap result re-design 6 years ago
Sultan Khan 4ed8f716db dashboard changes 6 years ago
Elham Rababah 2fd30ae1be improve exam step 6 years ago
Elham Rababah 042d4b4bfd remove commented code 6 years ago
Elham Rababah 4da72c81af first step form code refactor 6 years ago
Elham Rababah 76d411b79a move soap folder to the correct place 6 years ago
mosazaid 368ff27042 vitalsign fix error tet 6 years ago
mosazaid 8950dabf7a Merge branch 'development' into textfield-validation 6 years ago
mosazaid 4b32487540 referral design and service changes 6 years ago
Mohammad Aljammal 85a01edd5e Merge branch 'textfield-validation' into 'development'
make referral changes

See merge request Cloud_Solution/doctor_app_flutter!498
6 years ago
Mohammad Aljammal b1234945e0 Merge branch 'fix-issues' into 'development'
Hot Fixes

See merge request Cloud_Solution/doctor_app_flutter!497
6 years ago
mosazaid 82cbf392af Merge branch 'development' into textfield-validation 6 years ago
mosazaid a701b6e989 make referral changes 6 years ago
hussam al-habibeh 99ef89fa16 Hot Fixes 6 years ago
Sultan Khan 649379d88f bug fix 6 years ago
Sultan Khan 6f9069addc Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 8652c30a24 bug fix 6 years ago
Mohammad Aljammal da084d889c hot ECG,add a new button and hot fixes 6 years ago
Sultan Khan 20b31bde92 bug fix 6 years ago
Sultan Khan ffab532e94 bug fix 6 years ago
Sultan Khan 5c4aee849e bug fixes 6 years ago
Sultan Khan 148ea967fb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 1fb59c17bc bug fix 6 years ago
mosazaid 9f35f53fa2 re-design 6 years ago
mosazaid 604ff24a93 referral design fixes 6 years ago
Sultan Khan 212d1dc05f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 0498545e5c no data 6 years ago
Sultan Khan 49a28c302a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 9c54f85782 bug fix 6 years ago
mosazaid 0666940d56 Merge branch 'development' into textfield-validation 6 years ago
mosazaid 38d577e1f7 vital sign fix appbar 6 years ago
Mohammad Aljammal b812ac4b06 add no data image in all pages 6 years ago
hussam al-habibeh 6f914b3e93 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/screens/procedures/ProcedureCard.dart
	lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
6 years ago
hussam al-habibeh 3586d226e0 insurance approval & medical file design fix 6 years ago
Mohammad Aljammal f289ae0c44 Merge branch 'textfield-validation' into 'development'
Textfield validation

See merge request Cloud_Solution/doctor_app_flutter!475
6 years ago
mosazaid 0e028c05f5 Merge branch 'development' into textfield-validation 6 years ago
mosazaid 32e10269d4 add validation textfield 6 years ago
Sultan Khan 0080b66c8e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 32d1a19248 bug fixes 6 years ago
Mohammad Aljammal 915cf74d3c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/screens/patients/profile/radiology/radiology_home_page.dart
6 years ago
Mohammad Aljammal 8055fa17eb add the branch in all doctors card and add no data image 6 years ago
Mohammad Aljammal e1c67ad8ce Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!471
6 years ago
hussam al-habibeh 844bd9ba27 add lab & add radiology update 6 years ago
mosazaid 3047b655cf add Validation for customtextfield 6 years ago
mosazaid fea6501b9e design fixes issues 6 years ago
mosazaid 25c3bf1bb1 Merge branch 'development' into soap-objective-feature-re-design 6 years ago
mosazaid 0128144f83 working onm referral card and update on ucaf design 6 years ago
Mohammad Aljammal 9839ef4a00 Merge branch 'soap-objective-feature-re-design' into 'development'
cahnges on UCaf

See merge request Cloud_Solution/doctor_app_flutter!460
6 years ago
Elham Rababah eb5e5862ec fix bugs 6 years ago
Elham Rababah 3a7faf6b66 fix issues 6 years ago
mosazaid f017e4c280 cahnges on UCaf 6 years ago
Mohammad Aljammal c314bc7db7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/patients/profile/soap_update/update_soap_index.dart
6 years ago
mosazaid f0f4613960 Merge branch 'development' into soap-objective-feature-re-design 6 years ago
mosazaid f8f088fe8c design changes 6 years ago
Mohammad Aljammal 3449567086 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 6 years ago
hussam al-habibeh b83c7835b9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/widgets/patients/profile/soap_update/steps_widget.dart
6 years ago
hussam al-habibeh 26672dbb6e Radiology details & assessment fix 6 years ago
Mohammad Aljammal 87560250bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 6 years ago
Mohammad Aljammal 4bf9650b4f fix the design issues 6 years ago