Commit Graph

2735 Commits (d22ea2e2faee486f96e9f7371c34f2e6f58ca1f0)

Author SHA1 Message Date
Elham Rababah 0006a4de57 remove comment 5 years ago
Elham Rababah 93c7797ed4 recall the service 5 years ago
Elham Rababah 0c730e8270 change the status condition 5 years ago
Elham Rababah 74294bfaf5 finish fix referral 5 years ago
Elham Rababah 7d6123f9cb Merge branches 'development' and 'refferal_out_fixes' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into refferal_out_fixes 5 years ago
Elham Rababah 33f032b6c4 return from part on header 5 years ago
Elham Rababah 1af52dc5b7 fix referral patient 5 years ago
Mohammad Aljammal 1a735dca62 Merge branch 'medical_report_changes' into 'development'
medical report fix

See merge request Cloud_Solution/doctor_app_flutter!761
5 years ago
Mohammad Aljammal b1f3cf3ece Merge branch 'outpatient_referral_change' into 'development'
outpatirnt referral changes

See merge request Cloud_Solution/doctor_app_flutter!762
5 years ago
mosazaid d839fd3545 outpatirnt referral changes 5 years ago
hussam al-habibeh 1e35b70b01 medical report fix 5 years ago
mosazaid 1bb40ddeb9 Merge branch 'development' into video-stream-background 5 years ago
mosazaid 783c74108b video isRecord change 5 years ago
Mohammad Aljammal ec3ac18a15 Merge branch 'video-stream-background' into 'development'
Video stream background

See merge request Cloud_Solution/doctor_app_flutter!759
5 years ago
Mohammad Aljammal 9303091f20 Merge branch 'medical_report_changes' into 'development'
Medical report changes

See merge request Cloud_Solution/doctor_app_flutter!757
5 years ago
mosazaid eb62fdfe21 Merge branch 'development' into video-stream-background
# Conflicts:
#	android/app/src/main/kotlin/com/hmg/hmgDr/MainActivity.kt
#	android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt
#	lib/core/service/VideoCallService.dart
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
mosazaid a7c5e1afde finish solve keybaord issue 5 years ago
hussam al-habibeh 9890d6a063 using dynimc setup id in medical report service 5 years ago
Elham Rababah e80523749b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_episode_no
 Conflicts:
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
Elham Rababah 1918c2219e improve the code. 5 years ago
Elham Rababah 29eeb21e76 finalize create episode on Live care. 5 years ago
hussam al-habibeh 19548ccb1e Medical Report change status 5 years ago
Elham Rababah 80ef1a241d first step from fix episode in patient live care list 5 years ago
hussam al-habibeh bec5eb82bc update medical file service 5 years ago
hussam al-habibeh c652f40a89 add medical report new service 5 years ago
Mohammad Aljammal a5988c2885 Merge branch 'fixes' into 'development'
Fixes

See merge request Cloud_Solution/doctor_app_flutter!756
5 years ago
Elham Rababah 74b17c5fc9 Merge branches 'development' and 'fixes' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes
 Conflicts:
	lib/models/patient/patiant_info_model.dart
5 years ago
Elham Rababah f5b7829e7d fix create create episode on live care 5 years ago
mosazaid 1fd9c4f2f2 Merge branch 'development' into video-stream-background
# Conflicts:
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
mosazaid e1c4721ac1 Merge branch 'development' into video_stream_fix_bugs
# Conflicts:
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
Elham Rababah 0bc3b84cf8 fix sorting inside inpatient 5 years ago
mosazaid 385820fdce video stream add record icon and change button disable 5 years ago
hussam al-habibeh 07835aaa1b medical report changes 5 years ago
mosazaid c722c9b05a Merge branch 'development' into video-stream-background
# Conflicts:
#	android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt
#	lib/core/service/VideoCallService.dart
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
mosazaid c9d7df01e3 video stream keyboard changing 5 years ago
Mohammad Aljammal d879f1da77 fix add prescription issue 5 years ago
Mohammad Aljammal e70eabe68d Fix live care issues and qr code 5 years ago
Mohammad Aljammal e4a7f4e105 Merge branch 'sort_out_patient' into 'development'
first step form sort

See merge request Cloud_Solution/doctor_app_flutter!751
5 years ago
mosazaid 8d5f86e4f2 Merge branch 'development' into video_stream_fix_bugs 5 years ago
mosazaid 321bf7825e solve video stream publisher popup window bug 5 years ago
Elham Rababah 9da1bff723 first step form sort 5 years ago
Mohammad Aljammal 0e2bcd7916 Fix Qr issues 5 years ago
mosazaid 7fed1c58f3 working to open video stream from service 5 years ago
Mohammad Aljammal 78338ebc64 Merge branch 'video-streaming-android' into 'development'
Merge video call into 'development'

See merge request Cloud_Solution/doctor_app_flutter!745
5 years ago
Mohammad Aljammal 0cb82586bd Merge branch 'fix_inpatent_header' into 'development'
fix header

See merge request Cloud_Solution/doctor_app_flutter!744
5 years ago
Mohammad Aljammal 352d3263ac Merge branch 'special_clinic' into 'development'
add loader

See merge request Cloud_Solution/doctor_app_flutter!743
5 years ago
Mohammad Aljammal f9a989b6fd Merge remote-tracking branch 'origin/video-streaming-android' into video-streaming-android 5 years ago
Mohammad Aljammal 61c94f85b2 fix the end call 5 years ago
mosazaid 02f43d6e61 fix timer issue 5 years ago
Mohammad Aljammal 654a86a9b6 Add App Permissions Utils 5 years ago
Mohammad Aljammal bed7dee27c fix drop video call issue 5 years ago
Elham Rababah 4e6237f2ce fix header from lab 5 years ago
Elham Rababah b9711fce65 fix header from lab result details 5 years ago
Elham Rababah 78903043d9 fix header 5 years ago
Mohammad Aljammal 7614b4aa5c fix the video call issues 5 years ago
Mohammad Aljammal 746f44157e Add video call service 5 years ago
Elham Rababah c1ed1dc737 add loader 5 years ago
mosazaid 259a63384e fix draggable bugs 5 years ago
mosazaid 550b4a848d Merge branch 'development' into video-streaming-android 5 years ago
Mohammad Aljammal b4305a00ae Merge branch 'fix_header_out_patient' into 'development'
fix out patient header

