From 5695842fe3b90704c51abc61cdef6008b6eebed1 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Thu, 18 Aug 2016 16:05:15 +0200 Subject: [PATCH 1/6] fixes notifications when creating sample types and groups --- app/assets/javascripts/samples/samples.js | 13 +++++++++++++ app/assets/stylesheets/samples.scss | 6 ++++++ app/controllers/sample_groups_controller.rb | 7 ++++++- app/controllers/sample_types_controller.rb | 17 +++++++++++------ 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/samples/samples.js b/app/assets/javascripts/samples/samples.js index 0b547bf9c..c5a4dd3d0 100644 --- a/app/assets/javascripts/samples/samples.js +++ b/app/assets/javascripts/samples/samples.js @@ -45,6 +45,7 @@ $("#modal-create-sample-type").on("shown.bs.modal", function(event) { $("form#new_sample_type").on("ajax:success", function(ev, data, status) { $("#modal-create-sample-type").modal("hide"); updateSamplesTypesandGroups(); + sampleAlertMsg(data.flash); }); $("form#new_sample_type").on("ajax:error", function(e, data, status, xhr) { @@ -73,6 +74,7 @@ $("#modal-create-sample-group").on("shown.bs.modal", function(event) { $("form#new_sample_group").on("ajax:success", function(ev, data, status) { $("#modal-create-sample-group").modal("hide"); updateSamplesTypesandGroups(); + sampleAlertMsg(data.flash); }); $("form#new_sample_group").on("ajax:error", function(e, data, status, xhr) { @@ -141,6 +143,17 @@ function updateSamplesTypesandGroups() { }); } +function sampleAlertMsg(message) { + var html_snippet = '
' + + '
' + + '' + + '' + + ''+ message +'' + + '
' + + '
'; + $('#notifications').html(html_snippet); +} + function initTutorial() { var currentStep = parseInt(Cookies.get('current_tutorial_step'), 10); if (currentStep == 8) diff --git a/app/assets/stylesheets/samples.scss b/app/assets/stylesheets/samples.scss index 8d13e9743..98014cc35 100644 --- a/app/assets/stylesheets/samples.scss +++ b/app/assets/stylesheets/samples.scss @@ -16,4 +16,10 @@ .alert { position: inherit !important; } +} + +.samples-flash-alert { + position: relative; + top: 50px; + z-index: 1000; } \ No newline at end of file diff --git a/app/controllers/sample_groups_controller.rb b/app/controllers/sample_groups_controller.rb index d3a5632d8..104d793f9 100644 --- a/app/controllers/sample_groups_controller.rb +++ b/app/controllers/sample_groups_controller.rb @@ -19,7 +19,12 @@ class SampleGroupsController < ApplicationController if @sample_group.save format.json { render json: { - id: @sample_group.id + id: @sample_group.id, + flash: t( + "sample_groups.create.success_flash", + sample_group: @sample_group.name, + organization: @organization.name + ) }, status: :ok } diff --git a/app/controllers/sample_types_controller.rb b/app/controllers/sample_types_controller.rb index 6c6e7d6c8..d4ee5a7e5 100644 --- a/app/controllers/sample_types_controller.rb +++ b/app/controllers/sample_types_controller.rb @@ -17,14 +17,19 @@ class SampleTypesController < ApplicationController respond_to do |format| if @sample_type.save - flash[:success] = t( - "sample_types.create.success_flash", - sample_type: @sample_type.name, - organization: @organization.name - ) + # flash[:success] = t( + # "sample_types.create.success_flash", + # sample_type: @sample_type.name, + # organization: @organization.name + # ) format.json { render json: { - id: @sample_type.id + id: @sample_type.id, + flash: t( + "sample_types.create.success_flash", + sample_type: @sample_type.name, + organization: @organization.name + ) }, status: :ok } From 5c77167388e9a848d579d433eba7d25123efdc9f Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Thu, 18 Aug 2016 16:47:16 +0200 Subject: [PATCH 2/6] update buttons --- app/assets/javascripts/samples/samples.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/javascripts/samples/samples.js b/app/assets/javascripts/samples/samples.js index c5a4dd3d0..76bc5338f 100644 --- a/app/assets/javascripts/samples/samples.js +++ b/app/assets/javascripts/samples/samples.js @@ -46,6 +46,8 @@ $("form#new_sample_type").on("ajax:success", function(ev, data, status) { $("#modal-create-sample-type").modal("hide"); updateSamplesTypesandGroups(); sampleAlertMsg(data.flash); + currentMode = "viewMode"; + updateButtons(); }); $("form#new_sample_type").on("ajax:error", function(e, data, status, xhr) { @@ -75,6 +77,8 @@ $("form#new_sample_group").on("ajax:success", function(ev, data, status) { $("#modal-create-sample-group").modal("hide"); updateSamplesTypesandGroups(); sampleAlertMsg(data.flash); + currentMode = "viewMode"; + updateButtons(); }); $("form#new_sample_group").on("ajax:error", function(e, data, status, xhr) { From 571f5b60f39553a34a3296b820f3aef1f07d22a9 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Fri, 19 Aug 2016 10:48:43 +0200 Subject: [PATCH 3/6] fixes notifications appearance and disappearance and content adjustment --- app/assets/javascripts/application.js | 8 ++++++++ app/assets/javascripts/samples/samples.js | 3 ++- app/assets/stylesheets/samples.scss | 6 ------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 8b4dcfa9a..5d8f36509 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -158,6 +158,14 @@ $(document.body).ready(function () { }); }); +$(document).ajaxComplete(function(){ + $("#notifications .alert").on("closed.bs.alert", function () { + $("#content-wrapper") + .addClass("alert-hidden") + .removeClass("alert-shown"); + }); +}); + /* * Truncate long strings where is necessary */ diff --git a/app/assets/javascripts/samples/samples.js b/app/assets/javascripts/samples/samples.js index 76bc5338f..9c6b82a37 100644 --- a/app/assets/javascripts/samples/samples.js +++ b/app/assets/javascripts/samples/samples.js @@ -148,7 +148,7 @@ function updateSamplesTypesandGroups() { } function sampleAlertMsg(message) { - var html_snippet = '
' + + var html_snippet = '
' + '
' + '' + '' + @@ -156,6 +156,7 @@ function sampleAlertMsg(message) { '
' + '
'; $('#notifications').html(html_snippet); + $('#content-wrapper').addClass('alert-shown'); } function initTutorial() { diff --git a/app/assets/stylesheets/samples.scss b/app/assets/stylesheets/samples.scss index 98014cc35..8d13e9743 100644 --- a/app/assets/stylesheets/samples.scss +++ b/app/assets/stylesheets/samples.scss @@ -16,10 +16,4 @@ .alert { position: inherit !important; } -} - -.samples-flash-alert { - position: relative; - top: 50px; - z-index: 1000; } \ No newline at end of file From 51e0d53b120ce5adf8254e59eddef77ccf65c6bf Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Fri, 19 Aug 2016 13:08:35 +0200 Subject: [PATCH 4/6] remove code duplication --- app/assets/javascripts/application.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 5d8f36509..4e9702628 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -138,11 +138,7 @@ $(document.body).ready(function () { }); }; - $("#notifications .alert").on("closed.bs.alert", function () { - $("#content-wrapper") - .addClass("alert-hidden") - .removeClass("alert-shown"); - }); + notificationAlertClose(); $('#main-menu .btn-activity') .on('ajax:before', function () { @@ -159,12 +155,16 @@ $(document.body).ready(function () { }); $(document).ajaxComplete(function(){ + notificationAlertClose(); +}); + +function notificationAlertClose(){ $("#notifications .alert").on("closed.bs.alert", function () { $("#content-wrapper") .addClass("alert-hidden") .removeClass("alert-shown"); }); -}); +} /* * Truncate long strings where is necessary From 799cac123874b1eb71ca6a53107189e055180062 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Fri, 19 Aug 2016 13:55:34 +0200 Subject: [PATCH 5/6] fixes hound --- app/controllers/sample_groups_controller.rb | 2 +- app/controllers/sample_types_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/sample_groups_controller.rb b/app/controllers/sample_groups_controller.rb index 104d793f9..f3319ba48 100644 --- a/app/controllers/sample_groups_controller.rb +++ b/app/controllers/sample_groups_controller.rb @@ -21,7 +21,7 @@ class SampleGroupsController < ApplicationController render json: { id: @sample_group.id, flash: t( - "sample_groups.create.success_flash", + 'sample_groups.create.success_flash', sample_group: @sample_group.name, organization: @organization.name ) diff --git a/app/controllers/sample_types_controller.rb b/app/controllers/sample_types_controller.rb index d4ee5a7e5..feea3ec98 100644 --- a/app/controllers/sample_types_controller.rb +++ b/app/controllers/sample_types_controller.rb @@ -26,7 +26,7 @@ class SampleTypesController < ApplicationController render json: { id: @sample_type.id, flash: t( - "sample_types.create.success_flash", + 'sample_types.create.success_flash', sample_type: @sample_type.name, organization: @organization.name ) From 1c220aba7bc449c50e254b8442150e6b727d8b3c Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Mon, 22 Aug 2016 08:50:48 +0200 Subject: [PATCH 6/6] delete comment --- app/controllers/sample_types_controller.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/controllers/sample_types_controller.rb b/app/controllers/sample_types_controller.rb index feea3ec98..783572a5c 100644 --- a/app/controllers/sample_types_controller.rb +++ b/app/controllers/sample_types_controller.rb @@ -17,11 +17,6 @@ class SampleTypesController < ApplicationController respond_to do |format| if @sample_type.save - # flash[:success] = t( - # "sample_types.create.success_flash", - # sample_type: @sample_type.name, - # organization: @organization.name - # ) format.json { render json: { id: @sample_type.id,