[MERGE] forward port of branch saas-7 up to 7fa6f73

3 files changed, 21 insertions, 11 deletions

diff --git a/addons/web_planner/static/src/js/web_planner_backend.js b/addons/web_planner/static/src/js/web_planner_backend.js
index 40055e39321..0044905d6bb 100644
--- a/addons/web_planner/static/src/js/web_planner_backend.js
+++ b/addons/web_planner/static/src/js/web_planner_backend.js
@@ -28,7 +28,6 @@ var PlannerLauncher = Widget.extend({
             self.$el.on('click', self, self.show_dialog.bind(self));
             return self.fetch_application_planner();
         }).then(function(apps) {
-            self.$el.hide();  // hidden by default
             self.$('.progress').tooltip({html: true, placement: 'bottom', delay: {'show': 500}});
             self.planner_apps = apps;
             return apps;
diff --git a/addons/web_planner/static/src/js/web_planner_common.js b/addons/web_planner/static/src/js/web_planner_common.js
index 1abe71620f4..93bcf2bc775 100644
--- a/addons/web_planner/static/src/js/web_planner_common.js
+++ b/addons/web_planner/static/src/js/web_planner_common.js
@@ -3,6 +3,7 @@ odoo.define('web.planner.common', function (require) {
 
 var core = require('web.core');
 var Dialog = require('web.Dialog');
+var dom_utils = require('web.dom_utils');
 var Model = require('web.Model');
 var Widget = require('web.Widget');
 var session = require('web.session');
@@ -56,7 +57,6 @@ var PlannerDialog = Widget.extend({
         this._super(parent);
         this.planner = planner;
         this.cookie_name = this.planner.planner_application + '_last_page';
-        this.set('progress', 0);
         this.pages = [];
         this.menu_items = [];
     },
@@ -77,11 +77,6 @@ var PlannerDialog = Widget.extend({
     start: function() {
         var self = this;
         return this._super.apply(this, arguments).then(function() {
-            self.$el.on('keyup', "textarea", function() {
-                if (this.scrollHeight != this.clientHeight) {
-                    this.style.height = this.scrollHeight + "px";
-                }
-            }); 
             self.$res.find('.o_planner_page').andSelf().filter('.o_planner_page').each(function(index, dom_page) {
                 var page = new Page(dom_page, index);
                 self.pages.push(page);
@@ -116,7 +111,18 @@ var PlannerDialog = Widget.extend({
             self.trigger('planner_progress_changed', self.get('progress'));
         });
         this.on('planner_progress_changed', this, this.update_ui_progress_bar);
-        this.set('progress', this.planner.progress); // set progress to trigger initial UI update
+        // set progress to trigger initial UI update
+        var initial_progress = false;
+        if (!this.planner.progress) {
+            var total_pages = 0;
+            this.pages.forEach(function(page) {
+                if (! page.hide_mark_as_done) {
+                    total_pages++;
+                }
+            });
+            initial_progress = parseInt(( 1 / (total_pages + 1)) * 100, 10);
+        }
+        this.set('progress', initial_progress || this.planner.progress);
     },
     _render_done_page: function (page) {
         var mark_as_done_button = this.$('.mark_as_done')
@@ -267,6 +273,7 @@ var PlannerDialog = Widget.extend({
         return result;
     },
     _display_page: function(page_id) {
+        var self = this;
         var mark_as_done_button = this.$('button.mark_as_done');
         var next_button = this.$('a.btn-next');
         var page = this._find_page_by_id(page_id);
@@ -302,7 +309,10 @@ var PlannerDialog = Widget.extend({
         this.planner.data.last_open_page = page_id;
         utils.set_cookie(this.cookie_name, page_id, 8*60*60); // create cookie for 8h
         this.$(".modal-body").scrollTop("0");
-        autosize(this.$("textarea"));
+
+        this.$('textarea').each(function () {
+            dom_utils.autoresize($(this), {parent: self});
+        });
 
         this.$('.o_currently_shown_page').text(this.currently_shown_page.title);
     },
@@ -386,9 +396,9 @@ var PlannerDialog = Widget.extend({
                 done_pages++;
             }
         });
-
-        var percent = parseInt((done_pages / total_pages) * 100, 10);
+        var percent = parseInt(( (done_pages + 1) / (total_pages + 1)) * 100, 10);
         this.set('progress', percent);
+
         this.planner.progress = percent;
         // save data and progress in database
         this._save_planner_data();
diff --git a/addons/web_planner/static/src/less/web_planner_common.less b/addons/web_planner/static/src/less/web_planner_common.less
index bf823105d4e..a716f5c420a 100644
--- a/addons/web_planner/static/src/less/web_planner_common.less
+++ b/addons/web_planner/static/src/less/web_planner_common.less
@@ -30,6 +30,7 @@
 /**************** MENU PROGRESS BAR ****************/
 .o_planner_systray {
     > .progress {
+        display: none;
         width: 70px;
         height: 13px;
         cursor: pointer;