Allow uploads of images via ODK #766
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@dodumosu rebase |
dodumosu
force-pushed
the
issue-87-image-uploads
branch
from
2ad759c to
b1e19b8
Compare
|
@takinbo rebased |
dodumosu
force-pushed
the
issue-87-image-uploads
branch
from
b1e19b8 to
50afe6c
Compare
dodumosu
force-pushed
the
issue-87-image-uploads
branch
from
131881d to
9e6f3b2
Compare
takinbo
requested changes
Dec 7, 2020
dodumosu
force-pushed
the
issue-87-image-uploads
branch
3 times, most recently
from
01989c7 to
35b3ee0
Compare
takinbo
requested changes
Dec 20, 2020
dodumosu
force-pushed
the
issue-87-image-uploads
branch
from
35b3ee0 to
a8cde9a
Compare
dodumosu
force-pushed
the
issue-87-image-uploads
branch
2 times, most recently
from
2641172 to
d2a4679
Compare
takinbo
requested changes
Jan 6, 2021
There was a problem hiding this comment.
I'm getting this error when I try to spin a container:
worker_1 | Traceback (most recent call last):
worker_1 | File "/app/manage.py", line 15, in <module>
worker_1 | from apollo.core import db
worker_1 | File "/app/apollo/__init__.py", line 15, in <module>
worker_1 | from apollo import assets, models, services
worker_1 | File "/app/apollo/models.py", line 14, in <module>
worker_1 | from apollo.submissions.models import ( # noqa
worker_1 | File "/app/apollo/submissions/models.py", line 3, in <module>
worker_1 | from depot.fields.specialized.image import UploadedImageWithThumb
worker_1 | File "/usr/local/lib/python3.6/site-packages/depot/fields/specialized/image.py", line 5, in <module>
worker_1 | from PIL import Image
worker_1 | ModuleNotFoundError: No module named 'PIL'
to dependencies also upgrade requests because boto3 requires a higher minimum urllib3 version
this commit adds several configuration variables, viz: - `ATTACHMENTS_USE_S3` - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` - `AWS_DEFAULT_REGION` - `AWS_DEFAULT_BUCKET` - `AWS_IMAGES_REGION` - `AWS_IMAGES_BUCKET` - `AWS_ENDPINT_URL` - `DEFAULT_STORAGE_PATH` - `IMAGES_STORAGE_PATH`
this commit adds several changes: - adds the field `allow_attachments` to the form model - adds toggling of the `allow_attachments` field in the form properties - adds the `image` field type - adds image attachment model class - adds support for the `location` and `image` field types to the form builder - adds support for importing and exporting forms with the `image` field type
this commit disables rendering of image and location fields until a decision is reached on how they will be rendered
this commit adds the following: - a URL endpoint to generate a QR code for configuring ODK Collect, optionally for a specific participant - processing for image attachments using ODK
dodumosu
force-pushed
the
issue-87-image-uploads
branch
from
41c4c4b to
693b017
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this pull request allows Apollo manage participant-submitted images via ODK as responses to questions. it also allows for the configuration of ODK Collect via a QR Code, either for the entire system (in which case no credentials are applied), or for a specific participant.
Image uploads can be configured locally or for Amazon S3. Relevant settings are:
ATTACHMENTS_USE_S3(boolean flag, set to true if uploads should go to S3)AWS_ACCESS_KEY_ID: required if the above is trueAWS_SECRET_ACCESS_KEY: required if the above is trueAWS_DEFAULT_REGION: optionalAWS_DEFAULT_BUCKET: optionalAWS_IMAGES_REGION: specifically for images. defaults toAWS_DEFAULT_REGIONAWS_IMAGES_BUCKET: specifically for images: defaults toAWS_DEFAULT_BUCKETAWS_ENDPOINT_URLDEFAULT_STORAGE_PATH: defaults to the configured path for uploadsIMAGES_STORAGE_PATH: defaults to a subfolder namedimagesinDEFAULT_STORAGE_PATH