See merge request Cloud_Solution/doctor_app_flutter!741
5 years ago
Elham Rababah f76bac898b make clinic id dynamic 5 years ago
Elham Rababah 09634716e5 Merge branches 'development' and 'special_clinic' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinic
 Conflicts:
	lib/locator.dart
5 years ago
Elham Rababah 3cf4ef4348 check if special in home page 5 years ago
Elham Rababah fee36336d8 fix out patient header 5 years ago
Mohammad Aljammal 6b44a1c3aa Merge branch 'scan_qr' into 'development'
Scan qr code refactoring

See merge request Cloud_Solution/doctor_app_flutter!740
5 years ago
mosazaid 883778d278 video call 5 years ago
Elham Rababah 37e6853976 add special one first calling 5 years ago
hussam al-habibeh 1c3391baed Scan qr code refactoring 5 years ago
Elham Rababah 7f3ae19fd2 remove todo 5 years ago
Elham Rababah 7b71bd752f add to do 5 years ago
Elham Rababah 363b55069f first step form Special Clinic 5 years ago
Mohammad Aljammal 84561a7363 Merge branch 'referral_reply' into 'development'
Scan QR Code fix

See merge request Cloud_Solution/doctor_app_flutter!739
5 years ago
hussam al-habibeh 3913f8936c Scan QR Code fix 5 years ago
Elham Rababah c46c339933 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinic
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah 1edd375fd7 first step from special clinic 5 years ago
mosazaid 13ee7f6491 Merge branch 'videocall_popup' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into video-streaming-android
 Conflicts:
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/util/VideoChannel.dart
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
5 years ago
Zohaib Iqbal Kambrani f60ff85e31 no message 5 years ago
Mohammad Aljammal 01a49ae200 Merge branch 'headers_refactor' into 'development'
Headers refactor

See merge request Cloud_Solution/doctor_app_flutter!737
5 years ago
Elham Rababah 712a742aa2 fix small issue 5 years ago
Elham Rababah 161cb1e872 fix profile height size 5 years ago
hussam al-habibeh 142fbb93fd Referrel Doctor reply 5 years ago
Elham Rababah 411746da98 remove patient type and arrival type form patient profile header 5 years ago
Zohaib Iqbal Kambrani 1b4988e5f0 no message 5 years ago
Elham Rababah bc53ca7b8a fix appointment date in header 5 years ago
Elham Rababah 3fefcf60d7 match the app header design 5 years ago
Mohammad Aljammal e77f5773dc Merge branch 'video_screen_re-design' into 'development'
change video streaming design

See merge request Cloud_Solution/doctor_app_flutter!733
5 years ago
Elham Rababah 132565c298 Merge branches 'development' and 'headers_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into headers_refactor 5 years ago
Elham Rababah b0938562fa Merge branches 'development' and 'fix_medical_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_medical_report
 Conflicts:
	pubspec.lock
5 years ago
mosazaid c44b3d74bb reply changes 5 years ago
Mohammad Aljammal 726d3ab885 Fix video call issue android 5 years ago
Elham Rababah 30bf59458c finish medical report 5 years ago
mosazaid 1834d9f776 change video streaming design 5 years ago
Elham Rababah e530dc0168 first step from fix medical report 5 years ago
Elham Rababah 717468b637 fix design issue 5 years ago
Elham Rababah 57399c3dcb fix issues in header 5 years ago
Elham Rababah 95425d9568 fix issues in header 5 years ago
Elham Rababah 6aef8b5878 first step refactor headers 5 years ago
mosazaid 017669c406 Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
5 years ago
Elham Rababah 354a1f2dec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into end_call_fixes 5 years ago
Elham Rababah ca0cc745d5 remove headers 5 years ago
Elham Rababah 0e513ecca8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into end_call_fixes 5 years ago
Elham Rababah 23feb2c354 remove unused code 5 years ago
mosazaid 1b47b60155 Merge branch 'development' into reply-doctor_changes
# Conflicts:
#	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
5 years ago
mosazaid 10441e4af0 referral changes 5 years ago
Mohammad Aljammal 228df1e762 Merge branch 'end_call_fixes' into 'development'
fix font size in header

See merge request Cloud_Solution/doctor_app_flutter!730
5 years ago
Elham Rababah 4cdc654348 fix font size in header 5 years ago
Mohammad Aljammal 418918558f Merge branch 'end_call_fixes' into 'development'
End call fixes

See merge request Cloud_Solution/doctor_app_flutter!729
5 years ago
Mohammad Aljammal a0c7f7321d Merge branch 'fix_label_replay_on_referral' into 'development'
fix label on replay referral

See merge request Cloud_Solution/doctor_app_flutter!728
5 years ago
Elham Rababah cb5abfb2ec remove comment code 5 years ago
Elham Rababah 36caca0e46 test live care and general result header in lab result 5 years ago
Mohammad Aljammal 0b52b4009d fix label on replay referral 5 years ago
Elham Rababah 176c0ab97c first step from live care fixes 5 years ago
Zohaib Iqbal Kambrani 693f57a13e Merge branch 'development' into ZohaibKambrani
* development: (102 commits)
  prescription changes
  pescription changes
  fix imports
  project refactoring
  working on feature medical profile
  prescription changes
  hot fix
  hot fix
  hot fix
  refactoring
  hot fix
  hot fix
  add prescription form changes
  Add Medical Report Page
  hot fix
  hot fix
  add prescription changes
  fix in note and AddReplayOnReferralPatient
  Add Prescription changes
  prescription changes
  ...

# 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
Elham Rababah b1062dd537 fix merge issue 5 years ago
Elham Rababah 2e0f6aad5c Merge branches 'development' and 'navigation_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into navigation_service
 Conflicts:
	lib/locator.dart
