diff --git a/app/controllers/admin/admin_auths_controller.rb b/app/controllers/admin/admin_auths_controller.rb index 9fe9e2a..3cf027e 100644 --- a/app/controllers/admin/admin_auths_controller.rb +++ b/app/controllers/admin/admin_auths_controller.rb @@ -23,7 +23,7 @@ class Admin::AdminAuthsController < ApplicationController end def index - render :layout => "admin" + redirect_to admin_i_tasks_path end def new diff --git a/app/views/admin/i_tasks/_form.html.haml b/app/views/admin/i_tasks/_form.html.haml index 0b955f5..b20b591 100755 --- a/app/views/admin/i_tasks/_form.html.haml +++ b/app/views/admin/i_tasks/_form.html.haml @@ -1,5 +1,9 @@ -@new_i_task = @new_i_task || ITask.new(:admin_id => current_admin.id, :i_website_id => (@i_website.id if @i_website), :end_at => (Date.today + 2.day)) +-if @i_task_project + -@new_i_task.i_website = @i_task_project + + -new_var = new_var || false diff --git a/app/views/admin/i_tasks/_i_task.html.haml b/app/views/admin/i_tasks/_i_task.html.haml index 6b5c863..4ffe075 100644 --- a/app/views/admin/i_tasks/_i_task.html.haml +++ b/app/views/admin/i_tasks/_i_task.html.haml @@ -45,7 +45,9 @@ -if !@i_website %td.project{:style => "width:150px;"} -if i_task.i_website - =link_to i_task.i_website.name, [:admin, i_task.i_website] + =link_to i_task.i_website.name, params.merge(:i_task_project_id => i_task.i_website_id) + + %br = i_task.p_customer.show_name if i_task.p_customer -if !params[:no_detail] diff --git a/app/views/admin/i_tasks/index.html.haml b/app/views/admin/i_tasks/index.html.haml index b339ef3..a746afe 100644 --- a/app/views/admin/i_tasks/index.html.haml +++ b/app/views/admin/i_tasks/index.html.haml @@ -19,36 +19,52 @@ -params[:all] = true -@i_tasks = ITask.where(:done => false).all + -if params[:i_task_project_id] and params[:i_task_project_id].to_s != "" + -@i_task_project = IWebsite.where(:id => params[:i_task_project_id]).first + -@i_tasks = @i_tasks.where(:i_website_id => params[:i_task_project_id]).all - + + :scss + .i_task_project{ + background:white; + font-weight:bold; + padding:10px 20px; + margin-top:10px; + } .tasks_menu - =link_to admin_i_tasks_path(:no => 1), :class => ("active" if params[:no]) do + =link_to admin_i_tasks_path(:no => 1, :i_task_project_id => params[:i_task_project_id]), :class => ("active" if params[:no]) do Non planifiées - =link_to admin_i_tasks_path(:all => 1), :class => ("active" if params[:all]) do + =link_to admin_i_tasks_path(:all => 1, :i_task_project_id => params[:i_task_project_id]), :class => ("active" if params[:all]) do Toutes les tâches - =link_to admin_i_tasks_path(:urgent => 1), :class => ("active" if params[:urgent]) do + =link_to admin_i_tasks_path(:urgent => 1, :i_task_project_id => params[:i_task_project_id]), :class => ("active" if params[:urgent]) do =ic :"free-code-camp" Urgent - =link_to admin_i_tasks_path(:i_previ_id => 1), :class => ("active" if params[:i_previ_id].to_s == "1") do + =link_to admin_i_tasks_path(:i_previ_id => 1, :i_task_project_id => params[:i_task_project_id]), :class => ("active" if params[:i_previ_id].to_s == "1") do =ic :star Aujourd'hui - =link_to admin_i_tasks_path(:i_previ_id => 2), :class => ("active" if params[:i_previ_id].to_s == "2") do + =link_to admin_i_tasks_path(:i_previ_id => 2, :i_task_project_id => params[:i_task_project_id]), :class => ("active" if params[:i_previ_id].to_s == "2") do =ic :"arrow-right" Rapidement - =link_to admin_i_tasks_path(:i_previ_id => 3), :class => ("active" if params[:i_previ_id].to_s == "3") do + =link_to admin_i_tasks_path(:i_previ_id => 3, :i_task_project_id => params[:i_task_project_id]), :class => ("active" if params[:i_previ_id].to_s == "3") do =ic :history Un jour - =link_to admin_i_tasks_path(:archive => 1), :class => ("active" if params[:archive]) do + =link_to admin_i_tasks_path(:archive => 1, :i_task_project_id => params[:i_task_project_id]), :class => ("active" if params[:archive]) do Journal - + + -if @i_task_project + .i_task_project + .right + =@i_task_project.admin.name if @i_task_project.admin + =@i_task_project.name + =link_to ic(:times), params.merge(:i_task_project_id => "") :scss .tasks_menu{ a{ @@ -69,4 +85,22 @@ .row #i_tasks_results= render :partial => "admin/i_tasks/results" + + .projects + %strong Projets avec des tâches en cours : + %br + -ITask.where(:done => false).where("i_website_id is not NULL").group(:i_website_id).map {|i| [i.i_website_id, i.i_website.name]}.sort.each do |iw| + =link_to iw[1],admin_i_tasks_path(:i_task_project_id => iw[0]), :class => "project" + + :scss + .projects{ + margin-bottom:100px; + .project{ + display:inline-block; + padding:5px 8px; + margin:5px; + background:white; + } + + } \ No newline at end of file