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 |
Mohammad Aljammal
|
f1d1cc6243
|
Merge branch 'navigation_service' into 'development'
add NavigationService
See merge request Cloud_Solution/doctor_app_flutter!727
|
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 |
|
Mohammad Aljammal
|
b779450b62
|
Merge branch 'referral-outpatient' into 'development'
Merge branch 'development' into procedure_refactoring
See merge request Cloud_Solution/doctor_app_flutter!726
|
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 |
|
Mohammad Aljammal
|
77be588614
|
Merge branch 'procedure_refactoring' into 'development'
livecare
See merge request Cloud_Solution/doctor_app_flutter!722
|
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
|
64001e6b19
|
Merge branch 'procedure_refactoring' into 'development'
livecare changes
See merge request Cloud_Solution/doctor_app_flutter!721
|
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 |
|
Mohammad Aljammal
|
d6d58c5545
|
Merge branch 'favourite_prescription' into 'development'
Favourite prescription
See merge request Cloud_Solution/doctor_app_flutter!720
|
5 years ago |
|
mosazaid
|
0fe6d880fd
|
add livecare send instructions
|
5 years ago |
|
mosazaid
|
3edb4f68cf
|
Merge branch 'development' into procedure_refactoring
|
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 |
|
Mohammad Aljammal
|
f535bf1eaa
|
Merge branch 'procedure_refactoring' into 'development'
working on procedure refactoring
See merge request Cloud_Solution/doctor_app_flutter!711
|
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
|
7483f662f8
|
Merge branch 'fix_patient_mrn' into 'development'
hot fix in medical report
See merge request Cloud_Solution/doctor_app_flutter!718
|
5 years ago |
|
Mohammad Aljammal
|
d9358bce75
|
hot fix in medical report
|
5 years ago |
|
Mohammad Aljammal
|
9b857c47be
|
Merge branch 'fix_patient_mrn' into 'development'
fix ios issues
See merge request Cloud_Solution/doctor_app_flutter!717
|
5 years ago |
|
Mohammad Aljammal
|
7f2f065806
|
fix ios issues
|
5 years ago |
|
Mohammad Aljammal
|
cf69d34829
|
Merge branch 'fix_patient_mrn' into 'development'
fix patient MRN
See merge request Cloud_Solution/doctor_app_flutter!716
|
5 years ago |
|
Mohammad Aljammal
|
a9a7c8a73c
|
fix patient MRN
|
5 years ago |
|
Mohammad Aljammal
|
ff18b8c0ae
|
Merge branch 'live_care_appointment' into 'development'
fix appointment in live care
See merge request Cloud_Solution/doctor_app_flutter!715
|
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 |