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
|
fb6ef8fca1
|
fix appointment in live care
|
5 years ago |
Mohammad Aljammal
|
ac701c9806
|
fix live care issues
|
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 |
|
Elham Rababah
|
401516403f
|
first step from show Video call
|
5 years ago |
mosazaid
|
957cf96c16
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
|
mosazaid
|
8b2c7f1a05
|
livecare
|
5 years ago |
|
Elham Rababah
|
1367f2bebb
|
add translation
|
5 years ago |
|
Elham Rababah
|
6d989e3fc3
|
finish new service for live care
|
5 years ago |
|
Elham Rababah
|
d49d52458b
|
fix birthOfDate
|
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
|
57fcd2cdeb
|
fix home page design
|
5 years ago |
|
mosazaid
|
6192d9a84f
|
working on medical-profile
|
5 years ago |
|
Elham Rababah
|
9b34c2c833
|
first step from live care
|
5 years ago |
|
mosazaid
|
802bd83ddd
|
design-changes
|
5 years ago |
|
mosazaid
|
6fba03ed69
|
design fixes
|
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
|
7bc897bf39
|
fix profile issue
|
5 years ago |
|
Mohammad Aljammal
|
27a3dd1eb4
|
fix the filter page
|
5 years ago |
|
Elham Rababah
|
0f8820fa44
|
fix profile screen and start the first step from filter page
|
5 years ago |