Merge lp:~openerp-dev/openerp-web/trunk-widget-tooltip-mba into lp:openerp-web

[Richard Mathot (Odoo, formerly OpenERP)]

[lp:~openerp-dev/openerp-web/trunk-widget-tooltip-mba]

3940. By Mahendra Barad(OpenERP) on 2014-04-15

[Remove]unwanted code

3941. By Mahendra Barad(OpenERP) on 2014-04-25

[Merge]with trunk

3942. By Mahendra Barad(OpenERP) on 2014-04-28

[Merge]with trunk

3943. By Mahendra Barad(OpenERP) on 2014-04-28

[IMP]remove unwanted css

3944. By Mahendra Barad(OpenERP) on 2014-05-05

[Merge]with trunk

3945. By Mahendra Barad(OpenERP) on 2014-05-07

[Merge]with trunk

Unmerged revisions

3945. By Mahendra Barad(OpenERP) on 2014-05-07

[Merge]with trunk

3944. By Mahendra Barad(OpenERP) on 2014-05-05

[Merge]with trunk

3943. By Mahendra Barad(OpenERP) on 2014-04-28

[IMP]remove unwanted css

3942. By Mahendra Barad(OpenERP) on 2014-04-28

[Merge]with trunk

3941. By Mahendra Barad(OpenERP) on 2014-04-25

[Merge]with trunk

3940. By Mahendra Barad(OpenERP) on 2014-04-15

[Remove]unwanted code

3939. By Mahendra Barad(OpenERP) on 2014-04-14

[IMP]css

3938. By Mahendra Barad(OpenERP) on 2014-04-14

[IMP]improve the left for priority widget

3937. By Mahendra Barad(OpenERP) on 2014-04-14

[Merge]with trunk

3936. By Mahendra Barad(OpenERP) on 2014-04-11

[Merge]with trunk

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2014-05-02 12:33:55 +0000
+++ addons/web/static/src/css/base.css	2014-05-07 10:11:07 +0000
@@ -3378,3 +3378,69 @@
   background-color: black;
   opacity: 0.6;
 }
+.openerp .dropdown-menu.state {
+  background: white;
+  background: white !important;
+  min-width: 100%;
+  padding-right: 10px !important;
+}
+.openerp .dropdown-menu.state li a, .openerp .dropdown-menu.state li a:hover, .openerp .dropdown-menu.state li a:focus {
+  text-decoration: none;
+  color: #333333;
+  padding-left: 5px;
+  padding-right: 0px;
+  font-size: 13px;
+}
+.openerp .btn-group.state {
+  padding-top: 8px;
+}
+.openerp .btn-group.state a {
+  color: #333333;
+}
+.openerp .btn-group.state a:hover {
+  text-decoration: none;
+  color: #333333;
+}
+.openerp .btn-group.state .dropdown-toggle {
+  -webkit-box-shadow: None;
+}
+.openerp .status {
+  display: inline-block;
+  position: relative;
+  height: 12px;
+  width: 12px;
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+  border-radius: 6px;
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
+  -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
+  background-position: center center;
+  background-image: radial-gradient(#dddddd 0%, #aaaaaa 40%, #999999 100%);
+  background-image: -moz-radial-gradient(#dddddd 0%, #aaaaaa 40%, #999999 100%);
+  background-image: -webkit-radial-gradient(circle, #dddddd 0%, #aaaaaa 40%, #999999 100%);
+}
+.openerp .status.error {
+  background: #cc3333;
+  background-position: center center;
+  background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
+  background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
+  background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%);
+}
+.openerp .status.ok {
+  background: #44dd44;
+  background-position: center center;
+  background-image: radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%);
+  background-image: -moz-radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%);
+  background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44cc44 40%, #33bb33 100%);
+}
+.openerp .oe_star_left a:hover {
+  text-decoration: none;
+}
+.openerp .oe_star_left {
+  float: left;
+  margin-right: 8px;
+}
+.openerp .oe_star_on {
+  color: gold;
+}

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2014-05-02 12:33:55 +0000
+++ addons/web/static/src/css/base.sass	2014-05-07 10:11:07 +0000
@@ -2680,7 +2680,6 @@
         .openerp div.oe_mail_wall
             overflow: hidden !important
 // }}}
