odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Added date on message 

bzr revid: nicolas.vanhoren@openerp.com-20121130142601-bsqe00tyv2thuqz4
This commit is contained in:
niv-openerp 2012-11-30 15:26:01 +01:00
parent 78d5829642
commit 88f6d86264
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/web_im/im.py
View File

@ -22,6 +22,7 @@
import openerp
import openerp.tools.config
import openerp.modules.registry
import datetime
from osv import osv, fields
WATCHER_TIMER = 60
@ -109,6 +110,11 @@ class im_message(osv.osv):
'message': fields.char(string="Message", size=200, required=True),
'from': fields.many2one("res.users", "From", required= True, ondelete='cascade'),
'to': fields.many2one("res.users", "From", required=True, select=True, ondelete='cascade'),
'date': fields.datetime("Date", required=True),
}
_defaults = {
'date': datetime.datetime.now(),
}
def get_messages(self, cr, uid, last=None, context=None):
@ -116,7 +122,7 @@ class im_message(osv.osv):
tmp = self.search(cr, uid, [['to', '=', uid]], order="id desc", limit=1, context=context)
last = tmp[0] if len(tmp) >= 1 else -1
res = self.search(cr, uid, [['id', '>', last], ['to', '=', uid]], order="id", context=context)
res = self.read(cr, uid, res, ["id", "message", "from"], context=context)
res = self.read(cr, uid, res, ["id", "message", "from", "date"], context=context)
if len(res) > 0:
last = res[-1]["id"]
return {"res": res, "last": last, "dbname": cr.dbname}

9
addons/web_im/static/src/js/im.js
View File

@ -211,7 +211,7 @@ openerp.web_im = function(instance) {
this.$el.css("right", this.get("right_position"));
},
received_message: function(message) {
this._add_bubble("Him", [message.message]);
this._add_bubble("Him", [message.message], message.date);
},
send_message: function(e) {
if(e && e.which !== 13) {
@ -219,12 +219,13 @@ openerp.web_im = function(instance) {
}
var mes = this.$("input").val();
this.$("input").val("");
this._add_bubble("Me", [mes]);
this._add_bubble("Me", [mes], instance.web.datetime_to_str(new Date()));
var model = new instance.web.Model("im.message");
model.call("post", [mes, this.user_rec.id], {context: new instance.web.CompoundContext()});
},
_add_bubble: function(name, items) {
var date = new Date().toString(Date.CultureInfo.formatPatterns.shortDate + " " + Date.CultureInfo.formatPatterns.shortTime);
_add_bubble: function(name, items, date) {
date = instance.web.str_to_datetime(date);
date = date.toString(Date.CultureInfo.formatPatterns.shortDate + " " + Date.CultureInfo.formatPatterns.shortTime);
var bubble = QWeb.render("Conversation.bubble", {"items": items, "name": name, "time": date});
this.$(".oe_im_chatview_content").append($(bubble));
},