Commit Graph

133 Commits (new_prescreption)

Author SHA1 Message Date
Elham Rababh 9461d3d4a1 add new prescription 3 years ago
Elham Rababh 65e9840418 fix issues in lab order 3 years ago
Elham Rababh 0895a80d16 fix issues with date 3 years ago
RoaaGhali98 0d542a862e add new service 3 years ago
RoaaGhali98 79372b86c1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice
 Conflicts:
	lib/locator.dart
	lib/routes.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
3 years ago
Elham Rababh af1217dd67 finish assessment screen 3 years ago
RoaaGhali98 42feae9a2e add new medication service 3 years ago
RoaaGhali98 6e976c4597 Redesign for my_schedule_screen and make it responsive to any device 3 years ago
Elham Rababh ae5c9170a7 fix patient gird 3 years ago
hussam al-habibeh 75a10939fb adding appText to the bottom navagation 3 years ago
Elham Rababh 6b0e790cd2 add gradiant to home page 3 years ago
Elham Ali f256527302 Merge branch 'Dec_fixes' into 'development'
Dec fixes

See merge request Cloud_Solution/doctor_app_flutter!918
3 years ago
Elham Rababh a02e89febb add verfication svgs 3 years ago
hussam al-habibeh 2b763e954a bottom_sheet_title design fix 3 years ago
Elham Rababh 9e1aeb857f Patient card 3 years ago
Elham Rababh 98f6d63fcd add simibold 3 years ago
hussam al-habibeh 1c8d25c95c adding countries to registration 3 years ago
Elham Ali 81ae0b04d3 Revert "Merge branch 'hussam_flutter_2' into 'development'"
This reverts merge request !893
3 years ago
hussam al-habibeh 1146f613df flutter 2 models 3 years ago
Elham Rababh dc0f3e7235 fix utils && widget 3 years ago
Elham Rababh eceb3976ad fix issues happend after merge 3 years ago
Mohammad Aljammal 95c7161987 fix flutter 2 issue 3 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
3 years ago
mosazaid 61b0f6c22c Merge branch 'development' into video-streaming-android 3 years ago
Zohaib Iqbal Kambrani f60ff85e31 no message 3 years ago
hussam al-habibeh 142fbb93fd Referrel Doctor reply 3 years ago
mosazaid e76ecf172f video-straming-android-changes 3 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
3 years ago
Elham Rababah d57b331df2 add timer 3 years ago
hussam al-habibeh c800219428 Live Care Is Login Service 3 years ago
mosazaid ea0658c05c Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/viewModel/procedure_View_model.dart
3 years ago
Mohammad Aljammal ad74ff00dc fix issues in android and add ChangeCallStatus services in IOS 3 years ago
hussam al-habibeh e068009527 prescription form 3 years ago
Mohammad Aljammal 08d72ed121 Merge branch 'prescription_changes' into 'development'
Procedure template service

See merge request Cloud_Solution/doctor_app_flutter!680
3 years ago
hussam al-habibeh d50740b9b9 Procedure template service 3 years ago
mosazaid 67e0cac742 add livecare to home 3 years ago
Mohammad Aljammal 40b4a83c6b Fix Expansion Procedure 3 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
3 years ago
Elham Rababah 8cac9b6fe9 add rich editor 3 years ago
hussam al-habibeh 6b6243232c Procedure template service 3 years ago
Mohammad Aljammal 8e4321b3da Migration dev to Zohaib branch 4 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
4 years ago
mosazaid a34db1b00c Merge branch 'development' into fridayf-fix-bug
# Conflicts:
#	lib/util/translations_delegate_base.dart
4 years ago
Sultan Khan b52ba524a3 updated 4 years ago
hussam al-habibeh 6a33f60bad hot fixes 4 years ago
Sultan Khan 0ea66c4483 bug fixes 4 years ago
Mohammad Aljammal 327e058fbd fix design issues and merge conflict 4 years ago
hussam al-habibeh 92d33abac0 adding Doctor image in medical file & adding DoctorApp new Icons 4 years ago
Mohammad Aljammal fa1a5c7099 hot fix 4 years ago
hussam al-habibeh d1a6c2a703 adding add prescription form 4 years ago