Calendar Redesign #249

Closed
aamir.muhammad wants to merge 841 commits from dev_aamir into main
Collaborator
There is no content yet.
aamir.muhammad added 520 commits 3 months ago
3f123d12d6 Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/utils/utils.dart
#	lib/main.dart
27ad4e0764 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/home/landing_page.dart
8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
89ff10f506 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/theme/colors.dart
3d8daeb58d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/core/utils/calendar_utils.dart
#	lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
#	pubspec.yaml
190492a191 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/routes/app_routes.dart
f3674ba06f Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
11de01e079 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
20e4f82df3 Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
91c16f13d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
0c68ca4438 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  Added 'send report to email' feature
  Completed the health Tracker Module, Only the email part is left.
  only explain api left.
  Triage Completed. Explain API left
  Till Triage Completed
  refactoring

# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
250af1506c Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/services/dialog_service.dart
#	lib/theme/colors.dart
344adf23c0 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
0ddaa6899d Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  fixed parking qr
  added parking part
  added monthly report
  added monthly report
  added monthly report
  fix error
  monthly report
  fix toggle
  fix toggle
  active medication
  active medication
  active medication
a816afadea Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
8b5c4d7575 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
97a47ce4e8 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
3e6ee8c10c Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/routes/app_routes.dart
bb72c7f7d6 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/hmg_services/services_page.dart
#	pubspec.lock
e38892ff2d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/habib_wallet_page.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/insurance/insurance_home_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
4ceca016bb Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
#	pubspec.lock
418297b6fb Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
2648f304f6 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/data/landing_page_data.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
6e4d7519fb Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/widgets/habib_wallet_card.dart
931e3fa968 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
7014ac397e Merge remote-tracking branch 'origin/master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
f340f4fb8f Merge branch 'master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
95b65ed8a5 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev
# Conflicts:
#	lib/features/book_appointments/book_appointments_view_model.dart
a105d87241 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/features/authentication/authentication_view_model.dart
#	lib/generated/locale_keys.g.dart
02398d3bb4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
b91850d388 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New: (67 commits)
  added women support in symptoms checker module.
  family fil fixes
  PMA-1100
  updates
  updates
  Updates & fixes
  updates
  Ai Analysis & PMA-(1078,1079)
  update
  updates
  arabic fixes
  arabic fixes
  Vital sign data connected to Symptom checker
  Date format changed to en-US
  confirm button added
  iOS BundleID changes
  Services price list implemented
  Indoor navigation implemented
  updates & fixes
  JIRA bug fixes & updates
  ...

# Conflicts:
#	lib/presentation/authentication/register_step2.dart
#	lib/presentation/vital_sign/vital_sign_page.dart
46c8fbf0f6 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
3f9046f1e4 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/core/api_consts.dart
#	lib/generated/locale_keys.g.dart
ee358259f5 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
d6eb6970af Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New: (29 commits)
  calender package added
  Android zoom fixes
  updates
  updates
  wallet page fix
  updates
  fixed Ar and En files
  Insurance approvals page fixes
  fixed Ar En files
  Added immediate patient insurance update API
  updates
  sickleave & medical report fixes
  test description issue in lab results fixed
  Updates & fixes, Filter issues fixed for lab & rad
  Ancillary order fixes
  NPHIES Eligibility checks implemented
  updates
  Android package name updated to new package details
  Updates & fixes
  App update page implemented
  ...
80adf1bd2f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  updates & fixes
  updates
  updates
  Dark mode persistence added in the app
  Dark mode enabled
  Updates & fixes
  updates
  updates
  updates
151fcf23d1 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/build.gradle.kts
#	android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xxxhdpi/ic_launcher.png
#	android/build/reports/problems/problems-report.html
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	pubspec.yaml
f51e37db55 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  updates
  updates
  lab test description update

