diff --git a/app/assets/javascripts/reports/new.js b/app/assets/javascripts/reports/new.js index ce87cca6c..a128f577f 100644 --- a/app/assets/javascripts/reports/new.js +++ b/app/assets/javascripts/reports/new.js @@ -1060,7 +1060,7 @@ function reportHandsonTableConverter() { $.ajax({ url: this.dataset.createUrl, type: 'POST', - data: JSON.stringify(getReportData()), + data: JSON.stringify(params), contentType: 'application/json; charset=utf-8', success: function() {} @@ -1127,10 +1127,11 @@ function reportHandsonTableConverter() { $('.reports-new-body [href="#new-report-step-2"]').on('show.bs.tab', function() { var projectContents = $('#new-report-step-2').find('.project-contents'); var projectId = dropdownSelector.getValues('#projectSelector'); - if (projectContents.data('project-id') !== parseInt(projectId, 10)) { + if (parseInt(projectContents.attr('data-project-id'), 10) !== parseInt(projectId, 10)) { animateSpinner('.reports-new-body'); $.get(projectContents.data('project-content-url'), { project_id: projectId }, function(data) { animateSpinner('.reports-new-body', false); + projectContents.attr('data-project-id', projectId); projectContents.html(data.html); if ($('.select-all-my-modules-checkbox').prop('checked')) { $('.select-all-my-modules-checkbox').trigger('change'); @@ -1230,6 +1231,12 @@ function reportHandsonTableConverter() { noEmptyOption: true, selectAppearance: 'simple', onChange: function() { + let projectContents = $('#new-report-step-2').find('.project-contents'); + let loadedProjectId = parseInt(projectContents.attr('data-project-id'), 10); + let projectId = parseInt(dropdownSelector.getValues('#projectSelector'), 10); + if (!Number.isNaN(loadedProjectId) && loadedProjectId !== projectId) { + $('#projectReportWarningModal').modal('show'); + } $('.continue-button').attr('disabled', false); } }); @@ -1241,26 +1248,41 @@ function reportHandsonTableConverter() { selectAppearance: 'simple', disableSearch: true, onChange: function() { - let template = $('#templateSelector').val(); - let params = { - project_id: dropdownSelector.getValues('#projectSelector'), - template: template - }; - $.get($('#templateSelector').data('valuesEditorPath'), params, function(result) { - $('.report-template-values-container').html(result.html); - $('.report-template-value-dropdown').each(function() { - dropdownSelector.init($(this), { - singleSelect: false, - closeOnSelect: true, - noEmptyOption: true, - selectAppearance: 'simple' - }); - }); - }); + let filledFieldsCount = $('.report-template-values-container') + .find('input.sci-input-field, textarea.sci-input-field').filter(function () { + return !!this.value; + }).length; + + if (filledFieldsCount === 0) { + loadTemplate(); + } else { + $('#templateReportWarningModal').modal('show'); + } } }); } + function loadTemplate() { + let template = $('#templateSelector').val(); + let params = { + project_id: dropdownSelector.getValues('#projectSelector'), + template: template + }; + + $('#templateSelector').data('selected-template', template); + $.get($('#templateSelector').data('valuesEditorPath'), params, function(result) { + $('.report-template-values-container').html(result.html); + $('.report-template-value-dropdown').each(function() { + dropdownSelector.init($(this), { + singleSelect: false, + closeOnSelect: true, + noEmptyOption: true, + selectAppearance: 'simple' + }); + }); + }); + } + function initTaskContents() { dropdownSelector.init('.task-contents-container .order-results', { singleSelect: true, @@ -1316,6 +1338,23 @@ function reportHandsonTableConverter() { }); } + $('#templateReportWarningModal') + .on('click', '#loadSelectedTemplate', function() { + loadTemplate(); + $('#templateReportWarningModal').modal('hide'); + }) + .on('click', '#cancelTemplateChange', function() { + let previousTemplate = $('#templateSelector').data('selected-template'); + dropdownSelector.selectValues('#templateSelector', previousTemplate); + $('#templateReportWarningModal').modal('hide'); + }); + + $('#projectReportWarningModal').on('click', '#cancelProjectChange', function() { + let loadedProjectId = $('#new-report-step-2').find('.project-contents').attr('data-project-id'); + dropdownSelector.selectValues('#projectSelector', loadedProjectId); + $('#projectReportWarningModal').modal('hide'); + }); + $('#reportWizardEditWarning').modal('show'); initGenerateButton(); diff --git a/app/views/reports/modals/_project_change_warning.html.erb b/app/views/reports/modals/_project_change_warning.html.erb new file mode 100644 index 000000000..636d9f4c7 --- /dev/null +++ b/app/views/reports/modals/_project_change_warning.html.erb @@ -0,0 +1,26 @@ + diff --git a/app/views/reports/modals/_template_change_warning.html.erb b/app/views/reports/modals/_template_change_warning.html.erb new file mode 100644 index 000000000..fef1a48ad --- /dev/null +++ b/app/views/reports/modals/_template_change_warning.html.erb @@ -0,0 +1,26 @@ + diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb index fac4aae82..1f5a266f5 100644 --- a/app/views/reports/new.html.erb +++ b/app/views/reports/new.html.erb @@ -114,6 +114,9 @@ +<%= render partial: 'reports/modals/project_change_warning' %> +<%= render partial: 'reports/modals/template_change_warning' %> + <% if @edit %> <%= render partial: 'report_edit_warning_modal' %> <% end %> diff --git a/app/views/reports/wizard/_project_template_selector.html.erb b/app/views/reports/wizard/_project_template_selector.html.erb index 8a29af680..39c842b4d 100644 --- a/app/views/reports/wizard/_project_template_selector.html.erb +++ b/app/views/reports/wizard/_project_template_selector.html.erb @@ -15,6 +15,7 @@ options_for_select(@templates.invert, report.settings[:template]), data: { placeholder: t('projects.reports.wizard.first_step.select_template'), + selected_template: report.settings[:template] || @templates.first[0], values_editor_path: reports_new_template_values_path(report_id: report.id) } %> diff --git a/config/locales/en.yml b/config/locales/en.yml index eaf7dca3d..cea9b7aa0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -630,6 +630,14 @@ en: description_new: "You’re about to cancel the process of generating a report. This will cause all selections and possible entered data to be lost." description_edit: "You’re about to cancel the process of generating an edited report. This will cause all changes to be lost." description_2: "Do you want to continue?" + template_warning_modal: + title: "Template data will be lost" + description: "You’re about to switch to a different template. All the data related to the template you entered will be lost." + confirmation: "Do you want to continue?" + project_warning_modal: + title: "Task selection will refresh" + description: "You’re about to switch to a different project. The task selections you made will be completly refreshed." + confirmation: "Do you want to continue?" generate_PDF: generated_on: "Report generated by SciNote on: %{timestamp}" renderers: