dev_sultan #59

Open

khansultan1 wants to merge 0 commits from dev_sultan into master

khansultan1 commented

Collaborator

There is no content yet.

khansultan1 added 11 commits

f9bfc131a8 family screen & widgets

1125437a56 family screen & widgets

e5f4da4e16 Merge branch 'master' into dev_aamir

# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart

e48e98d61b Merge branch 'master' into dev_aamir

192d617350 family screen & widgets

d5bd99f525 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan

# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart

1b652f877d Merge branch 'master' into dev_aamir

# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart

47ce5022d3 family screen & widgets

9b33745a57 Merge branch 'master' into dev_aamir

3acd549de7 no message

3642523fdf Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan

# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart

Haroon6138 added 1 commit

318441c77f Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan

Haroon6138 added 1 commit

e2188b5a69 switch family member with super user

Haroon6138 added 128 commits

a711d3a6dd LiveCare shcedule implementation contd.

b1af9e1779 Merge branch 'master' into haroon_dev

9e8011c34c family screen & widgets

344ecaba18 LiveCare Schedule implementation done

f7e26da6f4 Merge branch 'master' into haroon_dev

45a1ce9254 Merge branch 'master' into dev_aamir

a07369165d Updates

918eb18b5f Region flow in select clinic implemented

94313b8870 Improved Error Handling

dc16a684c5 Merge branch 'master' into faiz_dev

62e82a7a31 Empty data state implementation contd.

02433e1bef family screen & widgets

36193d349c Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir

# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/medical_file/medical_file_view_model.dart

512628fb8b Lab result view along with the listing of items is added

b05b03a6f6 divider changed

6b28b57307 empty state implementation contd.

