diff --git a/app/assets/stylesheets/experiments.scss b/app/assets/stylesheets/experiments.scss index 6b7d4672b..0b77328dd 100644 --- a/app/assets/stylesheets/experiments.scss +++ b/app/assets/stylesheets/experiments.scss @@ -263,17 +263,13 @@ background-color: $color-alto; } - .dates-and-img-container { - .data-row { - line-height: 26px; - } - } - .progress-bar { background-color: $color-silver-chalice; } .description-cell { + width: 100%; + .description-text::after { background: linear-gradient(to right, transparent, $color-concrete 50%); } @@ -281,25 +277,12 @@ } &.list { - --list-columns-number: 8; .card.experiment-card { .archived-date-cell { grid-column: 5; } - .completed-task-cell { - grid-column: 6; - } - - .description-cell { - grid-column: 7; - } - - .actions-cell { - grid-column: 8; - } - &:hover { .description-text::after { background: linear-gradient(to right, transparent, $color-alto 50%); diff --git a/app/services/experiments_overview_service.rb b/app/services/experiments_overview_service.rb index d06ab1caa..3b4ca0a69 100644 --- a/app/services/experiments_overview_service.rb +++ b/app/services/experiments_overview_service.rb @@ -34,6 +34,12 @@ class ExperimentsOverviewService def fetch_records @project.experiments.joins(:project) + .left_joins(:my_modules) + .select('experiments.*') + .where('(my_modules.archived = FALSE OR my_modules.id IS NULL)') + .select('COUNT(DISTINCT my_modules.id) AS task_count') + .select('SUM(CASE WHEN my_modules.state = 1 THEN 1 ELSE 0 END) as completed_task_count') + .group('experiments.id, projects.archived_on') end def filter_records(records) diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 667d4a864..285384417 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -28,7 +28,7 @@