<%= I18n.t 'general.file.size_exceeded', file_size: Constants::FILE_MAX_SIZE_MB %>
";
+ }
+ totalSize += parseInt(maxSize);
+ return '';
+ }
+
+ function _validateTotalSize() {
+ if(totalSize > <%= Constants::FILE_MAX_SIZE_MB %>) {
+ filesValid = false;
+ $.each($('.panel-step-attachment-new'), function() {
+ $(this)
+ .find('.panel-body')
+ .append("<%= I18n.t 'general.file.size_exceeded', file_size: Constants::FILE_MAX_SIZE_MB %>
";
+ }
+ totalSize += parseInt(maxSize);
+ return '';
+ }
+
+ function _validateTotalSize() {
+ if(totalSize > <%= Constants::FILE_MAX_SIZE_MB %>) {
+ isValid = false;
+ $.each($('.panel-result-attachment-new'), function() {
+ $(this)
+ .find('.panel-body')
+ .append("<%= I18n.t('general.text.length_too_long', max_length: Constants::NAME_MAX_LENGTH) %>
");
+ isValid = false;
+ } else {
+ $(input).parent().find('.dnd-error').remove();
+ isValid = true;
+ }
+ }
+
+ function _uploadedAseetPreview(asset, i) {
+ var html = '';
+ html += '
';
+ html += '
';
+ html += '<%= I18n.t 'assets.drag_n_drop.file_label' %>';
+ html += '
';
+ html += '
';
+ return html;
+ }
+
+ function _removeItemHandler(id) {
+ $('[data-item-id="' + id +'"]').off('click').on('click', function(e) {
+ e.preventDefault();
+ e.stopImmediatePropagation();
+ e.stopPropagation();
+ var $el = $(this);
+ var index = $el.data('item-id');
+ totalSize -= parseInt(droppedFiles[index]/1048576);
+ droppedFiles[index] = null;
+ $el.closest('.panel-result-attachment-new').remove();
+ _validateTotalSize();
+ });
+ }
+
+ function processResult(button) {
+ if(isValid && _filerAndCheckFiles()) {
+ animateSpinner();
+ $.ajax({
+ url: $(button).attr('data-href'),
+ method: 'POST',
+ data: _appendFilesToForm(),
+ contentType: false,
+ processData: false,
+ success: function(data) {
+ animateSpinner(null, false);
+ $('#new-result-assets-select').parent().remove();
+ $(data.html).prependTo('#results').promise().done(function() {
+ $.each($('[data-container="new-reports"]').find('.result'),
+ function() {
+ initFormSubmitLinks($(this));
+ ResutlAssets.applyEditResultAssetCallback();
+ Results.applyCollapseLinkCallBack();
+ Results.toggleResultEditButtons(true);
+ initPreviewModal();
+ Comments.initialize();
+ ResutlAssets.initNewResultAsset();
+ Results.expandResult($(this));
+ });
+
+ });
+ $('#results-toolbar').show();
+ },
+ error: function() {
+ animateSpinner();
+ location.reload();
+ }
+ })
+ }
+ }
+
+ function destroyAll() {
+ _dragNdropAssetsOff();
+ droppedFiles = [];
+ isValid = true;
+ totalSize = 0;
+ }
+
+ function _dragNdropAssetsOff() {
+ $('body').off('drag dragstart dragend dragover dragenter dragleave drop');
+ $('.is-dragover').hide();
+ }
+
+ return Object.freeze({
+ init: init,
+ listItems: listItems,
+ destroyAll: destroyAll,
+ filesStatus: filesStatus,
+ validateTextSize: validateTextSize,
+ processResult: processResult
+ });
+ })();
+
+ global.dragNdropAssetsInit = function(location) {
+ var in_window = true;
+
+ $('body').on('drag dragstart dragend dragover dragenter dragleave drop',
+ function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ }).on('dragover', function() {
+ in_window = true;
+ $('.is-dragover').show();
+ }).on('dragleave', function() {
+ in_window = false;
+ setTimeout(function() {
+ if(!in_window) {
+ $('.is-dragover').hide();
+ }
+ }, 5000);
+
+ }).on('drop', function(e) {
+ $('.is-dragover').hide();
+ var files = e.originalEvent.dataTransfer.files;
+ if(location === 'steps') {
+ DragNDropSteps.init(files);
+ } else {
+ DragNDropResults.init(files);
+ }
+ });
+ }
+
+})(window);
diff --git a/app/assets/stylesheets/constants.scss b/app/assets/stylesheets/constants.scss
index c9cae6fef..b12a24d64 100644
--- a/app/assets/stylesheets/constants.scss
+++ b/app/assets/stylesheets/constants.scss
@@ -44,6 +44,9 @@ $color-milano-red: #a70b05;
// Colors for specific intents
$color-visited-link: #23527c;
+// Overlay shade for drag'n dropdown
+$color-drag-overlay: rgba(0, 0, 0, .4);
+
//==============================================================================
// Other
//==============================================================================
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index 7429fa6ff..a2825f52f 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -1265,6 +1265,45 @@ ul.content-module-activities {
}
}
+.new-asset-box {
+ border: 1px solid $color-silver;
+ border-radius: 2px;
+ font-size: 2rem;
+ margin-bottom: 20px;
+ margin-top: 20px;
+ padding-bottom: 30px;
+ padding-top: 30px;
+}
+
+.dnd-error {
+ color: $color-milano-red;
+}
+
+.is-dragover {
+ background: $color-drag-overlay;
+ bottom: 0;
+ display: none;
+ height: 100%;
+ left: 0;
+ min-height: 100%;
+ pointer-events: none;
+ position: fixed;
+ right: 0;
+ top: 0;
+ width: 100%;
+ z-index: 999999;
+
+ span {
+ color: $color-white;
+ display: block;
+ font-size: 4em;
+ font-weight: bold;
+ padding-top: 25%;
+ pointer-events: none;
+ text-align: center;
+ }
+}
+
.step,
.result {
.panel {
diff --git a/app/controllers/result_assets_controller.rb b/app/controllers/result_assets_controller.rb
index 7bae4741b..faeb069e2 100644
--- a/app/controllers/result_assets_controller.rb
+++ b/app/controllers/result_assets_controller.rb
@@ -26,53 +26,27 @@ class ResultAssetsController < ApplicationController
end
def create
- @asset = Asset.new(result_params[:asset_attributes])
- @asset.created_by = current_user
- @asset.last_modified_by = current_user
- @asset.team = current_team
- @result = Result.new(
- user: current_user,
- my_module: @my_module,
- name: result_params[:name],
- asset: @asset
- )
- @result.last_modified_by = current_user
-
+ obj = create_multiple_results
respond_to do |format|
- if (@result.save and @asset.save) then
- # Post process file here
- @asset.post_process_file(@my_module.experiment.project.team)
-
- # Generate activity
- Activity.create(
- type_of: :add_result,
- user: current_user,
- project: @my_module.experiment.project,
- experiment: @my_module.experiment,
- my_module: @my_module,
- message: t(
- "activities.add_asset_result",
- user: current_user.full_name,
- result: @result.name,
- )
- )
-
+ if obj.fetch(:status)
format.html do
- flash[:success] = t(
- "result_assets.create.success_flash",
- module: @my_module.name)
+ flash[:success] = t('result_assets.create.success_flash',
+ module: @my_module.name)
redirect_to results_my_module_path(@my_module)
end
format.json do
render json: {
- status: 'ok',
html: render_to_string(
- partial: 'my_modules/result.html.erb', locals: { result: @result }
+ partial: 'my_modules/results.html.erb',
+ locals: { results: obj.fetch(:results) }
)
}, status: :ok
end
else
- format.json { render json: @result.errors, status: :bad_request }
+ flash[:error] = t('result_assets.error_flash')
+ format.json do
+ render json: {}, status: :bad_request
+ end
end
end
end
@@ -249,4 +223,40 @@ class ResultAssetsController < ApplicationController
]
)
end
+
+ def create_multiple_results
+ success = true
+ results = []
+ params[:results_files].each_with_index do |file, index|
+ asset = Asset.new(file: file.second,
+ created_by: current_user,
+ last_modified_by: current_user,
+ team: current_team)
+ result = Result.new(user: current_user,
+ my_module: @my_module,
+ name: params[:results_names][index.to_s],
+ asset: asset,
+ last_modified_by: current_user)
+ if result.save && asset.save
+ results << result
+ # Post process file here
+ asset.post_process_file(@my_module.experiment.project.team)
+
+ # Generate activity
+ Activity.create(
+ type_of: :add_result,
+ user: current_user,
+ project: @my_module.experiment.project,
+ experiment: @my_module.experiment,
+ my_module: @my_module,
+ message: t('activities.add_asset_result',
+ user: current_user.full_name,
+ result: result.name)
+ )
+ else
+ success = false
+ end
+ end
+ { status: success, results: results }
+ end
end
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index a9cbf6409..20ee1b81b 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -44,7 +44,6 @@ class StepsController < ApplicationController
table.created_by = current_user
table.team = current_team
end
-
# Update default checked state
@step.checklists.each do |checklist|
checklist.checklist_items.each do |checklist_item|
diff --git a/app/views/my_modules/_results.html.erb b/app/views/my_modules/_results.html.erb
new file mode 100644
index 000000000..83af69b62
--- /dev/null
+++ b/app/views/my_modules/_results.html.erb
@@ -0,0 +1,5 @@
+
+ <% results.reverse_each do |result| %>
+ <%= render partial: 'my_modules/result.html.erb', locals: { result: result } %>
+ <% end %>
+
diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb
index d90814371..1645e5c8a 100644
--- a/app/views/my_modules/protocols.html.erb
+++ b/app/views/my_modules/protocols.html.erb
@@ -1,4 +1,6 @@
<% provide(:head_title, t("my_modules.protocols.head_title", project: h(@project.name), module: h(@my_module.name)).html_safe) %>
+
+<%= render partial: 'shared/drag_n_drop_overlay' %>
<%= render partial: "shared/sidebar" %>
<%= render partial: "shared/secondary_navigation" %>
diff --git a/app/views/my_modules/results.html.erb b/app/views/my_modules/results.html.erb
index f03a6b250..363764273 100644
--- a/app/views/my_modules/results.html.erb
+++ b/app/views/my_modules/results.html.erb
@@ -1,6 +1,7 @@
<% provide(:head_title, t("my_modules.results.head_title", project: h(@project.name), module: h(@my_module.name)).html_safe) %>
<%= render partial: "shared/sidebar" %>
<%= render partial: "shared/secondary_navigation" %>
+<%= render partial: 'shared/drag_n_drop_overlay' %>