suite
This commit is contained in:
parent
a4559af30d
commit
e4c6b8f768
@ -43,7 +43,7 @@ class Admin::ITasksController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@i_task = ITask.new(params.require(:i_task).permit!)
|
@i_task = ITask.new(params.require(:i_task).permit!)
|
||||||
|
|
||||||
if @i_task.name? and (tasks = @i_task.name.split(";")).size > 1
|
if @i_task.name? and (tasks = @i_task.name.split("\n")).size > 1
|
||||||
tasks.each do |task|
|
tasks.each do |task|
|
||||||
t = @i_task.dup
|
t = @i_task.dup
|
||||||
t.name = task.lstrip
|
t.name = task.lstrip
|
||||||
@ -52,7 +52,8 @@ class Admin::ITasksController < ApplicationController
|
|||||||
|
|
||||||
if @i_task.i_website
|
if @i_task.i_website
|
||||||
@i_website = @i_task
|
@i_website = @i_task
|
||||||
@new_i_task = @i_task.i_website.i_tasks.new
|
@new_i_task = @i_task.i_website.i_tasks.new()
|
||||||
|
@new_i_task.admin_id = current_admin.id
|
||||||
@i_tasks = @i_task.i_website.i_tasks.order("end_at ASC").all
|
@i_tasks = @i_task.i_website.i_tasks.order("end_at ASC").all
|
||||||
else
|
else
|
||||||
@i_tasks = ITask.order("end_at ASC").all
|
@i_tasks = ITask.order("end_at ASC").all
|
||||||
@ -71,6 +72,8 @@ class Admin::ITasksController < ApplicationController
|
|||||||
@i_tasks = ITask.order("end_at ASC").all
|
@i_tasks = ITask.order("end_at ASC").all
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@new_i_task.admin_id = current_admin.id
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
else
|
else
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
-@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))
|
-@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
|
-if @i_task_project
|
||||||
-@new_i_task.i_website = @i_task_project
|
-@new_i_task.i_website = @i_task_project
|
||||||
@ -17,7 +17,7 @@
|
|||||||
%tr
|
%tr
|
||||||
%td{:style => "width:120px;"}= f.input :admin_id, :label => false, :collection => Admin.all, :as => :select, :include_blank => true, :member_label => :show_name
|
%td{:style => "width:120px;"}= f.input :admin_id, :label => false, :collection => Admin.all, :as => :select, :include_blank => true, :member_label => :show_name
|
||||||
%td{:style => "width:200px;"}= f.input :i_website_id, :label => false, :placeholder => "Projet :", :collection => IWebsite.all, :as => :select, :include_blank => true
|
%td{:style => "width:200px;"}= f.input :i_website_id, :label => false, :placeholder => "Projet :", :collection => IWebsite.all, :as => :select, :include_blank => true
|
||||||
%td= f.input :name, :label => false, :placeholder => "Libélé"
|
%td= f.input :name, :label => false, :placeholder => "Libélé", :as => :text, :input_html => {:class => "expand_textarea"}
|
||||||
%td{:style => "width:100px;"}= f.input :minutes, :label => false, :placeholder => "Temps estimé (min)" , :as => :string
|
%td{:style => "width:100px;"}= f.input :minutes, :label => false, :placeholder => "Temps estimé (min)" , :as => :string
|
||||||
-if f.object.id
|
-if f.object.id
|
||||||
%td{:style => "width:100px;"}= f.input :minutes_done, :label => false, :placeholder => "Temps passé (min)" , :as => :string
|
%td{:style => "width:100px;"}= f.input :minutes_done, :label => false, :placeholder => "Temps passé (min)" , :as => :string
|
||||||
@ -56,8 +56,16 @@
|
|||||||
input{
|
input{
|
||||||
margin:0;
|
margin:0;
|
||||||
}
|
}
|
||||||
|
.expand_textarea{
|
||||||
|
height:33px;
|
||||||
|
|
||||||
|
&.focus{
|
||||||
|
height:250px;
|
||||||
|
}
|
||||||
|
}
|
||||||
td{
|
td{
|
||||||
padding:0;
|
padding:0;
|
||||||
|
vertical-align:top;
|
||||||
}
|
}
|
||||||
.form-group{
|
.form-group{
|
||||||
padding:0;
|
padding:0;
|
||||||
@ -66,5 +74,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
:coffeescript
|
||||||
|
$(document).on "focus", ".expand_textarea", ->
|
||||||
|
$(this).addClass("focus")
|
||||||
|
true
|
||||||
|
|
||||||
|
$(document).on "focusout", ".expand_textarea", ->
|
||||||
|
$(this).removeClass("focus")
|
||||||
|
true
|
||||||
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
|||||||
%table.table
|
%table.table
|
||||||
|
|
||||||
%tr
|
%tr
|
||||||
|
|
||||||
%td{:style => (params[:no_detail] ? "width:30px;" : "width:150px;")}
|
%td{:style => (params[:no_detail] ? "width:30px;" : "width:150px;")}
|
||||||
-if i_task.done
|
-if i_task.done
|
||||||
=link_to admin_i_task_path(:id => i_task.id, :i_task => {:done => false}), :remote => true, :method => :put do
|
=link_to admin_i_task_path(:id => i_task.id, :i_task => {:done => false}), :remote => true, :method => :put do
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
$('#i_task_form').html("");
|
//$('#i_task_form').html("");
|
||||||
$('#i_task_form').html("<%= escape_javascript(render(:partial => "admin/i_tasks/form", :locals => {:new_var => true}))%>");
|
$('#new_i_task_form').html("<%= escape_javascript(render(:partial => "admin/i_tasks/form", :locals => {:new_var => true}))%>");
|
||||||
|
|
||||||
$('#i_tasks_results').html("<%= escape_javascript(render(:partial => "admin/i_tasks/results"))%>");
|
$('#i_tasks_results').html("<%= escape_javascript(render(:partial => "admin/i_tasks/results"))%>");
|
Loading…
x
Reference in New Issue
Block a user