652: added Document (file) media type #668

viniciuscb · 2019-11-02T00:59:46Z

Proposal for a Document media type.

Resolves #652

spec/requests/media/objects_spec.rb

config/initializers/mime_types.rb

app/models/report/standard_form_report.rb

app/models/media/document.rb

Signed-off-by: Vinicius Cubas Brand <[email protected]>

smoyte · 2019-11-08T14:59:01Z

Thanks for these PRs! Hoping to get to them next week. In the meantime, if you could resolve any merge conflicts (preferably with a rebase), that would be helpful!

smoyte

Nice work! Very thorough! Thanks for taking the time to go through the whole codebase and cover all areas.

I have questions about ODK support. Let me know if that's been tested. If it has, wow, surprise for me! If it hasn't, I'm pretty sure it's not supported, so let's take it out and add a spec to ensure document questions aren't rendered for ODK. See the form_rendering_spec.rb file.

smoyte · 2019-12-04T14:48:33Z

app/decorators/odk/subqing_decorator.rb

@@ -127,6 +127,7 @@ def media_type
      when "image", "annotated_image", "sketch", "signature" then "image/*"
      when "audio" then "audio/*"
      when "video" then "video/*"
+      when "document" then "document/*"


Has this been tested in ODK Collect? What does it do? I know that image, audio, and video have specific meanings in Collect but I haven't heard of "document" in that context. If it's not supported by ODK then we should not be rendering this question type when rendering for Collect, and this deliberate omission should be tested in the form_rendering_spec.rb

Hi @smoyth. Yes, we've tested in ODK collect and also in Nemo web interface. I've tested by uploading a document (pdf, odt, doc) in the collect, the answer was saved and after I could download/preview that document in the answer screen. This also worked in the web interface.

smoyte · 2019-12-04T14:50:24Z

app/models/concerns/odk/mediable.rb

+                              application/vnd.oasis.opendocument.presentation
+                              application/x-ole-storage].freeze
+    ODK_MEDIA_EXTS = {audio: %w[mp3 ogg wav flac], video: %w[mp4], image: %w[png jpg jpeg],
+                      document: %w[pdf xls xlsx ods doc docx odt rtf ppt pptx odp csv txt]}.freeze


If ODK doesn't support the document type then all of this can be removed, yes?

smoyte · 2019-12-04T14:50:55Z

app/models/media/document.rb

+      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+      "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+      "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+      # sometimes mimemagic returns x-ole-storage for msoffice files: https://github.com/minad/mimemagic/issues/50


Thanks for the comment!

smoyte · 2019-12-04T14:51:20Z

app/models/question_type.rb

@@ -75,6 +75,10 @@ class QuestionType
    name: "video",
    odk_name: "binary",
    properties: %w[multimedia]
+  }, {
+    name: "document",
+    odk_name: "binary",


Maybe don't need this?

smoyte · 2019-12-04T14:55:29Z

spec/features/results/file_upload_spec.rb

+    # upload valid document
+    drop_in_dropzone(document, 2)
+    expect_preview(document_node)
+


Nice specs!

smoyte · 2019-12-04T14:57:28Z

spec/fixtures/media/document/document.csv

@@ -0,0 +1,2 @@
+This is a document.,
+"Answer to the Ultimate Question of Life, the Universe, and Everything:",42


smoyte · 2019-12-04T14:59:17Z

spec/fixtures/odk/forms/media_prompts.xml

+          </text>
+          <text id="*itemcode4*:hint">
+            <value>Question Hint 4</value>
+          </text>


Curious if this works too. In the docs, I only see support for image, audio, and photo media prompts:

https://docs.opendatakit.org/form-styling/

smoyte · 2019-12-04T15:02:40Z

app/decorators/odk/question_decorator.rb

@@ -4,7 +4,7 @@ module Odk
  class QuestionDecorator < ApplicationDecorator
    delegate_all

-    URI_DIRS_BY_TYPE = {video: "video", audio: "audio", image: "images"}.freeze
+    URI_DIRS_BY_TYPE = {video: "video", audio: "audio", image: "images", document: "document"}.freeze


If ODK document media prompts aren't supported then this should be removed too.

smoyte · 2021-01-21T20:36:12Z

Closing for now due to age. Can be opened again later.

houndci-bot reviewed Nov 2, 2019

View reviewed changes

viniciuscb closed this Nov 2, 2019

viniciuscb reopened this Nov 2, 2019

viniciuscb closed this Nov 2, 2019

viniciuscb reopened this Nov 2, 2019

viniciuscb force-pushed the 652_add_file_question_type branch from 79b07ed to 6676ac7 Compare November 2, 2019 01:12

houndci-bot reviewed Nov 2, 2019

View reviewed changes

app/models/media/document.rb Show resolved Hide resolved

viniciuscb force-pushed the 652_add_file_question_type branch from 6676ac7 to 121a17d Compare November 2, 2019 01:13

houndci-bot reviewed Nov 2, 2019

View reviewed changes

app/models/media/document.rb Outdated Show resolved Hide resolved

652: added Document (file) media type

3b7ca5f

Signed-off-by: Vinicius Cubas Brand <[email protected]>

viniciuscb force-pushed the 652_add_file_question_type branch from 121a17d to 3b7ca5f Compare November 2, 2019 01:14

smoyte reviewed Dec 4, 2019

View reviewed changes

cooperka force-pushed the develop branch from 6ded6b4 to 640b1f9 Compare March 24, 2020 00:59

cooperka force-pushed the develop branch from ee7e287 to 0dcf224 Compare May 19, 2020 01:14

cooperka force-pushed the develop branch 4 times, most recently from cfd1f24 to cf84400 Compare June 30, 2020 00:11

smoyte closed this Jul 20, 2020

cooperka reopened this Jul 22, 2020

cooperka changed the base branch from develop to master July 22, 2020 21:36

cooperka mentioned this pull request Jul 22, 2020

673: added skip authorization on option sets child nodes #674

Closed

cooperka changed the base branch from master to main July 31, 2020 18:53

cooperka force-pushed the main branch 5 times, most recently from 74cb6eb to 62b3d8d Compare August 27, 2020 00:29

cooperka force-pushed the main branch from c8a86d0 to 83e3768 Compare September 18, 2020 00:56

smoyte force-pushed the main branch from cf8256d to e2713d0 Compare January 19, 2021 17:30

smoyte closed this Jan 21, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

652: added Document (file) media type #668

652: added Document (file) media type #668

viniciuscb commented Nov 2, 2019 •

edited by cooperka

Loading

smoyte commented Nov 8, 2019

smoyte left a comment

smoyte Dec 4, 2019

viniciuscb Dec 11, 2019

smoyte Dec 4, 2019

smoyte Dec 4, 2019

smoyte Dec 4, 2019

smoyte Dec 4, 2019

smoyte Dec 4, 2019

smoyte Dec 4, 2019

smoyte Dec 4, 2019

smoyte commented Jan 21, 2021

		@@ -0,0 +1,2 @@
		This is a document.,
		"Answer to the Ultimate Question of Life, the Universe, and Everything:",42

652: added Document (file) media type #668

652: added Document (file) media type #668

Conversation

viniciuscb commented Nov 2, 2019 • edited by cooperka Loading

smoyte commented Nov 8, 2019

smoyte left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smoyte commented Jan 21, 2021

viniciuscb commented Nov 2, 2019 •

edited by cooperka

Loading