5 years ago
Elham Rababah 9d6a23c1a3 add NavigationService 5 years ago
Elham Rababah 3df6a55dad remove comment 5 years ago
Elham Rababah 72966c3269 fix referral patient services 5 years ago
mosazaid 663c8d1104 Merge branch 'development' into referral-outpatient 5 years ago
Mohammad Aljammal 95b00dd67d Merge branch 'fix_live_care' into 'development'
fix live care issues

See merge request Cloud_Solution/doctor_app_flutter!725
5 years ago
Mohammad Aljammal f6922ee41a Merge branch 'live_care_fixes' into 'development'
Live care fixes

See merge request Cloud_Solution/doctor_app_flutter!724
5 years ago
Elham Rababah 8a8b55d2de move show timer to its own file 5 years ago
Elham Rababah 792c85e28a fix live care icon size 5 years ago
Mohammad Aljammal a1abcaa7c0 fix live care issues 5 years ago
mosazaid ec9f628b67 Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
5 years ago
Elham Rababah f80215b6bb fix doctor id spelling in live care service, fix colors in 5 years ago
Elham Rababah d57b331df2 add timer 5 years ago
mosazaid 400420bd4d Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
5 years ago
Mohammad Aljammal 6dfcbcca12 Merge branch 'procedure_refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedure_refactoring
 Conflicts:
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
5 years ago
mosazaid 0fe6d880fd add livecare send instructions 5 years ago
mosazaid 0afe3b3afd livecare changes 5 years ago
mosazaid 5d0a7a4045 livecare changes 5 years ago
hussam al-habibeh c800219428 Live Care Is Login Service 5 years ago
hussam al-habibeh 25583d7bee Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favourite_prescription
 Conflicts:
	lib/core/service/patient/LiveCarePatientServices.dart
5 years ago
hussam al-habibeh 6989235334 Live care Is Login service 5 years ago
mosazaid 66d12f8fdd procedure fixes, liveCare working 5 years ago
mosazaid b36ddf9317 add prescription to procedure type 5 years ago
mosazaid ea0658c05c Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/viewModel/procedure_View_model.dart
5 years ago
mosazaid 91cd7f2b88 refactoring 5 years ago
Mohammad Aljammal 6439bb9a90 Merge branch 'favourite_prescription' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!719
5 years ago
hussam al-habibeh 4af94e6b71 hot fix 5 years ago
Mohammad Aljammal d9358bce75 hot fix in medical report 5 years ago
Mohammad Aljammal a9a7c8a73c fix patient MRN 5 years ago
Elham Rababah 8dbfb92f88 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_care_appointment
 Conflicts:
	ios/Podfile.lock
5 years ago
Elham Rababah 9692e54b97 fix login issue
# Conflicts:
#	lib/core/viewModel/authentication_view_model.dart
#	lib/root_page.dart
#	lib/widgets/shared/app_drawer_widget.dart
5 years ago
Elham Rababah fb6ef8fca1 fix appointment in live care 5 years ago
mosazaid 3107950f5c fix bug 5 years ago
Mohammad Aljammal 151b69ed17 Merge branch 'favourite_prescription' into 'development'
Favourite prescription

See merge request Cloud_Solution/doctor_app_flutter!714
5 years ago
hussam al-habibeh a6a8f616e1 hot fix 5 years ago
hussam al-habibeh df6a9a7822 hot fix 5 years ago
Mohammad Aljammal 61ea94faeb Merge branch 'live_care_new_services' into 'development'
Live care new services

See merge request Cloud_Solution/doctor_app_flutter!713
5 years ago
Mohammad Aljammal ad74ff00dc fix issues in android and add ChangeCallStatus services in IOS 5 years ago
mosazaid bc48d915c6 procedure refactoring 5 years ago
hussam al-habibeh 519e6f2fec Prescription favourite templates 5 years ago
mosazaid 9454e9d8af working on procedure refactoring 5 years ago
mosazaid c82a4a05d5 medical report design changes 5 years ago
hussam al-habibeh 13fb50f9be prescription refactoring 5 years ago
hussam al-habibeh 7595629c8b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_refactor
 Conflicts:
	lib/screens/prescription/add_prescription_form.dart
5 years ago
mosazaid c7ce4676f6 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 59e06f53af hot fix 5 years ago
Mohammad Aljammal 6e660883f6 Fix medical report 5 years ago
mosazaid 1b2e158a24 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 54fbe76c7b medical report fixes and vital sign 5 years ago
Mohammad Aljammal e336821f65 fix lab result 5 years ago
Mohammad Aljammal 3c325ef199 fix load procedure 5 years ago
Mohammad Aljammal 80a751ae4d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favorite_procedure_templates 5 years ago
mosazaid b16dc2092b liveCare cahnges 5 years ago
Mohammad Aljammal 2b6736ed6a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favorite_procedure_templates
 Conflicts:
	lib/screens/procedures/add-favourite-procedure.dart
5 years ago
Mohammad Aljammal 725c87fe8b Add favorite procedure templates for lab and radiology 5 years ago
mosazaid 390a34dd81 procedure hot fix 5 years ago
mosazaid f75ac64cad procedure get template 5 years ago
Mohammad Aljammal 6620c79478 fix ui issues 5 years ago
Mohammad Aljammal cf10eba134 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_live_care_issues 5 years ago
Mohammad Aljammal 280f87e514 fix live care issues 5 years ago
hussam al-habibeh e068009527 prescription form 5 years ago
hussam al-habibeh da45f8c4b6 prescription refactoring 5 years ago
Mohammad Aljammal ad036f7133 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into text-form-field
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 281a807ec8 fix live care 5 years ago
mosazaid 41515b311c lab-result-fixes 5 years ago
Mohammad Aljammal 1391799101 fix live care user 5 years ago
Mohammad Aljammal e89d5b13ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_cear_services 5 years ago
Mohammad Aljammal 169e5301a0 Merge branch 'lab-result-special' into 'development'
lab-result-special

See merge request Cloud_Solution/doctor_app_flutter!692
5 years ago
Mohammad Aljammal 7d423d9457 Merge branch 'prescription_changes' into 'development'
procedure changes

