Merge lp:~openerp-dev/openobject-addons/trunk-chat-feature into lp:openobject-addons

[Vidhin Mehta (OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-chat-feature]

8921. By Ishwar Malvi(OpenERP) on 2013-10-22

[IMP]improved typo and code for chat_history action.

8922. By Ishwar Malvi(OpenERP) on 2013-10-23

[IMP]improved code for hashtag message.

8923. By Ishwar Malvi(OpenERP) on 2013-10-23

[IMP]added yml test for im_livechat.

8924. By Ishwar Malvi(OpenERP) on 2013-10-23

[IMP]improved typo and space.

8925. By Ishwar Malvi(OpenERP) on 2014-01-07

[MERGE]with trunk.

8926. By Ishwar Malvi(OpenERP) on 2014-01-07

[IMP]improved css for livechat channel kanban.

Unmerged revisions

8926. By Ishwar Malvi(OpenERP) on 2014-01-07

[IMP]improved css for livechat channel kanban.

8925. By Ishwar Malvi(OpenERP) on 2014-01-07

[MERGE]with trunk.

8924. By Ishwar Malvi(OpenERP) on 2013-10-23

[IMP]improved typo and space.

8923. By Ishwar Malvi(OpenERP) on 2013-10-23

[IMP]added yml test for im_livechat.

8922. By Ishwar Malvi(OpenERP) on 2013-10-23

[IMP]improved code for hashtag message.

8921. By Ishwar Malvi(OpenERP) on 2013-10-22

[IMP]improved typo and code for chat_history action.

8920. By Ishwar Malvi(OpenERP) on 2013-10-22

[MERGE]with trunk.

8919. By Kunal Chavda on 2013-10-22

[MERGE] refactor code.

8918. By Ishwar Malvi(OpenERP) on 2013-10-17

[MERGE]with trunk.

8917. By Ishwar Malvi(OpenERP) on 2013-10-17

[IMP]improved code.

=== added directory 'im/doc'
=== added file 'im/doc/changelog.rst'
--- im/doc/changelog.rst	1970-01-01 00:00:00 +0000
+++ im/doc/changelog.rst	2014-01-15 16:16:23 +0000
@@ -0,0 +1,14 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk`
+----------------
+
+- im.user update
+
+   - ``get_hashtags``: Added method to get hashtag messages of individual user. 
+     - Value: ids
+     - Return: List of dictionary of hashtag message with it's description.
+

=== added file 'im/doc/im_hashtag_message.rst'
--- im/doc/im_hashtag_message.rst	1970-01-01 00:00:00 +0000
+++ im/doc/im_hashtag_message.rst	2014-01-15 16:16:23 +0000
@@ -0,0 +1,22 @@
+.. _im_hashtag_message:
+
+im.hashtag.message
+============
+
+Models
+++++++
+
+``im.hashtag.message`` is a model for holding attributes for hashtag message.
+
+
+Fields
+++++++
+- ``user_id``: Id of responsible user for hashtag message
+- ``hashtag``: Hashtag message must be start with hash(#)
+- ``note``: Descripton of hashtag message
+
+Methods
++++++++
+- ``_check_hashtag``:
+   - Value: ids
+   - Return: True when hashtag start with # else False.
\ No newline at end of file

=== added file 'im/doc/index.rst'
--- im/doc/index.rst	1970-01-01 00:00:00 +0000
+++ im/doc/index.rst	2014-01-15 16:16:23 +0000
@@ -0,0 +1,22 @@
+=====================
+Im DevDoc
+=====================
+
+Im module documentation
+===================================
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
+   
+Im Hashtag Message
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   im_hashtag_message.rst

=== modified file 'im/im.py'
--- im/im.py	2013-10-22 17:06:59 +0000
+++ im/im.py	2014-01-15 16:16:23 +0000
@@ -31,6 +31,12 @@
 from openerp.http import request
 from openerp.osv import osv, fields
 from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.translate import _
+import datetime
+import time
+import logging
+import json
+import select
 
 _logger = logging.getLogger(__name__)
 
@@ -191,6 +197,30 @@
             'to_id': [(6, 0, to_ids)], 'session_id': to_session_id, 'technical': technical}, context=context)
         notify_channel(cr, "im_channel", {'type': 'message', 'receivers': [my_id] + to_ids})
         return False
+    
+class im_hashtag_message(osv.osv):
+    _name= "im.hashtag.message"
+    
+    _defaults = {
+        'user_id': lambda obj, cr, uid, context: uid,
+        'hashtag': '#'
+    }
+    
+    _columns = {
+        'user_id': fields.many2one("res.users","User", select=True, ondelete='cascade'),
+        'hashtag': fields.char("Hashtag Message", required=True),
+        'note': fields.text("Message", required=True, translate=True),
+    } 
+    
+    def _check_hashtag(self, cr, uid, ids, context=None):
+        for l in self.browse(cr, uid, ids, context=context):
+            if not l.hashtag[:1] == "#":
+                return False
+        return True
+
+    _constraints = [
+        (_check_hashtag, 'Hashtag start with "#" sign will be allowed.', ['hashtag'])
+    ]
 
 class im_session(osv.osv):
     _name = 'im.session'
@@ -200,12 +230,11 @@
         for obj in self.browse(cr, uid, ids, context=context):
             res[obj.id] = ", ".join([x.name for x in obj.user_ids])
         return res
-
+    
     _columns = {
         'user_ids': fields.many2many('im.user'),
-        "name": fields.function(_calc_name, string="Name", type='char'),
+        'name': fields.function(_calc_name, string='Name', type='char'),
     }
-
     # Todo: reuse existing sessions if possible
     def session_get(self, cr, uid, users_to, uuid=None, context=None):
         my_id = self.pool.get("im.user").get_my_id(cr, uid, uuid, context=context)
@@ -215,11 +244,13 @@
             domain.append(('user_ids', 'in', [user_to]))
         sids = self.search(cr, openerp.SUPERUSER_ID, domain, context=context, limit=1)
         session_id = None
+        im_feedback_obj = self.pool.get('im.feedback')
         for session in self.browse(cr, uid, sids, context=context):
+            feed_ids = im_feedback_obj.search(cr, uid, [('session_id','=', session.id),('feedback','!=',None)])
             if len(session.user_ids) == len(users):
                 session_id = session.id
                 break
-        if not session_id:
+        if not session_id and users_to or feed_ids:
             session_id = self.create(cr, openerp.SUPERUSER_ID, {
                 'user_ids': [(6, 0, users)]
             }, context=context)
@@ -249,6 +280,15 @@
             res[obj["id"]] = obj["im_last_status"] and (last_update + delta) > current
         return res
 
+    def get_hashtags(self, cr, uid, ids, context):
+        res={}
+        im_hashtag_message_obj = self.pool.get('im.hashtag.message')
+        im_user_id = self.browse(cr, uid, ids, context=context).user_id
+        hashtags_ids = im_hashtag_message_obj.search(cr, uid, ['|',('user_id','=', None),('user_id','=', im_user_id.id)])
+        for data in im_hashtag_message_obj.browse(cr, uid, hashtags_ids, context=context):
+           res[data.hashtag] = data.note
+        return res
+
     def search_users(self, cr, uid, text_search, fields, limit, context=None):
         my_id = self.get_my_id(cr, uid, None, context)
         found = self.search(cr, uid, [["name", "ilike", text_search], ["id", "<>", my_id], ["uuid", "=", False]],

=== modified file 'im/security/im_security.xml'
--- im/security/im_security.xml	2013-09-02 12:23:11 +0000
+++ im/security/im_security.xml	2014-01-15 16:16:23 +0000
@@ -22,5 +22,16 @@
             <field name="perm_create" eval="1"/>
             <field name="perm_unlink" eval="1"/>
         </record>
+        
+        <record id="hashtag_rule_1" model="ir.rule">
+            <field name="name">Can create, read and modify hashtag message of his/her and unassigned </field>
+            <field name="model_id" ref="model_im_hashtag_message"/>
+            <field name="domain_force">["|", ('user_id', '=', user.id),('user_id', '=', False)]</field>
+            <field name="perm_unlink" eval="1"/>
+            <field name="perm_write" eval="1"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_create" eval="1"/>
+        </record>
+        
     </data>
 </openerp>

=== modified file 'im/security/ir.model.access.csv'
--- im/security/ir.model.access.csv	2013-09-02 12:23:11 +0000
+++ im/security/ir.model.access.csv	2014-01-15 16:16:23 +0000
@@ -1,4 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_im_message,im.message,model_im_message,base.group_user,1,0,1,0
 access_im_user,im.user,model_im_user,,1,1,1,0
-access_im_session,im.session,model_im_session,,1,0,0,0
\ No newline at end of file
+access_im_session,im.session,model_im_session,,1,1,1,0
+access_im_hashtag_message,access_im_hashtag_message,model_im_hashtag_message,,1,1,1,0
\ No newline at end of file

=== modified file 'im/static/src/css/im_common.css'
--- im/static/src/css/im_common.css	2013-09-02 16:08:11 +0000
+++ im/static/src/css/im_common.css	2014-01-15 16:16:23 +0000
@@ -73,7 +73,7 @@
     border-bottom: 1px solid #AEB9BD;
     cursor: pointer;
 }
-.oe_im_chatview .oe_im_chatview_close {
+.oe_im_chatview .oe_im_chatview_close,.oe_im_chatview .oe_im_chatview_add {
     padding: 0;
     cursor: pointer;
     background: transparent;
@@ -187,3 +187,63 @@
     width: 11px;
     height: 11px;
 }
+.oe_im_cancel_people {
+    float: right;
+}
+.oe_im_user_avatar_bubble {
+    width: 22px;
+    height: 22px;
+}
+
+/* feedback */
+
+.oe_im_feedback_notify, .oe_im_feedback_back {
+    margin-top: 80px;
+    color: #FFFFFF;
+}
+.oe_im_feedback_notify a, .oe_im_feedback_back a{
+    cursor: pointer;
+    text-decoration: underline;
+    margin-left:15px;
+}
+.oe_im_feedback {
+    margin-left: 35px;
+    margin-top: 15px;
+}
+.oe_im_feedback a {
+    margin-left: 10px;
+    cursor: pointer;
+}
+
+/* feedback reason*/
+ 
+.oe_im_feedback_reason_lbl {
+    margin-top: 45px;
+    color: #FFFFFF;
+    width: 95%;
+    font-size: 9pt;
+    padding-left: 10px;
+}
+.oe_im_feedback_reason_txt {
+    padding: 30px;
+}
+.oe_im_req_validation {
+    display: none;
+    color: #FC2929;
+    text-shadow: none;
+    font-weight: bold;
+}
+.oe_im_feedback_reason_txt textarea {
+    width: 180px;
+    height: 55px;
+}
+.oe_im_feedback_reason_btn {
+    padding-left: 60px;
+    padding-bottom: 50px;
+}
+.oe_im_reason_btn {
+    width: 60px;
+}
+.oe_chatter_checkbox{
+    float: right;
+}

=== added file 'im/static/src/img/bad.png'
Binary files im/static/src/img/bad.png	1970-01-01 00:00:00 +0000 and im/static/src/img/bad.png	2014-01-15 16:16:23 +0000 differ
=== added file 'im/static/src/img/good.png'
Binary files im/static/src/img/good.png	1970-01-01 00:00:00 +0000 and im/static/src/img/good.png	2014-01-15 16:16:23 +0000 differ
=== added file 'im/static/src/img/groupdefault.png'
Binary files im/static/src/img/groupdefault.png	1970-01-01 00:00:00 +0000 and im/static/src/img/groupdefault.png	2014-01-15 16:16:23 +0000 differ
=== added file 'im/static/src/img/ok.png'
Binary files im/static/src/img/ok.png	1970-01-01 00:00:00 +0000 and im/static/src/img/ok.png	2014-01-15 16:16:23 +0000 differ
=== modified file 'im/static/src/js/im.js'
--- im/static/src/js/im.js	2013-12-02 13:24:45 +0000
+++ im/static/src/js/im.js	2014-01-15 16:16:23 +0000
@@ -54,7 +54,7 @@
             this.set("right_offset", 0);
             this.set("current_search", "");
             this.users = [];
-            this.c_manager = new im_common.ConversationManager(this);
+            this.c_manager = new im_common.ConversationManager(this, {snippet: true, enable_chatroom: true});
             window.im_conversation_manager = this.c_manager;
             this.on("change:right_offset", this.c_manager, _.bind(function() {
                 this.c_manager.set("right_offset", this.get("right_offset"));
@@ -68,6 +68,8 @@
             $(window).resize(_.bind(this.calc_box, this));
             this.calc_box();
             this.on("change:current_search", this, this.search_changed);
+            this.search_changed();
+
             return this.c_manager.start_polling().then(function() {
                 self.c_manager.on("new_conversation", self, function(conv) {
                     conv.$el.droppable({

=== modified file 'im/static/src/js/im_common.js'
--- im/static/src/js/im_common.js	2013-09-11 16:34:52 +0000
+++ im/static/src/js/im_common.js	2014-01-15 16:16:23 +0000
@@ -57,12 +57,16 @@
     im_common.ConversationManager = openerp.Class.extend(openerp.PropertiesMixin, {
         init: function(parent, options) {
             openerp.PropertiesMixin.init.call(this, parent);
+            this.setParent(parent);
             this.options = _.clone(options) || {};
             _.defaults(this.options, {
                 inputPlaceholder: _t("Say something..."),
                 defaultMessage: null,
                 userName: _t("Anonymous"),
-                anonymous_mode: false
+                anonymous_mode: false,
+                snippet: false,
+                enable_chatroom: false,
+                feedback: false
             });
             this.set("right_offset", 0);
             this.set("bottom_offset", 0);
@@ -296,7 +300,11 @@
         events: {
             "keydown input": "keydown",
             "click .oe_im_chatview_close": "close",
-            "click .oe_im_chatview_header": "show_hide"
+            "click .oe_im_chatview_header": "show_hide",
+            "click .oe_im_chatview_add": "invite_people",
+            "click .oe_im_chatview_bubble button": "start_chat",
+            "click .oe_im_feedback_back a": "back_to_chat",
+            "click .oe_im_feedback a": "submit_feedback"
         },
         init: function(parent, c_manager, session_id, options) {
             this._super(parent);
@@ -307,14 +315,16 @@
             this.set("bottom_position", 0);
             this.shown = true;
             this.set("pending", 0);
-            this.inputPlaceholder = this.options.defaultInputPlaceholder;
+            this.inputPlaceholder = this.options.inputPlaceholder;
             this.set("users", []);
             this.set("disconnected", false);
             this.others = [];
+            this.hashtags = null;
+            this.feedback_fillup = false;
         },
         start: function() {
             var self = this;
-
+            
             self.$().append(openerp.qweb.render("im_common.conversation", {widget: self}));
             this.$().hide();
 
@@ -359,8 +369,7 @@
                     self.$(".oe_im_chatview_nbr_messages").text("(" + self.get("pending") + ")");
                 }
             }, self));
-
-            return this.refresh_users().then(function() {
+            return $.when(this.load_hashtags(), this.refresh_users()).done(function(){
                 self.$().show();
             });
         },
@@ -408,9 +417,22 @@
                 this._add_bubble(user, message.message, openerp.str_to_datetime(message.date));
             }, this));
         },
+        check_convert: function(){
+            var self = this;
+            var terms = _.keys(this.hashtags);
+            var values = this.split(this.$("input").val());
+            var new_list = [];
+            _.each(values, function(value){
+                new_list.push((_.contains(terms, value))?self.hashtags[value]:value)
+            });
+            this.$("input").val(new_list.join(" "))
+        },
         keydown: function(e) {
             if(e && e.which !== 13) {
+                if(this.options.snippet)this.do_convert_hashtag_action(e);
                 return;
+            }else if(this.options.snippet){
+                this.check_convert();
             }
             var mes = this.$("input").val();
             if (! mes.trim()) {
@@ -462,18 +484,66 @@
                 this.send_message(JSON.stringify({"type": "session_modified", "action": "added", "user_id": user.get("id")}), true);
             }, this));
         },
+        split: function (val) {
+            return val.split(/ \s*/);
+        },
+        extractLast: function (term) {
+            return this.split(term).pop();
+        },
+        do_convert_hashtag_action: function(e) {
+            var self = this;
+            $(".oe_im_chatview_footer input").bind( "keydown", function( event ) {
+            if(event.keyCode === 13 && !$( this ).data( "ui-autocomplete" ).menu.active){
+                $( ".oe_im_chatview_footer input" ).blur().focus();
+            }
+            if ( event.keyCode === $.ui.keyCode.TAB &&
+                $( this ).data( "ui-autocomplete" ).menu.active ) {
+                    event.preventDefault();
+            }
+            }).autocomplete({
+                minLength: 1,
+                source: function(request, response) {
+                    if(self.extractLast(request.term).match('#')){
+                        response($.ui.autocomplete.filter(_.keys(self.hashtags), self.extractLast(request.term)));
+                    } else {
+                        $( ".oe_im_chatview_footer input" ).blur().focus();
+                        return false;
+                    }
+                },
+                focus: function() {
+                    // prevent value inserted on focus
+                    return false;
+                },
+                select: function(event, ui) {
+                    var terms = self.split(this.value);
+                    terms.pop();
+                    terms.push(self.hashtags[ui.item.value]);
+                    this.value = terms.join(" ");
+                    return false;
+                }
+            });
+            var position = $(".oe_im_chatview_footer input").autocomplete( "option", "position" );
+            $(".oe_im_chatview_footer input").autocomplete( "option", "position", { my : "right top", at: "right bottom" } );
+        },
         focus: function() {
             this.$(".oe_im_chatview_input").focus();
             if (! this.shown)
                 this.show_hide();
         },
-        close: function() {
+        close: function(event) {
+            var self = this;
+            if(this.options.feedback && !this.feedback_fillup){
+                   this.toggle_class();
+                   this.$el.find(".oe_im_chatview_content").after(openerp.qweb.render("conversation_feedback"));
+                   event.stopPropagation();
+                   return
+            }
             var def = $.when();
             if (this.get("users").length > 1) {
                 def = im_common.connection.model("im.session").call("remove_me_from_session",
                         [this.session_id, this.c_manager.me.get("uuid")]).then(_.bind(function() {
-                    return this.send_message(JSON.stringify({"type": "session_modified", "action": "removed",
-                        "user_id": this.c_manager.me.get("id")}), true)
+                    return self.send_message(JSON.stringify({"type": "session_modified", "action": "removed",
+                        "user_id": self.c_manager.me.get("id")}), true)
                 }, this))
             }
 
@@ -481,6 +551,68 @@
                 this.destroy();
             }, this));
         },
+        invite_people:function(e){
+            e.stopPropagation();
+            this.toggle_class();
+            this.$el.find(".oe_im_chatview_content").after($(openerp.qweb.render("InvitePeople", {"widget": this, 'invited_ids':_.map(this.get('users'),function(user){ return user.get('id')})})));
+        },
+        toggle_class: function(){
+            this.$el.find(".oe_im_chatview_content").toggle();
+            this.$el.find(".oe_im_chatview_footer").toggle();
+            this.$el.find(".oe_im_chatview_header button").toggle();
+        },
+        load_hashtags: function(){
+            if(!this.options.snippet) return null;
+            var self = this;
+            return (new openerp.web.Model("im.user")).call("get_hashtags", [this.c_manager.me.get('id')], {context : new openerp.web.CompoundContext()
+            }).then(function(res) {
+                if(res)self.hashtags = res;
+            });
+        },
+        back_to_chat: function(){
+            this.$el.find(".oe_im_chatview_content:last").remove();
+            this.toggle_class();
+        },
+        submit_feedback:function(e){
+             var self = this;
+             var model = im_common.connection.model("im.feedback");
+             var feedback_value = parseInt($(e.currentTarget).attr('value'));
+             model.call("save_feedback", [{session_id: self.session_id,feedback: String(feedback_value)}])
+             .then(function(feedback_id){
+                 if(feedback_value < 10){
+                     self.$el.find(".oe_im_chatview_content:last").replaceWith(openerp.qweb.render("feedback_reason"));
+                     self.$el.find(":button").click(function(e){
+                         var reason = $(self.$el.find("#reason")).val();
+                         if (e.currentTarget.id == 'submit') {
+                             if (reason.length) {
+                                 model.call("write", [[feedback_id], {'reason':reason}],{context: {}});
+                             } else {
+                                 self.$el.find('.oe_im_req_validation').show();
+                                 return false
+                             }
+                         }
+                         self.feedback_fillup = true;
+                         self.close();
+                     });
+                 }else if(feedback_value == 10){
+                     self.feedback_fillup = true
+                     self.close();
+                 }
+             });
+             this.$el.find("#reason").bind("keydown", function() {
+                self.$el.find('.oe_im_req_validation').hide();
+             });
+        },
+        start_chat: function(e){
+            var self = this;
+            this.toggle_class();
+            var chat_user = this.$el.find(".oe_im_chatview_content:last").remove();
+            var parent = this.getParent();
+            $(chat_user).find("input[type='checkbox']:checked").each( function(key, value){
+               self.add_user(parent.get_user(parseInt($(value).val())));
+            });
+        },
+
         destroy: function() {
             _.each(this.get("users"), function(user) {
                 user.remove_watcher();
@@ -520,7 +652,7 @@
             txt += _.escape(str.slice(last, result.index));
             last = url_regex.lastIndex;
             var url = _.escape(result[0]);
-            txt += '<a href="' + url + '">' + url + '</a>';
+            txt += '<a target="_blank" href="' + url + '">' + url + '</a>';
         }
         txt += _.escape(str.slice(last, str.length));
         return txt;

=== modified file 'im/static/src/xml/im_common.xml'
--- im/static/src/xml/im_common.xml	2013-09-03 13:59:40 +0000
+++ im/static/src/xml/im_common.xml	2014-01-15 16:16:23 +0000
@@ -6,6 +6,7 @@
         <span class="oe_im_chatview_users"/>
         <scan class="oe_im_chatview_nbr_messages" />
         <button class="oe_im_chatview_close">×</button>
+        <button t-if="widget.options.enable_chatroom" class="oe_im_chatview_add">+</button>
     </div>
     <div class="oe_im_chatview_disconnected">
         All users are offline. They will receive your messages on their next connection.
@@ -39,4 +40,58 @@
         <div class="oe_im_chatview_time"><t t-esc="time"/></div>
     </div>
 </t>
-</templates>
\ No newline at end of file
+<t t-name="InvitePeople">
+    <div class="oe_im_chatview_content">
+        <t t-set="users" t-value="(widget.getParent()).getParent()['users']"/>
+        <div class = "oe_im_chatview_bubble" t-foreach="users" t-as="user">
+            <img class="oe_im_user_avatar_bubble oe_right" t-att-src='user.user.get("image_url")' />
+            <t t-esc='user.user.get("name")'/>
+            <input class="oe_chatter_checkbox" t-if= "_.contains(invited_ids, user.user.get('id'))" checked="checked" onclick="return false" type="checkbox" t-att-name= 'user.user.get("name")' t-att-value='user.user.get("id")'>
+            </input>
+            <input class="oe_chatter_checkbox" t-if= "!_.contains(invited_ids, user.user.get('id'))" type="checkbox" t-att-name= 'user.user.get("name")' t-att-value='user.user.get("id")'>
+            </input>
+        </div>
+        <div class="oe_im_chatview_bubble">
+            <t t-if="users.length gt 0">
+                <button class = "oe_im_submit_people"> Start Chat </button>
+                <button class = "oe_im_cancel_people"> Cancel </button>
+            </t>
+            <t t-if="users.length == 0">
+                <span>No more member is available.</span>
+                <button style="float:none !important" class = "oe_im_cancel_people"> Back </button>
+            </t>
+        </div>
+    </div>
+</t>
+<t t-name="conversation_feedback">
+    <div class="oe_im_chatview_content">
+        <div class="oe_im_feedback_notify">
+            Please take a second to rate my reply...
+        </div>
+        <div class="oe_im_feedback">
+            <a  value="10" name="good" title="It was Good."><img src='/im/static/src/img/good.png'/></a>
+            <a  value="5" name="ok" title="It was OK."><img src='/im/static/src/img/ok.png'/></a>
+            <a  value="1" name="bad" title="It was bad."><img src='/im/static/src/img/bad.png'/></a>
+        </div>
+        <div class="oe_im_feedback_back">
+            <a id="back_to_chat">or back to chat</a>
+        </div>
+    </div>
+</t>
+ <t t-name="feedback_reason">
+     <div class="oe_im_chatview_content">
+         <div class="oe_im_feedback_reason_lbl">
+             Please give me reason for your feedback...
+         </div>
+         <div class="oe_im_feedback_reason_txt">
+             <textarea id="reason"></textarea>
+             <div class="oe_im_req_validation">*Please enter valid reason.</div>
+         </div>
+         <div class="oe_im_feedback_reason_btn">
+             <input class="oe_im_reason_btn" type="button" id="submit" value="Submit" />
+             <input class="oe_im_reason_btn" type="button" id="close" value="Close" />
+         </div>
+     </div>
+ </t>
+ 
+</templates>

=== modified file 'im_livechat/__openerp__.py'
--- im_livechat/__openerp__.py	2013-03-15 11:21:53 +0000
+++ im_livechat/__openerp__.py	2014-01-15 16:16:23 +0000
@@ -22,7 +22,11 @@
     'demo': [
         "im_livechat_demo.xml",
     ],
+    'test':[
+        "test/test_im_livechat.yml"
+    ],
     'depends' : ["im", "mail", "portal_anonymous"],
+    'css': ['static/ext/static/css/*.css'],
     'installable': True,
     'auto_install': False,
     'application': True,

=== added directory 'im_livechat/doc'
=== added file 'im_livechat/doc/changelog.rst'
--- im_livechat/doc/changelog.rst	1970-01-01 00:00:00 +0000
+++ im_livechat/doc/changelog.rst	2014-01-15 16:16:23 +0000
@@ -0,0 +1,21 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk`
+----------------
+
+- im_livechat.channel update
+
+  -  ``hashtag_channel_ids``: field added which allow to access hashtag message created for individual channel.
+  -  ``channel_ids``: field added to access number of chats done in individual channel.
+  
+  -  ``_start_channel_session``: method added to create a session every time when join the channel.
+  
+- im_hashtag_message update
+
+  -  ``channel_id``: field added to access hashtag message for individual channel.
+  
+
+

=== added file 'im_livechat/doc/im_feedback.rst'
--- im_livechat/doc/im_feedback.rst	1970-01-01 00:00:00 +0000
+++ im_livechat/doc/im_feedback.rst	2014-01-15 16:16:23 +0000
@@ -0,0 +1,29 @@
+.. _im_feedback:
+
+im.feedback
+============
+
+Models
+++++++
+
+``im.feedback`` is a model for holding attribute for managing feedback and reason from individual chat session. 
+
+
+Fields
+++++++
+- ``session_id``: Id of session
+- ``feedback``: Feedback value
+- ``reason``: Feedback reason
+- ``feedback_date``: Date of feedback
+- ``feedback_id``: Id of chat session
+
+Methods
++++++++
+
+- ``save_feedback`` :
+   - Value: data
+   - Return: id of record
+
+- ``action_chat_history`` :
+   - Value: ids
+   - Return: action

=== added file 'im_livechat/doc/im_livechat_channel_session.rst'
--- im_livechat/doc/im_livechat_channel_session.rst	1970-01-01 00:00:00 +0000
+++ im_livechat/doc/im_livechat_channel_session.rst	2014-01-15 16:16:23 +0000
@@ -0,0 +1,34 @@
+.. _im_livechat_channel_session:
+
+im_livechat.channel.session
+============
+
+Models
+++++++
+
+``im_livechat.channel.session`` is a model for holding attribute for managing individual chat session from join to quit the channel. 
+
+
+Fields
+++++++
+- ``user_id``: Id of responsible user for chat session
+- ``channel_id``: Id of channel used for chat session
+- ``start_date``: Start date of chat session
+- ``end_date``: End date of chat session
+- ``duration``: Duration of chat session
+- ``channel_name``: Channel name that is related to channel_id
+- ``responsible_name``: Responsible name that is related to user_id
+- ``feedback_ids``: Allows to access all feedback get from chat sessions
+- ``feedbacks``: Computed from feedback_ids
+
+
+Methods
++++++++
+
+- ``_compute_feedback`` :
+   - Value: ids
+   - Return: List of dictionary of feedback and reason.
+
+- ``_compute_duration`` :
+   - Value: ids
+   - Return: List of dictionary of duration.

=== added file 'im_livechat/doc/index.rst'
--- im_livechat/doc/index.rst	1970-01-01 00:00:00 +0000
+++ im_livechat/doc/index.rst	2014-01-15 16:16:23 +0000
@@ -0,0 +1,30 @@
+=====================
+Im Livechat DevDoc
+=====================
+
+Im Livechat module documentation
+===================================
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
+
+Im Feedback
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   im_feedback.rst
+
+Livechat Channel Session
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   im_livechat_channel_session.rst
\ No newline at end of file

=== modified file 'im_livechat/im_livechat.py'
--- im_livechat/im_livechat.py	2013-12-04 13:00:23 +0000
+++ im_livechat/im_livechat.py	2014-01-15 16:16:23 +0000
@@ -27,6 +27,9 @@
 import openerp.addons.im.im as im
 from openerp.osv import osv, fields
 from openerp import tools
+from datetime import datetime
+import time
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT as DF
 from openerp import http
 from openerp.http import request
 
@@ -118,9 +121,10 @@
             res[record.id] = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + \
                 "/im_livechat/web_page?p=" + json.dumps({"db":cr.dbname, "channel":record.id})
         return res
-
+    
     _columns = {
         'name': fields.char(string="Channel Name", size=200, required=True),
+        'hashtag_channel_ids' : fields.one2many('im.hashtag.message', 'channel_id', 'Hashtag Channels'),
         'user_ids': fields.many2many('res.users', 'im_livechat_channel_im_user', 'channel_id', 'user_id', string="Users"),
         'are_you_inside': fields.function(_are_you_inside, type='boolean', string='Are you inside the matrix?', store=False),
         'script': fields.function(_script, type='text', string='Script', store=False),
@@ -147,6 +151,7 @@
             help="Small-sized photo of the group. It is automatically "\
                  "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
+        'channel_ids': fields.one2many('im_livechat.channel.session', 'channel_id', 'Channel Ids', ondelete='cascade'),
     }
 
     def _default_user_ids(self, cr, uid, context=None):
@@ -199,12 +204,51 @@
             "channelName": chan.name,
         }
 
