diff --git a/app/assets/stylesheets/dmpopidor.scss b/app/assets/stylesheets/dmpopidor.scss index cf1f6dd..06bad7d 100644 --- a/app/assets/stylesheets/dmpopidor.scss +++ b/app/assets/stylesheets/dmpopidor.scss @@ -757,6 +757,14 @@ } + // Plan Download + + #download_form { + #json-formatting { + display: none; + } + } + // News .question-divider { border-bottom: 2px solid $very-very-light-blue; diff --git a/app/javascript/views/plans/download.js b/app/javascript/views/plans/download.js index a1b0b2d..2325751 100644 --- a/app/javascript/views/plans/download.js +++ b/app/javascript/views/plans/download.js @@ -13,6 +13,14 @@ } else { $('#pdf-formatting').hide(); } + + if ($(e.currentTarget).val() === 'json') { + $('#research-output-export-mode, #export-options').hide(); + $('#json-formatting').show(); + } else { + $('#research-output-export-mode, #export-options').show(); + $('#json-formatting').hide(); + } }); $('#select-all-phases').on('click', (e) => { diff --git a/app/models/settings/template.rb b/app/models/settings/template.rb index c1299f4..d44d891 100644 --- a/app/models/settings/template.rb +++ b/app/models/settings/template.rb @@ -29,7 +29,7 @@ VALID_ADMIN_FIELDS = ['project_name', 'project_identifier', 'grant_title', 'principal_investigator', 'project_data_contact', 'project_description', 'funder', 'institution', 'orcid'] - VALID_FORMATS = ['html', 'pdf', 'docx', ["RDA Commons Standards", "json"]] + VALID_FORMATS = ['html', 'pdf', 'docx', "json"] DEFAULT_SETTINGS = { formatting: { diff --git a/app/views/branded/plans/_download_form.html.erb b/app/views/branded/plans/_download_form.html.erb index 380ace9..51070f2 100644 --- a/app/views/branded/plans/_download_form.html.erb +++ b/app/views/branded/plans/_download_form.html.erb @@ -19,7 +19,8 @@ <% end %> - <%= d_("dmpopidor", "Research output export mode") %> +
+ <%= d_("dmpopidor", "Research output export mode") %> +
<% else %> <%= hidden_field_tag(:research_output_id, @research_outputs[0].id) %> <% end %> @@ -63,7 +65,7 @@ <% else %> <%= hidden_field_tag(:phase_id, @phase_options[0][1]) %> <% end %> -
+
<%= d_('dmpopidor', "Plan components") %>
<%= label_tag 'export[project_details]' do %> @@ -101,6 +103,25 @@
+
+ <%= d_('dmpopidor', "JSON format") %> +
    +
  • + <%= label_tag 'json_format' do %> + <%= radio_button_tag("json_format", "default", true) %> + <%= d_("dmpopidor", 'Default export') %> + <% end %> +
  • +
  • + <%= label_tag 'json_format' do %> + <%= radio_button_tag("json_format", "rda", false) %> + <%= d_("dmpopidor", 'RDA Commons Standards') %> + <% end %> +
  • + +
+
+

<%= _('PDF formatting') %>

diff --git a/lib/dmpopidor/controllers/plan_exports.rb b/lib/dmpopidor/controllers/plan_exports.rb index af119ed..a314a0c 100644 --- a/lib/dmpopidor/controllers/plan_exports.rb +++ b/lib/dmpopidor/controllers/plan_exports.rb @@ -53,7 +53,7 @@ format.text { show_text } format.docx { show_docx } format.pdf { show_pdf } - format.json { show_json(params[:selected_research_outputs]) } + format.json { show_json(params[:selected_research_outputs], params[:json_format]) } end end @@ -73,11 +73,18 @@ } end - def show_json(selected_research_outputs) - render "shared/export/madmp_export_templates/rda/plan", locals: { - dmp: @plan.json_fragment, - selected_research_outputs: selected_research_outputs.map(&:to_i) - } + def show_json(selected_research_outputs, json_format) + if json_format.eql?("rda") + render "shared/export/madmp_export_templates/rda/plan", locals: { + dmp: @plan.json_fragment, + selected_research_outputs: selected_research_outputs.map(&:to_i) + } + else + render "shared/export/madmp_export_templates/default/plan", locals: { + dmp: @plan.json_fragment, + selected_research_outputs: selected_research_outputs.map(&:to_i) + } + end end end