See merge request Cloud_Solution/doctor_app_flutter!691
5 years ago
Mohammad Aljammal ac701c9806 fix live care issues 5 years ago
mosazaid 73cf681e9d lab-result-special 5 years ago
hussam al-habibeh 764578f28e procedure changes 5 years ago
Elham Rababah 69eca869b4 fix error after merge 5 years ago
Elham Rababah fdc23ce932 Merge branches 'development' and 'live_care_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_care_patient
 Conflicts:
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
Mohammad Aljammal b9831adeb2 Merge branch 'medical-profile-services' into 'development'
Medical profile services

See merge request Cloud_Solution/doctor_app_flutter!689
5 years ago
Mohammad Aljammal d7cd818a31 Merge branch 'expansion_procedure' into 'development'
Expansion procedure

See merge request Cloud_Solution/doctor_app_flutter!687
5 years ago
hussam al-habibeh 2a44840666 hot fix 5 years ago
hussam al-habibeh 17cca30b17 procedure changes 5 years ago
hussam al-habibeh 36ce997529 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/config/config.dart
5 years ago
hussam al-habibeh f26d870d5b procedure changes 5 years ago
Elham Rababah 401516403f first step from show Video call 5 years ago
mosazaid 0cd7fa0cb2 working on livecare 5 years ago
hussam al-habibeh 269c8e21f6 hot fix 5 years ago
Mohammad Aljammal e313722743 fix bug when logout 5 years ago
mosazaid 957cf96c16 Merge branch 'development' into medical-profile-services 5 years ago
Mohammad Aljammal 899c22419f Merge branch 'live_care_patient' into 'development'
add translation

See merge request Cloud_Solution/doctor_app_flutter!686
5 years ago
mosazaid 8b2c7f1a05 livecare 5 years ago
Elham Rababah 1367f2bebb add translation 5 years ago
Mohammad Aljammal dd23640a46 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into expansion_procedure 5 years ago
Mohammad Aljammal 5d5f9f6928 Fix issues on the add procedure 5 years ago
Mohammad Aljammal 15d826c8d1 Merge branch 'live_care_patient' into 'development'
add VC_ID

See merge request Cloud_Solution/doctor_app_flutter!685
5 years ago
mosazaid ac460f1d19 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 0ed0dbb5aa livecare changes 5 years ago
Mohammad Aljammal 2de29f0b83 Merge branch 'prescription_changes' into 'development'
adding validation and voice speach to prescription form

See merge request Cloud_Solution/doctor_app_flutter!684
5 years ago
hussam al-habibeh b6cb6362f6 adding validation and voice speach to prescription form 5 years ago
Elham Rababah 04c9a1168b add VC_ID 5 years ago
Elham Rababah 6d989e3fc3 finish new service for live care 5 years ago
mosazaid ced177e1c0 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 0798057f31 change 5 years ago
Elham Rababah d49d52458b fix birthOfDate 5 years ago
Elham Rababah 8e140abee9 make pending service dynamic 5 years ago
Elham Rababah 3557e87b75 fix loading issue 5 years ago
Elham Rababah 1bc01e0ad1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor 5 years ago
Elham Rababah 97a855ab70 return condition in home page 5 years ago
Elham Rababah 5778a4a887 view list of Live care patient 5 years ago
mosazaid fef70604be Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/config/config.dart
5 years ago
mosazaid 186461f3a8 hot fix 5 years ago
Mohammad Aljammal 08d72ed121 Merge branch 'prescription_changes' into 'development'
Procedure template service

See merge request Cloud_Solution/doctor_app_flutter!680
5 years ago
Elham Rababah c4b434497a Merge branches 'development' and 'html_editor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor
 Conflicts:
	lib/screens/home/home_screen.dart
5 years ago
Elham Rababah 33ceb01d67 first step from Live care patient list 5 years ago
hussam al-habibeh d50740b9b9 Procedure template service 5 years ago
mosazaid 70d171a599 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 67e0cac742 add livecare to home 5 years ago
Mohammad Aljammal 172b457092 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into expansion_procedure
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
5 years ago
Mohammad Aljammal 40b4a83c6b Fix Expansion Procedure 5 years ago
Mohammad Aljammal fa479ce258 Merge branch 'prescription_changes' into 'development'
favourite template Procedure service

See merge request Cloud_Solution/doctor_app_flutter!677
5 years ago
hussam al-habibeh c182928a5d favourite template Procedure service 5 years ago
Mohammad Aljammal 0603ea1e40 Merge branch 'html_editor' into 'development'
add rich editor for MedicalReportPage

See merge request Cloud_Solution/doctor_app_flutter!676
5 years ago
Mohammad Aljammal 16dac03b24 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_home_design
 Conflicts:
	lib/locator.dart
	lib/screens/home/home_screen.dart
5 years ago
Elham Rababah 342477beda add rich editor for MedicalReportPage 5 years ago
Mohammad Aljammal f6539c82a6 add live care card in home page 5 years ago
hussam al-habibeh 3801d7b59a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
5 years ago
hussam al-habibeh e1d00b87ad favourite template Procedure service 5 years ago
Mohammad Aljammal 5b94a19b60 Merge branch 'html_editor' into 'development'
add rich editor

See merge request Cloud_Solution/doctor_app_flutter!673
5 years ago
Elham Rababah 8cac9b6fe9 add rich editor 5 years ago
mosazaid 9e552668c7 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 2fabe85b30 Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 1cc55d809c fix authentication service 5 years ago
mosazaid deb126fdd5 meical report changes 5 years ago
Mohammad Aljammal a97a331d87 fix bugs in change the clinic, login page when get the projects and add the special Result 5 years ago
hussam al-habibeh 623f2730e8 Procedure card design update 5 years ago
hussam al-habibeh 066acc404a Procedure template service 5 years ago
Mohammad Aljammal 57fcd2cdeb fix home page design 5 years ago
Mohammad Aljammal a525787c19 Merge branch 'live_care' into 'development'
Live care

See merge request Cloud_Solution/doctor_app_flutter!668
5 years ago
mosazaid 9e80a1879e Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/locator.dart
5 years ago
mosazaid fa830cf4da changes 5 years ago
Elham Rababah d574dd0b16 return base app client 5 years ago
Elham Rababah 164a7fd2fc fix merge issues 5 years ago
Elham Rababah 56698a82fd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into merge_dev_into_auth_refactor
 Conflicts:
	lib/core/service/home/auth_service.dart
	lib/core/viewModel/auth_view_model.dart
	lib/core/viewModel/imei_view_model.dart
	lib/locator.dart
	lib/screens/auth/login_screen.dart
	lib/screens/home/home_screen.dart
	lib/screens/patients/patient_search/patient_search_screen.dart
	lib/widgets/auth/verification_methods.dart
5 years ago
hussam al-habibeh 84a7f44b68 favourite procedure templates 5 years ago
Elham Rababah 14a3ca8695 fix login screen design 5 years ago
Elham Rababah 515955663a add verification 5 years ago
hussam al-habibeh 3b800bcd19 favourite procedure templates 5 years ago
mosazaid 6192d9a84f working on medical-profile 5 years ago
Mohammad Aljammal 1187c3b605 fix authentication provider 5 years ago
Elham Rababah 6933b6577f add session time out. 5 years ago
Elham Rababah 9b34c2c833 first step from live care 5 years ago
Elham Rababah a9bd02a908 first step from user another account 5 years ago
hussam al-habibeh 6b6243232c Procedure template service 5 years ago
Elham Rababah 0d8684481d fix sms error and some design issue 5 years ago
Mohammad Aljammal 8ac040a809 hot fix 5 years ago
Mohammad Aljammal 42275b41fd Merge branch 'load_medical_report' into 'development'
Load medical report

See merge request Cloud_Solution/doctor_app_flutter!665
5 years ago
Mohammad Aljammal 2c43cfcdde Merge branch 'home-refactoring' into 'development'
Home refactoring

See merge request Cloud_Solution/doctor_app_flutter!648
5 years ago
Elham Rababah e0be4ec1be move logout function from helper to authentication view model 5 years ago
Elham Rababah c9e7fb9883 small fix 5 years ago
Elham Rababah 1eeaaa48ca remove comment 5 years ago
Elham Rababah 0adcfeccce fix auth bug 5 years ago
Elham Rababah 6815e47814 remove doctor profile view model 5 years ago
Mohammad Aljammal 8399677a0a Fix Dubai user issues 5 years ago
Elham Rababah 2e71706cab add UNVERIFIED status 5 years ago
mosazaid 0e2b700136 vital sign hot fix 5 years ago
mosazaid 25fb8ea5ae hot fix 5 years ago
Elham Rababah fd9f93a936 do some refactor and change the code to view model 5 years ago
mosazaid 70480cc09e Merge branch 'development' into home-refactoring 5 years ago
mosazaid 50b4b8eb50 dashboard change 5 years ago
Mohammad Aljammal 8541ddc0f8 fix LabOrderResult 5 years ago
mosazaid 6280904669 Merge branch 'development' into home-refactoring 5 years ago
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 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
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 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 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
hussam al-habibeh c17d3d63e0 hot fix 5 years ago
Mohammad Aljammal 06706ad9a6 Fix prescription item 5 years ago
Mohammad Aljammal 00d6a3cead Merge branch 'prescription_changes' into 'development'
add prescription form changes

See merge request Cloud_Solution/doctor_app_flutter!647
5 years ago
mosazaid 4f817810c2 hot fix 5 years ago
mosazaid 34a7c0b148 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/screens/home/home_screen.dart
5 years ago
hussam al-habibeh e16d91a1b8 add prescription form changes 5 years ago
Elham Rababah 53791f1028 change imei to authentication 5 years ago
Elham Rababah a5120b473f rename Auth view model to Doctor Profile View Model 5 years ago
mosazaid 4ce9a3c5bf finish home-refactoring 5 years ago
Mohammad Aljammal 086ca517d2 Add Medical Report Page 5 years ago
Mohammad Aljammal eb0fda3555 hot fix 5 years ago
Mohammad Aljammal a74a6b1212 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal 16519d0ccf hot fix 5 years ago
hussam al-habibeh a82a3fa38d add prescription changes 5 years ago
Mohammad Aljammal bf86fcc168 fix in note and AddReplayOnReferralPatient 5 years ago
Elham Rababah 15bead5164 add insert IMEI service 5 years ago
hussam al-habibeh f07208586d Add Prescription changes 5 years ago
mosazaid f1babb776b Merge branch 'development' into design-changes 5 years ago
mosazaid 0d86759245 working on dashboard re-factoring 5 years ago
Elham Rababah 9f1f06f2fc refactor verification methods services 5 years ago
Elham Rababah b20d936933 fix hospitals_service 5 years ago
hussam al-habibeh c4a6d9ad6f prescription changes 5 years ago
Elham Rababah 4dcec45603 Merge branches 'auth_refactor' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor 5 years ago
Sultan Khan 25babcfad3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 302294afad session issue fix 5 years ago
Mohammad Aljammal 5705c02bfd Merge branch 'fix_out_number' into 'development'
fix out patient number

See merge request Cloud_Solution/doctor_app_flutter!639
5 years ago
Elham Rababah 583edfed89 fix out patient number 5 years ago
mosazaid 260c708935 Merge branch 'development' into design-changes 5 years ago
Mohammad Aljammal 09d9f1ce25 Merge branch 'inpatient-hot-fix' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!638
5 years ago
mosazaid 81d518e725 hot fix 5 years ago
mosazaid 916c1266ca refactoring home screen 5 years ago
Sultan Khan f84bc6da9d voice command uodated 5 years ago
Sultan Khan b66d9d1ed6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5a42184716 voice commad updated 5 years ago
Elham Rababah c72ef3f585 finish refactoring login 5 years ago
hussam al-habibeh 4eba6d9f5a Project refactoring 5 years ago
Elham Rababah 34c58149a0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor 5 years ago
Elham Rababah 1a1757f841 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter 5 years ago
Elham Rababah 663d2a942f first step from refactoring auth part 5 years ago
Mohammad Aljammal d6e621e4ce Merge branch 'design-changes' into 'development'
Design changes

See merge request Cloud_Solution/doctor_app_flutter!635
5 years ago
Mohammad Aljammal a82775fc61 Merge branch 'app_translation' into 'development'
SMS Popup design fix

See merge request Cloud_Solution/doctor_app_flutter!634
5 years ago
mosazaid 802bd83ddd design-changes 5 years ago
hussam al-habibeh 1bcc643fb9 SMS Popup design fix 5 years ago
Elham Rababah 607da6af66 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
 Conflicts:
	lib/core/viewModel/PatientSearchViewModel.dart
5 years ago
Elham Rababah c3c4b66271 refactor search file name 5 years ago
Elham Rababah 7559ab31c0 fix out patient + fix steper in arabic 5 years ago
mosazaid a61cae4922 Merge branch 'development' into design-changes 5 years ago
mosazaid 6fba03ed69 design fixes 5 years ago
Mohammad Aljammal 866f6cc8ea Merge branch 'add_out_patient_filter' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!630
5 years ago
Elham Rababah 8e4d9d9692 hot fix 5 years ago
mosazaid 3295143840 Merge branch 'development' into design-changes 5 years ago
mosazaid eb74002cf0 hot fix 5 years ago
Mohammad Aljammal c6ac829813 hot fixes in PatientReferralScreen 5 years ago
Mohammad Aljammal 88b8454afe Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/screens/patients/DischargedPatientPage.dart
5 years ago
mosazaid 7eea1bf4a5 Merge branch 'development' into design-changes
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid b43b7cafcc working on in-patient screen design 5 years ago
Mohammad Aljammal 0d71378400 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Elham Rababah fba71b69ce Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Elham Rababah 6153c81aa4 small fix 5 years ago
Elham Rababah 7bc897bf39 fix profile issue 5 years ago
Mohammad Aljammal 82544cb2e7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Mohammad Aljammal 989774a0b3 Fix patient card and add the discharged in Patient referral page 5 years ago
hussam al-habibeh c24bb604d4 DashBoard design fix 5 years ago
Elham Rababah 0b473f630f translate progress_note_screen 5 years ago
Elham Rababah d5d57e7997 fix new design issue 5 years ago
Mohammad Aljammal 2978aeecb2 fix the tab bar 5 years ago
Mohammad Aljammal 27a3dd1eb4 fix the filter page 5 years ago
Mohammad Aljammal 2c81941428 Merge branch 'add_out_patient_filter' into 'development'
Add out patient filter

See merge request Cloud_Solution/doctor_app_flutter!622
5 years ago
Elham Rababah eebaf01570 fix diff msg 5 years ago
Elham Rababah 01bd55366a date difference 5 years ago
Elham Rababah f4020af4f8 date fix 5 years ago
Elham Rababah 4d87c6fb75 date fix 5 years ago
Elham Rababah 7337dc4f87 date picker 5 years ago
Mohammad Aljammal b1f1b7e34d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/screens/patients/profile/lab_result/labs_home_page.dart
	lib/screens/patients/profile/radiology/radiology_home_page.dart
5 years ago
Mohammad Aljammal ed3449bcf4 fix the doctor card in lab result and radiology 5 years ago
Mohammad Aljammal 04be0a7fc6 Merge branch 'add_out_patient_filter' into 'development'
Add out patient filter

See merge request Cloud_Solution/doctor_app_flutter!620
5 years ago
Elham Rababah fe581ae7ce remove button height 5 years ago
hussam al-habibeh 51e9df7401 page translation 5 years ago
hussam al-habibeh b5bebea932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
hussam al-habibeh c86a3dabda page translation 5 years ago
Elham Rababah f0457f4e99 finish filter page 5 years ago
Elham Rababah dcdbe76e54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issus_soap
 Conflicts:
	lib/screens/patients/profile/patient_profile_screen.dart
5 years ago
Elham Rababah 0f8820fa44 fix profile screen and start the first step from filter page 5 years ago
mosazaid 68f405cb21 design fixes 5 years ago
mosazaid 55895496e1 Merge branch 'design-changes' into development 5 years ago
mosazaid 3d6b55681a fix arabic and font style 5 years ago
Mohammad Aljammal 4613de5fe1 Merge branch 'fix_issus_soap' into 'development'
Fix issus soap

See merge request Cloud_Solution/doctor_app_flutter!617
5 years ago
Mohammad Aljammal 16717ede58 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/doctor_app_flutter!616
5 years ago
Elham Rababah 7c2889c5d2 fix height issue 5 years ago
Haroon Amjad 0244334bb5 Update on store 5 years ago
Elham Rababah 8e9687c2ed fix issue on add examination 5 years ago
Elham Rababah 30bc9b4bea fix issue 5 years ago
Mohammad Aljammal f08a91b0b8 Merge branch 'in-patient_re-design' into 'development'
In patient re design

See merge request Cloud_Solution/doctor_app_flutter!608
5 years ago
Haroon Amjad 53a610213c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/home/home_screen.dart
#	lib/widgets/auth/login_form.dart
#	lib/widgets/auth/verfiy_account.dart
5 years ago
Mohammad Aljammal 1dd668ed70 hot fixes 5 years ago
Elham Rababah bfd36b1c77 fix scrolling step 3 5 years ago
Elham Rababah cfe3056f17 fix scrolling step 2 5 years ago
Elham Rababah 72bf5d2337 fix scrolling in patient screen 5 years ago
Elham Rababah acb1bdbb37 fix 5 years ago
Elham Rababah b6d1c698e2 fix 5 years ago
Elham Rababah d37051ebe0 fix button 5 years ago
Elham Rababah e06771a298 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient 5 years ago
Mohammad Aljammal dc9f75f0ca hot fixes 5 years ago
Elham Rababah cf1d4439f2 fix issue of out SA in case of 3 or 2 project id 5 years ago
mosazaid b91d41428f Merge branch 'development' into in-patient_re-design 5 years ago
mosazaid 4f6fec07da vital sign fix bug 5 years ago
Mohammad Aljammal ef70a8f15d Merge branch 'referral_in_patient' into 'development'
Referral in patient