-
 // End of customize
 
 // Customize bootstrap3 for tooltip
@@ -2720,6 +2719,65 @@
         .oe_tooltip_message
             max-width: 310px
 
+.openerp
+    .dropdown-menu.state
+        background: white
+        background: white !important
+        min-width: 100%
+        padding-right: 10px !important
+    .dropdown-menu.state li a, .dropdown-menu.state li a:hover, .dropdown-menu.state li a:focus
+        text-decoration: none
+        color: #333
+        padding-left: 5px
+        padding-right: 0px
+        font-size: 13px
+    .btn-group.state
+        padding-top: 8px
+    .btn-group.state a
+        color: #333333
+    .btn-group.state a:hover
+        text-decoration: none
+        color: #333333
+    .btn-group.state .dropdown-toggle 
+        -webkit-box-shadow: None
+    .status
+        display: inline-block
+        position: relative
+        height: 12px
+        width: 12px
+        -moz-border-radius: 6px
+        -webkit-border-radius: 6px
+        border-radius: 6px
+        -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6)
+        -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6)
+        -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6)
+        background-position: center center
+        background-image: radial-gradient(#dddddd 0%, #aaaaaa 40%, #999999 100%)
+        background-image: -moz-radial-gradient(#dddddd 0%, #aaaaaa 40%, #999999 100%)
+        background-image: -webkit-radial-gradient(circle, #dddddd 0%, #aaaaaa 40%, #999999 100%)
+
+    .status.error
+        background: #cc3333
+        background-position: center center
+        background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%)
+        background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%)
+        background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%)
+
+    .status.ok
+        background: #44dd44
+        background-position: center center
+        background-image: radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%)
+        background-image: -moz-radial-gradient(#55dd55 0%, #44cc44 40%, #33bb33 100%)
+        background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44cc44 40%, #33bb33 100%)
+    .oe_star_left a:hover
+        text-decoration: none
+    .oe_star_left
+        float: left
+        margin-right: 8px
+    .oe_star_on
+        color: #FFD700
+// End hack }}}
+
 // Hack for ui icon {{{
 .ui-icon
     width: 18px

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-05-02 12:33:55 +0000
+++ addons/web/static/src/js/view_form.js	2014-05-07 10:11:07 +0000
@@ -2365,6 +2365,149 @@
     }
 });
 
+instance.web.form.DropdownSelection = instance.web.form.FieldChar.extend({
+    init: function (field_manager, node) {
+        this._super(field_manager, node);
+    },
+    prepare_dropdown_selection: function() {
+        var self = this;
+        var data = [];
+        var selection = self.field.selection || [];
+        _.map(selection, function(res) {
+            var state_class;
+            if (res[0] == 'normal')
+                state_class = 'status'
+            else if(res[0] == 'done')
+                state_class = 'status ok'
+            else
+                state_class = 'status error'
+            value = {
+                'name': res[0],
+                'tooltip': res[1],
+                'state_name': res[1],
+                'state_class': state_class
+            }
+            data.push(value)
+        });
+        return data;
+    },
+    render_value: function() {
+        var self = this;
+        var data = {'widget': self }
+        self.record_id = self.view.datarecord.id;
+        data['states'] = self.prepare_dropdown_selection();
+        self.$el.html(QWeb.render("DropdownSelection", data));
+        self.$el.find('.oe_legend').click(self.do_action.bind(self));
+        this.$el.on('mouseenter mouseleave', function(e) {
+            self.$el.find('.caret').toggleClass('hidden', e.type == 'mouseleave');
+        });
+
+        if (self.view.datarecord.stage_id) {
+            var stage_id = _.isArray(self.view.datarecord.stage_id) ? self.view.datarecord.stage_id[0] : self.view.datarecord.stage_id
+            return (new openerp.web.Model(self.view.fields.stage_id.field.relation)).query([])
+                .filter([["id", "=", stage_id]]).first().then(function(res) {
+                    var title = res['legend_'+self.get('value')]
+                    if (title) {
+                        self.$(".oe_state").attr("title", title)
+                    }
+             });
+        }
+    },
+    do_action: function(e) {
+        var self = this;
+        var li = $(e.target).closest( "li" );
+        if (li.length) {
+            var value = {};
+            value[self.name] = String(li.data('value'));
+            if (self.record_id) {
+                return self.view.dataset._model.call('write', [[self.record_id], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self));
+            } else {
+                return self.view.on_button_save().done(function(result) {
+                    if (result) {
+                        self.view.dataset._model.call('write', [[result], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self));
+                    }
+                });
+            }
+        }
+    },
+    reload_record: function() {
+        this.view.reload();
+    },
+});
+
+instance.web.form.Priority = instance.web.form.FieldChar.extend({
+    init: function (field_manager, node) {
+        this._super(field_manager, node);
+    },
+    prepare_priority: function() {
+        var self = this;
+        var data = [];
+        var selection = this.field.selection || [];
+        _.map(selection, function(res) {
+            value = {
+                'name': res[0],
+                'legend_name': res[1]
+            }
+            if (res[0] == '0') {
+                value['legend']= '<span class="oe_e oe_star_off">7</span>';
+            } else {
+                value['legend']= '<span class="oe_e oe_star_on">7</span>';
+            }
+            data.push(value)
+        });
+        return data;
+    },
+    render_value: function() {
+        var self = this;
+        var data = {'widget': self }
+        self.record_id =  self.view.datarecord.id;
+        data['legends'] = self.prepare_priority();
+        self.$el.html(QWeb.render("Priority", data));
+        self.$el.find('.oe_legend').click(self.do_action.bind(self));
+
+        if (self.view.datarecord.stage_id) {
+            var stage_id = _.isArray(self.view.datarecord.stage_id) ? self.view.datarecord.stage_id[0] : self.view.datarecord.stage_id
+            return (new openerp.web.Model(self.view.fields.stage_id.field.relation)).query([])
+                .filter([["id", "=", stage_id]]).first().then(function(res) {
+                    var li = self.$('li');
+                    for (i=1; i<=li.length; i++){
+                        var title = res['legend_star'+i]
+                        if (title) {
+                            self.$("ul").find("[data-value='" + i + "']").attr("title", title);
+                        }
+                    }
+             });
+        }
+    },
+    do_action: function(e) {
+        var self = this;
+        var li = $(e.target).closest( "li" );
+        if (li.length) {
+            var value = {};
+            if (self.val == li.data('value') && self.check_star) {
+                value[self.name] = String(li.data('value') - 1);
+                self.check_star = false
+            } else {
+                value[self.name] = String(li.data('value'));
+                self.check_star = true;
+            }
+            self.val = li.data('value')
+            if (self.record_id) {
+                return self.view.dataset._model.call('write', [[self.record_id], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self));
+            } else {
+                return self.view.on_button_save().done(function(result) {
+                    if (result) {
+                        self.view.dataset._model.call('write', [[result], value, self.view.dataset.get_context()]).done(self.reload_record.bind(self));
+                    }
+                });
+            }
+        }
+    },
+    reload_record: function() {
+        this.view.reload();
+    },
+});
+
 instance.web.form.FieldID = instance.web.form.FieldChar.extend({
     process_modifiers: function () {
         this._super();
@@ -6115,6 +6258,8 @@
     'monetary': 'instance.web.form.FieldMonetary',
     'many2many_checkboxes': 'instance.web.form.FieldMany2ManyCheckBoxes',
     'x2many_counter': 'instance.web.form.X2ManyCounter',
+    'priority':'instance.web.form.Priority',
+    'dropdown_selection':'instance.web.form.DropdownSelection',
     'statinfo': 'instance.web.form.StatInfo',
 });
 

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2014-05-02 12:33:55 +0000
+++ addons/web/static/src/xml/base.xml	2014-05-07 10:11:07 +0000
@@ -1029,6 +1029,41 @@
         </t>
     </span>
 </t>
+
+<t t-name="DropdownSelection">
+    <span class="btn-group state">
+        <t t-foreach="states" t-as="rec">
+            <a t-att-class="'oe_state '+rec.state_class" t-if="widget.get('value') === rec.name" t-att-title="rec.tooltip" >
+                <a class="oe_legend dropdown-toggle" data-toggle="dropdown">
+                <span class="caret hidden"></span>
+                <span class="sr-only">Toggle Dropdown</span> </a>
+            </a>
+        </t>
+        <ul class="dropdown-menu state" role="menu">
+            <t t-foreach="states" t-as="rec">
+                <t t-if="widget.get('value') !== rec.name">
+                    <li class="oe_legend" t-att-data-value="rec.name" ><a href="#">
+                        <span t-att-class="rec.state_class"/> <t t-raw="rec.state_name" /></a>
+                    </li>
+                </t>
+            </t>
+        </ul>
+    </span>
+</t>
+<t t-name="Priority">
+    <ul style="list-style: none; padding-left: 2px;">
+        <t t-foreach="legends" t-as="rec" >
+            <t t-if="widget.get('value') gte rec.name and !rec_first">
+                <li t-att-data-value="rec.name" class="oe_star_left oe_legend" t-att-title="rec.legend_name"><a href="#"><t t-raw="rec.legend"/></a></li>
+            </t>
+        </t>
+        <t t-foreach="legends" t-as="rec" >
+            <t t-if="widget.get('value') lt rec.name">
+                <li t-att-data-value="rec.name" class="oe_star_left oe_legend" t-att-title="rec.legend_name"><a href="#"><t t-raw="legends[0].legend"/></a></li>
+            </t>
+        </t>
+    </ul>
+</t>
 <t t-name="FieldEmail">
     <span class="oe_form_field oe_form_field_email" t-att-style="widget.node.attrs.style">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri" target="_blank"/>

=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js	2014-04-23 07:38:40 +0000
+++ addons/web_kanban/static/src/js/kanban.js	2014-05-07 10:11:07 +0000
@@ -562,6 +562,7 @@
         this.dataset = dataset;
         this.dataset_offset = 0;
         this.aggregates = {};
+        this.legend = {};
         this.value = this.title = null;
         if (this.group) {
             this.value = group.get('value');
@@ -646,7 +647,10 @@
         }
         this.$el.data('widget', this);
         this.$records.data('widget', this);
-        this.$has_been_started.resolve();
+        var def_tooltip = this.fetch_tooltip();
+        $.when(def_tooltip).done(function (){
+            self.$has_been_started.resolve();
+        });
         var add_btn = this.$el.find('.oe_kanban_add');
         add_btn.tooltip({delay: { show: 500, hide:1000 }});
         this.$records.find(".oe_kanban_column_cards").click(function (ev) {
@@ -657,8 +661,6 @@
             }
         });
         this.is_started = true;
