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

Add morkflow generator

Browse source
This commit is contained in:
aignatov-bio 2020-08-27 12:13:13 +02:00
parent c07ebe90fa
commit 6229ba6041
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@ module Dashboard
tasks = tasks.left_outer_joins(:user_my_modules).where(user_my_modules: { user_id: current_user.id }) tasks = tasks.left_outer_joins(:user_my_modules).where(user_my_modules: { user_id: current_user.id })
end end
# tasks = filter_by_state(tasks) tasks = tasks.where(my_module_status_id: task_filters[:statuses])
case task_filters[:sort] case task_filters[:sort]
when 'start_date' when 'start_date'
@ -92,10 +92,6 @@ module Dashboard
private private
def filter_by_state(tasks)
tasks.where(my_modules: { state: task_filters[:view] })
end
def prepare_due_date(task) def prepare_due_date(task)
if task.due_date.present? if task.due_date.present?
due_date_formatted = I18n.l(task.due_date, format: :full_date) due_date_formatted = I18n.l(task.due_date, format: :full_date)
@ -113,7 +109,7 @@ module Dashboard
end end
def task_filters def task_filters
params.permit(:project_id, :experiment_id, :mode, :view, :sort, :query, :page) params.permit(:project_id, :experiment_id, :mode, :sort, :query, :page, statuses: [])
end end
def load_project def load_project

17
db/migrate/20200826143431_migrate_task_status.rb
View file

@ -2,10 +2,19 @@
class MigrateTaskStatus < ActiveRecord::Migration[6.0] class MigrateTaskStatus < ActiveRecord::Migration[6.0]
def up def up
in_progress_status = execute("SELECT id FROM my_module_statuses WHERE name = 'In progress' LIMIT 1")[0]&['id'] MyModuleStatusFlow.ensure_default
completed_status = execute("SELECT id FROM my_module_statuses WHERE name = 'Completed' LIMIT 1")[0]&['id']
execute "UPDATE my_modules SET my_module_status_id = #{in_progress_status} WHERE state = 0" in_progress_status = execute("SELECT id FROM my_module_statuses WHERE name = 'In progress' LIMIT 1").to_a[0]
execute "UPDATE my_modules SET my_module_status_id = #{completed_status} WHERE state = 1" completed_status = execute("SELECT id FROM my_module_statuses WHERE name = 'Completed' LIMIT 1").to_a[0]
if in_progress_status
execute("UPDATE my_modules
SET my_module_status_id = #{in_progress_status['id']} WHERE state = 0")
end
if completed_status
execute("UPDATE my_modules
SET my_module_status_id = #{completed_status['id']} WHERE state = 1")
end
end end
end end