Elham Ali
|
8f1d4f80bd
|
Merge branch 'roaa_schedule_design' into 'development'
Roaa schedule design
See merge request Cloud_Solution/doctor_app_flutter!959
|
3 years ago |
RoaaGhali98
|
47a077bd52
|
Edit some issues in the my_schedule_screen
|
3 years ago |
|
RoaaGhali98
|
b1a65425c5
|
Edit the my_schedule_screen design
|
3 years ago |
|
Elham Ali
|
e6e5d8e03b
|
Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
add translations to pharmacy_intervention_screen, intervention_medication and...
See merge request Cloud_Solution/doctor_app_flutter!958
|
3 years ago |
|
RoaaGhali98
|
af72810b26
|
Merge remote-tracking branch 'origin/roaa2.8_addnewmedicationservice' into roaa2.8_addnewmedicationservice
|
3 years ago |
|
RoaaGhali98
|
2ffa745e73
|
add translations to pharmacy_intervention_screen, intervention_medication and intervention_medication_history_screen
|
3 years ago |
|
Elham Ali
|
c6a091ae32
|
Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
Wrapping the Row cards with CustomRow in intervention_medication.dart and...
See merge request Cloud_Solution/doctor_app_flutter!957
|
3 years ago |
|
Elham Rababh
|
90c74c2f06
|
small fix issues
|
3 years ago |
|
RoaaGhali98
|
f7e509d967
|
Merge remote-tracking branch 'origin/roaa2.8_addnewmedicationservice' into roaa2.8_addnewmedicationservice
|
3 years ago |
|
RoaaGhali98
|
8464c70f35
|
Replace static data
|
3 years ago |
|
RoaaGhali98
|
4ef41e0c5a
|
Replace static data
|
3 years ago |
|
Elham Rababh
|
fdc39f28e3
|
small change
|
3 years ago |
|
RoaaGhali98
|
19d981d9e0
|
Wrapping the Row cards with CustomRow in intervention_medication.dart and intervention_medication_history_screen.dart and fix the accept or reject issue, fix the lable in intervention_medication_history_screen.dart and edit the initial date in pharmacy_intervention_screen.dart
|
3 years ago |
|
Elham Ali
|
63e94e0d7b
|
Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
Roaa2.8 addnewmedicationservice
See merge request Cloud_Solution/doctor_app_flutter!953
|
3 years ago |
|
Elham Rababh
|
a829532717
|
call service after accept or reject
|
3 years ago |
|
RoaaGhali98
|
211990518f
|
Editing the accept_or_reject_req_model
|
3 years ago |
|
RoaaGhali98
|
9f77d080c0
|
Editing the schedule page
|
3 years ago |
|
Elham Ali
|
74501dbf07
|
Merge branch 'jan_fix_bugs' into 'development'
plan for refactor prescriptions
See merge request Cloud_Solution/doctor_app_flutter!956
|
3 years ago |
|
RoaaGhali98
|
de9dc0cb8c
|
Merge branch 'roaa2.8_addnewmedicationservice' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice
|
3 years ago |
|
RoaaGhali98
|
b38a153e22
|
Fix some issues
|
3 years ago |
|
Elham Rababh
|
694be7315b
|
fix issue on loading
|
3 years ago |
|
RoaaGhali98
|
fec899ebb7
|
Add static data
|
3 years ago |
|
RoaaGhali98
|
d3f0f1a141
|
Fix the date format in intervention_medication_view_model
|
3 years ago |
|
Elham Rababh
|
0895a80d16
|
fix issues with date
|
3 years ago |
|
RoaaGhali98
|
fde96fbce7
|
Fix some issues
|
3 years ago |
|
Elham Rababh
|
ad8d0f32b6
|
plan for refactor prescriptions
|
3 years ago |
|
Elham Rababh
|
37928c1757
|
fix issues
|
3 years ago |
|
Elham Ali
|
44bc3f1c3c
|
Merge branch 'jan_fix_bugs' into 'development'
fix issues
See merge request Cloud_Solution/doctor_app_flutter!955
|
3 years ago |
|
Elham Rababh
|
23e1fed349
|
fix issues
|
3 years ago |
|
RoaaGhali98
|
be40076def
|
Add new function in intervention_medication_service called accepted or rejected
|
3 years ago |
|
RoaaGhali98
|
65d04b2d0f
|
fix some issues
|
3 years ago |
|
Elham Ali
|
a5974ad584
|
Merge branch 'jan_fix_bugs' into 'development'
Jan fix bugs
See merge request Cloud_Solution/doctor_app_flutter!954
|
3 years ago |
|
Elham Rababh
|
b79eff7f6b
|
fix issues
|
3 years ago |
|
RoaaGhali98
|
e165ec5b1d
|
add new service called intervention_medication_history_screen
|
3 years ago |
|
RoaaGhali98
|
af9e8dd095
|
we edit a date format
|
3 years ago |
|
RoaaGhali98
|
0d542a862e
|
add new service
|
3 years ago |
|
RoaaGhali98
|
6d0ff69386
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice
|
3 years ago |
|
Elham Rababh
|
d9b2a618f5
|
small fix
|
3 years ago |
|
Elham Ali
|
f300dbf315
|
Merge branch 'jan_fix_bugs' into 'development'
small fix
See merge request Cloud_Solution/doctor_app_flutter!952
|
3 years ago |
|
Elham Rababh
|
05b656416d
|
small fix
|
3 years ago |
|
Elham Ali
|
278bd5e23f
|
Merge branch 'jan_fix_bugs' into 'development'
Jan fix bugs
See merge request Cloud_Solution/doctor_app_flutter!951
|
3 years ago |
|
Elham Rababh
|
ed447f6b17
|
fix issue DAPP-48
|
3 years ago |
|
Elham Rababh
|
0d61d0febc
|
fix issues
|
3 years ago |
|
Elham Rababh
|
ed9c77465f
|
fix chart issues
|
3 years ago |
|
Elham Rababh
|
1b12354581
|
DAPP-66: fix date with design improvement
|
3 years ago |
|
Elham Rababh
|
26fa1aec62
|
DAPP-66: fix date with design improvement
|
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 |
|
RoaaGhali98
|
0a0aa6ba77
|
we add a new service called new_medication_screen
|
3 years ago |
|
Elham Ali
|
fec10319bf
|
Merge branch 'point10' into 'development'
Point10
See merge request Cloud_Solution/doctor_app_flutter!950
|
3 years ago |
|
Elham Rababh
|
af1217dd67
|
finish assessment screen
|
3 years ago |