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

Feat/multimodal revised #520

Merged
merged 249 commits into from
Apr 17, 2024
Merged

Feat/multimodal revised #520

merged 249 commits into from
Apr 17, 2024

Conversation

johannesvedder
Copy link
Contributor

@johannesvedder johannesvedder commented Nov 6, 2023 •
edited
Loading

Successor of Multimodal Trial Support for StudyU (original PR #507)

DATABASE NEEDS TO BE MIGRATED ON MERGE

How to Review

  • Migration of SharedPreferences to flutter_secure_storage
    • Create a study using the dev branch and join a study
    • Update the branch to feat/multimodal-revised and reload the app
    • All locally stored data (supabase tokens, study subject, etc.) should still be accessible to the StudyU App. The participant should be able to continue the study
  • Multimodal features
    • Create a multimodal study with both image and audio questions
    • Join the study with the app
    • Complete the questions
    • Check if data has correctly be inserted into the supabase backend using Supabase Studio
    • Check if multimodal data can be downloaded via the StudyU Designer Analyze page

Changes

florian-papsdorf and others added 30 commits June 22, 2023 16:06
@florian-papsdorf
Refine CI/CD
524405a
@florian-papsdorf
Fix Branch Name
cfa4cac
@florian-papsdorf
Configure RProxy
10d6b06
@florian-papsdorf
Introduce named volumes for persitent data
d8830d5
@florian-papsdorf
Fix compose file locations
88700a2
@florian-papsdorf
Run up with d
d9cf863
@florian-papsdorf
Handle kong.yml
015f94d
@florian-papsdorf
Fix .env file copy order
a25513b
@florian-papsdorf
Merge branch 'dev' into deploy
96bd2c4
.
b77fe87
@florian-papsdorf
Updated pubspecs
78d4629
@florian-papsdorf
Merge branch 'dev' into deploy
c074561 
# Conflicts:
#	docker/supabase/docker-compose-db.yml
#	docker/supabase/docker-compose.yml
@florian-papsdorf
Repair GitLab CI
df8cbcc
added image_capturing_widget and task screen prototype
bac6acf
@johannesvedder @cansinorak
chore(release): publish packages
caaf2cb 
 - [email protected]
 - [email protected]
 - [email protected]
 - [email protected]
@johannesvedder @cansinorak
chore: lock files
1b381a2
@cansinorak
Creation of Image Capturing Type
ee862a6
@cansinorak
Creation of Image Capturing Type
c6ef3d9
@cansinorak
image question type and related files are added
9c93957
fixed all errors (except buildFormData) and ran json serialize build
d6ecdcb
@cansinorak
generated json files and edited Image form view
dedee1a
@johannesvedder @cansinorak
chore(release): publish packages
94b8402 
 - [email protected]
 - [email protected]
 - [email protected]
 - [email protected]
@johannesvedder @cansinorak
chore: lock files
cbc56c4
@cansinorak
Creation of Image Capturing Type
e0d5c44
@cansinorak
Creation of Image Capturing Type
c95fdd6
@cansinorak
image question type and related files are added
65f96ed
@cansinorak
generated json files and edited Image form view
80f5ba0
@cansinorak
add image_capturing_question.g.dart file
31025fd
@cansinorak
Merge branch 'feature/image-designer-frontend' of https://github.com/…
7e156d1 
…HIAlab/studyu-v2 into feature/image-designer-frontend
@florian-papsdorf
Insert basic classes from prototype
aef1937
@johannesvedder johannesvedder requested review from hig-dev and removed request for hig-dev March 6, 2024 09:36
@johannesvedder
Copy link
Contributor Author

Do not review and merge before https://github.com/hpi-studyu/studyu/milestone/3

@johannesvedder johannesvedder added this to the Release(2024-04) milestone Mar 8, 2024
hig-dev and others added 6 commits March 12, 2024 18:23
@hig-dev
Merge branch 'dev' into feat/multimodal-revised
67ea0dc 
# Conflicts:
#	app/pubspec.yaml
#	core/pubspec.lock
#	designer_v2/pubspec.lock
#	flutter_common/pubspec.lock
@hig-dev
fix: style of photo capture button
7ec8538
docs: update UML documentation
8ab7022
@johannesvedder
Merge branch 'dev' into feat/multimodal-revised
c1b2806 
# Conflicts:
#	app/lib/util/cache.dart
#	app/pubspec.yaml
#	core/lib/src/models/questionnaire/question.dart
#	designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart
#	designer_v2/pubspec.lock
#	docs/uml/app/lib/uml.svg
#	docs/uml/core/lib/src/models/report/sections/uml.svg
#	docs/uml/core/lib/src/models/report/uml.svg
#	docs/uml/core/lib/src/models/study_results/results/uml.svg
#	docs/uml/core/lib/src/models/study_results/uml.svg
#	docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/types/uml.svg
#	docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
#	docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
#	docs/uml/designer_v2/lib/features/design/shared/uml.svg
#	docs/uml/designer_v2/lib/features/design/uml.svg
@johannesvedder
chore: deps
79120ff
@johannesvedder
chore: mergefix
b22a0f0
@johannesvedder johannesvedder removed the request for review from hig-dev March 26, 2024 08:25
StudyU Documenter and others added 2 commits March 26, 2024 08:26
docs: update UML documentation
51aa9e5
@johannesvedder
Merge branch 'dev' into feat/multimodal-revised
e7f6b5f 
# Conflicts:
#	designer_v2/lib/features/design/shared/questionnaire/question/types/question_type.dart
#	docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/types/uml.svg
#	docs/uml/designer_v2/lib/features/design/shared/questionnaire/question/uml.svg
#	docs/uml/designer_v2/lib/features/design/shared/questionnaire/uml.svg
#	docs/uml/designer_v2/lib/features/design/shared/uml.svg
#	docs/uml/designer_v2/lib/features/design/uml.svg
hig-dev
hig-dev requested changes Apr 3, 2024
View reviewed changes
core/lib/src/util/multimodal/blob_storage_handler.dart Outdated Show resolved Hide resolved
flutter_common/lib/src/utils/storage.dart Show resolved Hide resolved
flutter_common/lib/src/utils/storage.dart Outdated Show resolved Hide resolved
@johannesvedder
Merge branch 'dev' into feat/multimodal-revised
a13754b 
# Conflicts:
#	docs/uml/app/lib/uml.svg
#	docs/uml/app/lib/widgets/uml.svg
@johannesvedder johannesvedder merged commit 93dc03c into dev Apr 17, 2024
11 checks passed
@johannesvedder johannesvedder deleted the feat/multimodal-revised branch April 17, 2024 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hig-dev hig-dev hig-dev approved these changes

Assignees

@johannesvedder johannesvedder

Labels
app core dependencies Pull requests that update a dependency file designer_v2 documentation Improvements or additions to documentation flutter_common
Projects
None yet
Milestone
Release(2024-04-15) New Question Type...
Development

Successfully merging this pull request may close these issues.

feat(multimodal): Improve recording screen
5 participants
@johannesvedder @hig-dev @florian-papsdorf @cansinorak @jannis-baum