From 3e878f561fff382014097a55d4ae1efec13fa848 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Tue, 15 Sep 2015 17:02:54 +0200
Subject: [PATCH] [FIX] project: planner: layout and default values of kanban
 stages

---
 .../static/src/js/web_planner_project.js      | 15 ++-
 addons/project/web_planner_data.xml           | 92 ++++++++++++-------
 2 files changed, 73 insertions(+), 34 deletions(-)

diff --git a/addons/project/static/src/js/web_planner_project.js b/addons/project/static/src/js/web_planner_project.js
index 6671b0eaabc..b6ceac91fa5 100644
--- a/addons/project/static/src/js/web_planner_project.js
+++ b/addons/project/static/src/js/web_planner_project.js
@@ -107,9 +107,9 @@ planner.PlannerDialog.include({
                     'input_element_stage_12' : '',
                     'input_element_stage_13' : '',
                 }
-            }
-            self.$('#input_element_kanban_stage_pipeline').on('change', function(ev) {
-                var option = self.$(ev.target).find(":selected").val();
+            };
+
+            var stage_handler = function (option) {
                 if (_.has(stages, option)) {
                     var values = stages[option];
                     var keys = _.keys(values);
@@ -118,10 +118,19 @@ planner.PlannerDialog.include({
                         self.$('#' + keys[i] + '_user').val(values[keys[i]]);
                     }
                 }
+            };
+
+            self.$('#input_element_kanban_stage_pipeline').on('change', function(ev) {
+                var option = self.$(ev.target).find(":selected").val();
+                stage_handler(option);
             });
             self.$( ".user_project" ).on('change', function() {
                 self.$("#" + self.$(this).attr("id") + "_user").val(self.$(this).val());
             });
+
+            // Load first option by default
+            var first_option = self.$('#input_element_kanban_stage_pipeline').find('option').first().val();
+            stage_handler(first_option);
         }
     }
 });
diff --git a/addons/project/web_planner_data.xml b/addons/project/web_planner_data.xml
index eea2959fffc..ce10e613dc0 100644
--- a/addons/project/web_planner_data.xml
+++ b/addons/project/web_planner_data.xml
@@ -260,8 +260,11 @@
                     <div class="row">
                         <div class="o_planner_notebook_container col-md-12">
                             <ul class="o_planner_notebook">
-                                <li class="o_planner_notebook_header">
-                                    <div class="pull-right">
+                                <li class="row o_planner_notebook_header">
+                                    <div class="col-md-7">
+                                        <h5><strong>Stages and Requirements</strong> for next stage:</h5>
+                                    </div>
+                                    <div class="col-md-5">
                                         <select id="input_element_kanban_stage_pipeline">
                                             <option value="basic_management">Basic Management</option>
                                             <option value="development_process">Development Process</option>
@@ -271,42 +274,69 @@
                                             <option value="repair_workshop">Repair Workshop</option>
                                         </select>
                                     </div>
-                                    <h5><strong>Stages and Requirements</strong> for next stage:</h5>
                                 </li>
-                                <li>
-                                    <span>#1</span>
-                                    <input class="user_project" id="input_element_stage_0" type="text" value="Ideas"/>
-                                    <input class="indented" id="input_element_stage_7" type="text" value="Idea is fully explained"/>
+                                <li class="row">
+                                    <div class="col-md-6">
+                                        <span>#1</span>
+                                        <input class="user_project" id="input_element_stage_0" type="text" value="Ideas"/>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <textarea id="input_element_stage_7" type="text"/>
+                                    </div>
                                 </li>
-                                <li>
-                                    <span>#2</span>
-                                    <input class="user_project" id="input_element_stage_1" type="text" value="To Do"/>
-                                    <input class="indented" id="input_element_stage_8" type="text" value="Idea has been transformed into concrete actions"/>
+                                <li class="row">
+                                    <div class="col-md-6">
+                                        <span>#2</span>
+                                        <input class="user_project" id="input_element_stage_1" type="text" value="To Do"/>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <textarea id="input_element_stage_8" type="text"/>
+                                    </div>
                                 </li>
-                                <li>
-                                    <span>#3</span>
-                                    <input class="user_project" id="input_element_stage_2" type="text" value="Done"/>
-                                    <input class="indented" id="input_element_stage_9" type="text" value="Task is completed"/>
+                                <li class="row">
+                                    <div class="col-md-6">
+                                        <span>#3</span>
+                                        <input class="user_project" id="input_element_stage_2" type="text" value="Done"/>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <textarea id="input_element_stage_9" type="text"/>
+                                    </div>
                                 </li>
-                                <li>
-                                    <span>#4</span>
-                                    <input class="user_project" id="input_element_stage_3" type="text" value="Cancelled"/>
-                                    <input class="indented" id="input_element_stage_10" type="text" value="Reason for cancellation has been documented"/>
+                                <li class="row">
+                                    <div class="col-md-6">
+                                        <span>#4</span>
+                                        <input class="user_project" id="input_element_stage_3" type="text" value="Cancelled"/>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <textarea id="input_element_stage_10" type="text"/>
+                                    </div>
                                 </li>
-                                <li>
-                                    <span>#5</span>
-                                    <input class="user_project" id="input_element_stage_4" type="text"/>
-                                    <input class="indented" id="input_element_stage_11" type="text"/>
+                                <li class="row">
+                                    <div class="col-md-6">
+                                        <span>#5</span>
+                                        <input class="user_project" id="input_element_stage_4" type="text"/>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <textarea id="input_element_stage_11" type="text"/>
+                                    </div>
                                 </li>
-                                <li>
-                                    <span>#6</span>
-                                    <input class="user_project" id="input_element_stage_5" type="text"/>
-                                    <input class="indented" id="input_element_stage_12" type="text"/>
+                                <li class="row">
+                                    <div class="col-md-6">
+                                        <span>#6</span>
+                                        <input class="user_project" id="input_element_stage_5" type="text"/>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <textarea id="input_element_stage_12" type="text"/>
+                                    </div>
                                 </li>
-                                <li>
-                                    <span>#7</span>
-                                    <input class="user_project" id="input_element_stage_6" type="text"/>
-                                    <input class="indented" id="input_element_stage_13" type="text"/>
+                                <li class="row">
+                                    <div class="col-md-6">
+                                        <span>#7</span>
+                                        <input class="user_project" id="input_element_stage_6" type="text"/>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <textarea id="input_element_stage_13" type="text"/>
+                                    </div>
                                 </li>
                                 <div class="o_planner_notebook_line_separator"></div>
                             </ul>