+    def _start_channel_session(self, cr, uid, ids, user_id=None, context=None):
+        vals = {
+            'user_id': user_id,
+            'channel_id': ids[0],
+            'start_date': datetime.now().strftime(DF),
+            'state': 'join'
+        }
+        self.pool.get('im_livechat.channel.session').create(cr, uid, vals, context=context)
+        return True
+
+    def create(self, cr, uid, data, context=None):
+        channel_id = super(im_livechat_channel, self).create(cr, uid, data, context=context)
+        channel = self.browse(cr, uid, channel_id, context=context)
+        for user_id in channel.user_ids:
+            self._start_channel_session(cr, uid, [channel_id], user_id.id, context=context)
+        return channel_id
+            
     def join(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'user_ids': [(4, uid)]})
+        self._start_channel_session(cr, uid, ids, uid, context=context)
         return True
-
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        res = super(im_livechat_channel, self).write(cr, uid, ids, vals, context=context)
+        im_livechat_session_obj = self.pool.get('im_livechat.channel.session')
+        for channel in self.browse(cr, uid ,ids, context=context):
+            for user in channel.user_ids:
+                records = im_livechat_session_obj.search(cr, uid, [('user_id','=',user.id),('channel_id','=',channel.id)])
+                if not records:
+                    self._start_channel_session(cr, uid, ids, user.id, context)
+        return res
+    
     def quit(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'user_ids': [(3, uid)]})
