Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/templatestudies Template studies support #558

Draft
wants to merge 268 commits into
base: dev
Choose a base branch
from
Draft

Feature/templatestudies Template studies support #558

wants to merge 268 commits into from

Conversation

hig-dev
Copy link
Contributor

@hig-dev hig-dev commented Dec 21, 2023 •
edited by johannesvedder
Loading

This PR adds support to create template studies with sub-studies.

Todos

  • Fix open bugs
    • Template trials not shown correctly on dashboard
    • Study created column broken
    • ...
  • Localize/translate
  • Check for open todos in code
  • Check usage of flutter_portal package
  • Adapt UI/UX/logic for study closing feature
  • Check database changes and create migrations
    • Check policies
  • Adapt integration tests (after merge of refactor(designer_v2): Support Riverpod v2 #626)

On release increase app_min_version!

Old todos

  • Update database
  • Expandable studies table with grouping
  • Create button with overlay to create standalone study or template
  • Design template with locking feature
  • Design sub-study with locking feature and inheritance
  • Adapt publish dialog for templates
  • Adapt app for template studies

During review:

  • Finalize database and study model
  • Finalize design of study creation overlay

hig-dev and others added 30 commits November 22, 2023 03:00
@hig-dev
Implement template study creation #2
dbf2595
docs: update UML documentation
7c8d4a0
@hig-dev
Adjust routing for template
722b668
docs: update UML documentation
4d42492
@hig-dev
Adjust routing for template #2
eb77b46
@hig-dev
Update translation of dashboard
ab7d7f2
@hig-dev
Implement locking feature for template studies
b38d01b
@hig-dev
Fix routing from splash with query parameters
f52219c
docs: update UML documentation
6de2db2
@hig-dev
Make ModelInstanceCreationArgs equatable so that Provider.family work…
4f6a141 
…s correctly
docs: update UML documentation
0eac212
@hig-dev
feat: add support for creation of sub studies
ae98467
@hig-dev
feat: add support for creation of sub studies
d2911a0
@hig-dev
feat: add support for creation of sub studies
fd2f843
@hig-dev
feat: relax requirements for templates
49f608c
@hig-dev
feat: adapt study publish dialog for templates
a8d5699
@hig-dev
feat: implement locking and inheritance from template for sub-studies
903127e
@hig-dev
feat: recruiting not available for templates
ec8df5f
@hig-dev
refactor: remove not needed parentTemplateWithMetadata
f9d0610
docs: update UML documentation
8a3f366
@hig-dev
fix: replace create new OverlayPortal with flutter_portal to prevent …
bc1efc8 
…resizing issue
docs: update UML documentation
036a65c
@hig-dev
feature: create sub-study with data from parent template
1e31807
@hig-dev
feature: implement locking for sub-studies
ccfbda2
@hig-dev
feature: add missing translations
bfe415d
docs: update UML documentation
955f201
@hig-dev
chore: normalize line endings to LF for text files
48f7cc2
@hig-dev
fix: disabled controls in template
0be8dcb
@hig-dev
fix: add margin between create button and overlay
d5cb004
@hig-dev
feat: change create overlay item icon to add
d4ee6e3
@johannesvedder johannesvedder self-requested a review March 22, 2024 14:02
@hig-dev
Merge branch 'dev' into feature/templatestudies
4efebe8 
# Conflicts:
#	designer_v2/lib/features/dashboard/studies_table_item.dart
#	designer_v2/pubspec.yaml
#	docs/uml/designer_v2/lib/common_views/uml.svg
#	docs/uml/designer_v2/lib/features/dashboard/uml.svg
#	docs/uml/designer_v2/lib/features/design/uml.svg
#	docs/uml/designer_v2/lib/features/uml.svg
#	docs/uml/designer_v2/lib/uml.svg
@johannesvedder
Copy link
Contributor

#601 needs to be integrated before merging

@johannesvedder
Merge branch 'dev' into feature/templatestudies
9f9fea9 
# Conflicts:
#	designer_v2/l10n-missing.txt
#	designer_v2/lib/main.dart
#	docs/uml/app/lib/widgets/uml.svg
#	docs/uml/designer_v2/lib/domain/uml.svg
@johannesvedder
chore: format
3d11830
@johannesvedder
chore: update .env.dev
311f10c
@johannesvedder
Merge branch 'refs/heads/dev' into feature/templatestudies
fc00f21 
# Conflicts:
#	app/lib/screens/study/onboarding/study_selection.dart
#	app/lib/widgets/study_tile.dart
#	core/lib/src/models/tables/study.g.dart
#	designer_v2/lib/features/analyze/study_analyze_controller.dart
#	designer_v2/lib/features/analyze/study_analyze_page.dart
#	designer_v2/lib/features/dashboard/dashboard_controller.dart
#	designer_v2/lib/features/dashboard/dashboard_page.dart
#	designer_v2/lib/features/dashboard/dashboard_state.dart
#	designer_v2/lib/features/dashboard/studies_table.dart
#	designer_v2/lib/features/dashboard/studies_table_item.dart
#	designer_v2/lib/features/design/enrollment/enrollment_form_data.dart
#	designer_v2/lib/features/design/enrollment/enrollment_form_view.dart
#	designer_v2/lib/features/design/info/study_info_form_controller.dart
#	designer_v2/lib/features/design/info/study_info_form_view.dart
#	designer_v2/lib/features/design/interventions/intervention_form_controller.dart
#	designer_v2/lib/features/design/interventions/interventions_form_controller.dart
#	designer_v2/lib/features/design/interventions/interventions_form_data.dart
#	designer_v2/lib/features/design/interventions/interventions_form_view.dart
#	designer_v2/lib/features/design/measurements/measurements_form_controller.dart
#	designer_v2/lib/features/design/measurements/measurements_form_view.dart
#	designer_v2/lib/features/design/measurements/survey/survey_form_controller.dart
#	designer_v2/lib/features/design/reports/reports_form_controller.dart
#	designer_v2/lib/features/design/reports/reports_form_view.dart
#	designer_v2/lib/features/design/reports/section/report_item_form_view.dart
#	designer_v2/lib/features/design/reports/section/types/linear_regression_section_form_view.dart
#	designer_v2/lib/features/design/study_design_page_view.dart
#	designer_v2/lib/features/design/study_form_controller.dart
#	designer_v2/lib/features/design/study_form_providers.dart
#	designer_v2/lib/features/design/study_form_scaffold.dart
#	designer_v2/lib/features/dialogs/publish/study_publish_dialog_confirm.dart
#	designer_v2/lib/features/dialogs/publish/study_publish_dialog_success.dart
#	designer_v2/lib/features/publish/study_publish_dialog.dart
#	designer_v2/lib/features/recruit/invite_code_form_controller.dart
#	designer_v2/lib/features/recruit/study_recruit_controller.dart
#	designer_v2/lib/features/recruit/study_recruit_page.dart
#	designer_v2/lib/features/study/settings/study_settings_dialog.dart
#	designer_v2/lib/features/study/settings/study_settings_form_controller.dart
#	designer_v2/lib/features/study/study_base_controller.dart
#	designer_v2/lib/features/study/study_controller.dart
#	designer_v2/lib/features/study/study_navbar.dart
#	designer_v2/lib/features/study/study_participation_badge.dart
#	designer_v2/lib/features/study/study_scaffold.dart
#	designer_v2/lib/features/study/study_test_controller.dart
#	designer_v2/lib/features/study/study_test_frame.dart
#	designer_v2/lib/features/study/study_test_page.dart
#	designer_v2/lib/localization/app_de.arb
#	designer_v2/lib/localization/app_en.arb
#	designer_v2/lib/main.dart
#	designer_v2/lib/repositories/model_repository.dart
#	designer_v2/lib/routing/router.dart
#	designer_v2/lib/routing/router_config.dart
#	docs/database/README.md
#	docs/database/public.repo.svg
#	docs/database/public.study.md
#	docs/database/public.study.svg
#	docs/database/public.study_invite.svg
#	docs/database/public.study_subject.svg
#	docs/database/public.user.svg
#	docs/database/schema.json
#	docs/database/schema.svg
#	docs/uml/designer_v2/lib/domain/uml.svg
#	docs/uml/designer_v2/lib/features/dashboard/uml.svg
#	docs/uml/designer_v2/lib/features/design/info/uml.svg
#	docs/uml/designer_v2/lib/features/design/reports/section/types/uml.svg
#	docs/uml/designer_v2/lib/features/design/reports/section/uml.svg
#	docs/uml/designer_v2/lib/features/design/reports/uml.svg
#	docs/uml/designer_v2/lib/features/forms/uml.svg
#	docs/uml/designer_v2/lib/features/recruit/uml.svg
#	docs/uml/designer_v2/lib/features/study/settings/uml.svg
#	docs/uml/designer_v2/lib/features/study/uml.svg
#	docs/uml/designer_v2/lib/features/uml.svg
#	docs/uml/designer_v2/lib/repositories/uml.svg
#	docs/uml/designer_v2/lib/routing/uml.svg
#	docs/uml/designer_v2/lib/uml.svg
@johannesvedder
chore: merge and fix
aee587f
@johannesvedder
chore: format
c44ddc9
@johannesvedder
chore: fix and format
191a21f
@johannesvedder
chore: cleanup
a5d416e
@github-actions github-actions bot removed documentation Improvements or additions to documentation flutter_common labels Jun 28, 2024
@johannesvedder johannesvedder marked this pull request as draft June 29, 2024 07:40
@johannesvedder johannesvedder removed their request for review July 1, 2024 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johannesvedder johannesvedder johannesvedder left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
app core dependencies Pull requests that update a dependency file designer_v2
Projects
None yet
Milestone
Release(2024-04-30) Template Trials
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@hig-dev @johannesvedder @malte-j @alisher-turubayev