-        var def_tooltip = this.fetch_tooltip();
-        return $.when(def_tooltip);
     },
     fetch_tooltip: function() {
         if (! this.group)
@@ -682,13 +684,13 @@
         var options = instance.web.py_eval(field_desc.attrs.options || '{}')
         if (! options.tooltip_on_group_by)
             return;
-
         var self = this;
         if (this.value) {
             return (new instance.web.Model(field.relation)).query([options.tooltip_on_group_by])
-                    .filter([["id", "=", this.value]]).first().then(function(res) {
-                self.tooltip = res[options.tooltip_on_group_by];
-                self.$(".oe_kanban_group_title_text").attr("title", self.tooltip || self.title || "").tooltip();
+                .filter([["id", "=", this.value]]).first().then(function(res) {
+                    self.legend = res[options.tooltip_on_group_by];
+                    var title = self.legend.tooltip || self.title || ""
+                    self.$(".oe_kanban_group_title_text").attr("title", title).tooltip({html: true,className: 'oe_tooltip_kanban_message'});
             });
         }
     },
@@ -1259,7 +1261,115 @@
     },
 });
 
+instance.web_kanban.Priority = instance.web_kanban.AbstractField.extend({
+    init: function(parent, field, $node) {
+        this._super.apply(this, arguments);
+        this.name = $node.attr('name')
+        this.parent = parent;
+    },
+    prepare_priority: function() {
+        var self = this;
+        var data = [];
+        var selection = self.field.selection || [];
+        _.map(selection, function(res) {
+            value = {
+                'name': res[0],
+                'legend_name': self.parent.group.legend['legend_star'+res[0]] || res[1]
+            }
+            if (res[0] == '0') {
+                value['legend'] = '<span class="oe_e oe_star_off">7</span>';
+            } else {
+                value['legend'] = '<span class="oe_e oe_star_on">7</span>';
+            }
+            data.push(value)
+        });
+        return data;
+    },
+    renderElement: function() {
+        var self = this;
+        self.record_id = self.parent.id;
+        var data = {'widget': self }
+        data['legends'] = self.prepare_priority();
+        this.$el = $(QWeb.render("Priority", data));
+        this.$el.find('.oe_legend').click(self.do_action.bind(self));
+    },
+    do_action: function(e) {
+        var self = this;
+        var li = $(e.target).closest( "li" );
+        if (li.length) {
+            var value = {};
+            if (self.parent.val == li.data('value') && self.parent.check_star) {
+                value[self.name] = String(li.data('value') - 1);
+                self.parent.check_star = false
+            } else {
+                value[self.name] = String(li.data('value'));
+                self.parent.check_star = true;
+            }
+            self.parent.val = li.data('value')
+            return self.parent.view.dataset._model.call('write', [[self.record_id], value, self.parent.view.dataset.get_context()]).done(self.reload_record.bind(self.parent));
+        }
+    },
+    reload_record: function() {
+        this.do_reload();
+    },
+});
+
+instance.web_kanban.DropdownSelection = instance.web_kanban.AbstractField.extend({
+    init: function(parent, field, $node) {
+        this._super.apply(this, arguments);
+        this.name = $node.attr('name')
+        this.parent = parent;
+    },
+    prepare_dropdown_selection: function() {
+        var self = this;
+        var data = [];
+        var selection = self.field.selection || [];
+        _.map(selection, function(res) {
+            var state_class;
+            if (res[0] == 'normal')
+                state_class = 'status'
+            else if(res[0] == 'done')
+                state_class = 'status ok'
+            else
+                state_class = 'status error'
+            value = {
+                'name': res[0],
+                'tooltip': self.parent.group.legend['legend_'+res[0]] || res[1],
+                'state_name': res[1],
+                'state_class': state_class
+            }
+            data.push(value)
+        });
+        return data;
+    },
+    renderElement: function() {
+        var self = this;
+        self.record_id = self.parent.id;
+        var data = {'widget': self }
+        data['states'] = self.prepare_dropdown_selection();
+        this.$el = $(QWeb.render("DropdownSelection", data));
+        this.$el.find('.oe_legend').click(self.do_action.bind(self));
+        this.$el.on('mouseenter mouseleave', function(e) {
+            self.$el.find('.caret').toggleClass('hidden', e.type == 'mouseleave');
+        });
+    },
+    do_action: function(e) {
+        var self = this;
+        var li = $(e.target).closest( "li" );
+        if (li.length) {
+            var value = {};
+            value[self.name] = String(li.data('value'));
+            return self.parent.view.dataset._model.call('write', [[self.record_id], value, self.parent.view.dataset.get_context()]).done(self.reload_record.bind(self.parent));
+        }
+    },
+    reload_record: function() {
+        this.do_reload();
+    },
+});
+
 instance.web_kanban.fields_registry = new instance.web.Registry({});
+instance.web_kanban.fields_registry.add('priority','instance.web_kanban.Priority');
+instance.web_kanban.fields_registry.add('dropdown_selection','instance.web_kanban.DropdownSelection');
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: