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

Fix markup

Browse source
This commit is contained in:
aignatov-bio 2020-03-05 14:40:46 +01:00
parent d830fcec4a
commit 79560e517d
3 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/assets/javascripts/dashboard/current_tasks.js
View file

@ -14,19 +14,19 @@ var DasboardCurrentTasksWidget = (function() {
function generateTasksListHtml(json, container) {
$.each(json.data, (i, task) => {
var currentTaskItem = `<a class="current-task-item" href="${task.link}">
<div class="current-task-breadcrumbs">${task.project}<span class="slash">/</span>${task.experiment}</div>
<div class="item-row">
<div class="task-name">${task.name}</div>
<div class="task-due-date ${task.state.class} ${task.due_date ? '' : 'hidden'}">
<i class="fas fa-calendar-day"></i> ${I18n.t('dashboard.current_tasks.due_date', { date: task.due_date })}
var currentTaskItem = ` <a class="current-task-item" href="${task.link}">
<div class="current-task-breadcrumbs">${task.project}<span class="slash">/</span>${task.experiment}</div>
<div class="item-row">
<div class="task-name">${task.name}</div>
<div class="task-due-date ${task.state.class} ${task.due_date ? '' : 'hidden'}">
<i class="fas fa-calendar-day"></i> ${I18n.t('dashboard.current_tasks.due_date', { date: task.due_date })}
</div>
<div class="task-progress-container ${task.state.class}">
<div class="task-progress" style="padding-left: ${task.steps_precentage}'%'"></div>
<div class="task-progress-label">${task.state.text}</div>
</div>
</div>
<div class="task-progress-container ${task.state.class}">
<div class="task-progress" style="padding-left: ${task.steps_precentage}'%'"></div>
<div class="task-progress-label">${task.state.text}</div>
</div>
</div>
</a>`;
</a>`;
$(container).append(currentTaskItem);
});
}

6
app/assets/stylesheets/dashboard/current_tasks.scss
View file

@ -265,6 +265,12 @@
}
}
&.day-prior {
.task-progress-label {
color: $brand-warning;
}
}
&.completed {
.task-progress {
outline: $border-success;

5
app/controllers/dashboard/current_tasks_controller.rb
View file

@ -27,7 +27,6 @@ module Dashboard
tasks = filter_by_state(tasks)
case task_filters[:sort]
when 'date_desc'
tasks = tasks.order('my_modules.due_date': :desc)
@ -43,7 +42,7 @@ module Dashboard
page = (params[:page] || 1).to_i
tasks = tasks.with_step_statistics.search_by_name(current_user, current_team, task_filters[:query])
.preload(experiment: :project).page(page).per(Constants::INFINITE_SCROLL_LIMIT)
.preload(experiment: :project).page(page).per(Constants::INFINITE_SCROLL_LIMIT)
tasks_list = tasks.map do |task|
{ id: task.id,
@ -97,9 +96,7 @@ module Dashboard
task_state_text = t('dashboard.current_tasks.progress_bar.completed')
else
task_state_text = t('dashboard.current_tasks.progress_bar.in_progress')
task_state_class = 'day-prior' if task.is_one_day_prior?
if task.is_overdue?
task_state_text = t('dashboard.current_tasks.progress_bar.overdue')
task_state_class = 'overdue'