scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor visual changes

Browse source
This commit is contained in:
Anton 2023-11-28 09:41:10 +01:00
parent 7fdbc73098
commit 8f862f3290
4 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/shared/ag_table.scss
View file

@ -1,6 +1,6 @@
.ag-root-wrapper {
--agg-row-border-color: var(--sn-light-grey);
--ag-odd-row-background-color: var(--sn-super-light-grey);
--ag-odd-row-background-color: var(--sn-white);
--ag-header-background-color: var(--sn-light-grey);
--ag-selected-row-background-color: var(--sn-super-light-blue);
--ag-range-selection-border: var(--sn-science-blue);

4
app/javascript/vue/shared/datatable/row_menu_renderer.vue
View file

@ -1,8 +1,8 @@
<template>
<div class="flex items-center">
<div class="items-center -ml-1.5 my-2">
<MenuDropdown
:listItems="this.formattedList"
:btnClasses="'btn btn-light icon-btn'"
btnClasses="bg-transparent w-6 h-6 border-0 p-0 flex"
:position="'right'"
:alwaysShow="true"
:btnIcon="'sn-icon sn-icon-more-hori'"

4
app/javascript/vue/shared/datatable/table.vue
View file

@ -183,8 +183,8 @@ export default {
this.columnDefs.push({
field: "rowMenu",
headerName: '',
width: 72,
minWidth: 72,
width: 42,
minWidth: 42,
resizable: false,
sortable: false,
cellRenderer: 'RowMenuRenderer',

36
app/services/lists/projects_service.rb
View file

@ -32,25 +32,25 @@ module Lists
def fetch_projects
@team.projects
.includes(:team, user_assignments: %i(user user_role))
.includes(:project_comments, experiments: { my_modules: { my_module_status: :my_module_status_implications } })
.visible_to(@user, @team)
.left_outer_joins(:project_comments)
.select('projects.*')
.select('COUNT(DISTINCT comments.id) AS comment_count')
.group('projects.id')
.includes(:team, user_assignments: %i(user user_role))
.includes(:project_comments, experiments: { my_modules: { my_module_status: :my_module_status_implications } })
.visible_to(@user, @team)
.left_outer_joins(:project_comments)
.select('projects.*')
.select('COUNT(DISTINCT comments.id) AS comment_count')
.group('projects.id')
end
def fetch_project_folders
project_folders = @team.project_folders
.includes(:team)
.joins('LEFT OUTER JOIN project_folders child_folders
.includes(:team)
.joins('LEFT OUTER JOIN project_folders child_folders
ON child_folders.parent_folder_id = project_folders.id')
.left_outer_joins(:projects)
.left_outer_joins(:projects)
project_folders.select('project_folders.*')
.select('COUNT(DISTINCT projects.id) AS projects_count')
.select('COUNT(DISTINCT child_folders.id) AS folders_count')
.group('project_folders.id')
.select('COUNT(DISTINCT projects.id) AS projects_count')
.select('COUNT(DISTINCT child_folders.id) AS folders_count')
.group('project_folders.id')
end
def filter_project_records(records)
@ -64,9 +64,15 @@ module Lists
if @filters[:members].present?
records = records.joins(:user_assignments).where(user_assignments: { user_id: @filters[:members] })
end
records = records.where('projects.created_at > ?', @filters[:created_on_from]) if @filters[:created_on_from].present?
if @filters[:created_on_from].present?
records = records.where('projects.created_at > ?',
@filters[:created_on_from])
end
records = records.where('projects.created_at < ?', @filters[:created_on_to]) if @filters[:created_on_to].present?
records = records.where('projects.archived_on < ?', @filters[:archived_on_to]) if @filters[:archived_on_to].present?
if @filters[:archived_on_to].present?
records = records.where('projects.archived_on < ?',
@filters[:archived_on_to])
end
if @filters[:archived_on_from].present?
records = records.where('projects.archived_on > ?', @filters[:archived_on_from])
end