Mohammad Aljammal
|
13be95a0bb
|
Merge branch 'feature_admission_request' into 'development'
Feature admission request
See merge request Cloud_Solution/doctor_app_flutter!210
|
6 years ago |
mosazaid
|
b4f813fc2d
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/locator.dart
# lib/routes.dart
|
6 years ago |
|
Mohammad Aljammal
|
3cb96f35ca
|
Merge branch 'design-updates' into 'development'
Design updates
See merge request Cloud_Solution/doctor_app_flutter!211
|
6 years ago |
hussam al-habibeh
|
d1a261c847
|
procedure update
|
6 years ago |
|
mosazaid
|
0e645c2b1f
|
Merge branch 'development' into feature_admission_request
|
6 years ago |
|
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
6 years ago |
|
Mohammad Aljammal
|
15b0f5c9f6
|
Merge branch 'login_back' into 'development'
return login
See merge request Cloud_Solution/doctor_app_flutter!209
|
6 years ago |
Mohammad Aljammal
|
93c0bdf32a
|
return login
|
6 years ago |
Elham
|
33bb7dd652
|
Merge branch 'SOAP' into 'development'
Soap
See merge request Cloud_Solution/doctor_app_flutter!208
|
6 years ago |
Elham Rababah
|
6a7f0e605f
|
Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
|
6 years ago |
|
Elham Rababah
|
4caf40a2ab
|
finish plan page
|
6 years ago |
|
Mohammad Aljammal
|
1af5f1040f
|
add search in soap update
|
6 years ago |
|
Mohammad Aljammal
|
d5bde6228a
|
add search in update assessment page
|
6 years ago |
|
hussam al-habibeh
|
b3567df020
|
medical file model
|
6 years ago |
|
Elham Rababah
|
d8ac550357
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
|
6 years ago |
|
Elham Rababah
|
311bee5136
|
try to fix get
|
6 years ago |
|
Elham Rababah
|
46043efb42
|
Finish Update objective code Page
|
6 years ago |
|
Elham Rababah
|
c92a848851
|
Finish Update Subjective Page
|
6 years ago |
|
mosazaid
|
e9ffbf06a6
|
Merge branch 'development' into feature_admission_request
|
6 years ago |
|
hussam al-habibeh
|
9210600e15
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
6 years ago |
|
mosazaid
|
3578c82f62
|
solve hacking patient screen
|
6 years ago |
|
mosazaid
|
095a915a89
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
6 years ago |
|
hussam al-habibeh
|
62984ffb03
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
6 years ago |
|
mosazaid
|
cb4ee05b40
|
working on ucaf
|
6 years ago |
|
hussam al-habibeh
|
ce0303fbce
|
Merge branch 'search_in_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/config.dart
|
6 years ago |
|
hussam al-habibeh
|
adb8033138
|
update prescription
|
6 years ago |
|
Mohammad Aljammal
|
27735c23d5
|
Merge branch 'search_in_soap' into 'development'
Search in soap
See merge request Cloud_Solution/doctor_app_flutter!207
|
6 years ago |
|
Mohammad Aljammal
|
a723ecbf1d
|
fix merger
|
6 years ago |
|
Mohammad Aljammal
|
5669021add
|
Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
Conflicts:
lib/widgets/patients/profile/SOAP/assessment_page.dart
lib/widgets/patients/profile/SOAP/subjective/add_allergies_widget.dart
lib/widgets/patients/profile/SOAP/subjective/subjective_page.dart
|
6 years ago |
|
Mohammad Aljammal
|
9bf08e81da
|
Add search button name and hint search text in MasterKeyCheckboxSearchWidget
|
6 years ago |
|
Elham Rababah
|
39970fe1a8
|
get update_subjective_page.dart
|
6 years ago |
|
Mohammad Aljammal
|
45edddb49f
|
Add search in Procedure Screen
|
6 years ago |
|
Mohammad Aljammal
|
b60b45ab53
|
Merge branch 'design-updates' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
Conflicts:
lib/screens/patients/patient_search_screen.dart
|
6 years ago |
|
Mohammad Aljammal
|
93bece09d7
|
add search in SOAP
|
6 years ago |
|
Elham Rababah
|
f0fd5d30e1
|
First step from update process
|
6 years ago |
|
mosazaid
|
ae6cd0e5f8
|
Merge branch 'development' into feature_admission_request
|
6 years ago |
|
mosazaid
|
5142b5b6c7
|
finish admission request design
|
6 years ago |
|
hussam al-habibeh
|
b3345a86ef
|
post prescription
|
6 years ago |
|
Elham Rababah
|
ea4bf159c6
|
commit issue
|
6 years ago |
|
Elham
|
88c2c04d68
|
Merge branch 'design-updates' into 'development'
post prescription
See merge request Cloud_Solution/doctor_app_flutter!203
|
6 years ago |
|
Elham
|
b554a157df
|
Merge branch 'SOAP' into 'development'
Soap
See merge request Cloud_Solution/doctor_app_flutter!205
|
6 years ago |
|
Elham Rababah
|
05e7762533
|
fix obj page
|
6 years ago |
|
Elham Rababah
|
49f7dab008
|
Merge branches 'SOAP' and 'patient_arrival_ist' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
|
6 years ago |
|
Elham Rababah
|
61209663f3
|
Finish arrived
|
6 years ago |
|
Elham Rababah
|
06a1236c68
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_arrival_ist
Conflicts:
lib/screens/patients/patient_search_screen.dart
|
6 years ago |
|
mosazaid
|
4d44d54806
|
Merge branch 'development' into feature_admission_request
|
6 years ago |
|
Mohammad Aljammal
|
5386866039
|
Merge branch 'hack_login' into 'development'
hack login
See merge request Cloud_Solution/doctor_app_flutter!204
|
6 years ago |
|
Mohammad Aljammal
|
806682b921
|
hack login
|
6 years ago |
|
Elham Rababah
|
dccf474e70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_arrival_ist
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
lib/core/service/patient_service.dart
lib/core/viewModel/patient_view_model.dart
lib/lookups/patient_lookup.dart
lib/models/patient/patiant_info_model.dart
lib/screens/patients/patients_screen.dart
|
6 years ago |
|
mosazaid
|
873ee67eb7
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
6 years ago |