Mohammad Aljammal
|
16dac03b24
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_home_design
Conflicts:
lib/locator.dart
lib/screens/home/home_screen.dart
|
5 years ago |
|
Mohammad Aljammal
|
f6539c82a6
|
add live care card in home page
|
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 |
|
hussam al-habibeh
|
e1d00b87ad
|
favourite template Procedure service
|
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
|
57fcd2cdeb
|
fix home page design
|
5 years ago |
|
mosazaid
|
9e80a1879e
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/locator.dart
|
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 |
|
hussam al-habibeh
|
6b6243232c
|
Procedure template service
|
5 years ago |
|
Elham Rababah
|
6815e47814
|
remove doctor profile view model
|
5 years ago |
|
Elham Rababah
|
2e71706cab
|
add UNVERIFIED status
|
5 years ago |
|
Elham Rababah
|
fd9f93a936
|
do some refactor and change the code to view model
|
5 years ago |
|
Mohammad Aljammal
|
b3ae86db31
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ZohaibKambrani
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 |
|
hussam al-habibeh
|
292bc2a97f
|
prescription changes
|
5 years ago |
|
hussam al-habibeh
|
c50a483663
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
Conflicts:
lib/core/service/patient_medical_file/prescription/prescription_service.dart
lib/core/viewModel/prescription_view_model.dart
lib/screens/prescription/add_prescription_form.dart
|
5 years ago |
|
hussam al-habibeh
|
cecc1a725d
|
pescription changes
|
5 years ago |
|
Mohammad Aljammal
|
74ded739c8
|
fix imports
|
5 years ago |
|
Elham Rababah
|
745545ffc3
|
add models
|
5 years ago |
|
hussam al-habibeh
|
bc340693ba
|
project refactoring
|
5 years ago |
|
hussam al-habibeh
|
9457e04825
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
Conflicts:
lib/core/viewModel/PatientSearchViewModel.dart
lib/screens/patients/PatientsInPatientScreen.dart
lib/screens/patients/out_patient/out_patient_screen.dart
lib/screens/patients/patient_search/patient_search_result_screen.dart
lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
lib/screens/sick-leave/add-sickleave.dart
|
5 years ago |
|
Elham Rababah
|
333d1e3f50
|
first step from models
|
5 years ago |
|
Elham Rababah
|
7af300d455
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor
|
5 years ago |
|
Elham Rababah
|
53791f1028
|
change imei to authentication
|
5 years ago |
|
Elham Rababah
|
a5120b473f
|
rename Auth view model to Doctor Profile View Model
|
5 years ago |
|
Mohammad Aljammal
|
bf86fcc168
|
fix in note and AddReplayOnReferralPatient
|
5 years ago |
|
Elham Rababah
|
15bead5164
|
add insert IMEI service
|
5 years ago |
|
Elham Rababah
|
9f1f06f2fc
|
refactor verification methods services
|
5 years ago |
|
Elham Rababah
|
b20d936933
|
fix hospitals_service
|
5 years ago |
|
hussam al-habibeh
|
4eba6d9f5a
|
Project refactoring
|
5 years ago |
|
Elham Rababah
|
663d2a942f
|
first step from refactoring auth part
|
5 years ago |
|
mosazaid
|
b43b7cafcc
|
working on in-patient screen design
|
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 |
|
Haroon Amjad
|
53a610213c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
# lib/screens/home/home_screen.dart
# lib/widgets/auth/login_form.dart
# lib/widgets/auth/verfiy_account.dart
|
5 years ago |
|
Mohammad Aljammal
|
1dd668ed70
|
hot fixes
|
5 years ago |
|
Mohammad Aljammal
|
dc9f75f0ca
|
hot fixes
|
5 years ago |
|
Mohammad Aljammal
|
60eb7adab1
|
hot fixes
|
5 years ago |
|
hussam al-habibeh
|
8a564b34ac
|
add procedure form update
|
5 years ago |
Zohaib Iqbal Kambrani
|
4b7688d620
|
showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
|
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 |
Mohammad Aljammal
|
54166c0568
|
Merge branch 'in_patient_services' into 'development'
sick leave service
See merge request Cloud_Solution/doctor_app_flutter!593
|
5 years ago |
|
hussam al-habibeh
|
058a6d9e8c
|
sick leave service
|
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
|
c062a14cc2
|
Merge branches 'development' and 'search_out_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
|
5 years ago |
|
Elham Rababah
|
cb67dcc9e1
|
first step from search
|
5 years ago |
|
Mohammad Aljammal
|
55c63c9531
|
fix Discharged Patient
|
5 years ago |
|
Mohammad Aljammal
|
57d22aca13
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
|
Mohammad Aljammal
|
c9c18efd72
|
add in lab result get in and out patient
|
5 years ago |
|
mosazaid
|
ddc266416d
|
some functionality and design changes
|
5 years ago |
|
Mohammad Aljammal
|
f708689d00
|
hot fixes
|
5 years ago |
|
Mohammad Aljammal
|
29e2d962bc
|
Optimize imports
|
5 years ago |
|
Mohammad Aljammal
|
97c29945d0
|
Merge branch 'in_patient_services' into 'development'
procedure screen hot fix
See merge request Cloud_Solution/doctor_app_flutter!577
|
5 years ago |
|
hussam al-habibeh
|
9a2cd1719b
|
procedure screen hot fix
|
5 years ago |
|
mosazaid
|
5003b3a001
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
5 years ago |
|
mosazaid
|
1b8e3eb895
|
some fixes
|
5 years ago |
|
Mohammad Aljammal
|
460a5293b9
|
add Discharged Patient
|
5 years ago |
|
Mohammad Aljammal
|
89e0107b86
|
Merge branch 'referral_in_patient' into 'development'
Referral in patient
See merge request Cloud_Solution/doctor_app_flutter!566
|
5 years ago |
|
Mohammad Aljammal
|
9b7bb687c8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
|
Mohammad Aljammal
|
cf4d2c6cb7
|
Merge branch 'progress_note' into 'development'
fix radiology_service
See merge request Cloud_Solution/doctor_app_flutter!565
|
5 years ago |
|
Elham Rababah
|
84ec110c82
|
fix radiology_service
|
5 years ago |
|
mosazaid
|
42d8fc0207
|
finish in-patient referral
|
5 years ago |
|
Mohammad Aljammal
|
3c224ece41
|
Add replay on referral patient and add the time on the vital signs
|
5 years ago |
|
Mohammad Aljammal
|
6d530301b6
|
done first page in ReferralInPatient
|
5 years ago |
|
mosazaid
|
596f518525
|
Merge branch 'development' into release-hot-fix
# Conflicts:
# lib/screens/patients/profile/patient_profile_screen.dart
# lib/widgets/patients/profile/PatientProfileButton.dart
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
|
mosazaid
|
bf9ce4694f
|
fix logic
|
5 years ago |
|
Elham Rababah
|
d4ddfa21e5
|
add the new logic
|
5 years ago |
|
Mohammad Aljammal
|
414ccdde49
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
|
Mohammad Aljammal
|
b37c607813
|
done the referral service
|
5 years ago |
Sultan Khan
|
426aa03aa5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
|
Sultan Khan
|
b5503a8411
|
fixes
|
5 years ago |
|
Mohammad Aljammal
|
36189adf94
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/widgets/shared/doctor_card.dart
|
5 years ago |
|
Mohammad Aljammal
|
ae8882fbae
|
Merge branch 'in-patient-changes' into 'development'
In patient changes
See merge request Cloud_Solution/doctor_app_flutter!539
|
5 years ago |
|
hussam al-habibeh
|
e3102b3f5e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
Conflicts:
lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart
|
5 years ago |
|
hussam al-habibeh
|
94e598c5f2
|
Insurance Approval In Patient
|
5 years ago |
|
mosazaid
|
2bf003c100
|
Merge branch 'development' into in-patient-changes
|
5 years ago |
|
mosazaid
|
33545d1180
|
work on in paitent referral
|
5 years ago |
|
Mohammad Aljammal
|
fd790978c4
|
add new referral service
|
5 years ago |
|
Elham Rababah
|
4a263dda8a
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
Conflicts:
lib/config/config.dart
|
5 years ago |
|
Elham Rababah
|
82285ccf39
|
show progress_note part
|
5 years ago |
|
mosazaid
|
34e9a3797c
|
Merge branch 'development' into in-patient-changes
|
5 years ago |
|
Mohammad Aljammal
|
bb8ad61b95
|
Merge branch 'in_patient_services' into 'development'
Prescriptions for in patient
See merge request Cloud_Solution/doctor_app_flutter!534
|
5 years ago |
|
hussam al-habibeh
|
3e0f87527f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
|
5 years ago |
|
hussam al-habibeh
|
017074ba56
|
Prescriptions for in patient
|
5 years ago |
|
Elham Rababah
|
f2011301c6
|
update progress_note
|
5 years ago |
|
mosazaid
|
9aecc6fbdb
|
add lap results to inpatient and some changes on patient profile
|
5 years ago |
|
mosazaid
|
b6a6f16b31
|
add vital sign inPatient
|
5 years ago |
|
Elham Rababah
|
67abe2a5e7
|
first step from radiology
|
5 years ago |
|
Elham Rababah
|
7579a21b83
|
Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor
Conflicts:
lib/widgets/auth/login_form.dart
|
5 years ago |
|
Mohammad Aljammal
|
ad0f159c98
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!516
|
5 years ago |
|
mosazaid
|
9f61c7eaa0
|
Merge branch 'design-fixes' into development
|
5 years ago |
|
mosazaid
|
65585ab586
|
add charts to procedures
|
5 years ago |
|
Elham Rababah
|
59ec9d8e56
|
first step from change text fields
|
5 years ago |
|
Sultan Khan
|
f6e0e1b0cd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
|
Sultan Khan
|
fda75c721d
|
bug fixes
|
5 years ago |
|
Haroon Amjad
|
6fc72328b7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
5 years ago |
|
Haroon Amjad
|
27b4450dac
|
versionID changed to 5.5
|
5 years ago |
|
Elham Rababah
|
76d411b79a
|
move soap folder to the correct place
|
5 years ago |
|
Mohammad Aljammal
|
cb568d74c0
|
add fun back press on relay page
|
5 years ago |
|
Mohammad Aljammal
|
7ab149a1cb
|
hot fix
|
5 years ago |
|
Mohammad Aljammal
|
d450affa37
|
Merge branch 'Stepper_header' into 'development'
add doctor replay
See merge request Cloud_Solution/doctor_app_flutter!502
|
5 years ago |
|
Elham Rababah
|
4ecf9fe4b9
|
add doctor replay
|
5 years ago |
|
mosazaid
|
8950dabf7a
|
Merge branch 'development' into textfield-validation
|
5 years ago |
|
mosazaid
|
4b32487540
|
referral design and service changes
|
5 years ago |
|
Mohammad Aljammal
|
ffabb8883c
|
fix in the verification methods and radiology page
|
5 years ago |
|
mosazaid
|
82cbf392af
|
Merge branch 'development' into textfield-validation
|
5 years ago |
|
mosazaid
|
a701b6e989
|
make referral changes
|
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
|
9268b13312
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
|
Sultan Khan
|
5c4aee849e
|
bug fixes
|
5 years ago |
|
Mohammad Aljammal
|
8ed9b3c023
|
Merge branch 'Stepper_header' into 'development'
Stepper header
See merge request Cloud_Solution/doctor_app_flutter!484
|
5 years ago |
|
Elham Rababah
|
14cf5a5a1c
|
finish fix the assessment
|
5 years ago |
|
hussam al-habibeh
|
9645791164
|
changeing add prescription behovior
|
5 years ago |
|
mosazaid
|
f8f088fe8c
|
design changes
|
5 years ago |
|
Sultan Khan
|
2aaeaa1a36
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
|
Sultan Khan
|
1fb594617a
|
bug fixes
|
5 years ago |
|
Mohammad Aljammal
|
ecccb2d068
|
fix font size
|
5 years ago |
|
Mohammad Aljammal
|
6ca4797c91
|
hot fixes
|
5 years ago |
|
Mohammad Aljammal
|
c66357a4ce
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
|
mosazaid
|
9dc708fd3d
|
Merge branch 'development' into patients-new-design
|
5 years ago |
|
mosazaid
|
494f716f05
|
working on new design on vital sign and referral screens
|
5 years ago |
|
Mohammad Aljammal
|
ca28fa77bd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
|
Mohammad Aljammal
|
5e85af35c2
|
fix radiology image
|
5 years ago |
|
Elham Rababah
|
fc98e75ec3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor_replay
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
|
Elham Rababah
|
04f39315b5
|
finish doctor replay design
|
5 years ago |
|
mosazaid
|
c642d88804
|
some fixes
|
5 years ago |
|
mosazaid
|
cc7c5af1d0
|
referral details fix bugs
|
5 years ago |
|
Mohammad Aljammal
|
6267d805f0
|
hot fixes
|
5 years ago |
|
Sultan Khan
|
a491eee7f7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
|
Sultan Khan
|
e640bcf975
|
search updated
|
5 years ago |
|
Mohammad Aljammal
|
de48ae2bff
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/config/config.dart
|
5 years ago |
|
Mohammad Aljammal
|
17f8b05748
|
Add prescriptions and radiology from the patient app
|
5 years ago |
|
Sultan Khan
|
091234ad77
|
bug fix
|
5 years ago |
|
Sultan Khan
|
1ac94d9ec8
|
bug fixes
|
5 years ago |
|
Sultan Khan
|
12dc637163
|
bug fixes
|
5 years ago |
|
Mohammad Aljammal
|
7dae41513f
|
Add insurance approval services
|
5 years ago |
|
Mohammad Aljammal
|
e515265f11
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
|
Mohammad Aljammal
|
0742d64428
|
add lab result services
|
5 years ago |
|
Elham Rababah
|
103a1bc6fc
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
Conflicts:
lib/config/localized_values.dart
lib/screens/medicine/medicine_search_screen.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
|
hussam al-habibeh
|
06fdee2d2d
|
hussam
|
5 years ago |
|
Elham Rababah
|
234cc57a2a
|
return search medicine
|
5 years ago |