# Conflicts:
#	lib/core/api/api_client.dart
#	lib/presentation/authentication/login.dart
078b236b67 Merge branch 'master' into haroon_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
78a6d55b35 Merge branch 'master' into watch_integration
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
db89408185 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/generated/locale_keys.g.dart
6178062ed0 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New: (33 commits)
  reminder start time added to the prescription
  Invoices Filter
  Updates
  updates
  Revert "graph values fix and comparision with the pdf"
  graph values fix and comparision with the pdf
  graph values fix and comparision with the pdf
  Updates
  Updates
  updates
  Updates
  Updates
  Updates
  Updates
  Habib Wallet updates
  Changes for AI Lab analysis
  App update page updates
  updates
  Updates
  warning dialog displayed to user if the watch intented is not currently implemented
  ...

# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
c970a3f697 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  updates
  family file switch back issue fixed
  Vital sign updates
  updates
  Updates
  Added location option in region selection bottom sheet
  Updates
  Profile settings update
a2fa661db4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
2ae9ab9fac graph reference low nd high value address.
* if the referenncehigh is 0 then it will be neglected
* if the referencelow is 0 then it will be neglected.
0d4563542a WD:map issues resolved:
1. map type added to the screen along with the translation
2. null shown for the arabic name of the fixed to show the actual name.
3. if the user opens the locationBottomsheet and close it without input of the area the screen freezes with no action on the location.
4. Gms And Hms Maps handled.
5. theme handled inside the maps screen.
92101d2b05 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/my_family/widget/family_cards.dart
081dfce480 Merge branch 'master' into haroon_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/widgets/location_input_bottom_sheet.dart
#	lib/widgets/input_widget.dart
18331f077e Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New: (41 commits)
  pull down to refresh in appointment queue implemented
  Pull to refresh implemented
  Updates & fixes
  updates
  Updates
  Updates
  WD:map issues resolved: 1. map type added to the screen along with the translation 2. null shown for the arabic name of the fixed to show the actual name. 3. if the user opens the locationBottomsheet and close it without input of the area the screen freezes with no action on the location. 4. Gms And Hms Maps handled. 5. theme handled inside the maps screen.
  Updates
  Font changes, Updates & fixes
  map type is added to the maps already present
  family switch parent child and child 2
  translation service changes
  Updates
  updates
  print statement removed
  graph reference low nd high value address. * if the referenncehigh is 0 then it will be neglected * if the referencelow is 0 then it will be neglected.
  family switch parent child and child 2
  updates
  remote localization files added
  Updates
  ...

# Conflicts:
#	android/app/build.gradle.kts
#	lib/presentation/rate_appointment/rate_appointment_doctor.dart
a2de3f1b14 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
708cbb138d Updates
# Conflicts:
#	lib/presentation/radiology/radiology_result_page.dart
6d647d75be Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  Updates
  radiology ai lab analysis & lab ai analysis api end points updates.
  Updates
  updates
  updates

# Conflicts:
#	lib/presentation/symptoms_checker/widgets/selected_organs_section.dart
b4ab3a112c Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/my_family/widget/family_cards.dart
7bf69c52f0 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/generated/codegen_loader.g.dart
fb93aa1092 ambulance call page changes:
1. icon change for the success of ambulance call and rrt.
2. flow changed to first select the appoiintment then hospital.
3. location accorate enabled.
90bcdf674d Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
f0b8db0318 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
a2c2b24b2a Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  health calculator design & timer & bell icon switch changes
  health calculator design & timer & bell icon switch changes
  appointment reminder & weather
  codegen
a38a2a0619 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/codegen_loader.g.dart
khansultan1 closed this pull request 3 months ago
Please reopen this pull request to perform a merge.
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_aamir main
git pull origin dev_aamir

Step 2:

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff dev_aamir
git push origin main
Sign in to join this conversation.
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.

Reference: Haroon6138/HMG_Patient_App_New#249
Loading…
There is no content yet.