See merge request Cloud_Solution/doctor_app_flutter!607
5 years ago
Mohammad Aljammal a1a500813b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal 21fd90ea8c hot fixes 5 years ago
Elham Rababah 4c493d8ea6 fix issue in patients_screen 5 years ago
Mohammad Aljammal 60eb7adab1 hot fixes 5 years ago
Elham Rababah 05a3ca7300 add doctor profile 5 years ago
Mohammad Aljammal 3e2323fbc0 Merge branch 'referral_in_patient' into 'development'
hot fixes

See merge request Cloud_Solution/doctor_app_flutter!605
5 years ago
Mohammad Aljammal debfc02af0 Merge branch 'search_out_patient' into 'development'
Search out patient

See merge request Cloud_Solution/doctor_app_flutter!604
5 years ago
Mohammad Aljammal c3ac50a859 hot fixes 5 years ago
Elham Rababah 29831e8207 return code back 5 years ago
Elham Rababah 48471bbc07 fix small 5 years ago
Elham Rababah a91d64f103 samll fix 5 years ago
Mohammad Aljammal 35b3aaf90a Merge branch 'search_out_patient' into 'development'
fix small bug

See merge request Cloud_Solution/doctor_app_flutter!602
5 years ago
Mohammad Aljammal 7346c9b0c3 Merge branch 'in_patient_services' into 'development'
add procedure form update

See merge request Cloud_Solution/doctor_app_flutter!603
5 years ago
hussam al-habibeh 8a564b34ac add procedure form update 5 years ago
Elham Rababah 1e68f8fe33 fix small bug 5 years ago
Mohammad Aljammal 85288cc014 Add filter in outpatient 5 years ago
Mohammad Aljammal 3c4f7654a1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal f4fd4b26d6 Add filter in outpatient 5 years ago
Mohammad Aljammal 17512e372f Merge branch 'search_out_patient' into 'development'
Search out patient

See merge request Cloud_Solution/doctor_app_flutter!600
5 years ago
Elham Rababah b6e698d4e4 fix header 5 years ago
Elham Rababah 50a240122d fix date issue 5 years ago
Mohammad Aljammal ac4df7b9d8 Merge branch 'referral_in_patient' into 'development'
Referral in patient

See merge request Cloud_Solution/doctor_app_flutter!599
5 years ago
Mohammad Aljammal 3af47304b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal 8d652372ff Merge branch 'search_out_patient' into 'development'
Search out patient

See merge request Cloud_Solution/doctor_app_flutter!598
5 years ago
Mohammad Aljammal 686c81463b Fix Patient Profile 5 years ago
Mohammad Aljammal 3927c40d7e Fix Patient Profile 5 years ago
Elham Rababah b5a90bd658 finish search 5 years ago
Elham Rababah 403fece008 commit things 5 years ago
Elham Rababah 5daadc8369 commit 5 years ago
Elham Rababah 46b4ea25ea fix search part 5 years ago
Mohammad Aljammal e252eb6e1f Merge branch 'search_out_patient' into 'development'
fix search issue

See merge request Cloud_Solution/doctor_app_flutter!597
5 years ago
Elham Rababah c12818f1d0 fix search issue 5 years ago
mosazaid 7c8583075a Merge branch 'development' into in-patient_re-design
# Conflicts:
#	lib/core/viewModel/PatientSearchViewModel.dart
5 years ago
Mohammad Aljammal cab9cddef0 Merge branch 'in_patient_services' into 'development'
Search Profile Patient update

See merge request Cloud_Solution/doctor_app_flutter!596
5 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
5 years ago
hussam al-habibeh 975260df2a Search Profile Patient update 5 years ago
mosazaid 9870356e6e Merge branch 'development' into in-patient_re-design 5 years ago
mosazaid 286d883c9b in-patient re-design 5 years ago
Elham Rababah cc7d64e9d1 fix merge issue 5 years ago
Elham Rababah 56a5209d92 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
 Conflicts:
	lib/core/model/PatientSearchRequestModel.dart
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/locator.dart
5 years ago
Elham Rababah 963e4b6373 fix issue 5 years ago
Elham Rababah 20f7664b4c fix issue 5 years ago
Mohammad Aljammal 54166c0568 Merge branch 'in_patient_services' into 'development'
sick leave service

See merge request Cloud_Solution/doctor_app_flutter!593
5 years ago
hussam al-habibeh 058a6d9e8c sick leave service 5 years ago
mosazaid 40c0f9f4a0 Merge branch 'development' into in-patient_re-design 5 years ago
mosazaid 3e24278d89 in-patient re-design 5 years ago
Mohammad Aljammal 357e01c846 hot fixes 5 years ago
Elham Rababah c062a14cc2 Merge branches 'development' and 'search_out_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient 5 years ago
Elham Rababah cb67dcc9e1 first step from search 5 years ago
Mohammad Aljammal 55c63c9531 fix Discharged Patient 5 years ago
Mohammad Aljammal 57d22aca13 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal c9c18efd72 add in lab result get in and out patient 5 years ago
Mohammad Aljammal 98eec8fcdb Merge branch 'referral_in_patient' into 'development'
add PatientSearchViewModel

See merge request Cloud_Solution/doctor_app_flutter!589
5 years ago
Mohammad Aljammal 2f01fa1b53 add PatientSearchViewModel 5 years ago
Mohammad Aljammal d18ca12aac Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!587
5 years ago
Mohammad Aljammal 0647dc4bc3 Merge branch 'design-changes' into 'development'
some functionality and design changes

See merge request Cloud_Solution/doctor_app_flutter!586
5 years ago
Mohammad Aljammal 4a92a6c7a0 Merge branch 'referral_in_patient' into 'development'
add PatientSearchRequestModel

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

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

See merge request Cloud_Solution/doctor_app_flutter!578
5 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
5 years ago
Mohammad Aljammal 97c29945d0 Merge branch 'in_patient_services' into 'development'
procedure screen hot fix

