Merge lp:~openerp-dev/openerp-web/trunk-customize_kanban-pan into lp:openerp-web

[Anand]

Hello,

Improved the description/requirements field in stage and put the legend in following [Task,Opportunity,Applicant].

1) Here if user enters like below and save:

   [green] = ready for next stage
   [red] = Blocked
   [Star Star Star] = High priority

then:-> in the read_only page view the value inside the square bracket '[]' should appear accordingly.
        if [green] then green's image , if [red] then red's image and if [star] then star's image.
        the value of the star may comes more than one time but,the [green] and [red] comes only once.

2) Made The Legend tool tip of the column in kanban. So that no need to go form_view of the stage to see the
   description or the requirements.the tool tip available on hover on the title of kanban column.

    Pad Link: http://pad.openerp.com/p/openerp-project.task-H2CYUKWGJN

Kindly Review the code.

Thanks,
PAN

[SnippetBucket.com (tta-openerp)]

Hello Anand,

Very bad implementation.

* Ugly coded: 'mouseenter' event, line 86, each time mouse enter it makes server calls.
Server call only once not each time mouse over.

* convert_image, Give proper function name like parse_legends(...). Also make proper code for parsing legends.

* Line no. 139, 140, 141 .
As you coded,
  if(self.dataset.model == "project.task") return 'description';
This should not be here, move it to project module, similarly others too.

* Improve coding,
 -> Line 11,14, 20,23,... this._super.apply(this,arguments); please add space between two argument.
     Correct it : this._super.apply(this, arguments);

Thanks,
tta

review: Disapprove

[lp:~openerp-dev/openerp-web/trunk-customize_kanban-pan]

3700. By Anand on 2013-03-12

[IMP]Improved code.

3701. By Anand on 2013-03-12

[MERGE]Trunk

3702. By Anand on 2013-03-12

[IMP]Improved code

3703. By Anand on 2013-03-13

[IMP]Improved code

3704. By Anand on 2013-03-13

[IMP]Done some improvement in sass file which are required

3705. By Anand on 2013-03-13

[IMP]Added css classes for legend feature

3706. By Anand on 2013-03-13

[REVERT]Reverted to the 3703

3707. By Anand on 2013-03-13

[IMP]Improved name of widget and div

3708. By Anand on 2013-03-13

[IMP]Added css classes for the legend

3709. By Anand on 2013-03-14

[MERGE]Trunk

3710. By Anand on 2013-03-14

[IMP]Improved code

3711. By Anand on 2013-03-14

[IMP]Improved code

3712. By Anand on 2013-03-14

[IMP]Improved code

3713. By Anand on 2013-03-15

[IMP]Improved code

3714. By Anand on 2013-03-15

[IMP]Improved code

3715. By Anand on 2013-03-15

[IMP]Improved code

3716. By Anand on 2013-03-15

[IMP]Improved code

3717. By Anand on 2013-03-18

[MERGE]Trunk

3718. By Anand on 2013-03-19

[IMP]Improved code

3719. By Anand on 2013-03-19

[IMP]Improved code

3720. By Anand on 2013-03-20

[MERGE]Trunk

3721. By Anand on 2013-03-22

[IMP]Added js test cases for the 'legends' widget in formats.js

3722. By Anand on 2013-03-22

[IMP] css: .base.css , appended class .oe_form_field_legend .star for legend star

3723. By Anand on 2013-03-25

[MERGE]with Trunk

3724. By Anand on 2013-03-25

[IMP] class for legend star and also added saas for allthree legends and same thing added for the kanban view and also improved js test cases because of the cahnge in the css classes

3725. By Anand on 2013-03-26

[IMP]base.css and kanban.css for the legend star and tipsy

3726. By Anand on 2013-03-26

[IMP] tooltip in kanban, if there is decription then and only then rpc will call.

3727. By Anand on 2013-03-26

[IMP] when you define the legend yourself then the default tooltip will not show but your defined legend will show as tooltip

3728. By Anand on 2013-03-28

[IMP]CSS: for legend star in kanban

3729. By Anand on 2013-04-01

 [IMP] Added the widget in the listview for the legends

3730. By Anand on 2013-04-01

[IMP] CSS: for the list view for legends

3731. By Anand on 2013-04-01

