Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-28 01:54:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace new repeating todo form with jquery dialog. And some refactoring

Browse source
This commit is contained in:
Reinier Balt 2011-11-17 17:07:55 +01:00
parent 4b6aff5502
commit 6aa8b8d2f9
9 changed files with 228 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

81
app/controllers/recurring_todos_controller.rb
View file

@ -9,8 +9,8 @@ class RecurringTodosController < ApplicationController
@page_title = t('todos.recurring_actions_title')
@source_view = params['_source_view'] || 'recurring_todo'
find_and_inactivate
@recurring_todos = current_user.recurring_todos.active
@completed_recurring_todos = current_user.recurring_todos.completed.find(:all, :limit => 10)
@recurring_todos = current_user.recurring_todos.active.find(:all, :include => [:tags, :taggings])
@completed_recurring_todos = current_user.recurring_todos.completed.find(:all, :limit => 10, :include => [:tags, :taggings])
@no_recurring_todos = @recurring_todos.size == 0
@no_completed_recurring_todos = @completed_recurring_todos.size == 0
@ -21,15 +21,15 @@ class RecurringTodosController < ApplicationController
def new
end
def show
end
def done
@page_title = t('todos.completed_recurring_actions_title')
@source_view = params['_source_view'] || 'recurring_todo'
items_per_page = 20
page = params[:page] || 1
page = params[:page] || 1
@completed_recurring_todos = current_user.recurring_todos.completed.paginate :page => params[:page], :per_page => items_per_page
@total = @count = current_user.recurring_todos.completed.count
@range_low = (page.to_i-1) * items_per_page + 1
@ -54,7 +54,7 @@ class RecurringTodosController < ApplicationController
params['recurring_todo']['recurring_period']=params['recurring_edit_todo']['recurring_period']
params['recurring_todo']['end_date']=parse_date_per_user_prefs(params['recurring_todo_edit_end_date'])
params['recurring_todo']['start_from']=parse_date_per_user_prefs(params['recurring_todo_edit_start_from'])
# update project
if params['recurring_todo']['project_id'].blank? && !params['project_name'].nil?
if params['project_name'] == 'None'
@ -70,7 +70,7 @@ class RecurringTodosController < ApplicationController
end
params["recurring_todo"]["project_id"] = project.id
end
# update context
if params['recurring_todo']['context_id'].blank? && !params['context_name'].blank?
context = current_user.contexts.find_by_name(params['context_name'].strip)
@ -88,14 +88,14 @@ class RecurringTodosController < ApplicationController
%w{monday tuesday wednesday thursday friday saturday sunday}.each do |day|
params["recurring_todo"]["weekly_return_"+day]=' ' if params["recurring_todo"]["weekly_return_"+day].nil?
end
@saved = @recurring_todo.update_attributes params["recurring_todo"]
respond_to do |format|
format.js
end
end
def create
p = RecurringTodoCreateParamsHelper.new(params)
p.attributes['end_date']=parse_date_per_user_prefs(p.attributes['end_date'])
@ -109,7 +109,7 @@ class RecurringTodosController < ApplicationController
@new_project_created = project.new_record_before_save?
@recurring_todo.project_id = project.id
end
if p.context_specified_by_name?
context = current_user.contexts.find_or_create_by_name(p.context_name)
@new_context_created = context.new_record_before_save?
@ -134,13 +134,13 @@ class RecurringTodosController < ApplicationController
@new_recurring_todo = RecurringTodo.new
else
@status_message = t('todos.error_saving_recurring')
end
end
respond_to do |format|
format.js
format.js
end
end
def destroy
# remove all references to this recurring todo
@todos = @recurring_todo.todos
@ -149,16 +149,16 @@ class RecurringTodosController < ApplicationController
t.recurring_todo_id = nil
t.save
end
# delete the recurring todo
@saved = @recurring_todo.destroy
# count remaining recurring todos
@active_remaining = current_user.recurring_todos.active.count
@completed_remaining = current_user.recurring_todos.completed.count
respond_to do |format|
format.html do
if @saved
notify :notice, t('todos.recurring_deleted_success'), 2.0
@ -168,10 +168,10 @@ class RecurringTodosController < ApplicationController
redirect_to :action => 'index'
end
end
format.js do
render
end
end
end
end
@ -184,19 +184,19 @@ class RecurringTodosController < ApplicationController
if @recurring_todo.active?
@completed_remaining = current_user.recurring_todos.completed.count
# from completed back to active -> check if there is an active todo
@active_todos = @recurring_todo.todos.active.count
# create todo if there is no active todo belonging to the activated
# recurring_todo
@new_recurring_todo = create_todo_from_recurring_todo(@recurring_todo) if @active_todos == 0
end
respond_to do |format|
format.js
format.js
end
end
def toggle_star
@recurring_todo.toggle_star!
@saved = @recurring_todo.save!
@ -204,13 +204,13 @@ class RecurringTodosController < ApplicationController
format.js
end
end
class RecurringTodoCreateParamsHelper
def initialize(params)
@params = params['request'] || params
@attributes = params['request'] && params['request']['recurring_todo'] || params['recurring_todo']
# make sure all selectors (recurring_period, recurrence_selector,
# daily_selector, monthly_selector and yearly_selector) are first in hash
# so that they are processed first by the model
@ -221,47 +221,47 @@ class RecurringTodosController < ApplicationController
'yearly_selector' => @attributes['yearly_selector']
}
end
def attributes
@attributes
end
def selector_attributes
return @selector_attributes
end
def project_name
@params['project_name'].strip unless @params['project_name'].nil?
end
def context_name
@params['context_name'].strip unless @params['context_name'].nil?
end
def tag_list
@params['tag_list']
end
def project_specified_by_name?
return false unless @attributes['project_id'].blank?
return false if project_name.blank?
return false if project_name == 'None'
true
end
def context_specified_by_name?
return false unless @attributes['context_id'].blank?
return false if context_name.blank?
true
end
end
private
def init
@days_of_week = []
0.upto 6 do |i|
0.upto 6 do |i|
@days_of_week << [t('date.day_names')[i], i]
end
@ -274,15 +274,18 @@ class RecurringTodosController < ApplicationController
@projects = current_user.projects.find(:all, :include => [:default_context])
@contexts = current_user.contexts.find(:all)
end
def get_recurring_todo_from_param
@recurring_todo = current_user.recurring_todos.find(params[:id])
end
def find_and_inactivate
# find active recurring todos without active todos and inactivate them
recurring_todos = current_user.recurring_todos.active
recurring_todos.each { |rt| rt.toggle_completion! if rt.todos.not_completed.count == 0}
current_user.recurring_todos.active.all(
:select => "recurring_todos.id, recurring_todos.state",
:joins => "LEFT JOIN todos fai_todos ON (recurring_todos.id = fai_todos.recurring_todo_id) AND (NOT fai_todos.state='completed')",
:conditions => "fai_todos.id IS NULL").each { |rt| current_user.recurring_todos.find(rt.id).toggle_completion! }
end
end