eaee656a74 Merge pull request 'Lab result view along with the listing of items is added' (#61 ) from feature/lab_result into master

Reviewed-on: #61

5f43063f2d Merge branch 'master' into haroon_dev

# Conflicts:
#	lib/core/app_assets.dart

288a0018ce family screen & widgets

060e7a8d68 Merge branch 'master' into dev_aamir

0aa0aeba98 Merge pull request 'haroon_dev' (#62 ) from haroon_dev into master

Reviewed-on: #62

048f0bb459 graph design change

51a4f83347 Merge remote-tracking branch 'origin/master' into feature/lab_result

# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart

153bbf27b9 Merge pull request 'feature/lab_result' (#63 ) from feature/lab_result into master

Reviewed-on: #63

1af2db5c09 patient profile settings page integration implementation contd.

6565ba719d Merge branch 'master' into haroon_dev

23942dc7bc Merge branch 'master' into faiz_dev

# Conflicts:
#	lib/core/api/api_client.dart

4cc4a7b0d9 merged main

dbe67834b8 Merge pull request 'Improved Error Handling' (#64 ) from faiz_dev1 into master

Reviewed-on: #64

1335d3a7c8 family screen & widgets

e5488299b8 Merge branch 'master' into dev_aamir

# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
#	lib/widgets/common_bottom_sheet.dart

2de02102c2 profile settings update

8bb0e495cc request medical report implementation contd.

093e645f60 request medical report implementation completed.

2f4d6f5553 immediate livecare consultation implementation contd.

da89c41925 lab result by hospital and translations are added

10b77206f6 Immediate LiveCare consultation implementation contd.

3418480122 Immediate LiveCare implementation completed

6ef9ae813d doctors search filter added

8a7f46441c updates

1d22e53f63 Merge branch 'master' into haroon_dev

# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/presentation/medical_file/medical_file_page.dart

a4a32cca44 doctor filter icon removed from the doctor listing from clininc

786aa05b19 doctor list handled to be cleared when going back

4909246958 Merge pull request 'feature/doctor_filter' (#66 ) from feature/doctor_filter into master

Reviewed-on: #66

5e000db556 updates

8166369f85 Merge branch 'master' into haroon_dev

# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart

5a1bd6a5b8 Merge pull request 'haroon_dev' (#67 ) from haroon_dev into master

Reviewed-on: #67

2e9a462a1c listing resizing if the data is in small numbers.

42abf9ca1b login bypass removed

36bf229787 Merge remote-tracking branch 'origin/master' into feature/lab_result

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart

641df8b51b logs removed

db979977ca Tamara implementation & enhancements

51c787c92a Merge pull request 'feature/lab_result' (#68 ) from feature/lab_result into master

Reviewed-on: #68

3d64ddf78b Merge branch 'master' into haroon_dev

bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page

7e92cad55b Merge pull request 'bottom handled when dental and laser clinic is selected from clinic page' (#69 ) from feature/search_by_region into master

Reviewed-on: #69

903248133e Lab order & results enhancements

8291e89ee7 Merge branch 'master' into haroon_dev

# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart

35e145ddf9 id selection from the appropiate list

415c0eb3c7 Dental appointment booking implementation contd.

156d7b4834 Merge pull request 'id selection from the appropiate list' (#70 ) from feature/search_by_region into master

Reviewed-on: #70

6cf08c04d2 appointment filters added.

483a1571d9 Merge remote-tracking branch 'origin/master' into appointment_filter

# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart

2b21086cc1 Dental appointment booking flow implementation contd.

b05e4e2a15 Dental appointment booking flow implementation contd.

6e24698031 Merge pull request 'appointment filters added.' (#71 ) from appointment_filter into master

Reviewed-on: #71

c0606fb530 Merge branch 'master' into haroon_dev

# Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/lab/lab_orders_page.dart

a661448d27 Merge pull request 'haroon_dev' (#72 ) from haroon_dev into master

Reviewed-on: #72

30eb8bf5de dental booking flow implemented

d220be7283 Tamara payment flow done

e5dcabacce lab prescription details are added andgraph visibility added to the graph page for result that are IRR

61007302c9 appointment date filter handled

f1a60a9dfb updates

a4dc0648e8 Merge pull request 'lab prescription details are added andgraph visibility added to the graph page for result that are IRR' (#73 ) from feature/lab_result into master

Reviewed-on: #73

3bbc014251 Merge pull request 'appointment date filter handled' (#74 ) from appointment_filter into master

Reviewed-on: #74

9d48a00b21 Merge branch 'master' into haroon_dev

0eaa50dcb3 Merge pull request 'haroon_dev' (#75 ) from haroon_dev into master

Reviewed-on: #75

8ff5566f0b dependencies update

d918b6e464 family screen & widgets

aaa8222b1a Merge branch 'master' into dev_aamir

# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/features/medical_file/medical_file_repo.dart
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/widgets/chip/app_custom_chip_widget.dart

77b4f28291 Merge branch 'master' into haroon_dev

24362f67cb family screen & widgets

25fa1acc9e Medical file widgets, Insurance approval implementation contd.

215f3f3335 Merge pull request 'dev_aamir' (#76 ) from dev_aamir into master

Reviewed-on: #76

b27e3268b1 Merge branch 'master' into haroon_dev

# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart

c1b88a958f Merge pull request 'haroon_dev' (#77 ) from haroon_dev into master

Reviewed-on: #77

fe5b6c35ac insurance approval implementation done

663eda0076 updates & fixes

a2310e1447 prescription instructions PDF implemented

ea92a0c75c laser appointment screen added

bf8f98ffb1 family screen add fixes & remove & switch & widgets

1e08394ba1 Lab report PDF implementation contd.

ab74a61969 lab severity values handled and size of lab description fixed

084efb7d32 Merge pull request 'lab severity values handled and size of lab description fixed' (#80 ) from feature/lab_result into master

Reviewed-on: #80

51d225e206 Merge pull request 'laser appointment screen added' (#78 ) from laser_appointment into master

Reviewed-on: #78

e1ac77855c Merge branch 'master' into haroon_dev

81a6c7d034 files and packages renamed

cc458b2ec7 files and packages renamed

773cc9229b Merge remote-tracking branch 'origin/master' into feature/lab_result

# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart

5e1a7652be lab report download implemented

5227fa6b58 Merge pull request 'family screen add fixes & remove & switch & widgets' (#79 ) from dev_aamir into master

Reviewed-on: #79

7a35f0ded6 Merge branch 'master' into haroon_dev

# Conflicts:
#	lib/features/authentication/authentication_view_model.dart

9e3035f02b units added to lab result and it graph and unwanted values removed from graph

a7bd5f61cb Merge remote-tracking branch 'origin/master' into feature/lab_result

baf7cf0ea0 dental routing fixed and laser exception removed

080b2327ef Merge pull request 'files and packages renamed' (#81 ) from feature/lab_result into master

Reviewed-on: #81

d693850ef4 ER services implementation contd.

0441d072fa Merge branch 'master' into haroon_dev

# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart

d755eb0df8 contd.

97959f7f28 Merge pull request 'haroon_dev' (#83 ) from haroon_dev into master

Reviewed-on: #83

d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment

# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart

5505f549fc Merge pull request 'dental routing fixed and laser exception removed' (#82 ) from laser_appointment into master

Reviewed-on: #82

c146747e5e nearest er clinic repo viewmodel and view added

47d158c1e2 Merge remote-tracking branch 'origin/master'

d480798053 location dennied forever handled and error builder added to the image network

916ebf2880 Merge pull request 'nearest er module added' (#84 ) from nearest_er into master

Reviewed-on: #84

1f7a941aa0 RRT Services implementation contd.

1c3ed8f2e1 Merge branch 'master' into haroon_dev

# Conflicts:
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/emergency_services/emergency_services_page.dart

eabfaf8182 Design Updates

4b52862ba0 updates

c36e32470e Merge pull request 'haroon_dev' (#85 ) from haroon_dev into master

Reviewed-on: #85

462f4eba14 Design Updates

21be3a2d06 Merge branch 'master' into faiz_dev

# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
#	lib/widgets/buttons/custom_button.dart
#	lib/widgets/common_bottom_sheet.dart
#	lib/widgets/input_widget.dart

72d765e508 Design Updates

83eb57ed9f Merge pull request 'Design Updates (Faiz_Dev)' (#86 ) from faiz_dev into master

Reviewed-on: #86

90128a812b call ambulance module design added.

57056e67f3 Merge remote-tracking branch 'origin/master'

# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart

ceb0f1ebb6 Merge pull request 'ambulance_ui' (#87 ) from ambulance_ui into master

Reviewed-on: #87

This pull request has changes conflicting with the target branch.

lib/features/medical_file/medical_file_repo.dart
lib/features/medical_file/medical_file_view_model.dart
lib/presentation/my_family/my_Family.dart
lib/widgets/chip/app_custom_chip_widget.dart
lib/widgets/common_bottom_sheet.dart

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b dev_sultan master

git pull origin dev_sultan

Step 2:

Merge the changes and update on Gitea.

git checkout master

git merge --no-ff dev_sultan

git push origin master

No reviewers

No Label

No Milestone

No project

No Assignees

2 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Loading…

There is no content yet.

Labels Milestones

dev_sultan #59

Step 1:

Step 2: