Commit Graph

670 Commits (development)

Author SHA1 Message Date
Elham Rababh 5a91f6a25b fix issues 4 years ago
Elham Rababh 50e8e7b0d6 add translation to text status 4 years ago
Elham Rababh 7e552cccd4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pagination_doctor_repay 4 years ago
Elham Rababh ae70fe1bdf first step from doctor replay 4 years ago
Mohammad Aljammal d4fec5080c Merge branch 'fix_bugs_new' into 'development'
working on lab result detail page

See merge request Cloud_Solution/doctor_app_flutter!804
4 years ago
mosazaid 547eb430db working on lab result detail page 4 years ago
hussam al-habibeh 792c7aea9b all special lab result 4 years ago
Mohammad Aljammal d5cff77743 fix login issue and add new localizedValues 4 years ago
Mohammad Aljammal f03a6d0982 Merge branch 'in_patient_soap' into 'development'
fix add prescription

See merge request Cloud_Solution/doctor_app_flutter!801
4 years ago
hussam al-habibeh 393943a19b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_soap 4 years ago
hussam al-habibeh a845f5b48d fix add prescription 4 years ago
mosazaid 5ba26692c1 working on lab result new service 4 years ago
mosazaid 0625de2b15 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_bugs_new
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/patient_card/PatientCard.dart
4 years ago
mosazaid ac4a68600c working on lab result new service 4 years ago
Elham Rababh 943463b1d9 add pagination to doctor replay 4 years ago
Elham Rababh a5f3731b9a first step from fixing header 4 years ago
Mohammad Aljammal 794c935d05 Merge branch 'fixes_before_live' into 'development'
fix show count in home page

See merge request Cloud_Solution/doctor_app_flutter!794
4 years ago
mosazaid 0fb4b4a890 add copy to selected texts 4 years ago
Elham Rababh 1712874c87 fix show count in home page 4 years ago
Mohammad Aljammal 0489e9584f fix login issue 4 years ago
Elham Rababh e2caebde8b some fixes before live 4 years ago
Mohammad Aljammal 8b7d61ba03 Merge branch 'episode_fixes_dev_merge' into 'development'
Episode fixes dev merge

See merge request Cloud_Solution/doctor_app_flutter!788
4 years ago
Elham Rababh 53d7d68012 add badge on bottom bar in order to show number of un replied msg 4 years ago
Elham Rababh 8147d20fc6 Merge branch 'in_patient_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes_dev
 Conflicts:
	lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
	lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
4 years ago
hussam al-habibeh 8c3fc3a6f7 chief complaint in in patient 4 years ago
Elham Rababh 1c45fcea22 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes
 Conflicts:
	lib/core/viewModel/authentication_view_model.dart
4 years ago
Elham Rababh 8a4e0db113 commit config 4 years ago
Mohammad Aljammal 243108e81a Apply the new authentication logic 4 years ago
Elham Rababh 14a0911aec fix first step from Soap 4 years ago
Elham Rababh 88b04a8f5d fix stepper labels and translate it. 4 years ago
Elham Rababh 8a69becab3 fix header issues && exam issues 4 years ago
Elham Rababh 25d0a08105 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes 4 years ago
Mohammad Aljammal efd3d4942e change the google json files 4 years ago
Elham Rababh d0d6874159 create mapper for the selected items 4 years ago
Mohammad Aljammal 1429a59138 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes 4 years ago
Elham Rababh c7c6314a8d finish create episode fixes 4 years ago
Elham Rababh 638ae40035 first step for fix first step from fixes soap 4 years ago
Mohammad Aljammal f3d675cdf9 Merge branch 'medical_report_changes' into 'development'
add patient to doctor list in live care

See merge request Cloud_Solution/doctor_app_flutter!771
4 years ago
hussam al-habibeh ef8db07875 add patient to doctor list in live care 4 years ago
Mohammad Aljammal d63fa42178 Merge branch 'medical_report_changes' into 'development'
Medical report changes

See merge request Cloud_Solution/doctor_app_flutter!770
4 years ago
hussam al-habibeh d19a881801 Sick Leave doctor app API 4 years ago
Mohammad Aljammal 3be4fb2986 Fix verification methods screen 4 years ago
Mohammad Aljammal e8f9c958b1 Fix medical report issues 4 years ago
hussam al-habibeh c652f40a89 add medical report new service 4 years ago
hussam al-habibeh 07835aaa1b medical report changes 4 years ago
Mohammad Aljammal e70eabe68d Fix live care issues and qr code 4 years ago
Mohammad Aljammal 0e2bcd7916 Fix Qr issues 4 years ago
Elham Rababah 4e6237f2ce fix header from lab 4 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
4 years ago
Elham Rababah 363b55069f first step form Special Clinic 4 years ago
hussam al-habibeh 3913f8936c Scan QR Code fix 4 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
4 years ago
Elham Rababah 1edd375fd7 first step from special clinic 4 years ago
hussam al-habibeh 142fbb93fd Referrel Doctor reply 4 years ago
mosazaid c44b3d74bb reply changes 4 years ago
mosazaid 1b47b60155 Merge branch 'development' into reply-doctor_changes
# Conflicts:
#	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
4 years ago
mosazaid 10441e4af0 referral changes 4 years ago
Elham Rababah 36caca0e46 test live care and general result header in lab result 4 years ago
Elham Rababah 72966c3269 fix referral patient services 4 years ago
mosazaid 663c8d1104 Merge branch 'development' into referral-outpatient 4 years ago
Mohammad Aljammal f6922ee41a Merge branch 'live_care_fixes' into 'development'
Live care fixes

See merge request Cloud_Solution/doctor_app_flutter!724
4 years ago
mosazaid ec9f628b67 Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
4 years ago
Elham Rababah d57b331df2 add timer 4 years ago
mosazaid 400420bd4d Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
4 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
4 years ago
mosazaid 0fe6d880fd add livecare send instructions 4 years ago
mosazaid 5d0a7a4045 livecare changes 4 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
4 years ago
hussam al-habibeh 6989235334 Live care Is Login service 4 years ago
mosazaid b36ddf9317 add prescription to procedure type 4 years ago
mosazaid bc48d915c6 procedure refactoring 4 years ago
mosazaid 9454e9d8af working on procedure refactoring 4 years ago
Mohammad Aljammal e336821f65 fix lab result 5 years ago
Mohammad Aljammal 3c325ef199 fix load procedure 5 years ago
mosazaid f75ac64cad procedure get template 5 years ago
Mohammad Aljammal 6620c79478 fix ui issues 5 years ago
hussam al-habibeh e068009527 prescription form 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 e89d5b13ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_cear_services 5 years ago
Mohammad Aljammal ac701c9806 fix live care issues 5 years ago
mosazaid 73cf681e9d lab-result-special 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
hussam al-habibeh 17cca30b17 procedure changes 5 years ago
mosazaid 957cf96c16 Merge branch 'development' into medical-profile-services 5 years ago
Elham Rababah 1367f2bebb add translation 5 years ago
mosazaid 0ed0dbb5aa livecare changes 5 years ago
Elham Rababah 5778a4a887 view list of Live care patient 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
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
hussam al-habibeh c182928a5d favourite template Procedure service 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
mosazaid 2fabe85b30 Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid deb126fdd5 meical report changes 5 years ago
hussam al-habibeh 066acc404a Procedure template service 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 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
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
Elham Rababah 9b34c2c833 first step from live care 5 years ago
hussam al-habibeh 6b6243232c Procedure template service 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 0adcfeccce fix auth bug 5 years ago
mosazaid 25fb8ea5ae hot fix 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
mosazaid 444afa464e working on feature medical profile 5 years ago
mosazaid 2cf77bac85 fit dashboard design 5 years ago
hussam al-habibeh 68e9470273 hot fix 5 years ago
mosazaid fa194f5e00 hot fix 5 years ago
mosazaid 4f817810c2 hot fix 5 years ago
Mohammad Aljammal 16519d0ccf hot fix 5 years ago
Mohammad Aljammal bf86fcc168 fix in note and AddReplayOnReferralPatient 5 years ago
mosazaid 81d518e725 hot fix 5 years ago
Sultan Khan 5a42184716 voice commad updated 5 years ago
mosazaid 802bd83ddd design-changes 5 years ago
mosazaid eb74002cf0 hot fix 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
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 7bc897bf39 fix profile issue 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
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
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
Haroon Amjad 0244334bb5 Update on store 5 years ago
Mohammad Aljammal 60eb7adab1 hot fixes 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
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 cb67dcc9e1 first step from search 5 years ago
Mohammad Aljammal d18ca12aac Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!587
5 years ago
Sultan Khan 099bf81d52 homepage and sms popup updated 5 years ago
mosazaid ddc266416d some functionality and design changes 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