scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-04 03:36:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

Assign column update

Browse source
This commit is contained in:
Urban Rotnik 2020-01-13 13:28:18 +01:00
parent 4ca2981177
commit 2468b67de0
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/assets/stylesheets/repository/repository_table.scss
View file

@ -34,14 +34,36 @@
// Assigned
.assigned-column {
position: relative;
.repository-row-edit-icon {
cursor: pointer;
display: none;
width: 30px;
}
.circle-icon {
.assign-counter-container {
border-radius: 2px;
cursor: pointer;
display: inline-block;
height: calc(100% - 2px);
margin-left: 30px;
padding-top: 7px;
position: absolute;
top: 1px;
width: calc(100% - 38px);
.assign-counter {
margin-left: 5px;
&.has-assigned {
color: $brand-primary;
}
}
&:hover {
background-color: $color-silver-chalice;
}
}
}
@ -81,8 +103,7 @@
.repository-row-edit-icon {
display: inline-block;
}
.circle-icon {
.assign-counter-container {
margin-left: 0;
}
}
@ -100,8 +121,7 @@
.repository-row-edit-icon {
display: none;
}
.circle-icon {
.assign-counter-container {
margin-left: 30px;
}
}

7
app/helpers/repository_datatable_helper.rb
View file

@ -43,9 +43,12 @@ module RepositoryDatatableHelper
def assigned_row(record)
if record.assigned_my_modules_count.positive?
"<span class='circle-icon'>&nbsp;</span>"
tooltip = "#{record.assigned_my_modules_count} tasks,&#10;#{record.assigned_experiments_count} " \
"experiments,&#10;#{record.assigned_projects_count} projects"
"<div class='assign-counter-container' title='#{tooltip}'>"\
"<span class='assign-counter has-assigned'>#{record.assigned_my_modules_count}</span></div>"
else
"<span class='circle-icon disabled'>&nbsp;</span>"
"<div class='assign-counter-container'><span class='assign-counter'>0</span></div>"
end
end