+        history_ids = self.pool.get('im_livechat.channel.session').search(cr, uid, (['user_id','=',uid],['channel_id','in',ids],['state','=','join']))
+        self.quit_channel_session(cr, uid, history_ids, context=context)
+        return True
+
+    def quit_channel_session(self, cr, uid, ids, context=None):
+        channel_history_obj = self.pool.get('im_livechat.channel.session')
+        for history_id in channel_history_obj.browse(cr, uid, ids, context=context):
+            channel_history_obj.write(cr, uid, history_id.id, {
+                'end_date': datetime.now().strftime(DF),
+                'state': 'quit'
+            })
         return True
 
 class im_session(osv.osv):
@@ -213,3 +257,88 @@
     _columns = {
         'channel_id': fields.many2one("im_livechat.channel", "Channel"),
     }
+
+class im_hashtag_message(osv.osv):
+    _inherit = 'im.hashtag.message'
+
+    _columns = {
+        'channel_id': fields.many2one("im_livechat.channel", "Channel"),
+    }
+
+class im_livechat_channel_session(osv.osv):
+    _name = 'im_livechat.channel.session'
+    _rec_name = "channel_name"
+    
+    def _compute_feedback(self, cr, uid, ids, name, arg, context=None):
+        result = {}
+        for chat in self.browse(cr, uid, ids, context=context):
+            feedback_list = []
+            reason_list = []
+            for feedback in chat.feedback_ids:
+                feedback_list.append(feedback.feedback)
+                reason_list.append(feedback.reason)
+            result[chat.id] = [{'feedback_list':feedback_list, 'reason_list':reason_list}]
+        return result
+    
+    def _compute_duration(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for id in self.browse(cr, uid, ids, context=context):
+            start_date = datetime.strptime(id.start_date, DF)
+            if id.end_date:
+                end_date = datetime.strptime(id.end_date, DF)
+                duration = datetime.strptime(str(end_date - start_date), "%H:%M:%S")
+                res[id.id] = "%sH %sM" % (duration.hour, duration.minute)
+            else:
+                res[id.id] = "0H 0M"
+        return res 
+
+    _columns = {
+        'user_id': fields.many2one('res.users', 'Support Member'),
+        'channel_id': fields.many2one('im_livechat.channel', 'Channel Id', ondelete='cascade'),
+        'start_date': fields.datetime('Start Date'),
+        'end_date': fields.datetime('End Date'),
+        'duration': fields.function(_compute_duration, string='Duration', type='char'),
+        'channel_name': fields.related('channel_id', 'name', type='char', string='Channel Name'),
+        'responsible_name': fields.related('user_id', 'name', type='char', string='Responsible Name'),
+        'feedback_ids': fields.one2many('im.feedback', 'feedback_id', 'Feedback Ids', ondelete='cascade'),
+        'feedbacks': fields.function(_compute_feedback, 'Feedbacks', type="serialized", relation='im.feedback'),
+        'state': fields.selection([('join','Join'),('quit','Quit')], 'Status', help='Status of user')
+    }
+
+class im_feedback(osv.osv):
+    _name = "im.feedback"
+    
+    _rec_name = "feedback"
+    _columns = {
+        'session_id': fields.many2one("im.session", string="Session", ondelete='cascade'),
+        'feedback': fields.selection([('10','Good'),('5','Ok'),('1','Bad')], 'Feedback', help='Feedback from user'),
+        'reason': fields.text('Reason'),
+        'feedback_date': fields.datetime('Date'),
+        'feedback_id': fields.many2one('im_livechat.channel.session', 'Feedback id', ondelete='cascade'),
+    }
+    
+    def action_chat_history(self, cr, uid, ids, context=None):
+        session_id = self.browse(cr, uid, ids,context=context)[0].session_id.id
+
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        action_res = mod_obj.get_object_reference(cr, uid, 'im_livechat', 'action_history')
+        action_id = action_res and action_res[1] or False
+        action_res = act_obj.read(cr, uid, [action_id], context=context)[0]
+        action_res['target'] = 'new'
+        action_res['domain'] = "[('session_id', 'in', %s)]" % [session_id]
+        return action_res
+
+    def save_feedback(self, cr, uid, data, context=None):
+        im_session = self.pool.get('im.session').browse(cr, uid, data['session_id'], context=context)
+        channel_session_obj = self.pool.get('im_livechat.channel.session')
+        im_user_obj = self.pool.get('im.user')
+        for user_id in im_session.user_ids:
+            im_user_id = im_user_obj.browse(cr, uid, user_id.id, context=context)
+            if im_user_id.user_id:
+                channel_session_id = channel_session_obj.search(cr, uid, [('channel_id', '=', im_session.channel_id.id),('user_id', '=', im_user_id.user_id.id),('state', '=', 'join')])
+        data['feedback_id'] = channel_session_id[0]
+        data['feedback_date'] = datetime.now().strftime(DF)
+        feedback_id = self.create(cr, openerp.SUPERUSER_ID, data, context=context)
+        return feedback_id

=== modified file 'im_livechat/im_livechat_demo.xml'
--- im_livechat/im_livechat_demo.xml	2013-03-15 11:21:53 +0000
+++ im_livechat/im_livechat_demo.xml	2014-01-15 16:16:23 +0000
@@ -10,6 +10,50 @@
         <record id="group_im_livechat" model="res.groups">
             <field name="users" eval="[(4, ref('base.user_demo'))]"/>
         </record>
+        
+        <!-- Resource: im.hashtag.message -->
+
+        <record id="im_hashtags_1" model="im.hashtag.message">
+            <field name="hashtag">#gm</field>
+            <field name="note">good morning</field>
+            <field name="user_id"/>
+            <field name="channel_id" ref="im_livechat.channel_website"/>
+        </record>
+
+        <record id="im_hashtags_2" model="im.hashtag.message">
+            <field name="hashtag">#gn</field>
+            <field name="note">good night</field>
+            <field name="user_id"/>
+            <field name="channel_id" ref="im_livechat.channel_website"/>
+        </record>
+
+        <record id="im_hashtags_3" model="im.hashtag.message">
+            <field name="hashtag">#u</field>
+            <field name="note">you</field>
+            <field name="user_id"/>
+            <field name="channel_id" ref="im_livechat.channel_website"/>
+        </record>
+
+        <record id="im_hashtags_4" model="im.hashtag.message">
+            <field name="hashtag">#ur</field>
+            <field name="note">your</field>
+            <field name="user_id"/>
+            <field name="channel_id" ref="im_livechat.channel_website"/>
+        </record>
+
+        <record id="im_hashtags_5" model="im.hashtag.message">
+            <field name="hashtag">#abt</field>
+            <field name="note">about</field>
+            <field name="user_id"/>
+            <field name="channel_id" ref="im_livechat.channel_website"/>
+        </record>
+
+        <record id="im_hashtags_6" model="im.hashtag.message">
+            <field name="hashtag">#bt</field>
+            <field name="note">but</field>
+            <field name="user_id"/>
+            <field name="channel_id" ref="im_livechat.channel_website"/>
+        </record>
 
     </data>
 </openerp>

=== modified file 'im_livechat/im_livechat_view.xml'
--- im_livechat/im_livechat_view.xml	2013-09-02 13:56:01 +0000
+++ im_livechat/im_livechat_view.xml	2014-01-15 16:16:23 +0000
@@ -3,6 +3,176 @@
     <data>
         <menuitem id="im_livechat" name="Live Chat" parent="mail.mail_feeds_main" groups="group_im_livechat"/>
 
+        <record model="ir.ui.view" id="view_im_livechat_channel_session_search">
+            <field name="name">im_livechat.channel.session.search</field>
+            <field name="model">im_livechat.channel.session</field>
+            <field name="arch" type="xml">
+                <search string="Feedback">
+                    <field name="channel_id"/>
+                    <field name="responsible_name" string="Responsible"/>
+                    <field name="channel_name" string="Channel"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Responsible" name="group_user_id" context="{'group_by':'user_id'}"/>
+                        <filter string="Channel" name="group_channel_id" context="{'group_by':'channel_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_im_livechat_channel_session_kanban">
+            <field name="name">im_livechat.channel.session.kanban</field>
+            <field name="model">im_livechat.channel.session</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" class="oe_background_grey" create="false">
+                    <field name="channel_name"/>
+                    <field name="responsible_name"/>
+                    <field name="start_date"/>
+                    <field name="duration"/>
+                    <field name="user_id"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_card oe_kanban_im_livechat oe_kanban_global_click">
+                               <div class="oe_kanban_content">
+                                    <span>
+                                        <h3 class="oe_kanban_ellipsis"><field name="responsible_name"/></h3>
+                                        <h4 class="oe_kanban_ellipsis"><field name="channel_name"/></h4>
+                                        <div class="oe_kanban_im_livechat_avatars oe_right">
+                                            <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-if="record.user_id.value" t-att-data-member_id="record.user_id.raw_value"/>
+                                        </div>
+                                    </span>
+                                    <span t-if="record.start_date.raw_value">
+                                        <t t-esc="record.start_date.raw_value.format('m/d/Y')"/>
+                                    </span><br/><br/>
+                                    <span>
+                                        <img src="/im_livechat/static/src/img/groupdefault.png" height="24" width="24" />
+                                        <field name="feedback_ids" invisible="1"/>
+                                        <t t-esc="record.feedback_ids.raw_value.length"/> during <t t-esc="record.duration.raw_value"/>
+                                    </span>
+                                    <div class="oe_kanban_feedback">
+                                        <field name="feedbacks" invisible="1"/>
+                                        <t t-foreach="record.feedbacks.raw_value" t-as="feedbacks">
+                                            <t t-foreach="feedbacks.feedback_list.length" t-as="index">
+                                                <span t-if="feedbacks.feedback_list[index] == 1">
+                                                    <img t-att-title="feedbacks.reason_list[index] ? feedbacks.reason_list[index] : 'No Reason'" src="/im/static/src/img/bad.png"></img>
+                                                </span>    
+                                                <span t-if="feedbacks.feedback_list[index] == 5">
+                                                    <img t-att-title="feedbacks.reason_list[index] ? feedbacks.reason_list[index] : 'No Reason'" src="/im/static/src/img/ok.png"></img>
+                                                </span>
+                                                <span t-if="feedbacks.feedback_list[index] == 10">
+                                                    <img title="Good" src="/im/static/src/img/good.png"/>
+                                                </span>
+                                            </t>
+                                        </t>
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_im_livechat_channel_session_tree">
+            <field name="name">im_livechat.channel.session.tree</field>
+            <field name="model">im_livechat.channel.session</field>
+            <field name="arch" type="xml">
+                <tree string="Feedback" create="false">
+                    <field name="channel_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="channel_name"/>
+                    <field name="responsible_name"/>
+                    <field name="start_date"/>
+                    <field name="duration"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_im_message_search">
+            <field name="name">im.message.search</field>
+            <field name="model">im.message</field>
+            <field name="arch" type="xml">
+                <search string="Chat History">
+                    <field name="session_id"/>
+                    <field name="date" string="Date"/>
+                    <field name="from_id" string="From"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Session" name="group_session_id" context="{'group_by':'session_id'}"/>
+                        <filter string="Date" name="group_date" context="{'group_by':'date'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_history">
+            <field name="name">History</field>
+            <field name="res_model">im.message</field>
+            <field name="view_mode">list</field>
+            <field name="domain">[('session_id.channel_id', '!=', None)]</field>
+            <field name="search_view_id" ref="view_im_message_search"/>
+        </record>
+
+        <menuitem name="History" parent="im_livechat" id="history" action="action_history" groups="group_im_livechat_manager"/>
+
+        <record id="im_message_form" model="ir.ui.view">
+            <field name="name">im.message.tree</field>
+            <field name="model">im.message</field>
+            <field name="arch" type="xml">
+                <tree string="History">
+                    <field name="session_id"/>
+                    <field name="date"/>
+                    <field name="from_id"/>
+                    <field name="message"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_im_livechat_channel_session_form">
+            <field name="name">im_livechat.channel.session.form</field>
+            <field name="model">im_livechat.channel.session</field>
+            <field name="arch" type="xml">
+                <form string="Feedback" version="7.0" create="false" edit="false">
+                    <group col="4">
+                        <field name="channel_name" required="1"/>
+                        <field name="responsible_name"/>
+                        <field name="start_date"/>
+                        <field name="duration"/>
+                    </group>
+                    <field name="feedback_ids" nolable="1">
+                        <tree string="List">
+                            <field name="feedback_date"/>
+                            <field name="feedback"/>
+                            <field name="reason"/>
+                            <button string="Chat History"
+                                name="action_chat_history"
+                                icon="terp-project"
+                                type="object"/>
+                        </tree>
+                    </field>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_im_livechat_channel_session2">
+            <field name="name">Feedback</field>
+            <field name="res_model">im_livechat.channel.session</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="context">{
+                'search_default_channel_id': [active_id],
+                'default_channel_id': active_id, 
+                'active_test': False,
+            }</field>
+            <field name="search_view_id" ref="view_im_livechat_channel_session_search"/>
+        </record>
+        
+        <record model="ir.actions.act_window" id="action_im_livechat_channel_session">
+            <field name="name">Feedback</field>
+            <field name="res_model">im_livechat.channel.session</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="search_view_id" ref="view_im_livechat_channel_session_search"/>
+        </record>
+
+        <menuitem name="Feedback" parent="im_livechat" id="im_feedback" action="action_im_livechat_channel_session" groups="group_im_livechat_manager"/>
+
         <record model="ir.actions.act_window" id="action_support_channels">
             <field name="name">Live Chat Channels</field>
             <field name="res_model">im_livechat.channel</field>
@@ -20,8 +190,8 @@
               </p>
             </field>
         </record>
-        <menuitem name="Channels" parent="im_livechat" id="support_channels" action="action_support_channels" groups="group_im_livechat"/>
 
+        <menuitem name="Channels" sequence="5" parent="im_livechat" id="support_channels" action="action_support_channels" groups="group_im_livechat"/>
 
         <record model="ir.ui.view" id="support_channel_kanban">
             <field name="name">support_channel.kanban</field>
@@ -32,13 +202,19 @@
                     <field name="web_page"/>
                     <field name="are_you_inside"/>
                     <field name="user_ids"/>
+                    <field name="channel_ids"/>
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_group_image">
                                 <a type="open"><img t-att-src="kanban_image('im_livechat.channel', 'image_medium', record.id.value)" class="oe_group_photo"/></a>
                             </div>
                             <div class="oe_group_details">
-                                <h4><a type="open"><field name="name"/></a></h4>
+                                <div class="oe_channel_name">
+                                    <a type="open"><field name="name"/></a>
+                                </div>
+                                <div class="oe_channel_feedback" groups="im_livechat.group_im_livechat_manager">
+                                    <a t-if="record.channel_ids.raw_value" name="%(action_im_livechat_channel_session2)d" type="action">Feedback</a>
+                                </div>
                                 <div class="oe_kanban_footer_left">
                                     <span>
                                         <span class="oe_e">+</span> <t t-esc="(record.user_ids.raw_value || []).length"/>
@@ -103,43 +279,35 @@
                         </group>
                     </group>
 
-                    <div attrs='{"invisible": [["web_page", "=", False]]}'>
-                        <separator string="How to use the Live Chat widget?"/>
-                        <p>
-                            Copy and paste this code into your website, within the &amp;lt;head&amp;gt; tag:
-                        </p>
-                        <field name="script" readonly="1" class="oe_tag"/>
-                        <p>
-                            or copy this url and send it by email to your customers or suppliers:
-                        </p>
-                        <field name="web_page" readonly="1" class="oe_tag"/>
-                    </div>
-
+                    <notebook>
+                        <page string="General">
+                            <div attrs='{"invisible": [["web_page", "=", False]]}'>
+                                <separator string="How to use the Live Chat widget?"/>
+                                <p>
+                                    Copy and paste this code into your website, within the &amp;lt;head&amp;gt; tag:
+                                </p>
+                                <field name="script" readonly="1" class="oe_tag"/>
+                                <p>
+                                    or copy this url and send it by email to your customers or suppliers:
+                                </p>
+                                <field name="web_page" readonly="1" class="oe_tag"/>
+                            </div>
+                        </page>
+                        <page string="Answer Shortcut">
+                            <p class="oe_grey">Enter # to access shortcuts into the chat session.</p>
+                            <field name="hashtag_channel_ids"  nolable="1">
+                            <tree string="List" editable="top">
+                                <field name="hashtag"/>
+                                <field name="note" widget="char"/>
+                                <field name="user_id"/>
+                            </tree>
+                            </field>
+                        </page>
+                    </notebook>
                 </sheet>
                 </form>
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_history">
-            <field name="name">History</field>
-            <field name="res_model">im.message</field>
-            <field name="view_mode">list</field>
-            <field name="domain">[('session_id.channel_id', '!=', None)]</field>
-        </record>
-        <menuitem name="History" parent="im_livechat" id="history" action="action_history" groups="group_im_livechat_manager"/>
-
-        <record id="im_message_form" model="ir.ui.view">
-            <field name="name">im.message.tree</field>
-            <field name="model">im.message</field>
-            <field name="arch" type="xml">
-                <tree string="History">
-                    <field name="session_id"/>
-                    <field name="date"/>
-                    <field name="from_id"/>
-                    <field name="message"/>
-                </tree>
-            </field>
-        </record>
-
     </data>
 </openerp>

=== modified file 'im_livechat/security/ir.model.access.csv'
--- im_livechat/security/ir.model.access.csv	2013-05-24 13:33:41 +0000
+++ im_livechat/security/ir.model.access.csv	2014-01-15 16:16:23 +0000
@@ -2,7 +2,15 @@
 access_ls_chann1,im_livechat.channel,model_im_livechat_channel,,1,0,0,0
 access_ls_chann2,im_livechat.channel,model_im_livechat_channel,group_im_livechat,1,1,1,0
 access_ls_chann3,im_livechat.channel,model_im_livechat_channel,group_im_livechat_manager,1,1,1,1
+access_im_feedback,im.feedback,model_im_feedback,group_im_livechat,1,1,1,0
+access_im_feedback_manager,im.feedback,model_im_feedback,group_im_livechat_manager,1,1,1,0
+access_im_feedback_anonymous,im.feedback,model_im_feedback,portal.group_anonymous,1,1,0,0
+access_ls_channel_session_anonymous,im_livechat.channel.session,model_im_livechat_channel_session,portal.group_anonymous,1,0,0,0
+access_ls_channel_session,im_livechat.channel.session,model_im_livechat_channel_session,group_im_livechat,1,1,1,0
+access_ls_channel_session_manager,im_livechat.channel.session,model_im_livechat_channel_session,group_im_livechat_manager,1,0,0,1
 access_ls_message_portal,im_livechat.im.message.portal,im.model_im_message,portal.group_portal,0,0,0,0
 access_im_user_portal,im_livechat.im.user.portal,im.model_im_user,portal.group_portal,1,0,0,0
+access_im_message_manager,im_livechat.im.message,im.model_im_message,group_im_livechat_manager,1,1,1,0
 access_ls_message,im_livechat.im.message,im.model_im_message,portal.group_anonymous,0,0,0,0
+access_ls_message_user,im_livechat.im.message,im.model_im_message,group_im_livechat,1,1,0,0
 access_im_user,im_livechat.im.user,im.model_im_user,portal.group_anonymous,1,0,0,0
\ No newline at end of file

=== added directory 'im_livechat/static/ext/static/css'
=== added file 'im_livechat/static/ext/static/css/im_livechat.css'
--- im_livechat/static/ext/static/css/im_livechat.css	1970-01-01 00:00:00 +0000
+++ im_livechat/static/ext/static/css/im_livechat.css	2014-01-15 16:16:23 +0000
@@ -0,0 +1,39 @@
+.oe_kanban_im_livechat {
+    max-width: 180px;
+}
+.oe_kanban_im_livechat_avatars img {
+    height: 50px;
+    width: 50px;
+    padding-left: 0px;
+    margin-left: 40px;
+    margin-top: -50px;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+    -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+.oe_kanban_feedback {
+    padding-top: 8px;
+}
+.oe_kanban_feedback img{
+    width: 30px;
+    height: 30px;
+}
+.oe_channel_feedback > a:hover {
+    text-decoration: underline !important;
+}
+.oe_channel_name {
+    font-weight: bold;
+}
+.oe_kanban_content span > h3,h4 {
+    width: 122px;
+}
+.oe_kanban_record .oe_group_button {
+    position: relative;
+}
+.openerp .oe_kanban_view .oe_kanban_action_button {
+    margin-top: 10px;
+}
+

=== modified file 'im_livechat/static/ext/static/js/livesupport.js'
--- im_livechat/static/ext/static/js/livesupport.js	2013-09-02 16:15:17 +0000
+++ im_livechat/static/ext/static/js/livesupport.js	2014-01-15 16:16:23 +0000
@@ -71,7 +71,7 @@
         init: function(parent, channel, options) {
             this._super(parent);
             this.channel = channel;
-            this.options = options;
+            this.options = _.defaults(options,{feedback: true});
             this.text = options.buttonText;
         },
         start: function() {

=== added file 'im_livechat/static/src/img/groupdefault.png'
Binary files im_livechat/static/src/img/groupdefault.png	1970-01-01 00:00:00 +0000 and im_livechat/static/src/img/groupdefault.png	2014-01-15 16:16:23 +0000 differ
=== added directory 'im_livechat/test'
=== added file 'im_livechat/test/test_im_livechat.yml'
--- im_livechat/test/test_im_livechat.yml	1970-01-01 00:00:00 +0000
+++ im_livechat/test/test_im_livechat.yml	2014-01-15 16:16:23 +0000
@@ -0,0 +1,39 @@
+- 
+  Create a channel.
+-
+  !record {model: im_livechat.channel, id: channel_website, view: False}:
+    name: YourWebsite.com
+    default_message: Hello, how may I help you?
+-
+  Create a hashtag message without user.
+-
+  !record {model: im.hashtag.message, id: im_hashtags_7, view: False}:
+    hashtag: '#der'
+    note: there
+    user_id: False
+    channel_id: channel_website
+-
+  Create a hashtag message with user.
+-
+  !record {model: im.hashtag.message, id: im_hashtags_8, view: False}:
+    hashtag: '#dis'
+    note: this
+    user_id: base.partner_root
+    channel_id: channel_website
+-
+  I check that the hashtag message is created successfully.
+-
+  !python {model: im.hashtag.message}: |
+    hashtag_id = self.browse(cr, uid, ref('im_hashtags_7'), context={})
+    assert hashtag_id, 'No Hashtag is generated!'
+-  
+  Create an im user. 
+-
+  !record {model: im.user, id: im_user_1, view: False}:
+    user_id: base.partner_root
+-
+  I browse individual user assigned and global hashtag message.
+-
+  !python {model: im.hashtag.message}: |
+    hashtag_ids = self.pool.get('im.user').get_hashtags(cr, uid, ref('im_user_1'), context={})
+    assert hashtag_ids, 'No more Hashtags!'

=== modified file 'im_livechat/web_page.html'
--- im_livechat/web_page.html	2013-03-15 11:21:53 +0000
+++ im_livechat/web_page.html	2014-01-15 16:16:23 +0000
@@ -41,7 +41,6 @@
             margin-top: -150px;
             color: white;
             text-shadow: 0 1px 0 rgba(34, 52, 72, 0.2);
-            z-index: 10;
             text-align: center;
         }
         .main h1 {