Commit Graph

2642 Commits (flutter_2_developemt)

Author SHA1 Message Date
Elham Rababh 5567b31daf Merge branch 'get_pending_orders' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into register_patient_services 4 years ago
Elham Rababh ad845b882c finish confirmation page 4 years ago
Elham Rababh 4fe53ef71e add hijri converter 4 years ago
Elham Rababh 3eddf2eab5 first step from service part 4 years ago
hussam al-habibeh 13c42b297a check activation code 4 years ago
hussam al-habibeh 9eadc0f0b1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/core/viewModel/PatientRegistrationViewModel.dart
	lib/screens/patients/register_patient/RegisterPatientPage.dart
4 years ago
hussam al-habibeh fd9e8ddb28 actaivation code page 4 years ago
Elham Ali 482feece26 Merge branch 'register_patient_services' into 'development'
mock the calling the second service

See merge request Cloud_Solution/doctor_app_flutter!877
4 years ago
Elham Ali 75e944427c Merge branch 'lap_result_fix' into 'development'
fix lap result special

See merge request Cloud_Solution/doctor_app_flutter!876
4 years ago
Elham Rababh 514fb71c51 mock the calling the second service 4 years ago
hussam al-habibeh 08df479b37 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/screens/patients/register_patient/RegisterPatientPage.dart
4 years ago
hussam al-habibeh d4927873d5 fix lap result special 4 years ago
Elham Rababh 324f515253 first step form register patient service 4 years ago
Elham Rababh f4311b4106 first step form register patient service 4 years ago
Elham Rababh 4f123b0af2 first step form register patient service 4 years ago
hussam al-habibeh 1a35201f27 regstration activtion code 4 years ago
Elham Rababh 3229a1ff99 remove red color 4 years ago
Elham Ali 4d01c74bf8 Merge branch 'rig_page' into 'development'
Rig page

See merge request Cloud_Solution/doctor_app_flutter!874
4 years ago
Elham Rababh cb223be8b3 fix issue in Register Patient Page 4 years ago
Elham Rababh 5e4b2d8202 showModalBottomSheet in confirmation page 4 years ago
Mohammad Aljammal 9de1085b49 Merge branch 'get_pending_orders' into 'development'
admission orders changes

See merge request Cloud_Solution/doctor_app_flutter!872
4 years ago
hussam al-habibeh d0e6532814 admission orders changes 4 years ago
Elham Rababh a9d097da54 fix merge conflict 4 years ago
Elham Rababh 6b09276c93 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into operation_details
 Conflicts:
	lib/core/service/operation_report_servive.dart
4 years ago
Mohammad Aljammal ac1b4d9865 Merge branch 'confirmation_page' into 'development'
first step form confirmation page

See merge request Cloud_Solution/doctor_app_flutter!870
4 years ago
Elham Rababh 04583d8c42 finish operation details report 4 years ago
Elham Rababh 22b424515c finish operation details report 4 years ago
Elham Rababh 97a15bfb35 first step form confirmation page 4 years ago
hussam al-habibeh 2fe475d98a admission orders change 4 years ago
hussam al-habibeh 9270f58615 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/core/service/operation_report_servive.dart
4 years ago
Mohammad Aljammal 6e61bd8c1d Merge branch 'diabetic_chart_values' into 'development'
Diabetic chart values

See merge request Cloud_Solution/doctor_app_flutter!867
4 years ago
Elham Rababh 230ebaf445 operation report 4 years ago
Elham Rababh 93bcfff7a0 fix doctors name 4 years ago
Mohammad Aljammal 331b27c3ec fix merge issue 4 years ago
Mohammad Aljammal 5ad9976c40 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_registration
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
4 years ago
Mohammad Aljammal 9689044be7 Add models and create vm, services for patient registration 4 years ago
mosazaid faa7c08266 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into register_patient_feature
 Conflicts:
	lib/locator.dart
4 years ago
mosazaid 7b8312fe26 make register patient feature 4 years ago
Elham Rababh 9e2b72a7cb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into diabetic_chart_values
 Conflicts:
	lib/config/config.dart
	lib/routes.dart
4 years ago
Elham Rababh 514e6c81c7 finish diabetic 4 years ago
hussam al-habibeh 056b0bbd78 admission orders change 4 years ago
hussam al-habibeh 9b87ea8c22 get admission orders 4 years ago
hussam al-habibeh 3f7a839950 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/routes.dart
	lib/screens/patients/profile/operation_report/operation_report.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
4 years ago
hussam al-habibeh ae0c588d32 get admission orders 4 years ago
Elham Rababh dd971ffddb first step from get diabetic 4 years ago
Elham Rababh 45f4aa9a22 fix issues related to design 4 years ago
Elham Rababh b21acfd2c6 fix route issues 4 years ago
Mohammad Aljammal 52e5b86f6c Merge branch 'get_operation_report' into 'development'
Get operation report

See merge request Cloud_Solution/doctor_app_flutter!862
4 years ago
hussam al-habibeh 64b5652c8d Pending Orders Service 4 years ago
Elham Rababh 35acd1f21f finish the nursing DiagnosisScreen 4 years ago
Elham Rababh 1a3567f917 finish the nursing DiagnosisScreen 4 years ago
Elham Rababh 72c948371a finish the nursing progress_note_screen 4 years ago
Elham Rababh 4ebecc4277 Merge branch 'get_operation_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_operation_report
 Conflicts:
	lib/core/viewModel/operation_report_view_model.dart