[IMP]minimize the code

3732. By Anand on 2013-04-01

[IMP] Optimized code

3733. By Anand on 2013-04-10

[IMP] removed code which makes description field editable

3734. By Anand on 2013-04-10

[IMP]in the description if we try to put other value than star, green, red and save it, its displaying 'undefined' :added code for that.

3735. By Anand on 2013-04-11

[IMP]CSS: for the form view

3736. By Anand on 2013-04-11

[IMP]CSS: for the kanban view

3737. By Anand on 2013-04-17

[IMP]tranfered the method 'get_legend' from kanban.js to formats.js for muliple use.

3738. By Anand on 2013-04-17

[IMP]removed the legend if the user has change the value of legend

3739. By Anand on 2013-04-18

[IMP] removes unwanted code.

3740. By Anand on 2013-04-19

[IMP]Added code for tool-tip Design improvement

3741. By Anand on 2013-04-19

[IMP]JS Tests

3742. By Anand on 2013-04-19

[IMP]Improved code

3743. By Anand on 2013-04-22

[IMP]it will reject the unwanted white spaces and also newline characters entered by the user.So that the output of the tooltip looks fine for the end user.

3744. By Anand on 2013-04-22

[IMP]CSS:for the tipsy in kanban

3745. By Anand on 2013-04-30

[MERGE] with Trunk

3746. By Anand on 2013-05-02

[IMP]chenage the gavity of the tooltip from 's'(south) to 'e'(east)

3747. By Anand on 2013-05-02

[IMP]when we click on next previous on stages, values of description doesn't change because there is no value so the value of previous record is showing. for that case passed ''(space) so if no value then it will shows nothing.

3748. By Anand on 2013-05-06

[IMP]CSS: for the legend star

3749. By Anand on 2013-05-06

[IMP]chabge the direction of the tool-tip from east to south

3750. By Anand on 2013-05-06

[IMP]tipsy behaving wrong when we scroll to right and try to see the tool-tip mesage. so done some changes in jquery.tips.js library file to give the proper width to the tool-tip message

3751. By Anand on 2013-05-08

[IMP]CSS: for list view legends

3752. By Anand on 2013-05-13

[IMP]CSS: set the text-shadow for the mozila and chrome

3753. By Anand on 2013-05-13

[IMP]CSS: height for the mozila for legend star in the list view

3754. By Anand on 2013-05-21

[IMP] remove conflicts and merged with trunk

3755. By Anand on 2013-05-21

[IMP] remove conflicts

3756. By RGA(OpenERP) on 2013-06-19

Merge with trunk

3757. By RGA(OpenERP) on 2013-06-20

[IMP] change legend description for star tag

3758. By RGA(OpenERP) on 2013-06-20

[FIX] legend items are not aligned

3759. By RGA(OpenERP) on 2013-06-21

[IMP] support multi line legend description

3760. By RGA(OpenERP) on 2013-06-21

[IMP] refactore parser: now legend tag can parse any where in line not only at begining, legend key is not casesensetive now

3761. By RGA(OpenERP) on 2013-06-21

Merge with trunk

3762. By RGA(OpenERP) on 2013-06-22

Merge with trunk

3763. By RGA(OpenERP) on 2013-06-24

[IMP]support title attribute for boolean field, it usefully to display tips on checkbox, openerp help display only on lable of checkbox

3764. By RGA(OpenERP) on 2013-06-25

Merge with trunk

3765. By RGA(OpenERP) on 2013-06-25

update web test case for legend widget

3766. By RGA(OpenERP) on 2013-06-25

Merge with trunk

3767. By RGA(OpenERP) on 2013-06-26

[IMP] tooltips display according to viewport (top or bottom side)

3768. By RGA(OpenERP) on 2013-06-27

[IMP] tooltips: remvoe float alingment for .star

3769. By RGA(OpenERP) on 2013-06-28

[IMP] add option to dipslay only perticular state msg in tooltips

Unmerged revisions

3769. By RGA(OpenERP) on 2013-06-28

[IMP] add option to dipslay only perticular state msg in tooltips

3768. By RGA(OpenERP) on 2013-06-27

[IMP] tooltips: remvoe float alingment for .star

3767. By RGA(OpenERP) on 2013-06-26