See merge request Cloud_Solution/doctor_app_flutter!577
5 years ago
Elham Rababah 5075a52a02 fix radiology date 5 years ago
hussam al-habibeh 9a2cd1719b procedure screen hot fix 5 years ago
mosazaid 9468450c4d Merge branch 'development' into in-patient-changes 5 years ago
mosazaid 3335147313 vital sign add oxygenation 5 years ago
Mohammad Aljammal b2bcb3dd6d Done Referral Discharged Patient 5 years ago
Elham Rababah fd7b8b19e3 fix progress_note_screen 5 years ago
mosazaid 5003b3a001 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 5 years ago
mosazaid 1b8e3eb895 some fixes 5 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
5 years ago
Mohammad Aljammal 127bc16415 Merge branch 'in_patient_services' into 'development'
medical file hot fix

See merge request Cloud_Solution/doctor_app_flutter!572
5 years ago
Mohammad Aljammal 460a5293b9 add Discharged Patient 5 years ago
hussam al-habibeh 0e836c67c8 medical file hot fix 5 years ago
Mohammad Aljammal 6f6e2d3397 Merge branch 'progress_note' into 'development'
fix progress_note issue

See merge request Cloud_Solution/doctor_app_flutter!571
5 years ago
Elham Rababah 89f29d5de7 fix progress_note issue 5 years ago
Sultan Khan 872e9cd0bd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 648f6fd7cb bug fix 5 years ago
Mohammad Aljammal e87ba4db50 set VERSION_ID 5.9 5 years ago
Mohammad Aljammal 2d52058a94 done replay onReferral Patient 5 years ago
Mohammad Aljammal a3cdacad08 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 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
5 years ago
Mohammad Aljammal b924d404a8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal cd3002b0e4 done the referral 5 years ago
hussam al-habibeh 45e9ee60a9 add doctor image to in patient insurance approvals 5 years ago
Elham Rababah 1a830b7f44 make icon on top 5 years ago
Elham Rababah d8f27f6a98 add speech to text 5 years ago
Elham Rababah b1fc59aa0f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note 5 years ago
Mohammad Aljammal 89e0107b86 Merge branch 'referral_in_patient' into 'development'
Referral in patient

See merge request Cloud_Solution/doctor_app_flutter!566
5 years ago
Elham Rababah 09d2cbead5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note 5 years ago
Elham Rababah c0d568070c add icon 5 years ago
Mohammad Aljammal 9b7bb687c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal cf4d2c6cb7 Merge branch 'progress_note' into 'development'
fix radiology_service

See merge request Cloud_Solution/doctor_app_flutter!565
5 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
5 years ago
Elham Rababah 220ea803ff Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note 5 years ago
Mohammad Aljammal 5811a39a9c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Sultan Khan 3e9c93e0cd sick leave 5 years ago
Elham Rababah 723b4326ca add sick leave to inpatient 5 years ago
mosazaid 3074dfd42e hot fix 5 years ago
Elham Rababah 84ec110c82 fix radiology_service 5 years ago
Sultan Khan 9e87c63d22 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan acf74ab9fc bug fix 5 years ago
mosazaid a34db1b00c Merge branch 'development' into fridayf-fix-bug
# Conflicts:
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 42d8fc0207 finish in-patient referral 5 years ago
Mohammad Aljammal 1cfc970051 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal d14659d2b7 Merge branch 'sultan' into 'development'
Sultan

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

See merge request Cloud_Solution/doctor_app_flutter!560
5 years ago
Elham Rababah 8f871898b8 return config back 5 years ago
Elham Rababah 23cb01daf5 prevent add spaces 5 years ago
Elham Rababah 4a6503c2cf fix design issue 5 years ago
Elham Rababah 2d4cb00716 fix design issue 5 years ago
mosazaid 6eb12b011f Merge branch 'development' into fridayf-fix-bug 5 years ago
mosazaid d9f9c3e36e REFERRAL DESIGN 5 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
5 years ago
Mohammad Aljammal eec640efe8 Merge branch 'in_patient_services' into 'development'
hot fix

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

See merge request Cloud_Solution/doctor_app_flutter!557
5 years ago
Mohammad Aljammal 6d530301b6 done first page in ReferralInPatient 5 years ago
hussam al-habibeh 714c569a13 hot fix 5 years ago
Elham Rababah fceb351b6c fix the progress_note_screen 5 years ago
mosazaid 9d00440789 referral -re design 5 years ago
Elham Rababah 9e31cf5379 first step from modification 5 years ago
mosazaid 976da1e935 Merge branch 'development' into fridayf-fix-bug 5 years ago
mosazaid d06cf27724 vital-sign- fixes 5 years ago
Sultan Khan dad5aeb262 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan c9150ef088 bug fixes 5 years ago
Mohammad Aljammal 1d2ee1284e fix issues on Referral 5 years ago
Mohammad Aljammal 8a63d8bb83 hot fixes 5 years ago
Mohammad Aljammal 3127a09ecf Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 704a4bd0be hot fixes 5 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
5 years ago
mosazaid bf9ce4694f fix logic 5 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
5 years ago
hussam al-habibeh 1d09bcf251 hot fixes 5 years ago
Elham Rababah d4ddfa21e5 add the new logic 5 years ago
Mohammad Aljammal c924ea667f hot fixes 5 years ago
Sultan Khan c5f12ca307 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan e83032e725 patient card 5 years ago
Mohammad Aljammal 6007421629 Merge branch 'patient_app_services' into 'development'
Patient app services

See merge request Cloud_Solution/doctor_app_flutter!547
5 years ago
Mohammad Aljammal 0ded3a5a03 hot fixes 5 years ago
Mohammad Aljammal 349c63f4ce Merge branch 'in-patient-changes' into 'development'
hoh design fixes

See merge request Cloud_Solution/doctor_app_flutter!543
5 years ago
Mohammad Aljammal 1711f6482d Merge branch 'in_patient_services' into 'development'
small update in procedure

See merge request Cloud_Solution/doctor_app_flutter!544
5 years ago
Mohammad Aljammal 9e8aef0835 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 8350d68397 Merge branch 'progress_note' into 'development'
add condition

See merge request Cloud_Solution/doctor_app_flutter!545
5 years ago
Mohammad Aljammal 414ccdde49 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal b37c607813 done the referral service 5 years ago
Sultan Khan 426aa03aa5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan b5503a8411 fixes 5 years ago