Symptoms Checker and User Info Selection (faiz_dev) #113

Merged

FaizHashmiCS22 merged 68 commits from faiz_dev into main

FaizHashmiCS22 commented

Collaborator

There is no content yet.

FaizHashmiCS22 added 56 commits

cd81372fc6 family screen add fixes & remove & switch & widgets

58e65e7a64 Merge branch 'master' into dev_aamir

02ae79c458 Merge branch 'refs/heads/master' into dev_aamir

6f01f92dd0 Merge remote-tracking branch 'origin/faiz_dev' into dev_aamir

987fe73128 family screen add fixes & remove & switch & widgets

8123981092 Merge branch 'master' into dev_aamir

3e5c3a3a27 Merge branch 'master' into dev_aamir

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

e113c4c1ee updates & fixes & RRT Flow

c43f96c619 e-referral work in progress

9a04974db3 Merge branch 'faiz_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan

# Conflicts:
#	lib/core/api_consts.dart

d8a9d8443a e-referral work done search-referral in progress.

5f047e1b6f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan

# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/hmg_services/hmg_services_repo.dart
#	lib/features/hmg_services/hmg_services_view_model.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/pickup_location.dart

c84564dafd minor changes

5e437e42a9 Merge branch 'master' into faiz_dev

# Conflicts:
#	lib/features/location/location_view_model.dart

8068de70cb Completed the HHC and CMC

fb69723a65 e-referral done.

a4d3bb3533 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan

2532b494f7 e-referral done.

757ace2ba1 Added Organ Selector

9e0336687c virtual tour.

a3d89c7afa Merge pull request 'dev_sultan' (#104 ) from dev_sultan into master

Reviewed-on: #104

fc0f98da1d calender reminder added

acb6d31ff3 Added possible conditions screen

1e5744cf44 Updates & enhancements

5a1c58e6b2 Merge branch 'master' into haroon_dev

e0e41d1900 calender reminder added on appointment and pescription

e200479332 old calender util deleted

ddac155a6a silent login case handled.

ac84d268e9 triage design

36bf63dcde Incoming call updates

2b7379c1c3 Waiting appointment implementation in progress

0f17a655ed Merge branch 'master' into dev_aamir

# Conflicts:
#	ios/Runner/AppDelegate.swift
#	lib/core/dependencies.dart
#	lib/core/utils/utils.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/authentication/quick_login.dart
#	lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/appbar/collapsing_list_view.dart
#	lib/widgets/common_bottom_sheet.dart

581a4a5a74 WalkIn Appointment implementation done

980b72f23f Merge branch 'master' into dev_sultan

de0227dd57 Merge pull request 'silent login case handled.' (#106 ) from dev_sultan into master

Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/106

88039534e2 Merge pull request 'Calendar reminder added for both prescription and appointment.' (#105 ) from calender_reminder into master

Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/105

5c0d3144d6 iOS App Icons Added

b37804d012 Merge branch 'master' into haroon_dev

# Conflicts:
#	lib/features/prescriptions/prescriptions_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart

03811586f1 Merge pull request 'haroon_dev' (#107 ) from haroon_dev into master

Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/107

3185d1e9e7 Allergies list implemented

19365375f6 medical file changes

2173d091ed Added symptoms selector

e35fe9ac05 Merge branch 'master' into faiz_dev

# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart

d256eec392 medical file changes

f91f8e63d7 Merge branch 'master' into dev_aamir

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

df3b3bc26b Merge pull request 'dev_aamir' (#109 ) from dev_aamir into master

Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/109

ca47315b2c Merge branch 'master' into haroon_dev

634a138c7f Queueing system screen implementation contd.

2ffd4cc1ae Integrated the API for Symptoms Checker

e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd.

9410ad9b60 Refactoring

2061ace278 Merge pull request 'haroon_dev' (#110 ) from haroon_dev into master

Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/110

34f4cd4f91 Merge branch 'refs/heads/master' into faiz_dev

# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart

c7c0a0ac09 Added user_info module IAP

cf26e71645 Complete USerInfo Selectoiun

fbe124f6ee Complete UserInfo Selection Module

FaizHashmiCS22 added 12 commits

393eaad2c7 Merge remote-tracking branch 'origin/master'

ac15ab26f5 graph changes for high and low

95243c250f graph shaded region added from horizontal spaces

2125e30c23 Merge remote-tracking branch 'origin/master' into lab-result-changes

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

2d2380851e loading view added

95325dad02 Merge pull request 'lab result added along with the available characters scroll bar' (#111 ) from lab-result-changes into master

Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/111

a83a35a284 Services Page Revamp

7cdb30a364 Merge branch 'master' into haroon_dev

818534e9f6 Master merged

dd8f3b95a7 Merge pull request 'haroon_dev' (#112 ) from haroon_dev into master

Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/112

6f72c99975 Merge branch 'master' into faiz_dev

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

5fd1905d8c Complete UserInfo Selection Module

FaizHashmiCS22 merged commit 7a5b753f63 into main 10 months ago

FaizHashmiCS22 referenced this issue from a commit

Merge pull request 'Symptoms Checker and User Info Selection (faiz_dev)' (#113) from faiz_dev into main

The pull request has been merged as 7a5b753f63.

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 faiz_dev main

git pull origin faiz_dev

Step 2:

Merge the changes and update on Gitea.

git checkout main

git merge --no-ff faiz_dev

git push origin main

No reviewers

No Label

No Milestone

No project

No Assignees

1 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

Symptoms Checker and User Info Selection (faiz_dev) #113

Step 1:

Step 2: