Commit Graph

190 Commits (ipd-changes-for-vida-plus)

Author SHA1 Message Date
hussam al-habibeh bb20b4d582 flutter 2 migration 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
Mohammad Aljammal ea2a635925 hot fix 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 9d6a23c1a3 add NavigationService 5 years ago
hussam al-habibeh 6e6a7deba5 migration Services to flutter 2 5 years ago
Mohammad Aljammal d784310c82 Migrate models to flutter 2 5 years ago
Mohammad Aljammal 0747dfb1e0 Migrate to flutter 2 5 years ago
Mohammad Aljammal ad74ff00dc fix issues in android and add ChangeCallStatus services in IOS 5 years ago
mosazaid f75ac64cad procedure get template 5 years ago
Mohammad Aljammal 281a807ec8 fix live care 5 years ago
hussam al-habibeh f26d870d5b procedure changes 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 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
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 d574dd0b16 return base app client 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
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 e0be4ec1be move logout function from helper to authentication view model 5 years ago
Mohammad Aljammal 8399677a0a Fix Dubai user issues 5 years ago
Mohammad Aljammal bf86fcc168 fix in note and AddReplayOnReferralPatient 5 years ago
Elham Rababah 7bc897bf39 fix profile issue 5 years ago
Mohammad Aljammal 27a3dd1eb4 fix the filter page 5 years ago
Haroon Amjad 0244334bb5 Update on store 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
Mohammad Aljammal 4e37a16211 add PatientSearchRequestModel 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 b37c607813 done the referral service 5 years ago
Mohammad Aljammal fd790978c4 add new referral service 5 years ago
Sultan Khan 4a8ae97518 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 0ea66c4483 bug fixes 5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
Mohammad Aljammal 2d7b2003bd hot fixes 5 years ago
Mohammad Aljammal 90fdeb7893 add update page 5 years ago
Mohammad Aljammal 7ab149a1cb hot fix 5 years ago
Mohammad Aljammal f4d1aac5e6 hot fixes on doctor replay and schedule 5 years ago
Mohammad Aljammal b6941d9f63 Merge branch 'Stepper_header' into 'development'
small fixes in soap and in all app.

See merge request Cloud_Solution/doctor_app_flutter!495
5 years ago
Elham Rababah 2aba9e79f1 small fixes in soap and in all app. 5 years ago
Mohammad Aljammal da084d889c hot ECG,add a new button and hot fixes 5 years ago
Sultan Khan 5c4aee849e bug fixes 5 years ago
Mohammad Aljammal 16bc4adcd7 hot fixes 5 years ago
Mohammad Aljammal 70a0104750 hot fix 5 years ago
Mohammad Aljammal e6cad64cf0 fix PatientArrivalList 5 years ago
Mohammad Aljammal 6ca4797c91 hot fixes 5 years ago
Sultan Khan b19c3092a6 bug fixes 5 years ago
Mohammad Aljammal 17f8b05748 Add prescriptions and radiology from the patient app 5 years ago
Mohammad Aljammal 7dae41513f Add insurance approval services 5 years ago
Mohammad Aljammal 0742d64428 add lab result services 5 years ago
Sultan Khan 12f936d045 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 531e7f497b drug to drug intraction 5 years ago
Elham Rababah 12b78d0a3b fix DA-391: return back my comment code in base app client 5 years ago
Elham Rababah 8615671095 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_medication_details
 Conflicts:
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah f819e6353e fix DA-350 5 years ago
Sultan Khan a309acbf46 dashboard changes 5 years ago
Elham Rababah 2b07d16f00 fix : DA-303 5 years ago
Sultan Khan 896078507f gub fixes 5 years ago
Sultan Khan ad99cebf02 login and drug to drug 5 years ago
Sultan Khan 909940a6d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 40e9ab864a login changes 5 years ago
Elham Rababah a46a61c5cf fix get and post issue to make it works with vida 5 years ago
Elham Rababah 7ce1d2dd55 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
mosazaid e75e7801aa working on UCAF get data 5 years ago
Elham Rababah 9aa5ab4228 small changes 5 years ago
Elham Rababah cece85cda7 small fix remove todo 5 years ago
Elham Rababah e65740761a add improvement on create episode 5 years ago
Mohammad Aljammal 93c0bdf32a return login 5 years ago
Elham Rababah 05e7762533 fix obj page 5 years ago
Mohammad Aljammal 6f2e764deb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hack_login
 Conflicts:
	lib/client/base_app_client.dart
	lib/routes.dart
5 years ago
Mohammad Aljammal 04ed76069c hack login 5 years ago
Mohammad Aljammal 21252c6ae9 Merge branch 'feature-vital-sign' into 'development'
Feature vital sign

See merge request Cloud_Solution/doctor_app_flutter!201
5 years ago
Elham Rababah 72886ccaa7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Elham Rababah a47e9b69f5 add CDI service 5 years ago
mosazaid 25d884c774 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/routes.dart
#	lib/util/helpers.dart
#	lib/util/translations_delegate_base.dart
#	lib/widgets/patients/profile/SOAP/add_SOAP_index.dart
#	pubspec.lock
5 years ago
hussam al-habibeh 0c18d96ba2 post procedure 5 years ago
Mohammad Aljammal df83883139 fix base app client 5 years ago
Mohammad Aljammal 7c4e0d929f fix base app client 5 years ago
Sultan Khan e45220829f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah e6af5a3e39 remove is Auth for test target 5 years ago
Elham Rababah cd46b4317c fix error null thing 5 years ago
Elham Rababah cde56a82f2 Finish subjective 5 years ago
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah d4a1dcfc81 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
	lib/core/service/base/lookup-service.dart
5 years ago
Elham Rababah 18d58e7037 remove is Auth for test target 5 years ago
Sultan Khan 384c7cd58a code merged 5 years ago