4 years ago
Elham Rababh a44a207116 finish the operation Reports from our side 4 years ago
Mohammad Aljammal d7b1212b54 Merge branch 'get_operation_report' into 'development'
Get operation report

See merge request Cloud_Solution/doctor_app_flutter!860
4 years ago
hussam al-habibeh ee3d207795 get operation report 4 years ago
Elham Rababh 231614e914 Merge branch 'get_operation_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_operation_report
 Conflicts:
	lib/core/service/operation_report_servive.dart
	lib/core/viewModel/operation_report_view_model.dart
	lib/screens/patients/profile/operation_report/update_operation_report.dart
4 years ago
Elham Rababh fbf1cd29ee add some fiels 4 years ago
hussam al-habibeh d035f1ba37 opertion report screen 4 years ago
Elham Rababh 7684b65e8a first step from update_operation_report.dart 4 years ago
Elham Rababh 469556758b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_operation_report 4 years ago
hussam al-habibeh d4363aeefb opertion report screen 4 years ago
hussam al-habibeh 318560b1d7 opertion report screen 4 years ago
mosazaid efbe6ae76b home page design fix 4 years ago
Mohammad Aljammal 6003df7f63 Merge branch 'special_clinic_fixes' into 'development'
fix special clinic issue

See merge request Cloud_Solution/doctor_app_flutter!858
4 years ago
Elham Rababh 93da7b8118 fix special clinic issue 4 years ago
Mohammad Aljammal 4e52155342 Merge branch 'all_special_lab_result' into 'development'
fix in-patient prescription

See merge request Cloud_Solution/doctor_app_flutter!857
4 years ago
Mohammad Aljammal 54f1bbf184 Merge branch 'refer-hot-fix' into 'development'
refer inpatient hot fix

See merge request Cloud_Solution/doctor_app_flutter!856
4 years ago
mosazaid bb8ffbf63b refer inpatient hot fix 4 years ago
Elham Rababh 96cfc3d659 fix specialClinic it suppose to be fixed 4 years ago
hussam al-habibeh 2f65546ff6 fix in-patient prescription 4 years ago
Elham Rababh 9c6cebcffd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sick_leave 4 years ago
Elham Rababh a4654e9bce add isCopyable on progress note 4 years ago
Mohammad Aljammal 7436cdb5be Merge branch 'all_special_lab_result' into 'development'
adding slide up to prescription and procedure

See merge request Cloud_Solution/doctor_app_flutter!854
4 years ago
hussam al-habibeh 7d4f6d5264 adding slide up to prescription and procedure 4 years ago
Mohammad Aljammal 96ee21b15f change server url 4 years ago
Mohammad Aljammal 35bfa85a1a Merge branch 'all_special_lab_result' into 'development'
fix reschedule

See merge request Cloud_Solution/doctor_app_flutter!851
4 years ago
hussam al-habibeh 6dd8f62b2a fix reschedule 4 years ago
Mohammad Aljammal b9ebde0ec8 Merge branch 'sick_leave' into 'development'
fix issue

See merge request Cloud_Solution/doctor_app_flutter!850
4 years ago
Elham Rababh 17ee942de1 fix issue 4 years ago
Mohammad Aljammal 65f8f061db Merge branch 'fix_inpatient' into 'development'
Fix inpatient

See merge request Cloud_Solution/doctor_app_flutter!849
4 years ago
Elham Rababh d1ccb3c433 fix last 4 years ago
Elham Rababh 8be6bd257d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sick_leave
 Conflicts:
	pubspec.lock
4 years ago
Elham Rababh b23fe5ee1b add selected date 4 years ago
Elham Rababh 87b70ff905 fix last issue 4 years ago
Mohammad Aljammal dd4eb2f76d Merge branch 'design-fixes' into 'development'
design fixes

See merge request Cloud_Solution/doctor_app_flutter!846
4 years ago
Elham Rababh 9a5eff8c8b sick leave fixes 4 years ago
mosazaid 495c8fb3b0 change lab result design 4 years ago
Elham Rababh 4711b6264c rename files 4 years ago
Elham Rababh 8a0e94c854 match the design as xd 4 years ago
Elham Rababh f05455fddf finish sick leave design 4 years ago
Elham Rababh ff07686bf7 fix sick leave design 4 years ago
mosazaid 2274affd9a design fixes 4 years ago
Elham Rababh 29336a9ef3 fix the design of all sick leave 4 years ago
Mohammad Aljammal cec3a78d94 Merge branch 'all_special_lab_result' into 'development'
All special lab result

See merge request Cloud_Solution/doctor_app_flutter!845
4 years ago
hussam al-habibeh b86bc33266 fix scroll in special lab result 4 years ago
hussam al-habibeh fe5456db2a fix prescription 4 years ago
Mohammad Aljammal 640dc239b0 Merge branch 'search_text_fields' into 'development'
Search text fields

See merge request Cloud_Solution/doctor_app_flutter!844
4 years ago
Elham Rababh 71463dc459 remove margin top form DischargedPatient 4 years ago
Elham Rababh aaca94e93c first step form sick leave 4 years ago