From e4c6b8f76824550a2ef38fc7f8f92164ef141f83 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <info@nicolasbally.com>
Date: Tue, 12 Nov 2019 11:46:35 +0100
Subject: [PATCH] suite

---
 app/controllers/admin/i_tasks_controller.rb |  7 +++++--
 app/views/admin/i_tasks/_form.html.haml     | 20 ++++++++++++++++++--
 app/views/admin/i_tasks/_i_task.html.haml   |  1 +
 app/views/admin/i_tasks/create.js.erb       |  4 ++--
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/i_tasks_controller.rb b/app/controllers/admin/i_tasks_controller.rb
index efa4f49..ba0b120 100644
--- a/app/controllers/admin/i_tasks_controller.rb
+++ b/app/controllers/admin/i_tasks_controller.rb
@@ -43,7 +43,7 @@ class Admin::ITasksController < ApplicationController
   def create
     @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|
         t = @i_task.dup
         t.name = task.lstrip
@@ -52,7 +52,8 @@ class Admin::ITasksController < ApplicationController
     
       if @i_task.i_website
         @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
       else
         @i_tasks = ITask.order("end_at ASC").all
@@ -70,6 +71,8 @@ class Admin::ITasksController < ApplicationController
         else
           @i_tasks = ITask.order("end_at ASC").all
         end
+        
+        @new_i_task.admin_id = current_admin.id
       
      
       
diff --git a/app/views/admin/i_tasks/_form.html.haml b/app/views/admin/i_tasks/_form.html.haml
index b20b591..8a5c436 100755
--- a/app/views/admin/i_tasks/_form.html.haml
+++ b/app/views/admin/i_tasks/_form.html.haml
@@ -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
   -@new_i_task.i_website = @i_task_project
@@ -17,7 +17,7 @@
           %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: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
             -if f.object.id
               %td{:style => "width:100px;"}= f.input :minutes_done, :label => false, :placeholder => "Temps passé (min)" , :as => :string
@@ -56,8 +56,16 @@
         input{
           margin:0;
         }
+        .expand_textarea{
+          height:33px;
+          
+          &.focus{
+            height:250px;
+          }
+        }
         td{
           padding:0;
+          vertical-align:top;
         }
         .form-group{
           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
       
   
\ No newline at end of file
diff --git a/app/views/admin/i_tasks/_i_task.html.haml b/app/views/admin/i_tasks/_i_task.html.haml
index 4ffe075..04c11b9 100644
--- a/app/views/admin/i_tasks/_i_task.html.haml
+++ b/app/views/admin/i_tasks/_i_task.html.haml
@@ -3,6 +3,7 @@
     %table.table
 
       %tr
+        
         %td{:style => (params[:no_detail] ? "width:30px;" : "width:150px;")}
           -if i_task.done
             =link_to admin_i_task_path(:id => i_task.id, :i_task => {:done => false}), :remote => true, :method => :put do
diff --git a/app/views/admin/i_tasks/create.js.erb b/app/views/admin/i_tasks/create.js.erb
index 038759e..b5fc72e 100644
--- a/app/views/admin/i_tasks/create.js.erb
+++ b/app/views/admin/i_tasks/create.js.erb
@@ -1,4 +1,4 @@
-$('#i_task_form').html("");
-$('#i_task_form').html("<%= escape_javascript(render(:partial => "admin/i_tasks/form", :locals => {:new_var => true}))%>");
+//$('#i_task_form').html("");
+$('#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"))%>");
\ No newline at end of file