+ <%= label_tag(:phase_id, _("Select phase to download")) %>
+ <%= select_tag(:phase_id, options_for_select(@phase_options, @phase_options[0])) %>
+
+ <% else %>
+ <%= hidden_field_tag(:phase_id, @phase_options[0][1]) %>
+ <% end %>
+
+
+ <%= label_tag 'export[project_details]', raw("#{check_box_tag 'export[project_details]', true, false} #{_('project details coversheet')}") %>
+
+
+ <%= label_tag 'export[question_headings]', raw("#{check_box_tag 'export[question_headings]', true, true} #{_('question text and section headings')}") %>
+
+
+ <%= label_tag 'export[unanswered_questions]', raw("#{check_box_tag 'export[unanswered_questions]', true, true} #{_('unanswered questions')}") %>
+
+ <% if @plan.template.customization_of.present? %>
+
+ <%= label_tag 'export[custom_sections]', raw("#{check_box_tag 'export[custom_sections]', true, false} #{_('supplementary section(s) not requested by funding organisation')}") %>
+
+ <% end %>
+
+
+
+ <%= label_tag "export[formatting][font_face]", _('Face'), class: 'control-label' %>
+ <%= select_tag "export[formatting][font_face]",
+ options_for_select(Settings::Template::VALID_FONT_FACES,
+ @export_settings.formatting[:font_face]),
+ class: 'form-control',
+ "data-default": @plan.template.settings(:export).formatting[:font_face] %>
+
+
+ <%= label_tag "export[formatting][font_size]", _('Size') + " (pt)", class: 'control-label' %>
+ <%= select_tag "export[formatting][font_size]",
+ options_for_select(Settings::Template::VALID_FONT_SIZE_RANGE.to_a, @export_settings.formatting[:font_size]),
+ class: 'form-control',
+ "data-default": @plan.template.settings(:export).formatting[:font_size] %>
+
+
+
+ <%= label_tag "export[formatting][margin][top]", _('Top'),
+ class: 'control-label' %>
+ <%= select_tag "export[formatting][margin][top]",
+ options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a,
+ @export_settings.formatting[:margin][:top]),
+ class: 'form-control',
+ "data-default": @plan.template.settings(:export).formatting[:margin][:top] %>
+
+
+ <%= label_tag "export[formatting][margin][bottom]", _('Bottom'),
+ class: 'control-label' %>
+ <%= select_tag "export[formatting][margin][bottom]",
+ options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a,
+ @export_settings.formatting[:margin][:bottom]),
+ class: 'form-control',
+ "data-default": @plan.template.settings(:export).formatting[:margin][:bottom] %>
+
+
+ <%= label_tag "export[formatting][margin][left]", _('Left'),
+ class: 'control-label' %>
+ <%= select_tag "export[formatting][margin][left]",
+ options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a,
+ @export_settings.formatting[:margin][:left]),
+ class: 'form-control',
+ "data-default": @plan.template.settings(:export).formatting[:margin][:left] %>
+
+
+ <%= label_tag "export[formatting][margin][right]", _('Right'),
+ class: 'control-label' %>
+ <%= select_tag "export[formatting][margin][right]",
+ options_for_select(Settings::Template::VALID_MARGIN_RANGE.to_a,
+ @export_settings.formatting[:margin][:right]),
+ class: 'form-control',
+ "data-default": @plan.template.settings(:export).formatting[:margin][:rigth] %>
+
+
-
-
<%= answered -%> <%= _(' answered')%>
+
;">
+ <%= "#{value} % #{_('answered')}" %>
diff --git a/app/views/plans/download.html.erb b/app/views/plans/download.html.erb
new file mode 100644
index 0000000..f971efe
--- /dev/null
+++ b/app/views/plans/download.html.erb
@@ -0,0 +1,12 @@
+
+
+
+
<%= @plan.title %>
+
+
+
+
+
+ <%= render partial: 'download_form', layout: '/shared/plan_navigation', locals: { plan: @plan } %>
+
+
diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb
index fd90df3..9567967 100644
--- a/app/views/plans/index.html.erb
+++ b/app/views/plans/index.html.erb
@@ -76,14 +76,14 @@
<%= link_to _('Share'), share_plan_path(plan) %>
<% end %>
-
<%= link_to _('Download'), show_export_plan_path(plan) %>
+
<%= link_to _('Download'), download_plan_path(plan) %>
<%= link_to _('Make a copy'), duplicate_plan_path(plan),
method: :post, remote: true %>
<% else %>
<%= link_to _('View'), plan_path(plan) %>
-
<%= link_to _('Download'), show_export_plan_path(plan) %>
+
<%= link_to _('Download'), download_plan_path(plan) %>
<% end %>
<% role = plan.roles.where(user_id: current_user.id).first %>
<% conf = (role.creator? && plan.publicly_visible?) ? _("Are you sure you wish to remove this public plan? This will remove it from the Public DMPs page but any collaborators will still be able to access it.") : _("Are you sure you wish to remove this plan? Any collaborators will still be able to access it.") %>
diff --git a/app/views/plans/show_export.html.erb b/app/views/plans/show_export.html.erb
deleted file mode 100644
index 3a2253a..0000000
--- a/app/views/plans/show_export.html.erb
+++ /dev/null
@@ -1,124 +0,0 @@
-<%- model_class = Plan -%>
-
-
-
-
-
<%= @plan.title %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<%= _("Download Settings") %>
-
- <%= form_tag( export_plan_path(@plan), method: :get, html: {class: "roadmap-form"}) do |f| %>
- <% if @phase_options.length > 1 %>
-
- <%= label_tag(:phase_id, _("Select phase to download")) %>
- <%= select_tag(:phase_id, options_for_select(@phase_options, @phase_options[0])) %>
-
- <% else %>
- <%= hidden_field_tag(:phase_id, @phase_options[0][1]) %>
- <% end %>
- <%= _("Optional plan components") %>
-
- <%= check_box_tag 'export[project_details]', true, false %>
- <%= label_tag 'export[project_details]', _('project details coversheet'), class: 'checkbox-label' %>
-
-
- <%= check_box_tag 'export[question_headings]', true, true, class: 'question-headings'%>
- <%= label_tag 'export[question_headings]', _('question text and section headings'), class: 'checkbox-label' %>
-
-
- <%= check_box_tag 'export[unanswered_questions]', true, true, class: 'unanswered-questions' %>
- <%= label_tag 'export[unanswered_questions]', _('unanswered questions'), class: 'checkbox-label' %>
-
- <% if @plan.template.customization_of.present? %>
-
- <%= check_box_tag 'export[custom_sections]', true, false %>
- <%= label_tag 'export[custom_sections]', _('supplementary section(s) not requested by funding organisation'), class: 'checkbox-label' %>
-
- <% end %>
-
-
-
-
- <%= label_tag(:format, _('Format')) %>
- <%= select_tag(:format, options_for_select(ExportedPlan::VALID_FORMATS, :pdf), class: 'export-format-selection') %>
-
-
-
-
-
-
-
- <% end %>
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/views/questions/_new_edit_question_option_based.html.erb b/app/views/questions/_new_edit_question_option_based.html.erb
new file mode 100644
index 0000000..7a5a0c1
--- /dev/null
+++ b/app/views/questions/_new_edit_question_option_based.html.erb
@@ -0,0 +1,48 @@
+<% options = question.question_options.by_number %>
+<% if question.question_format.checkbox? %>
+ <%= f.label(:question_option_ids, raw(question.text), class: 'control-label') %>
+ <% options.each do |op| %>
+
+
+ <%= f.check_box(:question_option_ids, { multiple: true, checked: answer.has_question_option(op.id), disabled: readonly }, op.id, nil) %>
+ <%= raw op.text %>
+
+
+ <% end %>
+<% elsif question.question_format.radiobuttons? %>
+ <%= f.label(:question_option_ids, raw(question.text), class: 'control-label') %>
+ <% options.each do |op| %>
+
+
+ <%= f.radio_button :question_option_ids, op.id, { checked: answer.has_question_option(op.id), id: "answer_option_ids_#{op.id}", disabled: readonly } %>
+ <%= raw op.text %>
+
+
+ <% end %>
+<% elsif question.question_format.dropdown? || question.question_format.multiselectbox? %>
+ <%
+ options_html = ""
+ options.each do |op|
+ options_html += answer.has_question_option(op.id) ?
+ "
#{op.text} " :
+ "
#{op.text} "
+ end
+ %>
+ <%= f.label(:question_option_ids, raw(question.text), class: 'control-label') %>
+ <%= select_tag('answer[question_option_ids]',
+ raw(options_html),
+ { multiple: question.question_format.multiselectbox?,
+ include_blank: question.question_format.dropdown?,
+ disabled: readonly,
+ class: 'form-control' }) %>
+<% end %>
+
diff --git a/app/views/questions/_new_edit_question_textarea.html.erb b/app/views/questions/_new_edit_question_textarea.html.erb
new file mode 100644
index 0000000..c390574
--- /dev/null
+++ b/app/views/questions/_new_edit_question_textarea.html.erb
@@ -0,0 +1,8 @@
+
\ No newline at end of file
diff --git a/app/views/questions/_new_edit_question_textfield.html.erb b/app/views/questions/_new_edit_question_textfield.html.erb
new file mode 100644
index 0000000..b1dbd95
--- /dev/null
+++ b/app/views/questions/_new_edit_question_textfield.html.erb
@@ -0,0 +1,8 @@
+
\ No newline at end of file
diff --git a/app/views/sections/_progress.html.erb b/app/views/sections/_progress.html.erb
index 02c8d69..7eae314 100644
--- a/app/views/sections/_progress.html.erb
+++ b/app/views/sections/_progress.html.erb
@@ -3,6 +3,6 @@
<% num_section_answers = section.num_answered_questions(plan.id) %>
- <%= num_section_answers %> / <%= num_section_questions %>
+ (<%= num_section_answers %> / <%= num_section_questions %>)
\ No newline at end of file
diff --git a/app/views/shared/_plan_navigation.html.erb b/app/views/shared/_plan_navigation.html.erb
index 1c65b33..a6ffbd4 100644
--- a/app/views/shared/_plan_navigation.html.erb
+++ b/app/views/shared/_plan_navigation.html.erb
@@ -12,8 +12,8 @@
<%= _('Share') %>
-
- <%= _('Download') %>
+
+ <%= _('Download') %>
diff --git a/config/routes.rb b/config/routes.rb
index 343704b..218ec8f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -212,7 +212,7 @@
get 'warning'
get 'section_answers'
get 'share'
- get 'show_export'
+ get 'download'
post 'duplicate'
get 'export'
post 'invite'
diff --git a/lib/assets/javascripts/application.js b/lib/assets/javascripts/application.js
index 58a9708..0a2fc35 100644
--- a/lib/assets/javascripts/application.js
+++ b/lib/assets/javascripts/application.js
@@ -1,7 +1,9 @@
+import './views/answers/status';
import './views/contacts/new';
import './views/devise/invitations/edit';
import './views/devise/passwords/edit';
import './views/devise/passwords/new';
import './views/phases/edit';
+import './views/plans/download';
import './views/plans/edit_details';
import './views/plans/share';
diff --git a/lib/assets/javascripts/views/answers/status.js b/lib/assets/javascripts/views/answers/status.js
index ae9b12d..55e3aa0 100644
--- a/lib/assets/javascripts/views/answers/status.js
+++ b/lib/assets/javascripts/views/answers/status.js
@@ -1,92 +1,130 @@
-$(document).ready(function(){
- /*--------------
- START Autosaving
- ----------------*/
- // debounced object holds a set of debounced functions, one for each form present in the page. Note,
- // each debounced function stored at funcs is created on demand, i.e. once the user changes any element of a form
- var debounced = (function(){
- var funcs = {};
- return {
- has: function(id){
- return funcs[id] !== undefined;
- },
- get: function(id){
+import {
+ isObject,
+ isNumber,
+ isString } from '../../utils/isType';
+import { Tinymce } from '../../utils/tinymce';
+import debounce from '../../utils/debounce';
- return funcs[id];
- },
- set: function(id, func){
- funcs[id] = dmproadmap.utils.debounce(func);
- }
- }
- })();
- // This function triggers a form submit, if and only if the answer has not been optimistically locked
- var autoSaving=function(){
- if($(this).closest('.question-form').find('.answer-locking').children().length === 0){
- $(this).closest('form.answer').submit();
- }
- };
- var listenersForEditor=function(editor){
- editor.on('change', function(){
- var notAnswered = $('#'+editor.id).closest('.question-form').find('.not-answered');
- notAnswered.hide();
- });
- editor.on('blur', function(){
- var id = $('#'+editor.id).closest('form.answer').attr('data-autosave');
- $('#'+editor.id).val(editor.getContent()); //Updates target element of tinyMCE.editor with its content
- if(!debounced.has(id)){
- debounced.set(id, autoSaving);
- }
- debounced.get(id).apply($('#'+editor.id),[id]);
- });
- editor.on('focus', function(){
- var id = $('#'+editor.id).closest('form.answer').attr('data-autosave');
- if(debounced.has(id)){
- debounced.get(id).cancel(); //Cancels the execution of its debounced function either because user transitioned from question with options
- // to the comments or because textarea lost focus and gained again before the delay being met
- }
- });
+$(() => {
+ /*
+ * Shows the closest saving-message HTML element within a question-form
+ * @param { Strin } selector - A valid CSS selector to look for
+ * @return { jQuery }
+ */
+ const showSavingMessage = selector => $(selector).closest('.question-form').find('.saving-message').show();
+ /*
+ * Hides the closest not-answered HTML element within a question-form
+ * @param { String } selector - A valid CSS selector to look for
+ * @return { jQuery }
+ */
+ const hideNotAnswered = selector => $(selector).closest('.question-form').find('.not-answered').hide();
+ /*
+ * Retrieves the question id for the closest form-answer
+ * @param { String } selector - A valid CSS selector to look for
+ * @return { String } representing the question id for a given answer, otherwise undefined
+ */
+ const questionId = selector => $(selector).closest('.form-answer').attr('data-autosave');
+ /*
+ * A map of debounced functions, one for each input, textarea or select change at any
+ * form with class form-answer. The key represents a question id and the value holds
+ * the debounced function for a given input, textarea or select. Note, this map is
+ * populated on demand, i.e. the first time a change is made at a given input, textarea
+ * or select within the form, a new key-value should be created. Succesive times, the
+ * debounced function should be retrieved instead.
+ */
+ const debounceMap = {};
+ const autoSaving = (selector) => {
+ if ($(selector).closest('.question-form').find('.answer-locking').html().length === 0) {
+ $(selector).closest('.form-answer').trigger('submit');
}
- /*--------------
- END Autosaving
- ----------------*/
- // Listener for submit event triggered
- $('.question-form').on('submit', 'form.answer', function(){
- var id = $(this).attr('data-autosave');
- if(debounced.has(id)){
- debounced.get(id).cancel(); //Cancels the execution of its debounced function, if not already, since submit() could have been trigerred through Save button
- }
- var container = $(this).closest('.question-form');
- var saving = container.find('.saving-message');
- saving.show();
+ };
+ // Initialises tinymce for any target element with class tinymce_answer
+ Tinymce.init({ selector: '.tinymce_answer' });
+ // Listeners for change, blur and focus at any target element with class tinymce_answer
+ Tinymce.findEditorsByClassName('tinymce_answer').forEach((editor) => {
+ editor.on('Change', () => {
+ hideNotAnswered(`#${editor.id}`);
});
- // Listener for changes at any element value from question-form
- $('.question-form').on('change', 'form.answer fieldset input, form.answer fieldset select', function(){
- var notAnswered = $(this).closest('.question-form').find('.not-answered');
- notAnswered.hide();
+ editor.on('Blur', () => {
+ const id = questionId(`#${editor.id}`);
+ $(`#${editor.id}`).val(editor.getContent()); // Updates target element of editor with its content
+ if (!debounceMap[id]) {
+ debounceMap[id] = debounce(autoSaving);
+ }
+ debounceMap[id]($(`#${editor.id}`));
});
- // Listener for changes at any element value from question-form. This triggers the debounced function
- $('.question-form').on('change', 'form.answer fieldset input, form.answer fieldset select', function(){
- var id = $(this).closest('form.answer').attr('data-autosave');
- if(!debounced.has(id)){
- debounced.set(id, autoSaving);
- }
- debounced.get(id).apply($(this),[id]);
+ editor.on('Focus', () => {
+ const id = questionId(`#${editor.id}`);
+ if (debounceMap[id]) {
+ /* Cancels the delayed execution of autoSaving, either because user
+ * transitioned from an option_based question to the comment or
+ * because the target element triggered blur and focus before
+ * the delayed execution of autoSaving.
+ */
+ debounceMap[id].cancel();
+ }
});
- // Init function to add listeners for every tinyMCE editor whose target element class is tinymce_answer
- (function(){
- var editors = dmproadmap.utils.tinymce.findEditorsByClassName('tinymce_answer');
- editors.forEach(listenersForEditor);
- // Initialises timeago for each element abbr with class timeago
- $('abbr.timeago').timeago();
- })();
- (function(ctx){
- // function to add listeners for a tinyMCE editor with target element id passed
- ctx.reloadEditorListeners = ctx.reloadEditorListeners || (function(id){
- var editor = dmproadmap.utils.tinymce.findEditorById(id);
- if(editor){
- listenersForEditor(editor);
- $('abbr.timeago').timeago();
+ });
+ // Listener for input or select field
+ $('.question-form').on('change', 'form.answer fieldset input, form.answer fieldset select', (e) => {
+ hideNotAnswered(e.target);
+ const id = questionId(e.target);
+ if (!debounceMap[id]) {
+ debounceMap[id] = debounce(autoSaving);
+ }
+ debounceMap[id]($(e.target));
+ });
+ // Listener for submit button
+ $('.form-answer').on('submit', (e) => {
+ e.preventDefault();
+ const id = questionId(e.target);
+ if (debounceMap[id]) {
+ // Cancels the delated execution of autoSaving
+ // (e.g. user clicks the button before the delay is met)
+ debounceMap[id].cancel();
+ }
+ showSavingMessage(e.target);
+ const formElements = $(e.target).closest('.form-answer').serializeArray();
+ const answerId = formElements.find(el => el.name === 'answer[id]');
+ if (answerId) {
+ // TODO centralise AJAX calls
+ $.ajax({
+ method: 'PUT',
+ url: `/answers/${answerId}`,
+ data: formElements,
+ }).done((data) => {
+ // Validation for the data object received
+ if (isObject(data)) {
+ if (isObject(data.question)) { // Object related to question within data received
+ if (isNumber(data.question.id)) {
+ if (isString(data.question.answer_status)) {
+ $(`#answer-status-${data.question.id}`).html(data.question.answer_status); // TODO check partial render of this view on the server
+ $('abbr.timeago').timeago();
+ }
+ if (isString(data.question.locking)) {
+ $(`#answer-locking-${data.question.id}`).html(data.question.locking);
+ }
+ if (isNumber(data.question.answer_lock_version)) {
+ $(e.target).closest('.form-answer').find('#answer_lock_version').val(data.question.answer_lock_version);
+ }
}
- });
- })(define('dmproadmap.answers.status'));
-});
\ No newline at end of file
+ }
+ if (isObject(data.plan)) { // Object related to plan within data received
+ if (isString(data.plan.progress)) {
+ $('.progress').html(data.plan.progress);
+ }
+ }
+ if (isObject(data.section)) { // Object related to section within data received
+ if (isNumber(data.section.id)) {
+ if (isString(data.section.progress)) {
+ $(`.section-progress-${data.section.id}`).html(data.section.progress);
+ }
+ }
+ }
+ }
+ }, () => {
+ // TODO adequate error handling for network error
+ });
+ }
+ });
+});
diff --git a/lib/assets/javascripts/views/phases/edit.js b/lib/assets/javascripts/views/phases/edit.js
index ffab5ac..f771160 100644
--- a/lib/assets/javascripts/views/phases/edit.js
+++ b/lib/assets/javascripts/views/phases/edit.js
@@ -1,8 +1,16 @@
+import 'bootstrap-sass/assets/javascripts/bootstrap/collapse';
import expandCollapseAll from '../../utils/expandCollapseAll';
$(() => {
// Attach handlers for the expand/collapse all accordions
expandCollapseAll();
+ $('a[data-toggle="collapse"').click((e) => {
+ if ($(e.target).hasClass('fa-plus')) {
+ $(e.target).removeClass('fa-plus').addClass('fa-minus');
+ } else {
+ $(e.target).removeClass('fa-minus').addClass('fa-plus');
+ }
+ });
});
/*
$(document).ready(function(){
diff --git a/lib/assets/javascripts/views/plans/download.js b/lib/assets/javascripts/views/plans/download.js
new file mode 100644
index 0000000..2f5af98
--- /dev/null
+++ b/lib/assets/javascripts/views/plans/download.js
@@ -0,0 +1,10 @@
+$(() => {
+ // Hide the PDF Formatting section if 'pdf' is not the desired format
+ $('select#format').on('change', (e) => {
+ if ($(e.currentTarget).val() === 'pdf') {
+ $('#pdf-formatting').show();
+ } else {
+ $('#pdf-formatting').hide();
+ }
+ });
+});
diff --git a/lib/assets/javascripts/views/plans/export_configure.js b/lib/assets/javascripts/views/plans/export_configure.js
deleted file mode 100644
index 5e7bf31..0000000
--- a/lib/assets/javascripts/views/plans/export_configure.js
+++ /dev/null
@@ -1,131 +0,0 @@
-$(document).ready(function() {
-
- // Prevent the click handler from being registered multiple times.
- // This is due to the buggy way this is included.
- if (window['has_export_js'])
- return;
-
- window['has_export_js'] = true;
-
- $.expr.filters.indeterminate = function(element) {
- return $(element).prop('indeterminate');
- };
-
- $("select#format").change(function(){
- if ($(this).val() == 'pdf') {
- $("#pdf-format-options").show();
- $("#settings-toggle > small").show();
- }
- else {
- $("#pdf-format-options").hide();
- $("#settings-toggle > small").hide();
- }
- });
-
- $("input:checkbox, select:not(#format)").change(function(){
- $(".unsaved_changes_alert").show();
- });
-
- $("select:not(#format)").change(function(){
- $(".unsaved_changes_alert").show();
- });
-
- $('.check_select > legend').append('