RoaaGhali98
|
447ca6d4dc
|
Merge branch 'procedures_refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedures_refactoring
Conflicts:
lib/screens/procedures/add-procedure-page.dart
lib/screens/procedures/favorite_procedure/add_favourite_procedure.dart
|
4 years ago |
Elham Ali
|
4b7b4fda7f
|
Merge branch 'hot_fix' into 'development'
hot fix the progress_note_screen.dart
See merge request Cloud_Solution/doctor_app_flutter!993
|
4 years ago |
Elham Rababh
|
e242aa19bc
|
hot fix the progress_note_screen.dart
|
4 years ago |
RoaaGhali98
|
9f7cdba8b7
|
Refactoring procedure pages
|
4 years ago |
Elham Rababh
|
8c93d5c450
|
fix the keyborad issue on real device
|
4 years ago |
RoaaGhali98
|
28defc2582
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedures_refactoring
Conflicts:
lib/screens/patients/profile/lab_result/labs_home_page.dart
|
4 years ago |
RoaaGhali98
|
f1dd50d7bf
|
Doing some refactoring
|
4 years ago |
Elham Rababh
|
5ec07bb931
|
DAPP-100 : renames file
|
4 years ago |
Elham Rababh
|
077cad7df5
|
refactor names
|
4 years ago |
Elham Rababh
|
a019319589
|
some fixes
|
4 years ago |
Elham Rababh
|
e73271cb29
|
episode refactor names part 2
|
4 years ago |
RoaaGhali98
|
1ac24bee90
|
Refactoring some issues in procedures screen
|
4 years ago |
RoaaGhali98
|
e85a32274a
|
Refactoring some issues in procedures screen
|
4 years ago |
Elham Rababh
|
47352ae77d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into DAPP_99_soap_model
Conflicts:
lib/config/config.dart
|
4 years ago |
Elham Rababh
|
1ca7b28590
|
first step from refactor soap
|
4 years ago |
RoaaGhali98
|
d743c2c99c
|
Rename to bottom_sheet_dialog_button and two_bottom_sheet_dialog_buttons
|
4 years ago |
RoaaGhali98
|
e1c635a911
|
Rename to bottom_sheet_dialog_button and two_bottom_sheet_dialog_buttons
|
4 years ago |
Elham Rababh
|
7fc52ecad4
|
finish fix lab result
|
4 years ago |
RoaaGhali98
|
31cf229763
|
Fixing the comments
|
4 years ago |
Elham Rababh
|
286dbe0a3f
|
refactor the lab result structure
|
4 years ago |
RoaaGhali98
|
dfc792ce64
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin
|
4 years ago |
RoaaGhali98
|
b7892fc18e
|
Rename to files name of admission request screens to match our standard
|
4 years ago |
RoaaGhali98
|
3f41ff267a
|
Fix some design issue in admission request screens and make new component called two_bottom_sheet_dialog_buttons and use it in admission-request_second-screen.dart and admission-request-third-screen
|
4 years ago |
Elham Rababh
|
c96939e6b0
|
refactor some name and add todos
|
4 years ago |
RoaaGhali98
|
fcdec6dbf7
|
Fix some design issue in admission request screens
|
4 years ago |
RoaaGhali98
|
4d820728e8
|
Fixing small design issues in admission-request-first-screen
|
4 years ago |
RoaaGhali98
|
41e79d5e00
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin
|
4 years ago |
RoaaGhali98
|
7962d9b1be
|
fix the remark validation, make the bottomSheet show after loading and edit the order numbers of priority refer-patient-screen-in-patient
|
4 years ago |
RoaaGhali98
|
8980f6f440
|
replace the TabBar in refer-patient-screen-in-patient with our dropDownList
|
4 years ago |
RoaaGhali98
|
39c64779aa
|
Merge branch 'fix_refere_desgin' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin
|
4 years ago |
Elham Rababh
|
95321a9305
|
fix the bug
|
4 years ago |
Elham Rababh
|
ed6af7f26e
|
change the file structure
|
4 years ago |
RoaaGhali98
|
505c3f470f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin
|
4 years ago |
RoaaGhali98
|
dc37e2e559
|
replace the TabBar in refer-patient-screen-in-patient with our dropDownList
|
4 years ago |
Elham Rababh
|
47dd2ecf56
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_prescription
Conflicts:
lib/screens/patients/profile/notes/note/update_note.dart
|
4 years ago |
Elham Rababh
|
208aa9dd6e
|
ucaf design refactor finished
|
4 years ago |
RoaaGhali98
|
4c7db58489
|
replace the TabBar in refer-patient-screen-in-patient with our custom TabBar in tab_utils
|
4 years ago |
RoaaGhali98
|
e61d1e78f6
|
Refactoring
|
4 years ago |
RoaaGhali98
|
c93ea2f285
|
Refactoring
|
4 years ago |
RoaaGhali98
|
240c9aa411
|
Refactoring
|
4 years ago |
RoaaGhali98
|
81d3aa5ad1
|
Fixing some design issues in refer-patient-screen-in-patient and refer-patient-screen
|
4 years ago |
RoaaGhali98
|
177a2e8bc4
|
Fixing some design issues in refer-patient-screen-in-patient and refer-patient-screen
|
4 years ago |
RoaaGhali98
|
01cd91ef93
|
Fixing some design issues in refer-patient-screen-in-patient and refer-patient-screen
|
4 years ago |
RoaaGhali98
|
c4f2543471
|
Fixing some design issues
|
4 years ago |
Elham Rababh
|
70fa365377
|
hot fix
hot fix
|
4 years ago |
RoaaGhali98
|
9f7dbf5ec7
|
Fixing update in update_note
|
4 years ago |
RoaaGhali98
|
17a6ec5795
|
Fixing update in update_note
|
4 years ago |
RoaaGhali98
|
dceefadc06
|
Fixing some issues in progress_note_screen and update_note
|
4 years ago |
RoaaGhali98
|
f3b39906f5
|
Add DropDownText to add progress note screen
|
4 years ago |
RoaaGhali98
|
40c1502a9b
|
add translation
|
4 years ago |
Elham Rababh
|
b1ddd9935c
|
finish add Prescription
|
4 years ago |
Elham Rababh
|
ada10f595a
|
finish add Prescription
|
4 years ago |
Elham Rababh
|
ba62056c4d
|
finish add Prescription
|
4 years ago |
Elham Rababh
|
954402fe52
|
show the list of prescription
|
4 years ago |
Elham Rababh
|
9461d3d4a1
|
add new prescription
|
4 years ago |
Elham Rababh
|
1f770793fd
|
fix issue
|
4 years ago |
RoaaGhali98
|
85a6f4965f
|
Fix some issues in prescription pages
|
4 years ago |
RoaaGhali98
|
cdc0d2f4a9
|
Finish prescription refactoring
|
4 years ago |
RoaaGhali98
|
34f658a166
|
Add Translation to prescription pages
|
4 years ago |
RoaaGhali98
|
f266f54be0
|
Fix the prescriptions pages
|
4 years ago |
RoaaGhali98
|
c76900a868
|
Refactor add_prescription_form
|
4 years ago |
RoaaGhali98
|
8cb5171bc9
|
Refactor add_prescription_form
|
4 years ago |
RoaaGhali98
|
0147481c27
|
Fix the drug to drug page
|
4 years ago |
RoaaGhali98
|
5f3f509b8c
|
fix the DOCTYPE html error in getPrescription service
|
4 years ago |
RoaaGhali98
|
e10c07f6a4
|
fix loader in prescriptions_page
|
4 years ago |
RoaaGhali98
|
ce978db2dd
|
Fix add medication button
|
4 years ago |
RoaaGhali98
|
d5e3a79f85
|
Fix add medication button
|
4 years ago |
RoaaGhali98
|
5b8211eec4
|
Refactor add_prescription_form
|
4 years ago |
RoaaGhali98
|
c1956aee9b
|
Refactor add_prescription_form
|
4 years ago |
RoaaGhali98
|
2b38293d61
|
Refactor add_prescription_form
|
4 years ago |
RoaaGhali98
|
113fb42d68
|
refactor some files in prescription screen
|
4 years ago |
RoaaGhali98
|
3f25acda8f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design
|
4 years ago |
RoaaGhali98
|
f769189bee
|
Refactor add_prescription_form
|
4 years ago |
RoaaGhali98
|
7afe24c2bc
|
Refactor add_prescription_form
|
4 years ago |
Elham Rababh
|
65e9840418
|
fix issues in lab order
|
4 years ago |
RoaaGhali98
|
228237bf96
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design
Conflicts:
lib/widgets/patients/dynamic_elements.dart
|
4 years ago |
RoaaGhali98
|
182f890e92
|
Fix the form in prescription screen
|
4 years ago |
Elham Rababh
|
cb19a5fcfe
|
move models to the core file
|
4 years ago |
Elham Rababh
|
f8371f71a1
|
fix intervention_medication
|
4 years ago |
RoaaGhali98
|
0257bb1f16
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design
|
4 years ago |
Elham Rababh
|
1789eb8c5b
|
first step form redesign pharmacy page
|
4 years ago |
RoaaGhali98
|
994b43a590
|
Fix the form in prescription screen
|
4 years ago |
Elham Rababh
|
6905ed702e
|
first step form redesign pharmacy page
|
4 years ago |
Elham Rababh
|
25f902487c
|
small fix in referal
|
4 years ago |
RoaaGhali98
|
83ea30303b
|
fix referred-patient-screen
|
4 years ago |
RoaaGhali98
|
e8b5165953
|
Fix some issues
|
4 years ago |
RoaaGhali98
|
b8076f177b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design
|
4 years ago |
RoaaGhali98
|
db83bec292
|
Fix referred-patient-screen design
|
4 years ago |
Elham Rababh
|
45f30a8d61
|
small fixes
|
4 years ago |
Elham Rababh
|
bbdc243f0f
|
fix main issues
|
4 years ago |
Elham Ali
|
8f1d4f80bd
|
Merge branch 'roaa_schedule_design' into 'development'
Roaa schedule design
See merge request Cloud_Solution/doctor_app_flutter!959
|
4 years ago |
RoaaGhali98
|
b1a65425c5
|
Edit the my_schedule_screen design
|
4 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
|
4 years ago |
RoaaGhali98
|
af72810b26
|
Merge remote-tracking branch 'origin/roaa2.8_addnewmedicationservice' into roaa2.8_addnewmedicationservice
|
4 years ago |
RoaaGhali98
|
2ffa745e73
|
add translations to pharmacy_intervention_screen, intervention_medication and intervention_medication_history_screen
|
4 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
|
4 years ago |
Elham Rababh
|
90c74c2f06
|
small fix issues
|
4 years ago |
Elham Rababh
|
fdc39f28e3
|
small change
|
4 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
|
4 years ago |
Elham Ali
|
63e94e0d7b
|
Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
Roaa2.8 addnewmedicationservice
See merge request Cloud_Solution/doctor_app_flutter!953
|
4 years ago |