[IMP] tooltips display according to viewport (top or bottom side)

3766. By RGA(OpenERP) on 2013-06-25

Merge with trunk

3765. By RGA(OpenERP) on 2013-06-25

update web test case for legend widget

3764. By RGA(OpenERP) on 2013-06-25

Merge with trunk

3763. By RGA(OpenERP) on 2013-06-24

[IMP]support title attribute for boolean field, it usefully to display tips on checkbox, openerp help display only on lable of checkbox

3762. By RGA(OpenERP) on 2013-06-22

Merge with trunk

3761. By RGA(OpenERP) on 2013-06-21

Merge with trunk

3760. By RGA(OpenERP) on 2013-06-21

[IMP] refactore parser: now legend tag can parse any where in line not only at begining, legend key is not casesensetive now

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-03-15 09:01:12 +0000
+++ addons/web/static/src/css/base.css	2013-03-20 04:55:24 +0000
@@ -3126,6 +3126,32 @@
   float: right;
   color: #333333;
 }
+.openerp .oe_field_legend_green {
+  border-radius: 6px 6px 6px 6px;
+  display: inline-block;
+  height: 12px;
+  position: relative;
+  top: 4px;
+  width: 12px;
+  background: -webkit-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%) repeat scroll center center green;
+  background: -moz-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%) repeat scroll center center green;
+  background: -ms-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%) repeat scroll center center green;
+  background: -o-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%) repeat scroll center center green;
+  background: radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%) repeat scroll center center green;
+}
+.openerp .oe_field_legend_red {
+  border-radius: 6px 6px 6px 6px;
+  display: inline-block;
+  height: 12px;
+  position: relative;
+  top: 4px;
+  width: 12px;
+  background: -webkit-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%) repeat scroll center center red;
+  background: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%) repeat scroll center center red;
+  background: -ms-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%) repeat scroll center center red;
+  background: -o-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%) repeat scroll center center red;
+  background: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%) repeat scroll center center red;
+}
 
 @-moz-document url-prefix() {
   .openerp .oe_view_manager .oe_view_manager_switch li {

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2013-03-15 09:01:12 +0000
+++ addons/web/static/src/css/base.sass	2013-03-20 04:55:24 +0000
@@ -2462,6 +2462,32 @@
         float: right
         color: #333
     // }}}
+    // {{{ Legends [red] and [green]
+    .oe_field_legend_green
+        border-radius: 6px 6px 6px 6px
+        display: inline-block
+        height: 12px
+        position: relative
+        top: 4px
+        width: 12px
+        background: -webkit-radial-gradient(#55DD55 0%, #44AA44 40%, #339933 100%) repeat scroll center center green
+        background: -moz-radial-gradient(#55DD55 0%, #44AA44 40%, #339933 100%) repeat scroll center center green
+        background: -ms-radial-gradient(#55DD55 0%, #44AA44 40%, #339933 100%) repeat scroll center center green
+        background: -o-radial-gradient(#55DD55 0%, #44AA44 40%, #339933 100%) repeat scroll center center green
+        background: radial-gradient(#55DD55 0%, #44AA44 40%, #339933 100%) repeat scroll center center green
+    .oe_field_legend_red
+        border-radius: 6px 6px 6px 6px
+        display: inline-block
+        height: 12px
+        position: relative
+        top: 4px
+        width: 12px
+        background: -webkit-radial-gradient(#EE7777 0%, #CC3333 40%, #BB0808 100%) repeat scroll center center red
+        background: -moz-radial-gradient(#EE7777 0%, #CC3333 40%, #BB0808 100%) repeat scroll center center red
+        background: -ms-radial-gradient(#EE7777 0%, #CC3333 40%, #BB0808 100%) repeat scroll center center red
+        background: -o-radial-gradient(#EE7777 0%, #CC3333 40%, #BB0808 100%) repeat scroll center center red
+        background: radial-gradient(#EE7777 0%, #CC3333 40%, #BB0808 100%) repeat scroll center center red
+        /// }}}
 @-moz-document url-prefix()
     .openerp
         .oe_view_manager .oe_view_manager_switch li

=== modified file 'addons/web/static/src/js/formats.js'
--- addons/web/static/src/js/formats.js	2013-01-22 06:04:20 +0000
+++ addons/web/static/src/js/formats.js	2013-03-20 04:55:24 +0000
@@ -120,6 +120,20 @@
 };
 
 /**
+ * Replace the [green],[red] and [star] from the string
+ * And Add the appropriate legends accordingly.
+ *
+ * @param {String} value    -value of the field
+ */
+instance.web.parselegend = function(value) {
+    value = value.toLowerCase();
+    value = value.replace(new RegExp("\\[red\]*", "g"), "<span class='oe_field_legend_red'/>")
+                 .replace(new RegExp("\\[green\]*", "g"), "<span class='oe_field_legend_green'/>")
+                 .replace(new RegExp("\\[star\]*", "g"), "<img height='12' width='12' src='/web/static/src/img/icons/star-on.png'/>")
+                 .replace(new RegExp("\n", "g"), "</br>");
+    return value;
+};
+/**
  * Formats a single atomic value based on a field descriptor
  *
  * @param {Object} value read from OpenERP

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-03-19 10:28:59 +0000
+++ addons/web/static/src/js/view_form.js	2013-03-20 04:55:24 +0000
@@ -2637,6 +2637,20 @@
     },
 });
 
+instance.web.form.FieldLegend = instance.web.form.FieldText.extend({
+    render_value: function() {
+        var value = this.get('value');
+        if(this.get("effective_readonly") && value){
+            this.$el.html(instance.web.parselegend(value));
+        } else {
+            this._super.apply(this, arguments);
+        }
+    },
+    renderElement: function() {
+       this.template = this.get("effective_readonly") ? "FieldLegend" : "FieldText";
+       this._super.apply(this, arguments); 
+    }
+});
 /**
  * FieldTextHtml Widget
  * Intended for FieldText widgets meant to display HTML content. This
@@ -5441,6 +5455,7 @@
     'many2many_binary': 'instance.web.form.FieldMany2ManyBinaryMultiFiles',
     'statusbar': 'instance.web.form.FieldStatus',
     'monetary': 'instance.web.form.FieldMonetary',
+    'legends': 'instance.web.form.FieldLegend'
 });
 
 /**

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2013-03-19 10:28:59 +0000
+++ addons/web/static/src/xml/base.xml	2013-03-20 04:55:24 +0000
@@ -1068,6 +1068,9 @@
         </t>
     </div>
 </t>
+<t t-name="FieldLegend">
+    <div class="oe_form_field_legend" contenteditable="true"></div>
+</t>
 <t t-name="FieldTextHtml">
     <div t-att-class="'oe_form_field oe_form_field_html' + (widget.get('effective_readonly') ? ' oe_form_embedded_html' : '')"
             t-att-style="widget.node.attrs.style">

=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
--- addons/web_kanban/static/src/css/kanban.sass	2013-03-13 09:49:09 +0000
+++ addons/web_kanban/static/src/css/kanban.sass	2013-03-20 04:55:24 +0000
@@ -539,7 +539,6 @@
                 @include vertical-gradient(#f6f6f6, #e3e3e3)
                 @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset))
 
-
 // Internet Explorer 9+ specifics {{{
 .openerp_ie .oe_kanban_view
     .oe_kanban_group_header .oe_kanban_group_title_vertical

=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js	2013-02-27 14:12:09 +0000
+++ addons/web_kanban/static/src/js/kanban.js	2013-03-20 04:55:24 +0000
@@ -607,6 +607,28 @@
         this.is_started = true;
         return def;
     },
+    show_legend: function(){
+        var self = this;
+         self.$el.find('.oe_kanban_header').tipsy({
+            'fade': true,
+            'title': function(){
+                return self.description_data
+            },
+            'gravity': 's',
+            'html': true,
+            'opacity': 0.8,
+            'trigger': 'hover'
+        });
+    },
+    get_legend: function(){
+        var self = this;
+        (new instance.web.Model(this.view.group_by_field.relation)).query([this.description_field]).filter([["id", "=", this.value]]).first().done(function(res){
+            if(res[self.description_field]){
+                self.description_data = instance.web.parselegend(res[self.description_field]);
+                self.show_legend();
+            }
+        });
+    },
     compute_cards_auto_height: function() {
         // oe_kanban_no_auto_height is an empty class used to disable this feature
         if (!this.view.group_by) {