From b1296adeb3d012db1134aea72f3bd5fa0ef58d69 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Fri, 28 Oct 2022 10:49:13 +0400 Subject: [PATCH 1/4] pitstop --- app/assets/javascripts/projects/index.js | 6 +++++- app/assets/javascripts/projects/show.js | 8 ++++++-- app/assets/stylesheets/experiments.scss | 19 ++++++++++++++++++- app/helpers/cards_view_helper.rb | 2 +- .../projects/show/_experiment_card.html.erb | 19 +++++++++++-------- 5 files changed, 41 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/projects/index.js b/app/assets/javascripts/projects/index.js index 1d5924281..e1fe51e38 100644 --- a/app/assets/javascripts/projects/index.js +++ b/app/assets/javascripts/projects/index.js @@ -519,7 +519,11 @@ var ProjectsIndex = (function() { $(projectsPageSelector) .on('ajax:success', '.change-projects-view-type-form', function(ev, data) { - $(cardsWrapper).removeClass('list').addClass(data.cards_view_type_class); + if (data.cards_view_type_class === 'list') { + $(cardsWrapper).removeClass('cards').addClass(data.cards_view_type_class); + } else if (data.cards_view_type_class === 'cards') { + $(cardsWrapper).removeClass('list').addClass(data.cards_view_type_class); + } $(projectsPageSelector).find('.cards-switch .button-to').removeClass('selected'); $(ev.target).find('.button-to').addClass('selected'); $(ev.target).parents('.dropdown.view-switch').removeClass('open'); diff --git a/app/assets/javascripts/projects/show.js b/app/assets/javascripts/projects/show.js index 4658cd7f4..e274735a6 100644 --- a/app/assets/javascripts/projects/show.js +++ b/app/assets/javascripts/projects/show.js @@ -51,11 +51,15 @@ }); $(experimentsPage).attr('data-toolbar-visible', toolbarVisible); } - + console.log(12) function initProjectsViewModeSwitch() { $(experimentsPage) .on('ajax:success', '.change-experiments-view-type-form', function(ev, data) { - $(cardsWrapper).removeClass('list').addClass(data.cards_view_type_class); + if (data.cards_view_type_class === 'list') { + $(cardsWrapper).removeClass('cards').addClass(data.cards_view_type_class); + } else if (data.cards_view_type_class === 'cards') { + $(cardsWrapper).removeClass('list').addClass(data.cards_view_type_class); + } $(experimentsPage).find('.cards-switch .button-to').removeClass('selected'); $(ev.target).find('.button-to').addClass('selected'); $(ev.target).parents('.dropdown.view-switch').removeClass('open'); diff --git a/app/assets/stylesheets/experiments.scss b/app/assets/stylesheets/experiments.scss index bbf5b2c73..a4241ce57 100644 --- a/app/assets/stylesheets/experiments.scss +++ b/app/assets/stylesheets/experiments.scss @@ -53,7 +53,7 @@ grid-row: span 7; .experiment-code-cell { - display: none; + display: block; } &.experiment-card { @@ -93,6 +93,8 @@ overflow: hidden; text-overflow: ellipsis; width: 100%; + position: relative; + a { color: inherit; @@ -540,3 +542,18 @@ } } } +.cards-wrapper.last-page.cards { + .experiment-card { + // background-color: red; + + .experiment-name-cell { + right: 28px; + top: 20px; + } + + .modified-date-cell { + color: $color-silver-chalice; + + } + } +} \ No newline at end of file diff --git a/app/helpers/cards_view_helper.rb b/app/helpers/cards_view_helper.rb index 5dde2f9d6..f11e5ca5f 100644 --- a/app/helpers/cards_view_helper.rb +++ b/app/helpers/cards_view_helper.rb @@ -2,6 +2,6 @@ module CardsViewHelper def cards_view_type_class(view_type) - view_type == 'table' ? 'list' : '' + view_type == 'table' ? 'list' : 'cards' end end diff --git a/app/views/projects/show/_experiment_card.html.erb b/app/views/projects/show/_experiment_card.html.erb index 7ba328cd1..38b5375d8 100644 --- a/app/views/projects/show/_experiment_card.html.erb +++ b/app/views/projects/show/_experiment_card.html.erb @@ -10,7 +10,13 @@ <% end %> - +
+ <%= experiment.code %> +
+
+ <%= t('experiments.card.modified_date') %> + <%= l(experiment.updated_at, format: :full_date) %> +
<%= render partial: 'projects/show/experiment_workflow_image_container', locals: { experiment: experiment } %> @@ -21,9 +27,9 @@ <%= link_to experiment.name, canvas_experiment_path(experiment), title: experiment.name, class: 'name-link' %> <% end %>
-
- <%= experiment.code %> -
+ + +
-
- <%= t('experiments.card.modified_date') %> - <%= l(experiment.updated_at, format: :full_date) %> -
+ <% if experiment.archived_branch? %>
<%= t('experiments.card.archived_date') %> From a9287df1a04335de0d94ec64eaaf10ee71027eb1 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Fri, 28 Oct 2022 15:16:02 +0400 Subject: [PATCH 2/4] exposed experiment ids on card view page / other styling updates [SCI-7176] --- app/assets/javascripts/projects/show.js | 2 +- app/assets/stylesheets/experiments.scss | 23 +++++++++++++++---- .../projects/show/_experiment_card.html.erb | 16 ++++++------- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/projects/show.js b/app/assets/javascripts/projects/show.js index e274735a6..345578c76 100644 --- a/app/assets/javascripts/projects/show.js +++ b/app/assets/javascripts/projects/show.js @@ -51,7 +51,7 @@ }); $(experimentsPage).attr('data-toolbar-visible', toolbarVisible); } - console.log(12) + function initProjectsViewModeSwitch() { $(experimentsPage) .on('ajax:success', '.change-experiments-view-type-form', function(ev, data) { diff --git a/app/assets/stylesheets/experiments.scss b/app/assets/stylesheets/experiments.scss index a4241ce57..477cfe3a3 100644 --- a/app/assets/stylesheets/experiments.scss +++ b/app/assets/stylesheets/experiments.scss @@ -542,18 +542,33 @@ } } } + .cards-wrapper.last-page.cards { .experiment-card { - // background-color: red; - .experiment-name-cell { right: 28px; - top: 20px; + top: -11px; + } + + .data-row { + .card-label { + color: $color-silver-chalice; + } } .modified-date-cell { color: $color-silver-chalice; + position: relative; + top: -2px; + left: 80px; + margin-left: auto; + margin-right: 114px; + } + .experiment-code-cell { + position: relative; + top: 5px; + left: 20px; } } -} \ No newline at end of file +} diff --git a/app/views/projects/show/_experiment_card.html.erb b/app/views/projects/show/_experiment_card.html.erb index 38b5375d8..8cf522bbe 100644 --- a/app/views/projects/show/_experiment_card.html.erb +++ b/app/views/projects/show/_experiment_card.html.erb @@ -10,13 +10,16 @@
<% end %>
-
+ +
<%= experiment.code %>
-
- <%= t('experiments.card.modified_date') %> - <%= l(experiment.updated_at, format: :full_date) %> -
+ +
+ <%= t('experiments.card.modified_date') %> + <%= l(experiment.updated_at, format: :full_date) %> +
+
<%= render partial: 'projects/show/experiment_workflow_image_container', locals: { experiment: experiment } %> @@ -27,9 +30,6 @@ <%= link_to experiment.name, canvas_experiment_path(experiment), title: experiment.name, class: 'name-link' %> <% end %>
- - -
<% end %> -
+
<%= t('experiments.card.completed_task') %> <%= t('experiments.card.completed_value', completed: experiment.completed_task_count, all: experiment.task_count) %>
diff --git a/app/views/projects/show/_experiment_workflow_image_container.html.erb b/app/views/projects/show/_experiment_workflow_image_container.html.erb index 1c2e9b3e5..18ba48279 100644 --- a/app/views/projects/show/_experiment_workflow_image_container.html.erb +++ b/app/views/projects/show/_experiment_workflow_image_container.html.erb @@ -1,8 +1,4 @@ -<% if experiment.archived_branch? %> -
- -
-<% elsif experiment.my_modules.any?(&:active?) %> +<% if experiment.my_modules.any?(&:active?) %> <% if experiment.workflowimg.attached? %>
<%= render partial: 'projects/show/workflow_img', locals: { experiment: experiment } %> From 36b99fa2cb4f45da15eb7cb778a294041c4e61b0 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Fri, 2 Dec 2022 14:51:22 +0400 Subject: [PATCH 4/4] code cleanup --- app/assets/javascripts/projects/index.js | 6 +----- app/assets/javascripts/projects/show.js | 6 +----- app/assets/stylesheets/experiments.scss | 6 +++--- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/projects/index.js b/app/assets/javascripts/projects/index.js index e1fe51e38..d2e20665a 100644 --- a/app/assets/javascripts/projects/index.js +++ b/app/assets/javascripts/projects/index.js @@ -519,11 +519,7 @@ var ProjectsIndex = (function() { $(projectsPageSelector) .on('ajax:success', '.change-projects-view-type-form', function(ev, data) { - if (data.cards_view_type_class === 'list') { - $(cardsWrapper).removeClass('cards').addClass(data.cards_view_type_class); - } else if (data.cards_view_type_class === 'cards') { - $(cardsWrapper).removeClass('list').addClass(data.cards_view_type_class); - } + $(cardsWrapper).removeClass('list cards').addClass(data.cards_view_type_class); $(projectsPageSelector).find('.cards-switch .button-to').removeClass('selected'); $(ev.target).find('.button-to').addClass('selected'); $(ev.target).parents('.dropdown.view-switch').removeClass('open'); diff --git a/app/assets/javascripts/projects/show.js b/app/assets/javascripts/projects/show.js index 345578c76..9826f0fbd 100644 --- a/app/assets/javascripts/projects/show.js +++ b/app/assets/javascripts/projects/show.js @@ -55,11 +55,7 @@ function initProjectsViewModeSwitch() { $(experimentsPage) .on('ajax:success', '.change-experiments-view-type-form', function(ev, data) { - if (data.cards_view_type_class === 'list') { - $(cardsWrapper).removeClass('cards').addClass(data.cards_view_type_class); - } else if (data.cards_view_type_class === 'cards') { - $(cardsWrapper).removeClass('list').addClass(data.cards_view_type_class); - } + $(cardsWrapper).removeClass('list cards').addClass(data.cards_view_type_class); $(experimentsPage).find('.cards-switch .button-to').removeClass('selected'); $(ev.target).find('.button-to').addClass('selected'); $(ev.target).parents('.dropdown.view-switch').removeClass('open'); diff --git a/app/assets/stylesheets/experiments.scss b/app/assets/stylesheets/experiments.scss index 477cfe3a3..903efc97e 100644 --- a/app/assets/stylesheets/experiments.scss +++ b/app/assets/stylesheets/experiments.scss @@ -558,17 +558,17 @@ .modified-date-cell { color: $color-silver-chalice; - position: relative; - top: -2px; left: 80px; margin-left: auto; margin-right: 114px; + position: relative; + top: -2px; } .experiment-code-cell { + left: 20px; position: relative; top: 5px; - left: 20px; } } }