Commit Graph

3136 Commits (101bc9f1b68a39aa6b1c27c9d4753252c7a87852)
 

Author SHA1 Message Date
Elham Ali 101bc9f1b6 Merge branch 'hijri_calender' into 'development'
Hijri calender

See merge request Cloud_Solution/doctor_app_flutter!883
4 years ago
Elham Rababh ca854638e5 fix merge issue 4 years ago
Elham Rababh 0bdb15b14e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hijri_calender
 Conflicts:
	lib/screens/patients/register_patient/RegisterSearchPatientPage.dart
4 years ago
Elham Ali c4617250ae Merge branch 'get_pending_orders' into 'development'
Get pending orders

See merge request Cloud_Solution/doctor_app_flutter!882
4 years ago
Elham Rababh 8d2b6e9b08 finish hijri calender 4 years ago
hussam al-habibeh 132d781eb5 conflect resorved 4 years ago
hussam al-habibeh aaabae5900 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/models/doctor/profile_req_Model.dart
4 years ago
hussam al-habibeh 92d81700e1 adding country option to register page 4 years ago
Elham Rababh 8e85bb239e first step from hijri Calender 4 years ago
hussam al-habibeh 25f65802a5 register search page change 4 years ago
Elham Ali 61d2c6cdad Merge branch 'register_patient_services' into 'development'
Register patient services

See merge request Cloud_Solution/doctor_app_flutter!881
4 years ago
Elham Rababh eb89dc3395 fix navigator issues 4 years ago
Elham Rababh 52ec3fc0e3 fix navigator issues 4 years ago
Elham Ali ffba0ae352 Merge branch 'register_patient_services' into 'development'
fix version id

See merge request Cloud_Solution/doctor_app_flutter!880
4 years ago
Elham Rababh 03acd233cf fix version id 4 years ago
Elham Ali 26ffd7cb7a Merge branch 'register_patient_services' into 'development'
Register patient services

See merge request Cloud_Solution/doctor_app_flutter!879
4 years ago
Elham Rababh 515297ebf6 finish confirmation page 4 years ago
Elham Rababh cf498de70f finish confirmation page 4 years ago
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 Ali 6f29a70991 Merge branch 'register_patient_services' into 'development'
Register patient services

See merge request Cloud_Solution/doctor_app_flutter!875
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
Mohammad Aljammal 45822d16d1 Merge branch 'operation_details' into 'development'
fix merge conflict

See merge request Cloud_Solution/doctor_app_flutter!871
4 years ago
Elham Rababh a9d097da54 fix merge conflict 4 years ago
Mohammad Aljammal e371d105c4 Merge branch 'operation_details' into 'development'
Operation details

See merge request Cloud_Solution/doctor_app_flutter!869
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
Mohammad Aljammal 5e976367f0 Merge branch 'get_pending_orders' into 'development'
admission orders change

See merge request Cloud_Solution/doctor_app_flutter!868
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