mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-21 07:26:15 +08:00
Merge branch 'develop' into ai-sci-4128-change-datatable-headers-colors
This commit is contained in:
commit
6d55b07fdc
|
@ -65,6 +65,10 @@
|
|||
background-color: $color-alto;
|
||||
}
|
||||
}
|
||||
|
||||
.circle-icon {
|
||||
margin-left: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
// Checklists
|
||||
|
@ -104,7 +108,8 @@
|
|||
display: inline-block;
|
||||
}
|
||||
|
||||
.assign-counter-container {
|
||||
.assign-counter-container,
|
||||
.circle-icon {
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
|
@ -123,7 +128,8 @@
|
|||
display: none;
|
||||
}
|
||||
|
||||
.assign-counter-container {
|
||||
.assign-counter-container,
|
||||
.circle-icon {
|
||||
margin-left: 30px;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,9 +42,16 @@ module RepositoryDatatableHelper
|
|||
end
|
||||
|
||||
def assigned_row(record)
|
||||
if @my_module
|
||||
if record.assigned_my_modules_count.positive?
|
||||
"<span class='circle-icon'> </span>"
|
||||
else
|
||||
"<span class='circle-icon disabled'> </span>"
|
||||
end
|
||||
elsif record.assigned_my_modules_count.positive?
|
||||
tooltip = "#{record.assigned_my_modules_count} tasks, #{record.assigned_experiments_count} " \
|
||||
"experiments, #{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
|
||||
|
|
|
@ -28,11 +28,11 @@ class RepositoryTableStateColumnUpdateService
|
|||
raise ArgumentError, 'repository is empty' if repository.blank?
|
||||
raise ArgumentError, 'old_column_index is empty' if old_column_index.blank?
|
||||
|
||||
RepositoryTableState.where(
|
||||
repository: repository
|
||||
).find_each do |table_state|
|
||||
RepositoryTableState.where(repository: repository).find_each do |table_state|
|
||||
state = table_state.state
|
||||
user = table_state.user
|
||||
|
||||
begin
|
||||
# Remove column from ColReorder, columns, length entries
|
||||
state['columns'].delete_at(old_column_index)
|
||||
state['ColReorder'].delete(old_column_index)
|
||||
|
@ -55,6 +55,10 @@ class RepositoryTableStateColumnUpdateService
|
|||
state['length'] = (state['length'] - 1)
|
||||
state['time'] = (Time.now.to_f * 1_000).to_i
|
||||
table_state.save
|
||||
rescue NoMethodError => e
|
||||
Rails.logger.error e.message
|
||||
RepositoryTableStateService.new(user, repository).create_default_state
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
selected_delimiter_char = Constants::REPOSITORY_LIST_ITEMS_DELIMITERS_MAP[selected_delimiter.to_sym]
|
||||
%>
|
||||
|
||||
<%= hidden_field_tag 'dropdown-options', '', class: 'dropdown-options' %>
|
||||
<%= hidden_field_tag 'dropdown-options', '[]', class: 'dropdown-options' %>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-3" for="repository-column-data-type">
|
||||
<%= t('libraries.manange_modal_column.list_type.delimiter_label') %>
|
||||
|
@ -32,7 +32,7 @@
|
|||
>
|
||||
</select>
|
||||
<div class="limit-counter-container">
|
||||
<span class="items-count"></span>
|
||||
<span class="items-count" data-count="0">0</span>
|
||||
<span class="items-limit">/<%= Constants::REPOSITORY_CHECKLIST_ITEMS_PER_COLUMN %> </span>
|
||||
<span class="items-label"></span></div>
|
||||
</div>
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
selected_delimiter_char = Constants::REPOSITORY_LIST_ITEMS_DELIMITERS_MAP[selected_delimiter.to_sym]
|
||||
%>
|
||||
|
||||
<%= hidden_field_tag 'dropdown-options', '', class: 'dropdown-options' %>
|
||||
<%= hidden_field_tag 'dropdown-options', '[]', class: 'dropdown-options' %>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-3" for="repository-column-data-type">
|
||||
<%= t('libraries.manange_modal_column.list_type.delimiter_label') %>
|
||||
|
@ -28,7 +28,7 @@
|
|||
<select class="form-control preview-select">
|
||||
</select>
|
||||
<div class="limit-counter-container">
|
||||
<span class="items-count"></span>
|
||||
<span class="items-count" data-count="0">0</span>
|
||||
<span class="items-limit">/<%= Constants::REPOSITORY_LIST_ITEMS_PER_COLUMN %> </span>
|
||||
<span class="items-label"></span></div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue